Skip to content

Commit

Permalink
Merge pull request #906 from CliMA/zs/up_climaatmos
Browse files Browse the repository at this point in the history
update climaatmos to 0.27.1
  • Loading branch information
szy21 authored Jul 21, 2024
2 parents 16bf40b + 1c19e1c commit b786f6f
Show file tree
Hide file tree
Showing 13 changed files with 321 additions and 291 deletions.
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
FLOAT_TYPE: "Float32"
anim: false
apply_limiter: false
atmos_config_file: "config/longrun_configs/longrun_aquaplanet_rhoe_equil_55km_nz63_allsky_diagedmf_0M.yml"
atmos_config_file: "config/longrun_configs/longrun_aquaplanet_allsky_diagedmf_0M.yml"
dt: "100secs"
dt_cloud_fraction: "1hours"
dt_cpl: 100
Expand Down
8 changes: 4 additions & 4 deletions config/longrun_configs/amip_target.yml
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
FLOAT_TYPE: "Float32"
anim: true
apply_limiter: false
atmos_config_file: "config/longrun_configs/longrun_aquaplanet_rhoe_equil_55km_nz63_clearsky_0M.yml"
dt: "100secs"
atmos_config_file: "config/longrun_configs/longrun_aquaplanet_allsky_0M.yml"
dt: "120secs"
dt_cloud_fraction: "1hours"
dt_cpl: 100
dt_cpl: 120
dt_rad: "1hours"
dt_save_state_to_disk: "20days"
dt_save_to_sol: "10days"
Expand All @@ -16,6 +16,6 @@ mono_surface: false
rad: "allskywithclear"
start_date: "20100101"
surface_setup: "PrescribedSurface"
t_end: "100days"
t_end: "120days"
turb_flux_partition: "CombinedStateFluxesMOST"
vert_diff: "true"
9 changes: 4 additions & 5 deletions config/longrun_configs/amip_target_topo.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@ FLOAT_TYPE: "Float32"
albedo_model: "CouplerAlbedo"
anim: true
apply_limiter: false
atmos_config_file: "config/longrun_configs/longrun_aquaplanet_rhoe_equil_55km_nz63_clearsky_0M_earth.yml"
dt: "100secs"
atmos_config_file: "config/longrun_configs/longrun_aquaplanet_allsky_0M_earth.yml"
dt: "120secs"
dt_cloud_fraction: "1hours"
dt_cpl: 100
dt_cpl: 120
dt_rad: "1hours"
dt_save_state_to_disk: "20days"
dt_save_to_sol: "10days"
Expand All @@ -15,10 +15,9 @@ land_albedo_type: "map_temporal"
mode_name: "amip"
mono_surface: false
netcdf_interpolate_z_over_msl: true
rad: "allskywithclear"
start_date: "20100101"
surface_setup: "PrescribedSurface"
t_end: "100days"
t_end: "120days"
topo_smoothing: true
topography: "Earth"
turb_flux_partition: "CombinedStateFluxesMOST"
Expand Down
13 changes: 0 additions & 13 deletions config/longrun_configs/dyamond_target.yml

This file was deleted.

