Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Switch to PartitionedFluxes #1117

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Switch to PartitionedFluxes #1117

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion config/amip_configs/amip.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ surface_setup: "PrescribedSurface"
t_end: "1098days"
topo_smoothing: true
topography: "Earth"
turb_flux_partition: "CombinedStateFluxesMOST"
turb_flux_partition: "PartitionedStateFluxes"
viscous_sponge: true
z_elem: 63
z_max: 55000.0
2 changes: 1 addition & 1 deletion config/benchmark_configs/amip_diagedmf.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ mono_surface: false
monthly_checkpoint: false
start_date: "20100101"
t_end: "12hours"
turb_flux_partition: "CombinedStateFluxesMOST"
turb_flux_partition: "PartitionedStateFluxes"
use_coupler_diagnostics: false
prescribe_ozone: true
aerosol_radiation: true
Expand Down
2 changes: 1 addition & 1 deletion config/benchmark_configs/amip_diagedmf_io.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ mono_surface: false
monthly_checkpoint: false
start_date: "20100101"
t_end: "12hours"
turb_flux_partition: "CombinedStateFluxesMOST"
turb_flux_partition: "PartitionedStateFluxes"
use_coupler_diagnostics: true
prescribe_ozone: true
aerosol_radiation: true
Expand Down
2 changes: 1 addition & 1 deletion config/benchmark_configs/climaatmos.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ precip_model: 0M
rad: allskywithclear
surface_setup: DefaultMoninObukhov
t_end: 12hours
turb_flux_partition: "CombinedStateFluxesMOST"
turb_flux_partition: "PartitionedStateFluxes"
vert_diff: "FriersonDiffusion"
z_elem: 63
z_max: 55000.0
Expand Down
2 changes: 1 addition & 1 deletion config/benchmark_configs/climaatmos_diagedmf.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ prognostic_tke: true
rad: allskywithclear
surface_setup: DefaultMoninObukhov
t_end: 12hours
turb_flux_partition: "CombinedStateFluxesMOST"
turb_flux_partition: "PartitionedStateFluxes"
toml: [toml/diagnostic_edmfx.toml]
turbconv: diagnostic_edmfx
z_elem: 63
Expand Down
2 changes: 1 addition & 1 deletion config/benchmark_configs/climaatmos_diagedmf_io.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ prognostic_tke: true
rad: allskywithclear
surface_setup: DefaultMoninObukhov
t_end: 12hours
turb_flux_partition: "CombinedStateFluxesMOST"
turb_flux_partition: "PartitionedStateFluxes"
toml: [toml/diagnostic_edmfx.toml]
turbconv: diagnostic_edmfx
z_elem: 63
Expand Down
2 changes: 1 addition & 1 deletion config/ci_configs/gpu_amip_target_topo_diagedmf_shortrun.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,4 +20,4 @@ surface_setup: "PrescribedSurface"
t_end: "200secs"
topo_smoothing: true
topography: "Earth"
turb_flux_partition: "CombinedStateFluxesMOST"
turb_flux_partition: "PartitionedStateFluxes"
2 changes: 1 addition & 1 deletion config/ci_configs/interactive_debug.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,5 +16,5 @@ rad: "gray"
start_date: "20100101"
surface_setup: "PrescribedSurface"
t_end: "20days"
turb_flux_partition: "CombinedStateFluxesMOST"
turb_flux_partition: "PartitionedStateFluxes"
vert_diff: "true"
2 changes: 1 addition & 1 deletion config/longrun_configs/amip_target.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ rad: "allskywithclear"
start_date: "20100101"
surface_setup: "PrescribedSurface"
t_end: "366days"
turb_flux_partition: "CombinedStateFluxesMOST"
turb_flux_partition: "PartitionedStateFluxes"
prescribe_ozone: true
aerosol_radiation: true
prescribed_aerosols: ["CB1", "CB2", "DST01", "OC1", "OC2", "SO4", "SSLT01"]
2 changes: 1 addition & 1 deletion config/longrun_configs/amip_target_topo.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ surface_setup: "PrescribedSurface"
t_end: "366days"
topo_smoothing: true
topography: "Earth"
turb_flux_partition: "CombinedStateFluxesMOST"
turb_flux_partition: "PartitionedStateFluxes"
prescribe_ozone: true
aerosol_radiation: true
prescribed_aerosols: ["CB1", "CB2", "DST01", "OC1", "OC2", "SO4", "SSLT01"]
2 changes: 1 addition & 1 deletion config/longrun_configs/amip_target_topo_diagedmf_cpu.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ t_end: "30days"
topo_smoothing: true
topography: "Earth"
coupler_toml_file: "toml/amip_target_topo_diagedmf.toml"
turb_flux_partition: "CombinedStateFluxesMOST"
turb_flux_partition: "PartitionedStateFluxes"
prescribe_ozone: true
aerosol_radiation: true
prescribed_aerosols: ["CB1", "CB2", "DST01", "OC1", "OC2", "SO4", "SSLT01"]
2 changes: 1 addition & 1 deletion config/longrun_configs/amip_target_topo_diagedmf_gpu.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ t_end: "300days"
topo_smoothing: true
topography: "Earth"
coupler_toml_file: "toml/amip_target_topo_diagedmf.toml"
turb_flux_partition: "CombinedStateFluxesMOST"
turb_flux_partition: "PartitionedStateFluxes"
prescribe_ozone: true
aerosol_radiation: true
prescribed_aerosols: ["CB1", "CB2", "DST01", "OC1", "OC2", "SO4", "SSLT01"]
2 changes: 1 addition & 1 deletion config/longrun_configs/longrun_amip_dyamond.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ mono_surface: false
monthly_checkpoint: false
start_date: "20100101"
t_end: "1days"
turb_flux_partition: "CombinedStateFluxesMOST"
turb_flux_partition: "PartitionedStateFluxes"
prescribe_ozone: true
aerosol_radiation: true
prescribed_aerosols: ["CB1", "CB2", "DST01", "OC1", "OC2", "SO4", "SSLT01"]
2 changes: 1 addition & 1 deletion config/longrun_configs/slabplanet_aqua_atmos_sf_couple.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,6 @@ rad: "gray"
start_date: "20100101"
surface_setup: "DefaultMoninObukhov"
t_end: "20days"
turb_flux_partition: "CombinedStateFluxesMOST"
turb_flux_partition: "PartitionedStateFluxes"
use_land_diagnostics: false
vert_diff: "FriersonDiffusion"
2 changes: 1 addition & 1 deletion config/longrun_configs/slabplanet_aqua_atmos_sf_nocouple.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,6 @@ rad: "gray"
start_date: "20100101"
surface_setup: "DefaultMoninObukhov"
t_end: "20days"
turb_flux_partition: "CombinedStateFluxesMOST"
turb_flux_partition: "PartitionedStateFluxes"
use_land_diagnostics: false
vert_diff: "FriersonDiffusion"
2 changes: 1 addition & 1 deletion config/longrun_configs/slabplanet_aqua_coupler_sf.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,6 @@ rad: "gray"
start_date: "20100101"
surface_setup: "PrescribedSurface"
t_end: "20days"
turb_flux_partition: "CombinedStateFluxesMOST"
turb_flux_partition: "PartitionedStateFluxes"
use_land_diagnostics: false
vert_diff: "FriersonDiffusion"
2 changes: 1 addition & 1 deletion config/longrun_configs/slabplanet_aqua_coupler_sf_evolve_ocn.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,6 @@ rad: "gray"
start_date: "20100101"
surface_setup: "PrescribedSurface"
t_end: "20days"
turb_flux_partition: "CombinedStateFluxesMOST"
turb_flux_partition: "PartitionedStateFluxes"
use_land_diagnostics: false
vert_diff: "FriersonDiffusion"
2 changes: 1 addition & 1 deletion config/longrun_configs/slabplanet_aqua_target.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,6 @@ mono_surface: false
start_date: "20100101"
surface_setup: "PrescribedSurface"
t_end: "120days"
turb_flux_partition: "CombinedStateFluxesMOST"
turb_flux_partition: "PartitionedStateFluxes"
use_land_diagnostics: false
vert_diff: "true"
2 changes: 1 addition & 1 deletion config/longrun_configs/slabplanet_aqua_target_evolve_ocn.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,6 @@ mono_surface: false
start_date: "20100101"
surface_setup: "PrescribedSurface"
t_end: "120days"
turb_flux_partition: "CombinedStateFluxesMOST"
turb_flux_partition: "PartitionedStateFluxes"
use_land_diagnostics: false
vert_diff: "true"
2 changes: 1 addition & 1 deletion config/longrun_configs/slabplanet_aqua_target_nocouple.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,6 @@ mono_surface: false
start_date: "20100101"
surface_setup: "DefaultMoninObukhov"
t_end: "120days"
turb_flux_partition: "CombinedStateFluxesMOST"
turb_flux_partition: "PartitionedStateFluxes"
use_land_diagnostics: false
vert_diff: "true"
2 changes: 1 addition & 1 deletion config/longrun_configs/slabplanet_coupler_sf_evolve_ocn.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,5 @@ rad: "gray"
start_date: "20100101"
surface_setup: "PrescribedSurface"
t_end: "20days"
turb_flux_partition: "CombinedStateFluxesMOST"
turb_flux_partition: "PartitionedStateFluxes"
vert_diff: "true"
2 changes: 1 addition & 1 deletion config/longrun_configs/slabplanet_target.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,5 +15,5 @@ mono_surface: false
start_date: "20100101"
surface_setup: "PrescribedSurface"
t_end: "120days"
turb_flux_partition: "CombinedStateFluxesMOST"
turb_flux_partition: "PartitionedStateFluxes"
vert_diff: "true"
2 changes: 1 addition & 1 deletion config/longrun_configs/slabplanet_target_evolve_ocn.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,5 +15,5 @@ mono_surface: false
start_date: "20100101"
surface_setup: "PrescribedSurface"
t_end: "120days"
turb_flux_partition: "CombinedStateFluxesMOST"
turb_flux_partition: "PartitionedStateFluxes"
vert_diff: "true"
2 changes: 1 addition & 1 deletion config/longrun_configs/slabplanet_terra.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,5 @@ rad: "gray"
start_date: "20100101"
surface_setup: "PrescribedSurface"
t_end: "20days"
turb_flux_partition: "CombinedStateFluxesMOST"
turb_flux_partition: "PartitionedStateFluxes"
vert_diff: "FriersonDiffusion"
2 changes: 1 addition & 1 deletion config/nightly_configs/amip_coarse.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ surface_setup: "PrescribedSurface"
t_end: "732days"
topo_smoothing: true
topography: "Earth"
turb_flux_partition: "CombinedStateFluxesMOST"
turb_flux_partition: "PartitionedStateFluxes"
viscous_sponge: true
z_elem: 31
z_max: 55000.0
2 changes: 1 addition & 1 deletion config/nightly_configs/amip_coarse_random.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ surface_setup: "PrescribedSurface"
t_end: "732days"
topo_smoothing: true
topography: "Earth"
turb_flux_partition: "CombinedStateFluxesMOST"
turb_flux_partition: "PartitionedStateFluxes"
unique_seed: true
viscous_sponge: true
z_elem: 31
Expand Down
2 changes: 1 addition & 1 deletion experiments/ClimaEarth/run_moist_held_suarez.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ config_dict = Dict(
"precip_model" => "0M",
"moist" => "equil",
"prognostic_surface" => "PrescribedSurfaceTemperature",
"turb_flux_partition" => "CombinedStateFluxesMOST",
"turb_flux_partition" => "PartitionedStateFluxes",
)
# TODO: may need to switch to Bulk fluxes

Expand Down
2 changes: 1 addition & 1 deletion experiments/ClimaEarth/test/amip_test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ surface_setup: "PrescribedSurface"
t_end: "540secs"
topo_smoothing: true
topography: "Earth"
turb_flux_partition: "CombinedStateFluxesMOST"
turb_flux_partition: "PartitionedStateFluxes"
viscous_sponge: false
z_elem: 31
z_max: 50000.0