oceanbox/Plume
6
0
Fork 0
Code Issues 1 Pull Requests 1 Actions Packages Projects Releases 92 Wiki Activity

chore: Bump SDSLite for netcdf createdimension workaround

Browse Source
This commit is contained in:
Moritz Jörg
2025-09-01 16:02:11 +02:00
parent e0180ee2e5
commit 3b53883554
13 changed files with 93 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
default.nix
View File

@@ -100,11 +100,16 @@ rec {
fantomas
fsautocomplete
dotnet-sdk
# k8s
kustomize
kubernetes-helm
mirrord
];
# Environment variables
DOTNET_ROOT = dotnet-sdk;
DOTNET_ROOT = "${dotnet-sdk}/share/dotnet";
DOTNET_CLI_TELEMETRY_OPTOUT = "true";
LOG_LEVEL = "verbose";

2
nix/package.nix
View File

@@ -21,7 +21,7 @@ let
packageSources = {
"Oceanbox.FvcomKit" = "https://gitlab.com/api/v4/projects/35569541/packages/nuget/download";
"ProjNet.FSharp" = "https://gitlab.com/api/v4/projects/35009572/packages/nuget/download";
"SDSLite.Oceanbox" = "https://gitlab.com/api/v4/projects/34025102/packages/nuget/download";
"Oceanbox.SDSLite" = "https://gitlab.com/api/v4/projects/34025102/packages/nuget/download";
"Oceanbox.ServerPack" = "https://gitlab.com/api/v4/projects/67427353/packages/nuget/download";
"Oceanbox.DataAgent" = "https://gitlab.com/api/v4/projects/37541600/packages/nuget/download";
# TODO(mrtz): Move to poseidon

4
src/Console/Plume.Console.fsproj
View File

@@ -16,8 +16,8 @@
<ItemGroup>
<PackageReference Include="Argu" Version="6.2.5"/>
<PackageReference Include="FSharpPlus" Version="1.7.0"/>
<PackageReference Include="Oceanbox.FvcomKit" Version="5.12.0"/>
<PackageReference Include="SDSLite.Oceanbox" Version="2.7.2"/>
<PackageReference Include="Oceanbox.FvcomKit" Version="5.12.2"/>
<PackageReference Include="Oceanbox.SDSLite" Version="2.8.0"/>
<PackageReference Include="Serilog" Version="4.2.0"/>
<PackageReference Include="Serilog.Sinks.Console" Version="6.0.0"/>
<PackageReference Include="Serilog.Sinks.Seq" Version="9.0.0"/>

28
src/Console/packages.lock.json
View File

@@ -29,9 +29,9 @@
},
"Oceanbox.FvcomKit": {
"type": "Direct",
"requested": "[5.12.0, )",
"resolved": "5.12.0",
"contentHash": "78qkFpO2819Ddg6hYqRKXwCj2/ZBqrNKJ3536Q9R+4lx7dfMox97VPcpHviPRb/NsFG1M60TaYpm2DxuZclPaA==",
"requested": "[5.12.2, )",
"resolved": "5.12.2",
"contentHash": "vOB9Me2Gb7yhnnEGOLfWFMBgKBiGc9ktOor++YfCSddCOjdLVM4oLQwbg2/miL8rZ26lprU/H6IdZ5nnWlVDRg==",
"dependencies": {
"FSharp.Core": "9.0.201",
"FSharp.Data": "6.4.1",
@@ -40,19 +40,19 @@
"KDTree": "1.4.1",
"MathNet.Numerics.FSharp": "5.0.0",
"MessagePack": "3.1.3",
"Oceanbox.SDSLite": "2.8.0",
"ProjNet.FSharp": "5.2.0",
"SDSlite.Oceanbox": "2.7.3",
"Serilog": "4.2.0",
"Serilog.Sinks.Console": "6.0.0",
"Serilog.Sinks.Seq": "9.0.0",
"Thoth.Json.Net": "12.0.0"
}
},
"SDSLite.Oceanbox": {
"Oceanbox.SDSLite": {
"type": "Direct",
"requested": "[2.7.2, )",
"resolved": "2.7.3",
"contentHash": "tmTPsEUmQhwaCzHwuSw7he2FfjcVpZ/Sy2ewfTwm1IKnwOZazKouTS5t4LNUpaGtjK1o/gdfz1b+0KxXnUl97g==",
"requested": "[2.8.0, )",
"resolved": "2.8.0",
"contentHash": "DzMcnywHhtmLVDZSVCZq6Mqq+SIm4snGRYgquho9xZSyEq5RhBkLdSa5k59m7o24FGZyt75DGpElN9p+dezU7Q==",
"dependencies": {
"DynamicInterop": "0.9.1"
}
@@ -544,6 +544,14 @@
"ProjNet": "2.0.0"
}
},
"SDSLite.Oceanbox": {
"type": "Transitive",
"resolved": "2.7.3",
"contentHash": "tmTPsEUmQhwaCzHwuSw7he2FfjcVpZ/Sy2ewfTwm1IKnwOZazKouTS5t4LNUpaGtjK1o/gdfz1b+0KxXnUl97g==",
"dependencies": {
"DynamicInterop": "0.9.1"
}
},
"Serilog.Sinks.File": {
"type": "Transitive",
"resolved": "6.0.0",
@@ -670,8 +678,8 @@
"FSharp.Core": "[9.0.300, )",
"FSharpPlus": "[1.7.0, )",
"Oceanbox.DataAgent": "[6.23.1, )",
"Oceanbox.FvcomKit": "[5.12.0, )",
"SDSLite.Oceanbox": "[2.7.3, )",
"Oceanbox.FvcomKit": "[5.12.2, )",
"Oceanbox.SDSLite": "[2.8.0, )",
"Serilog": "[4.2.0, )",
"Serilog.Sinks.Console": "[6.0.0, )",
"Thoth.Json.Net": "[12.0.0, )"

22
src/Lib/Model.fs
View File

@@ -5,7 +5,6 @@ open FSharpPlus.Data.NonEmptySeq
open Tools
open Serilog
[<Struct>]
type AmbientData = {
temp: float array
salt: float array
@@ -17,7 +16,6 @@ type AmbientData = {
time: float
}
[<Struct>]
type ModelSolution = {
temp: float array
salt: float array
@@ -66,7 +64,7 @@ let dens (temp: float) (salt: float) (pres: float) =
let RB = b0 + (b1 + (b2 + (b3 + b4 * temp) * temp) * temp) * temp
let RC = c0 + (c1 + c2 * temp) * temp
SMOW + RB * salt + RC * salt ** 1.5 + d0 * salt * salt
SMOW + RB * salt + RC * (salt ** 1.5) + d0 * salt * salt
/// Secant bulk modulus
let seck salt temp pres =
@@ -120,7 +118,7 @@ let dens (temp: float) (salt: float) (pres: float) =
// Convert to bar
let pres = 0.1 * pres
dens0 salt temp / (1.0 - pres / seck salt temp pres)
(dens0 salt temp) / (1.0 - pres / seck salt temp pres)
let ambientWmass (za: float array) (Ta: float array) (Sa: float array) (zp: float) =
let i1 =
@@ -170,10 +168,10 @@ let zstep0 (s0: ModelSolution) (awm: AmbientData) (rhoref: float) (alpha: float)
failwith "theta larger than -pi for downward plume"
// Ambient velocity tangential to plume
let vat = va * cos th
let vat = va * (cos th)
// Ambient velocity normal to plume (in theta direction)
let van = va * sin theta0
let van = va * (sin theta0)
// Entrainment velocity
let ve = alpha * abs (v0 - vat) + beta * abs van
@@ -192,13 +190,13 @@ let zstep0 (s0: ModelSolution) (awm: AmbientData) (rhoref: float) (alpha: float)
// Momentum equation in normal (theta) direction
let theta =
if up then
theta0 + (-dr2v * van + R0 * R0 * gp * cos theta0) * ds / r2v2
theta0 + (-dr2v * van + R0 * R0 * gp * (cos theta0)) * ds / r2v2
else
theta0 + (dr2v * van + R0 * R0 * gp * cos theta0) * ds / r2v2
theta0 + (dr2v * van + R0 * R0 * gp * (cos theta0)) * ds / r2v2
// Equations for temperature and salinity
let r2vt = R0 * R0 * (v0 * (Ta - T0) + dTz * sin theta0 * ds)
let r2vs = R0 * R0 * (v0 * (Sa - S0) + dSz * sin theta0 * ds)
let r2vt = R0 * R0 * (v0 * (Ta - T0) + dTz * (sin theta0) * ds)
let r2vs = R0 * R0 * (v0 * (Sa - S0) + dSz * (sin theta0) * ds)
let T = Ta - r2vt / r2v
let S = Sa - r2vs / r2v
@@ -216,8 +214,8 @@ let zstep0 (s0: ModelSolution) (awm: AmbientData) (rhoref: float) (alpha: float)
R = Array.append s0.R [| R |]
vTr = Array.append s0.vTr [| vTr |]
redgrav = Array.append s0.redgrav [| gp |]
z = Array.append s0.z [| Array.last s0.z + ds * sin theta |]
x = Array.append s0.x [| Array.last s0.x + ds * cos theta |]
z = Array.append s0.z [| (Array.last s0.z) + ds * (sin theta) |]
x = Array.append s0.x [| (Array.last s0.x) + ds * (cos theta) |]
time = awm.time
}

2
src/Lib/Netcdf.fs
View File

@@ -165,6 +165,8 @@ let fvcomfiles (fvstarttime: float) (fvendtime: float) (path: string) =
files
let writeAmbientFile (amb: AmbientData array) (file: string) (sol: ModelSolution array) (dilution: float[][]) =
printfn $"%A{amb}"
printfn $"%s{file}"
if IO.File.Exists file then
IO.File.Delete file
let nc = new NetCDFDataSet (file)

4
src/Lib/Plume.Lib.fsproj
View File

@@ -17,9 +17,9 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="FSharpPlus" Version="1.7.0"/>
<PackageReference Include="Oceanbox.FvcomKit" Version="5.12.0"/>
<PackageReference Include="Oceanbox.FvcomKit" Version="5.12.2"/>
<PackageReference Include="Oceanbox.DataAgent" Version="6.23.1"/>
<PackageReference Include="SDSLite.Oceanbox" Version="2.7.3"/>
<PackageReference Include="Oceanbox.SDSLite" Version="2.8.0"/>
<PackageReference Include="Serilog" Version="4.2.0"/>
<PackageReference Include="Serilog.Sinks.Console" Version="6.0.0"/>
<PackageReference Include="Thoth.Json.Net" Version="12.0.0"/>

24
src/Lib/packages.lock.json
View File

@@ -41,9 +41,9 @@
},
"Oceanbox.FvcomKit": {
"type": "Direct",
"requested": "[5.12.0, )",
"resolved": "5.12.0",
"contentHash": "78qkFpO2819Ddg6hYqRKXwCj2/ZBqrNKJ3536Q9R+4lx7dfMox97VPcpHviPRb/NsFG1M60TaYpm2DxuZclPaA==",
"requested": "[5.12.2, )",
"resolved": "5.12.2",
"contentHash": "vOB9Me2Gb7yhnnEGOLfWFMBgKBiGc9ktOor++YfCSddCOjdLVM4oLQwbg2/miL8rZ26lprU/H6IdZ5nnWlVDRg==",
"dependencies": {
"FSharp.Core": "9.0.201",
"FSharp.Data": "6.4.1",
@@ -52,19 +52,19 @@
"KDTree": "1.4.1",
"MathNet.Numerics.FSharp": "5.0.0",
"MessagePack": "3.1.3",
"Oceanbox.SDSLite": "2.8.0",
"ProjNet.FSharp": "5.2.0",
"SDSlite.Oceanbox": "2.7.3",
"Serilog": "4.2.0",
"Serilog.Sinks.Console": "6.0.0",
"Serilog.Sinks.Seq": "9.0.0",
"Thoth.Json.Net": "12.0.0"
}
},
"SDSLite.Oceanbox": {
"Oceanbox.SDSLite": {
"type": "Direct",
"requested": "[2.7.3, )",
"resolved": "2.7.3",
"contentHash": "tmTPsEUmQhwaCzHwuSw7he2FfjcVpZ/Sy2ewfTwm1IKnwOZazKouTS5t4LNUpaGtjK1o/gdfz1b+0KxXnUl97g==",
"requested": "[2.8.0, )",
"resolved": "2.8.0",
"contentHash": "DzMcnywHhtmLVDZSVCZq6Mqq+SIm4snGRYgquho9xZSyEq5RhBkLdSa5k59m7o24FGZyt75DGpElN9p+dezU7Q==",
"dependencies": {
"DynamicInterop": "0.9.1"
}
@@ -525,6 +525,14 @@
"ProjNet": "2.0.0"
}
},
"SDSLite.Oceanbox": {
"type": "Transitive",
"resolved": "2.7.3",
"contentHash": "tmTPsEUmQhwaCzHwuSw7he2FfjcVpZ/Sy2ewfTwm1IKnwOZazKouTS5t4LNUpaGtjK1o/gdfz1b+0KxXnUl97g==",
"dependencies": {
"DynamicInterop": "0.9.1"
}
},
"Serilog.Sinks.File": {
"type": "Transitive",
"resolved": "6.0.0",

2
src/Server/JobActor.fs
View File

@@ -404,7 +404,7 @@ let processPlumeJob (plume: PlumeJob) (jobId: int) (guid: Guid) (agent: string)
// Write files
let dirname = plumeBasePath guid
// Create if it does not exists, accounts for subDirs
// Create if it does not exist, accounts for subDirs
if Directory.Exists(dirname) |> not then
Directory.CreateDirectory(dirname) |> ignore
let out = Path.Combine(dirname, outCsv)

4
src/Server/Plume.Server.fsproj
View File

@@ -38,9 +38,9 @@
<PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="8.0.17"/>
<PackageReference Include="Swashbuckle.AspNetCore" Version="9.0.1"/>
<PackageReference Include="FSharpPlus" Version="1.7.0"/>
<PackageReference Include="Oceanbox.FvcomKit" Version="5.12.0"/>
<PackageReference Include="Oceanbox.FvcomKit" Version="5.12.2"/>
<PackageReference Include="Oceanbox.ServerPack" Version="1.20.2"/>
<PackageReference Include="SDSLite.Oceanbox" Version="2.7.3"/>
<PackageReference Include="Oceanbox.SDSLite" Version="2.8.0"/>
<PackageReference Include="Sentry.AspNetCore" Version="5.11.0"/>
<PackageReference Include="Serilog" Version="4.2.0"/>
<PackageReference Include="Serilog.AspNetCore" Version="9.0.0"/>

14
src/Server/appsettings.json
View File

@@ -1,8 +1,10 @@
{
"archmaesterUrl": "https://atlantis.srv.oceanbox.io",
"cacheDir": "/data/archives/cache",
"appEnv" : "example setting",
"appName" : "example setting",
"appNamespace" : "example setting",
"appVersion" : "example setting"
"archmaesterUrl": "https://atlantis.beta.oceanbox.io",
"appName": "plume",
"appEnv": "mrtz",
"appNamespace": "mrtz-plume",
"appVersion": "0.0.0",
"otelCollector": "http://10.255.241.12:4317",
"sentryUrl": "https://2b68ecf0c4d02e6cc9433c371321ac9d@o4509530141622272.ingest.de.sentry.io/4509910315237456",
"cacheDir": "/data/archives/cache"
}

38
src/Server/packages.lock.json
View File

@@ -131,9 +131,9 @@
},
"Oceanbox.FvcomKit": {
"type": "Direct",
"requested": "[5.12.0, )",
"resolved": "5.12.0",
"contentHash": "78qkFpO2819Ddg6hYqRKXwCj2/ZBqrNKJ3536Q9R+4lx7dfMox97VPcpHviPRb/NsFG1M60TaYpm2DxuZclPaA==",
"requested": "[5.12.2, )",
"resolved": "5.12.2",
"contentHash": "vOB9Me2Gb7yhnnEGOLfWFMBgKBiGc9ktOor++YfCSddCOjdLVM4oLQwbg2/miL8rZ26lprU/H6IdZ5nnWlVDRg==",
"dependencies": {
"FSharp.Core": "9.0.201",
"FSharp.Data": "6.4.1",
@@ -142,14 +142,23 @@
"KDTree": "1.4.1",
"MathNet.Numerics.FSharp": "5.0.0",
"MessagePack": "3.1.3",
"Oceanbox.SDSLite": "2.8.0",
"ProjNet.FSharp": "5.2.0",
"SDSlite.Oceanbox": "2.7.3",
"Serilog": "4.2.0",
"Serilog.Sinks.Console": "6.0.0",
"Serilog.Sinks.Seq": "9.0.0",
"Thoth.Json.Net": "12.0.0"
}
},
"Oceanbox.SDSLite": {
"type": "Direct",
"requested": "[2.8.0, )",
"resolved": "2.8.0",
"contentHash": "DzMcnywHhtmLVDZSVCZq6Mqq+SIm4snGRYgquho9xZSyEq5RhBkLdSa5k59m7o24FGZyt75DGpElN9p+dezU7Q==",
"dependencies": {
"DynamicInterop": "0.9.1"
}
},
"Oceanbox.ServerPack": {
"type": "Direct",
"requested": "[1.20.2, )",
@@ -209,15 +218,6 @@
"Saturn": "0.17.0"
}
},
"SDSLite.Oceanbox": {
"type": "Direct",
"requested": "[2.7.3, )",
"resolved": "2.7.3",
"contentHash": "tmTPsEUmQhwaCzHwuSw7he2FfjcVpZ/Sy2ewfTwm1IKnwOZazKouTS5t4LNUpaGtjK1o/gdfz1b+0KxXnUl97g==",
"dependencies": {
"DynamicInterop": "0.9.1"
}
},
"Sentry.AspNetCore": {
"type": "Direct",
"requested": "[5.11.0, )",
@@ -1384,6 +1384,14 @@
"ProjNet": "2.0.0"
}
},
"SDSLite.Oceanbox": {
"type": "Transitive",
"resolved": "2.7.3",
"contentHash": "tmTPsEUmQhwaCzHwuSw7he2FfjcVpZ/Sy2ewfTwm1IKnwOZazKouTS5t4LNUpaGtjK1o/gdfz1b+0KxXnUl97g==",
"dependencies": {
"DynamicInterop": "0.9.1"
}
},
"Sentry": {
"type": "Transitive",
"resolved": "5.11.0",
@@ -1609,8 +1617,8 @@
"FSharp.Core": "[9.0.300, )",
"FSharpPlus": "[1.7.0, )",
"Oceanbox.DataAgent": "[6.23.1, )",
"Oceanbox.FvcomKit": "[5.12.0, )",
"SDSLite.Oceanbox": "[2.7.3, )",
"Oceanbox.FvcomKit": "[5.12.2, )",
"Oceanbox.SDSLite": "[2.8.0, )",
"Serilog": "[4.2.0, )",
"Serilog.Sinks.Console": "[6.0.0, )",
"Thoth.Json.Net": "[12.0.0, )"

2
tilt/values.yaml
View File

@@ -11,6 +11,8 @@ podAnnotations:
dapr.io/sidecar-cpu-request: "10m"
dapr.io/sidecar-memory-request: "50Mi"
env:
- name: ARCHMAESTER_AUTH
value: admin:en-to-tre-fire
- name: DAPR_API_TOKEN
valueFrom:
secretKeyRef: