Merge pull request #889 from CliMA/as/up-pkgversions

Update ClimaAtmos compat to 0.27, ClimaLand to 0.13
CliMA · Jul 9, 2024 · da579bd · da579bd
2 parents 6541ec5 + 5582838
commit da579bd
Show file tree

Hide file tree

Showing 12 changed files with 168 additions and 155 deletions.
diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
@@ -44,11 +44,13 @@ steps:
       - "julia --project=experiments/ClimaCore/ -e 'using Pkg; Pkg.status()'"
 
       - echo "--- Instantiate ClimaEarth env"
+      - "julia --project=experiments/ClimaEarth/ -e 'using Pkg; Pkg.develop(path=\".\")'"
       - "julia --project=experiments/ClimaEarth/ -e 'using Pkg; Pkg.instantiate(;verbose=true)'"
       - "julia --project=experiments/ClimaEarth/ -e 'using Pkg; Pkg.precompile()'"
       - "julia --project=experiments/ClimaEarth/ -e 'using Pkg; Pkg.status()'"
 
       - echo "--- Instantiate perf env"
+      - "julia --project=perf/ -e 'using Pkg; Pkg.develop(path=\".\")'"
       - "julia --project=perf/ -e 'using Pkg; Pkg.instantiate(;verbose=true)'"
       - "julia --project=perf/ -e 'using Pkg; Pkg.precompile()'"
       - "julia --project=perf/ -e 'using Pkg; Pkg.status()'"

diff --git a/config/benchmark_configs/climaatmos.yml b/config/benchmark_configs/climaatmos.yml
@@ -8,7 +8,7 @@ dt_save_to_sol: "Inf"
 dz_bottom: 30.0
 dz_top: 3000.0
 h_elem: 30
-idealized_insolation: false
+insolation: "timevarying"
 implicit_diffusion: true
 moist: equil
 output_default_diagnostics: false

diff --git a/config/benchmark_configs/climaatmos_diagedmf.yml b/config/benchmark_configs/climaatmos_diagedmf.yml
@@ -14,7 +14,7 @@ edmfx_sgs_diffusive_flux: true
 edmfx_sgs_mass_flux: true
 edmfx_upwinding: first_order
 h_elem: 30
-idealized_insolation: false
+insolation: "timevarying"
 implicit_diffusion: true
 moist: equil
 ode_algo: ARS343

diff --git a/config/benchmark_configs/climaatmos_diagedmf_io.yml b/config/benchmark_configs/climaatmos_diagedmf_io.yml
@@ -14,7 +14,7 @@ edmfx_sgs_diffusive_flux: true
 edmfx_sgs_mass_flux: true
 edmfx_upwinding: first_order
 h_elem: 30
-idealized_insolation: false
+insolation: "timevarying"
 implicit_diffusion: true
 moist: equil
 ode_algo: ARS343

diff --git a/config/ci_configs/gpu_amip_target_topo_diagedmf_shortrun.yml b/config/ci_configs/gpu_amip_target_topo_diagedmf_shortrun.yml
@@ -10,7 +10,7 @@ dt_save_state_to_disk: "1days"
 dt_save_to_sol: "1days"
 energy_check: false
 hourly_checkpoint: true
-idealized_insolation: false
+insolation: "timevarying"
 land_albedo_type: "map_temporal"
 mode_name: "amip"
 mono_surface: false

diff --git a/config/ci_configs/target_params_in_slab_test2.yml b/config/ci_configs/target_params_in_slab_test2.yml
@@ -8,7 +8,7 @@ dt_rad: "6hours"
 dt_save_to_sol: "3600secs"
 energy_check: true
 h_elem: 6
-idealized_insolation: false
+insolation: "timevarying"
 mode_name: "slabplanet"
 moist: "equil"
 mono_surface: true

diff --git a/config/ci_configs/target_params_in_slab_test3.yml b/config/ci_configs/target_params_in_slab_test3.yml
@@ -8,7 +8,7 @@ dt_rad: "6hours"
 dt_save_to_sol: "3600secs"
 energy_check: true
 h_elem: 6
-idealized_insolation: false
+insolation: "timevarying"
 mode_name: "slabplanet"
 moist: "equil"
 mono_surface: true