Skip to content

Commit a2b1536

Browse files
szy21szy21
committed
update atmos config
1 parent 873e3d2 commit a2b1536

37 files changed

+104
-84
lines changed

‎NEWS.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,10 @@ ClimaCoupler.jl Release Notes
66

77
### ClimaCoupler features
88

9+
#### Remove `atmos_config_repo` PR[#1448](https://github.com/CliMA/ClimaCoupler.jl/pull/1448)
10+
ClimaCoupler doesn't depend on configuration files in ClimaAtmos anymore. All the atmosphere
11+
configuration files are now specified in ClimaCoupler.
12+
913
#### Remove bucket `get_new_cache` PR[#1437](https://github.com/CliMA/ClimaCoupler.jl/pull/1437)
1014

1115
As of ClimaLand v0.16.2, total energy and and water are always stored in the bucket cache.

‎config/amip_configs/amip.yml

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,18 @@
11
FLOAT_TYPE: "Float32"
22
albedo_model: "CouplerAlbedo"
3-
atmos_config_file: "config/longrun_configs/amip_target_diagedmf.yml"
3+
atmos_config_file: "config/atmos_configs/climaatmos_diagedmf.yml"
44
bucket_albedo_type: "map_temporal"
55
checkpoint_dt: "366days"
6-
co2_model: "maunaloa"
76
coupler_toml: ["toml/amip.toml"]
87
dt: "120secs"
98
dt_cpl: "120secs"
10-
dz_bottom: 30.0
119
energy_check: false
12-
h_elem: 16
1310
mode_name: "amip"
1411
netcdf_output_at_levels: true
1512
output_default_diagnostics: true
1613
radiation_reset_rng_seed: true
17-
rayleigh_sponge: true
1814
start_date: "20100101"
1915
surface_setup: "PrescribedSurface"
2016
t_end: "1098days"
2117
topo_smoothing: true
2218
topography: "Earth"
23-
viscous_sponge: true
24-
z_elem: 63
25-
z_max: 60000.0

‎config/atmos_configs/climaatmos_diagedmf.yml

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
# This inherits from config/common_configs/numerics_sphere_he16ze63.yml and config/longrun_configs/amip_target_diagedmf.yml in ClimaAtmos.jl
2+
aerosol_radiation: true
3+
approximate_linear_solve_iters: 2
4+
cloud_model: "quadrature_sgs"
5+
co2_model: maunaloa
6+
dt: "120secs"
7+
dt_cloud_fraction: "1hours"
8+
dt_rad: "1hours"
9+
dt_save_state_to_disk: "30days"
10+
dz_bottom: 30.0
11+
edmfx_detr_model: "Generalized"
12+
edmfx_entr_model: "Generalized"
13+
edmfx_nh_pressure: true
14+
edmfx_sgs_diffusive_flux: true
15+
edmfx_sgs_mass_flux: true
16+
edmfx_upwinding: "first_order"
17+
h_elem: 16
18+
implicit_diffusion: true
19+
insolation: "timevarying"
20+
moist: "equil"
21+
netcdf_output_at_levels: true
22+
precip_model: "0M"
23+
prescribe_ozone: true
24+
prescribed_aerosols: ["CB1", "CB2", "DST01", "DST02", "DST03", "DST04", "DST05", "OC1", "OC2", "SO4", "SSLT01", "SSLT02", "SSLT03", "SSLT04", "SSLT05"]
25+
prognostic_tke: true
26+
rad: "allskywithclear"
27+
rayleigh_sponge: true
28+
surface_setup: "DefaultMoninObukhov"
29+
t_end: "120days"
30+
toml: [toml/longrun_aquaplanet_diagedmf.toml]
31+
turbconv: "diagnostic_edmfx"
32+
viscous_sponge: true
33+
z_elem: 63
34+
z_max: 60000.0

