Skip to content

Commit

Permalink
cp from ln/fixes-for-longruns + rebase
Browse files Browse the repository at this point in the history
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

clean
  • Loading branch information
LenkaNovak committed Feb 2, 2024
1 parent 6ce983e commit d2d838d
Show file tree
Hide file tree
Showing 26 changed files with 296 additions and 242 deletions.
4 changes: 2 additions & 2 deletions .buildkite/longruns/pipeline.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
29 changes: 17 additions & 12 deletions config/longrun_configs/amip_target.yml
Original file line number Diff line number Diff line change
@@ -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_0M.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"
36 changes: 21 additions & 15 deletions config/longrun_configs/amip_target_topo.yml
Original file line number Diff line number Diff line change
@@ -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_0M_earth.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"
3 changes: 2 additions & 1 deletion config/longrun_configs/slabplanet_aqua_atmos_sf_couple.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
3 changes: 2 additions & 1 deletion config/longrun_configs/slabplanet_aqua_atmos_sf_nocouple.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
3 changes: 2 additions & 1 deletion config/longrun_configs/slabplanet_aqua_coupler_sf.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
29 changes: 16 additions & 13 deletions config/longrun_configs/slabplanet_aqua_target.yml
Original file line number Diff line number Diff line change
@@ -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"
29 changes: 16 additions & 13 deletions config/longrun_configs/slabplanet_aqua_target_evolve_ocn.yml
Original file line number Diff line number Diff line change
@@ -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"
29 changes: 16 additions & 13 deletions config/longrun_configs/slabplanet_aqua_target_nocouple.yml
Original file line number Diff line number Diff line change
@@ -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"
29 changes: 16 additions & 13 deletions config/longrun_configs/slabplanet_target.yml
Original file line number Diff line number Diff line change
@@ -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"
29 changes: 16 additions & 13 deletions config/longrun_configs/slabplanet_target_evolve_ocn.yml
Original file line number Diff line number Diff line change
@@ -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"
3 changes: 2 additions & 1 deletion config/longrun_configs/slabplanet_terra.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
1 change: 1 addition & 0 deletions config/model_configs/slabplanet_eisenman.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,3 +15,4 @@ precip_model: "0M"
anim: true
apply_limiter: false
job_id: "slabplanet_eisenman"
conservation_softfail: true
1 change: 1 addition & 0 deletions config/model_configs/target_params_in_slab_test2.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
1 change: 1 addition & 0 deletions config/model_configs/target_params_in_slab_test3.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Loading

0 comments on commit d2d838d

Please sign in to comment.