3 changes: 2 additions & 1 deletion config/longrun_configs/longrun_amip_dyamond.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
anim: false
atmos_config_file: "config/longrun_configs/longrun_aquaplanet_dyamond.yml"
dt_cpl: 50
dt: "30secs"
dt_cpl: 30
dt_save_state_to_disk: "0.5days"
dt_save_to_sol: "0.5days"
energy_check: false
Expand Down
8 changes: 4 additions & 4 deletions config/longrun_configs/slabplanet_aqua_target.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
anim: true
apply_limiter: false
atmos_config_file: "config/longrun_configs/longrun_aquaplanet_rhoe_equil_55km_nz63_clearsky_0M.yml"
dt: "150secs"
atmos_config_file: "config/longrun_configs/longrun_aquaplanet_allsky_0M.yml"
dt: "120secs"
dt_cloud_fraction: "1hours"
dt_cpl: 150
dt_cpl: 120
dt_rad: "1hours"
dt_save_state_to_disk: "20days"
dt_save_to_sol: "10days"
Expand All @@ -15,6 +15,6 @@ mode_name: "slabplanet_aqua"
mono_surface: false
start_date: "19790301"
surface_setup: "PrescribedSurface"
t_end: "100days"
t_end: "120days"
turb_flux_partition: "CombinedStateFluxesMOST"
vert_diff: "true"
8 changes: 4 additions & 4 deletions config/longrun_configs/slabplanet_aqua_target_evolve_ocn.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
anim: true
apply_limiter: false
atmos_config_file: "config/longrun_configs/longrun_aquaplanet_rhoe_equil_55km_nz63_clearsky_0M.yml"
dt: "150secs"
atmos_config_file: "config/longrun_configs/longrun_aquaplanet_rhoe_equil_allsky_0M.yml"
dt: "120secs"
dt_cloud_fraction: "1hours"
dt_cpl: 150
dt_cpl: 120
dt_rad: "1hours"
dt_save_state_to_disk: "20days"
dt_save_to_sol: "10days"
Expand All @@ -15,6 +15,6 @@ mode_name: "slabplanet_aqua"
mono_surface: false
start_date: "19790301"
surface_setup: "PrescribedSurface"
t_end: "100days"
t_end: "120days"
turb_flux_partition: "CombinedStateFluxesMOST"
vert_diff: "true"
6 changes: 3 additions & 3 deletions config/longrun_configs/slabplanet_aqua_target_nocouple.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
anim: true
apply_limiter: false
atmos_config_file: "config/longrun_configs/longrun_aquaplanet_rhoe_equil_55km_nz63_clearsky_0M.yml"
dt: "150secs"
atmos_config_file: "config/longrun_configs/longrun_aquaplanet_rhoe_equil_allsky_0M.yml"
dt: "120secs"
dt_cloud_fraction: "1hours"
dt_cpl: 8639800
dt_rad: "1hours"
Expand All @@ -15,6 +15,6 @@ mode_name: "slabplanet_aqua"
mono_surface: false
start_date: "19790301"
surface_setup: "DefaultMoninObukhov"
t_end: "100days"
t_end: "120days"
turb_flux_partition: "CombinedStateFluxesMOST"
vert_diff: "true"
8 changes: 4 additions & 4 deletions config/longrun_configs/slabplanet_target.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
anim: true
apply_limiter: false
atmos_config_file: "config/longrun_configs/longrun_aquaplanet_rhoe_equil_55km_nz63_clearsky_0M.yml"
dt: "150secs"
atmos_config_file: "config/longrun_configs/longrun_aquaplanet_allsky_0M.yml"
dt: "120secs"
dt_cloud_fraction: "1hours"
dt_cpl: 150
dt_cpl: 120
dt_rad: "1hours"
dt_save_state_to_disk: "20days"
dt_save_to_sol: "10days"
Expand All @@ -15,6 +15,6 @@ mode_name: "slabplanet"
mono_surface: false
start_date: "19790301"
surface_setup: "PrescribedSurface"
t_end: "100days"
t_end: "120days"
turb_flux_partition: "CombinedStateFluxesMOST"
vert_diff: "true"
8 changes: 4 additions & 4 deletions config/longrun_configs/slabplanet_target_evolve_ocn.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
anim: true
apply_limiter: false
atmos_config_file: "config/longrun_configs/longrun_aquaplanet_rhoe_equil_55km_nz63_clearsky_0M.yml"
dt: "150secs"
atmos_config_file: "config/longrun_configs/longrun_aquaplanet_allsky_0M.yml"
dt: "120secs"
dt_cloud_fraction: "1hours"
dt_cpl: 150
dt_cpl: 120
dt_rad: "1hours"
dt_save_state_to_disk: "20days"
dt_save_to_sol: "10days"
Expand All @@ -15,6 +15,6 @@ mode_name: "slabplanet"
mono_surface: false
start_date: "19790301"
surface_setup: "PrescribedSurface"
t_end: "100days"
t_end: "120days"
turb_flux_partition: "CombinedStateFluxesMOST"
vert_diff: "true"
Loading

0 comments on commit b786f6f

Please sign in to comment.