‎config/atmos_configs/climaatmos_edonly.yml

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
# This inherits from config/common_configs/numerics_sphere_he16ze63.yml and config/longrun_configs/amip_target_edonly.yml in ClimaAtmos.jl
2+
aerosol_radiation: true
3+
approximate_linear_solve_iters: 2
4+
co2_model: maunaloa
5+
dt: "120secs"
6+
dt_cloud_fraction: "1hours"
7+
dt_rad: "1hours"
8+
dt_save_state_to_disk: "30days"
9+
dz_bottom: 30.0
10+
edmfx_sgs_diffusive_flux: true
11+
h_elem: 16
12+
implicit_diffusion: true
13+
insolation: "timevarying"
14+
moist: "equil"
15+
netcdf_output_at_levels: true
16+
precip_model: "0M"
17+
prescribe_ozone: true
18+
prescribed_aerosols: ["CB1", "CB2", "DST01", "DST02", "DST03", "DST04", "DST05", "OC1", "OC2", "SO4", "SSLT01", "SSLT02", "SSLT03", "SSLT04", "SSLT05"]
19+
rad: "allskywithclear"
20+
rayleigh_sponge: true
21+
surface_setup: "DefaultMoninObukhov"
22+
t_end: "120days"
23+
toml: [toml/longrun_aquaplanet.toml]
24+
turbconv: "edonly_edmfx"
25+
viscous_sponge: true
26+
z_elem: 63
27+
z_max: 60000.0

‎config/benchmark_configs/amip_diagedmf.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
FLOAT_TYPE: "Float32"
22
aerosol_radiation: true
33
atmos_config_file: "config/benchmark_configs/climaatmos_diagedmf.yml"
4-
atmos_config_repo: "ClimaCoupler"
54
bucket_albedo_type: "map_temporal"
65
dt: "120secs"
76
dt_cpl: "120secs"

‎config/benchmark_configs/amip_diagedmf_io.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
FLOAT_TYPE: "Float32"
22
aerosol_radiation: true
33
atmos_config_file: "config/benchmark_configs/climaatmos_diagedmf_io.yml"
4-
atmos_config_repo: "ClimaCoupler"
54
bucket_albedo_type: "map_temporal"
65
dt: "120secs"
76
dt_cpl: "120secs"

‎config/ci_configs/amip_diagedmf_bucket.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
FLOAT_TYPE: "Float32"
22
albedo_model: "CouplerAlbedo"
3-
atmos_config_file: "config/longrun_configs/amip_target_diagedmf.yml"
3+
atmos_config_file: "config/atmos_configs/climaatmos_diagedmf.yml"
44
bucket_albedo_type: "map_temporal"
55
co2: "maunaloa"
66
coupler_toml: ["toml/amip.toml"]

‎config/ci_configs/amip_diagedmf_integrated_land.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
FLOAT_TYPE: "Float32"
22
albedo_model: "CouplerAlbedo"
3-
atmos_config_file: "config/longrun_configs/amip_target_diagedmf.yml"
3+
atmos_config_file: "config/atmos_configs/climaatmos_diagedmf.yml"
44
co2: "maunaloa"
55
coupler_toml: ["toml/amip.toml"]
66
dt: "120secs"

‎config/ci_configs/amip_edonly_bucket.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
FLOAT_TYPE: "Float32"
22
albedo_model: "CouplerAlbedo"
3-
atmos_config_file: "config/longrun_configs/amip_target_edonly.yml"
3+
atmos_config_file: "config/atmos_configs/climaatmos_edonly.yml"
44
bucket_albedo_type: "map_temporal"
55
coupler_toml: ["toml/amip.toml"]
66
dt: "240secs"

‎config/ci_configs/amip_edonly_integrated_land.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
FLOAT_TYPE: "Float32"
22
albedo_model: "CouplerAlbedo"
3-
atmos_config_file: "config/longrun_configs/amip_target_edonly.yml"
3+
atmos_config_file: "config/atmos_configs/climaatmos_edonly.yml"
44
coupler_toml: ["toml/amip.toml"]
55
dt: "240secs"
66
dt_cpl: "240secs"

0 commit comments

Comments
 (0)