Merge branch 'main' into reset

.github/workflows/core_testmodels.yml

@@ -36,7 +36,7 @@ jobs:
           cache-registries: "true"
       - uses: prefix-dev/[email protected]
         with:
-          pixi-version: "latest"
+          pixi-version: v0.30.0
       - name: Prepare pixi
         run: pixi run install-ci
       - name: Run testmodels with Ribasim Core

.github/workflows/core_tests.yml

@@ -36,7 +36,7 @@ jobs:
           cache-registries: "true"
       - uses: prefix-dev/[email protected]
         with:
-          pixi-version: "latest"
+          pixi-version: v0.30.0
       - name: Test Ribasim Core
         run: |
           pixi run test-ribasim-core-cov

.github/workflows/docs.yml

@@ -27,7 +27,7 @@ jobs:
           cache-registries: "true"
       - uses: prefix-dev/[email protected]
         with:
-          pixi-version: "latest"
+          pixi-version: v0.30.0
       - name: Prepare pixi
         run: pixi run install-ci
 

.github/workflows/julia_auto_update.yml

@@ -16,7 +16,7 @@ jobs:
           ssh-key: ${{ secrets.SSH_PRIVATE_KEY }}
       - uses: prefix-dev/[email protected]
         with:
-          pixi-version: "latest"
+          pixi-version: v0.30.0
       - name: Update Julia manifest file
         run: |
           pixi run install-julia

.github/workflows/mypy.yml

@@ -19,7 +19,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: prefix-dev/[email protected]
         with:
-          pixi-version: "latest"
+          pixi-version: v0.30.0
       - name: Run mypy on python/ribasim
         run: |
           pixi run mypy-ribasim-python

.github/workflows/pixi_auto_update.yml

@@ -19,6 +19,7 @@ jobs:
       - name: Set up pixi
         uses: prefix-dev/[email protected]
         with:
+          pixi-version: v0.30.0
           run-install: false
       - name: Update lockfiles
         run: |
@@ -31,7 +32,7 @@ jobs:
           commit-message: Update pixi lockfile
           title: Update pixi lockfile
           body-path: diff.md
-          branch: update-pixi
+          branch: update/pixi-lock
           base: main
           delete-branch: true
           add-paths: pixi.lock

.github/workflows/python_codegen.yml

@@ -19,7 +19,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: prefix-dev/[email protected]
         with:
-          pixi-version: "latest"
+          pixi-version: v0.30.0
       - name: Test if codegen runs without errors
         run: pixi run codegen
       - name: Ensure that no code has been generated

.github/workflows/python_tests.yml

@@ -29,7 +29,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: prefix-dev/[email protected]
         with:
-          pixi-version: "latest"
+          pixi-version: v0.30.0
       - name: Test Ribasim Python
         run: pixi run --environment ${{ matrix.pixi-environment }} test-ribasim-python-cov
       - name: Upload coverage to Codecov

.github/workflows/qgis.yml

@@ -19,7 +19,7 @@ jobs:
           - uses: actions/checkout@v4
           - uses: prefix-dev/[email protected]
             with:
-              pixi-version: "latest"
+              pixi-version: v0.30.0
           - name: Run tests
             run: pixi run test-ribasim-qgis-docker
           - name: Upload coverage to Codecov

core/src/config.jl

@@ -18,8 +18,8 @@ using OrdinaryDiffEqNonlinearSolve: NLNewton
 using OrdinaryDiffEqLowOrderRK: Euler, RK4
 using OrdinaryDiffEqTsit5: Tsit5
 using OrdinaryDiffEqSDIRK: ImplicitEuler, KenCarp4, TRBDF2
-using OrdinaryDiffEqBDF: QNDF
-using OrdinaryDiffEqRosenbrock: Rodas5, Rosenbrock23
+using OrdinaryDiffEqBDF: FBDF, QNDF
+using OrdinaryDiffEqRosenbrock: Rosenbrock23, Rodas4P, Rodas5P
 
 export Config, Solver, Results, Logging, Toml
 export algorithm,
@@ -213,9 +213,11 @@ Map from config string to a supported algorithm type from [OrdinaryDiffEq](https
 Supported algorithms:
 
 - `QNDF`
+- `FBDF`
 - `Rosenbrock23`
 - `TRBDF2`
-- `Rodas5`
+- `Rodas4P`
+- `Rodas5P`
 - `KenCarp4`
 - `Tsit5`
 - `RK4`
@@ -224,9 +226,11 @@ Supported algorithms:
 """
 const algorithms = Dict{String, Type}(
     "QNDF" => QNDF,
+    "FBDF" => FBDF,
     "Rosenbrock23" => Rosenbrock23,
     "TRBDF2" => TRBDF2,
-    "Rodas5" => Rodas5,
+    "Rodas4P" => Rodas4P,
+    "Rodas5P" => Rodas5P,
     "KenCarp4" => KenCarp4,
     "Tsit5" => Tsit5,
     "RK4" => RK4,

core/test/run_models_test.jl

@@ -280,7 +280,7 @@ end
     @test sparse_fdm.integrator.u ≈ sparse_ad.integrator.u atol = 4
     @test dense_fdm.integrator.u ≈ sparse_ad.integrator.u atol = 4
 
-    config = Ribasim.Config(toml_path; solver_algorithm = "Rodas5", solver_autodiff = true)
+    config = Ribasim.Config(toml_path; solver_algorithm = "Rodas5P", solver_autodiff = true)
     time_ad = Ribasim.run(config)
     @test successful_retcode(time_ad)
     @test time_ad.integrator.u ≈ sparse_ad.integrator.u atol = 10

docs/reference/usage.qmd

@@ -21,7 +21,7 @@ If your model does not converge, or your performance is lower than expected, it
 
 The default solver `algorithm = "QNDF"`, which is a multistep method similar to Matlab's `ode15s` [@shampine1997matlab].
 It is an implicit method that supports the default adaptive timestepping.
-The full list of available solvers is: `QNDF`, `Rosenbrock23`, `TRBDF2`, `Rodas5`, `KenCarp4`, `Tsit5`, `RK4`, `ImplicitEuler`, `Euler`.
+The full list of available solvers is: `QNDF`, `FBDF`, `Rosenbrock23`, `Rodas4P`, `Rodas5P`, `TRBDF2`, `KenCarp4`, `Tsit5`, `RK4`, `ImplicitEuler`, `Euler`.
 Information on the solver algorithms can be found on the [ODE solvers page](https://docs.sciml.ai/DiffEqDocs/stable/solvers/ode_solve/).
 
 By default Ribasim uses adaptive timestepping, though not all algorithms support adaptive timestepping.