cp from ln/fixes-for-longruns + rebase

revert to min changes

pkg project

clean

pip fix

ρ_ice

conserving. add info for cc

conserving. add info for cc

add asserts

clean up cons checks

add softfails

add longrun softfails, amip netcdf_int

.buildkite/longruns/pipeline.yml

@@ -128,8 +128,8 @@ steps:
 
       - label: "ClimaAtmos standalone target"
         command:
-          - srun julia --project=experiments/AMIP/ target/atmos_driver.jl --config_file target/longrun_aquaplanet_rhoe_equilmoist_nz63_0M_55km_rs35km_clearsky_tvinsolation.yml
-        artifact_paths: "longrun_aquaplanet_rhoe_equilmoist_nz63_0M_55km_rs35km_clearsky_tvinsolation/*"
+          - srun julia --project=experiments/AMIP/ test/component_model_tests/climaatmos_standalone/atmos_driver.jl --config_file test/component_model_tests/climaatmos_standalone/longrun_aquaplanet_rhoe_equil_55km_nz63_clearsky_tvinsol_0M_slabocean.yml
+        artifact_paths: "longrun_aquaplanet_rhoe_equil_55km_nz63_clearsky_tvinsol_0M_slabocean/*"
         env:
           BUILD_HISTORY_HANDLE: ""
           CLIMACORE_DISTRIBUTED: "MPI"

Project.toml

@@ -38,7 +38,7 @@ NCDatasets = "0.11, 0.12, 0.13"
 Plots = "1.39.0"
 SciMLBase = "1, 2"
 StaticArrays = "1"
-Statistics = "1"
+Statistics = "=1.10.0"
 SurfaceFluxes = "0.8"
 TempestRemap_jll = "2"
 Thermodynamics = "0.11"

config/longrun_configs/amip_target.yml

@@ -1,18 +1,23 @@
-run_name: "amip_target"
 anim: true
-dt_cpl: 150
+apply_limiter: false
+atmos_config_file: "config/longrun_configs/longrun_aquaplanet_rhoe_equil_55km_nz63_clearsky_tvinsol_0M_slabocean.yml"
+dt_cloud_fraction: "1hours"
+dt_cpl: 100
+dt_rad: "1hours"
+dt_save_state_to_disk: "20days"
+dt_save_to_sol: "10days"
+dt: "100secs"
 energy_check: false
+FLOAT_TYPE: "Float32"
+hourly_checkpoint: true
+job_id: "amip_target"
+land_albedo_type: "map_temporal"
 mode_name: "amip"
 mono_surface: false
-dt: "150secs"
+rad: "allskywithclear"
+run_name: "amip_target"
+start_date: "19790301"
+surface_setup: "PrescribedSurface"
 t_end: "200days"
-job_id: "amip_target"
-dt_save_to_sol: "10days"
-dt_save_state_to_disk: "20days"
-apply_limiter: false
-hourly_checkpoint: true
 turb_flux_partition: "CombinedStateFluxes"
-atmos_config_file: "config/longrun_configs/longrun_aquaplanet_rhoe_equil_55km_nz63_clearsky_0M.yml"
-surface_setup: "PrescribedSurface"
-land_albedo_type: "map_temporal"
-start_date: "19790301"
+vert_diff: "true"

config/longrun_configs/amip_target_topo.yml

@@ -1,21 +1,27 @@
-run_name: "amip_target_topo"
 anim: true
-dt_cpl: 75
-energy_check: false
-mode_name: "amip"
-mono_surface: false
-dt: "150secs"
-t_end: "100days"
-job_id: "amip_target_topo"
-dt_save_to_sol: "10days"
-dt_save_state_to_disk: "20days"
 apply_limiter: false
+atmos_config_file: "config/longrun_configs/longrun_aquaplanet_rhoe_equil_55km_nz63_clearsky_tvinsol_0M_slabocean.yml"
+dt_cloud_fraction: "1hours"
+dt_cpl: 100
+dt_rad: "1hours"
+dt_save_state_to_disk: "20days"
+dt_save_to_sol: "10days"
+dt: "100secs"
+energy_check: false
+FLOAT_TYPE: "Float32"
 hourly_checkpoint: true
-turb_flux_partition: "CombinedStateFluxes"
-atmos_config_file: "config/longrun_configs/longrun_aquaplanet_rhoe_equil_55km_nz63_clearsky_0M.yml"
-surface_setup: "PrescribedSurface"
+job_id: "amip_target"
 land_albedo_type: "map_temporal"
+mode_name: "amip"
+mono_surface: false
+netcdf_interpolate_z_over_msl: true
+rad: "allskywithclear"
+run_name: "amip_target"
 start_date: "19790301"
-topography: "Earth"
+surface_setup: "PrescribedSurface"
+t_end: "200days"
 topo_smoothing: true
-use_reference_state: false
+topography: "Earth"
+turb_flux_partition: "CombinedStateFluxes"
+use_reference_state: false
+vert_diff: "true"

