comments

.buildkite/pipeline.yml

@@ -40,7 +40,7 @@ steps:
       - "julia --project=perf -e 'using Pkg; Pkg.status()'"
 
       - echo "--- Instantiate calibration/test"
-      - "julia --project=calibration/test -e 'using Pkg; Pkg.instantiate(;verbose=true)'"
+      - "julia --project=calibration/test -e 'using Pkg; Pkg.develop(;path="."); Pkg.instantiate(;verbose=true)'"
       - "julia --project=calibration/test -e 'using Pkg; Pkg.precompile()'"
       - "julia --project=calibration/test -e 'using Pkg; Pkg.status()'"
 

.github/workflows/calibration_test.yml

@@ -5,6 +5,15 @@ on:
   pull_request:
   merge_group:
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
+# Needed to allow julia-actions/cache to delete old caches that it has created
+permissions:
+  actions: write
+  contents: read
+
 jobs:
   test:
     name: ClimaCalibrate E2E Test
@@ -18,5 +27,5 @@ jobs:
         with:
           version: '1.10'
       - run: |
-          julia --project=calibration/test -e 'using Pkg; Pkg.instantiate(;verbose=true)'
+          julia --project=calibration/test -e 'using Pkg; Pkg.develop(;path="."); Pkg.instantiate(;verbose=true)'
           julia --project=calibration/test calibration/test/e2e_test.jl

.github/workflows/ci.yml

@@ -38,10 +38,6 @@ jobs:
           version: ${{ matrix.version }}
           arch: ${{ matrix.arch }}
       - uses: julia-actions/julia-buildpkg@v1
-      - name: Calibration E2E Test
-        run: |
-          julia --project=calibration/test -e 'using Pkg; Pkg.instantiate(;verbose=true)'
-          julia --project=calibration/test calibration/test/e2e_test.jl
       - uses: julia-actions/julia-runtest@v1
       - uses: julia-actions/julia-processcoverage@v1
       - uses: codecov/codecov-action@v4

.gitignore

@@ -28,6 +28,7 @@ docs/site/
 # environment.
 /Manifest.toml
 test/Manifest.toml
+calibration/test/Manifest.toml
 
 # ignore vscode artifacts
 *.vscode

calibration/experiments/sphere_held_suarez_rhoe_equilmoist/model_interface.jl

@@ -46,7 +46,7 @@ function run_forward_model(atmos_config::CA.AtmosConfig)
     simulation = CA.get_simulation(atmos_config)
     sol_res = CA.solve_atmos!(simulation)
     if sol_res.ret_code == :simulation_crashed
-        !isnothing(sol_res.sol) && sol_res.sol .= eltype(sol_res.sol)(NaN)
+        !isnothing(sol_res.sol) && sol_res.sol .= NaN
         error(
             "The ClimaAtmos simulation has crashed. See the stack trace for details.",
         )

calibration/experiments/sphere_held_suarez_rhoe_equilmoist/pipeline.sbatch

@@ -22,7 +22,7 @@ prior = get_prior(joinpath(experiment_dir, "prior.toml"))
 output_dir = joinpath("output", "sphere_held_suarez_rhoe_equilmoist")
 
 experiment_config = ExperimentConfig(; n_iterations, ensemble_size, 
-                                    observations, noise, output_dir, prior)
+                                       observations, noise, output_dir, prior)
 slurm_kwargs = kwargs(time = 50, ntasks = 16)
 eki = calibrate(CaltechHPCBackend, experiment_config; model_interface, slurm_kwargs, verbose=true)
 

calibration/model_interface.jl

@@ -61,7 +61,7 @@ function run_forward_model(atmos_config::CA.AtmosConfig)
     simulation = CA.get_simulation(atmos_config)
     sol_res = CA.solve_atmos!(simulation)
     if sol_res.ret_code == :simulation_crashed
-        !isnothing(sol_res.sol) && sol_res.sol .= eltype(sol_res.sol)(NaN)
+        !isnothing(sol_res.sol) && sol_res.sol .= NaN
         error(
             "The ClimaAtmos simulation has crashed. See the stack trace for details.",
         )