config/longrun_configs/slabplanet_aqua_atmos_sf_couple.yml

@@ -18,4 +18,5 @@ turb_flux_partition: "CombinedStateFluxes"
 surface_setup: "DefaultMoninObukhov"
 land_albedo_type: "function"
 evolving_ocean: false
-start_date: "19790301"
+start_date: "19790301"
+conservation_softfail: true

config/longrun_configs/slabplanet_aqua_atmos_sf_nocouple.yml

@@ -18,4 +18,5 @@ turb_flux_partition: "CombinedStateFluxes"
 surface_setup: "DefaultMoninObukhov"
 land_albedo_type: "function"
 evolving_ocean: false
-start_date: "19790301"
+start_date: "19790301"
+conservation_softfail: true

config/longrun_configs/slabplanet_aqua_coupler_sf.yml

@@ -18,4 +18,5 @@ turb_flux_partition: "CombinedStateFluxes"
 surface_setup: "PrescribedSurface"
 land_albedo_type: "function"
 evolving_ocean: false
-start_date: "19790301"
+start_date: "19790301"
+conservation_softfail: true

config/longrun_configs/slabplanet_aqua_target.yml

@@ -1,19 +1,22 @@
-run_name: "slabplanet_aqua_target"
 anim: true
+apply_limiter: false
+atmos_config_file: "config/longrun_configs/longrun_aquaplanet_rhoe_equil_55km_nz63_clearsky_0M.yml"
+dt_cloud_fraction: "1hours"
 dt_cpl: 150
-energy_check: false
-mode_name: "slabplanet_aqua"
-mono_surface: false
-dt: "150secs"
-t_end: "200days"
-job_id: "slabplanet_aqua_target"
-dt_save_to_sol: "10days"
+dt_rad: "1hours"
 dt_save_state_to_disk: "20days"
-apply_limiter: false
+dt_save_to_sol: "10days"
+dt: "150secs"
+energy_check: false
+evolving_ocean: false
 hourly_checkpoint: true
-turb_flux_partition: "CombinedStateFluxes"
-atmos_config_file: "config/longrun_configs/longrun_aquaplanet_rhoe_equil_55km_nz63_clearsky_0M.yml"
-surface_setup: "PrescribedSurface"
+job_id: "slabplanet_aqua_target"
 land_albedo_type: "function"
-evolving_ocean: false
+mode_name: "slabplanet_aqua"
+mono_surface: false
+run_name: "slabplanet_aqua_target"
 start_date: "19790301"
+surface_setup: "PrescribedSurface"
+t_end: "100days"
+turb_flux_partition: "CombinedStateFluxes"
+vert_diff: "true"

config/longrun_configs/slabplanet_aqua_target_evolve_ocn.yml

@@ -1,19 +1,22 @@
-run_name: "slabplanet_aqua_target_evolve_ocn"
 anim: true
+apply_limiter: false
+atmos_config_file: "config/longrun_configs/longrun_aquaplanet_rhoe_equil_55km_nz63_clearsky_0M.yml"
+dt_cloud_fraction: "1hours"
 dt_cpl: 150
-energy_check: false
-mode_name: "slabplanet_aqua"
-mono_surface: false
-dt: "150secs"
-t_end: "200days"
-job_id: "slabplanet_target_evolve_ocn"
-dt_save_to_sol: "10days"
+dt_rad: "1hours"
 dt_save_state_to_disk: "20days"
-apply_limiter: false
+dt_save_to_sol: "10days"
+dt: "150secs"
+energy_check: false
+evolving_ocean: true
 hourly_checkpoint: true
-turb_flux_partition: "CombinedStateFluxes"
-atmos_config_file: "config/longrun_configs/longrun_aquaplanet_rhoe_equil_55km_nz63_clearsky_0M.yml"
-surface_setup: "PrescribedSurface"
+job_id: "slabplanet_target_evolve_ocn"
 land_albedo_type: "function"
-evolving_ocean: true
+mode_name: "slabplanet_aqua"
+mono_surface: false
+run_name: "slabplanet_aqua_target_evolve_ocn"
 start_date: "19790301"
+surface_setup: "PrescribedSurface"
+t_end: "100days"
+turb_flux_partition: "CombinedStateFluxes"
+vert_diff: "true"

config/longrun_configs/slabplanet_aqua_target_nocouple.yml

@@ -1,19 +1,22 @@
-run_name: "slabplanet_aqua_target_nocouple"
 anim: true
+apply_limiter: false
+atmos_config_file: "config/longrun_configs/longrun_aquaplanet_rhoe_equil_55km_nz63_clearsky_0M.yml"
+dt_cloud_fraction: "1hours"
 dt_cpl: 8639800
-energy_check: false
-mode_name: "slabplanet_aqua"
-mono_surface: false
-dt: "150secs"
-t_end: "200days"
-job_id: "slabplanet_aqua_target_nocouple"
-dt_save_to_sol: "10days"
+dt_rad: "1hours"
 dt_save_state_to_disk: "20days"
-apply_limiter: false
+dt_save_to_sol: "10days"
+dt: "150secs"
+energy_check: false
+evolving_ocean: false
 hourly_checkpoint: true
-turb_flux_partition: "CombinedStateFluxes"
-atmos_config_file: "config/longrun_configs/longrun_aquaplanet_rhoe_equil_55km_nz63_clearsky_0M.yml"
-surface_setup: "DefaultMoninObukhov"
+job_id: "slabplanet_aqua_target_nocouple"
 land_albedo_type: "function"
-evolving_ocean: false
+mode_name: "slabplanet_aqua"
+mono_surface: false
+run_name: "slabplanet_aqua_target_nocouple"
 start_date: "19790301"
+surface_setup: "DefaultMoninObukhov"
+t_end: "100days"
+turb_flux_partition: "CombinedStateFluxes"
+vert_diff: "true"

config/longrun_configs/slabplanet_target.yml

@@ -1,19 +1,22 @@
-run_name: "slabplanet_target"
 anim: true
+apply_limiter: false
+atmos_config_file: "config/longrun_configs/longrun_aquaplanet_rhoe_equil_55km_nz63_clearsky_0M.yml"
+dt_cloud_fraction: "1hours"
 dt_cpl: 150
-energy_check: false
-mode_name: "slabplanet"
-mono_surface: false
-dt: "150secs"
-t_end: "200days"
-job_id: "slabplanet_target"
-dt_save_to_sol: "10days"
+dt_rad: "1hours"
 dt_save_state_to_disk: "20days"
-apply_limiter: false
+dt_save_to_sol: "10days"
+dt: "150secs"
+energy_check: false
+evolving_ocean: false
 hourly_checkpoint: true
-turb_flux_partition: "CombinedStateFluxes"
-atmos_config_file: "config/longrun_configs/longrun_aquaplanet_rhoe_equil_55km_nz63_clearsky_0M.yml"
-surface_setup: "PrescribedSurface"
+job_id: "slabplanet_target"
 land_albedo_type: "function"
-evolving_ocean: false
+mode_name: "slabplanet"
+mono_surface: false
+run_name: "slabplanet_target"
 start_date: "19790301"
+surface_setup: "PrescribedSurface"
+t_end: "100days"
+turb_flux_partition: "CombinedStateFluxes"
+vert_diff: "true"

config/longrun_configs/slabplanet_target_evolve_ocn.yml

@@ -1,19 +1,22 @@
-run_name: "slabplanet_target_evolve_ocn"
 anim: true
+apply_limiter: false
+atmos_config_file: "config/longrun_configs/longrun_aquaplanet_rhoe_equil_55km_nz63_clearsky_0M.yml"
+dt_cloud_fraction: "1hours"
 dt_cpl: 150
-energy_check: false
-mode_name: "slabplanet"
-mono_surface: false
-dt: "150secs"
-t_end: "200days"
-job_id: "slabplanet_target_evolve_ocn"
-dt_save_to_sol: "10days"
+dt_rad: "1hours"
 dt_save_state_to_disk: "20days"
-apply_limiter: false
+dt_save_to_sol: "10days"
+dt: "150secs"
+energy_check: false
+evolving_ocean: true
 hourly_checkpoint: true
-turb_flux_partition: "CombinedStateFluxes"
-atmos_config_file: "config/longrun_configs/longrun_aquaplanet_rhoe_equil_55km_nz63_clearsky_0M.yml"
-surface_setup: "PrescribedSurface"
+job_id: "slabplanet_target_evolve_ocn"
 land_albedo_type: "function"
-evolving_ocean: true
+mode_name: "slabplanet"
+mono_surface: false
+run_name: "slabplanet_target_evolve_ocn"
 start_date: "19790301"
+surface_setup: "PrescribedSurface"
+t_end: "100days"
+turb_flux_partition: "CombinedStateFluxes"
+vert_diff: "true"

config/longrun_configs/slabplanet_terra.yml

@@ -17,4 +17,5 @@ apply_limiter: false
 turb_flux_partition: "CombinedStateFluxes"
 surface_setup: "PrescribedSurface"
 land_albedo_type: "function"
-start_date: "19790301"
+start_date: "19790301"
+conservation_softfail: true

config/model_configs/slabplanet_eisenman.yml

@@ -15,3 +15,4 @@ precip_model: "0M"
 anim: true
 apply_limiter: false
 job_id: "slabplanet_eisenman"
+conservation_softfail: true

config/model_configs/target_params_in_slab_test2.yml

@@ -18,3 +18,4 @@ precip_model: "0M"
 run_name: "target_params_in_slab_test2"
 apply_limiter: false
 job_id: "target_params_in_slab_test2"
+conservation_softfail: true

config/model_configs/target_params_in_slab_test3.yml

@@ -18,3 +18,4 @@ precip_model: "0M"
 run_name: "target_params_in_slab_test3"
 apply_limiter: false
 job_id: "target_params_in_slab_test3"
+conservation_softfail: true