Skip to content

Commit b0c1956

Browse files
authored
Merge pull request #4062 from CliMA/aj/tracer_upwinding
ADD emdfx_tracer_upwinding flag, set it to first_order
2 parents 981154f + 0d0f4d2 commit b0c1956

File tree

60 files changed

+68
-109
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

60 files changed

+68
-109
lines changed

calibration/experiments/gcm_driven_scm/model_config_diagnostic.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ turbconv: "diagnostic_edmfx"
66
implicit_diffusion: true
77
approximate_linear_solve_iters: 2
88
prognostic_tke: true
9-
edmfx_upwinding: "first_order"
109
rayleigh_sponge: true
1110
edmfx_entr_model: "PiGroups"
1211
edmfx_detr_model: "PiGroups"

calibration/experiments/gcm_driven_scm/model_config_prognostic.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ implicit_diffusion: true
77
implicit_sgs_advection: false
88
approximate_linear_solve_iters: 2
99
max_newton_iters_ode: 1
10-
edmfx_upwinding: "first_order"
1110
rayleigh_sponge: true
1211
edmfx_entr_model: "PiGroups"
1312
edmfx_detr_model: "PiGroups"

config/default_configs/default_config.yml

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@ hyperdiff:
166166
amd_les:
167167
help: "AMD LES closure [`true`, `false` (default)]"
168168
value: false
169-
c_amd:
169+
c_amd:
170170
help: "Model coefficient for AMD-LES closure (TODO: Move to parameters.toml)"
171171
value: 0.29
172172
smagorinsky_lilly:
@@ -238,7 +238,7 @@ viscous_sponge:
238238
tracer_upwinding:
239239
help: "Tracer upwinding mode [`none`, `first_order` , `third_order`, `boris_book`, `zalesak`, `vanleer_limiter` (default)]"
240240
value: vanleer_limiter
241-
energy_upwinding:
241+
energy_q_tot_upwinding:
242242
help: "Energy upwinding mode [`none`, `first_order` , `third_order`, `boris_book`, `zalesak`, `vanleer_limiter` (default)]"
243243
value: vanleer_limiter
244244
orographic_gravity_wave:
@@ -390,9 +390,12 @@ edmfx_entr_model:
390390
edmfx_detr_model:
391391
help: "EDMFX detrainment closure. [`nothing` (default), `PiGroups`, `Generalized`]"
392392
value: ~
393-
edmfx_upwinding:
394-
help: "EDMFX upwinding mode [`none` (default), `first_order`, `third_order`]"
395-
value: none
393+
edmfx_mse_q_tot_upwinding:
394+
help: "EDMFX upwinding mode [`none`, `first_order` (default), `third_order`]"
395+
value: first_order
396+
edmfx_tracer_upwinding:
397+
help: "EDMFX tracer upwinding mode [`none`, `first_order` (default)]"
398+
value: first_order
396399
edmfx_sgsflux_upwinding:
397400
help: "EDMFX SGS mass flux upwinding mode [`none` (default), `first_order`, `third_order`]"
398401
value: none

config/longrun_configs/amip_target_diagedmf.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ prescribed_aerosols: ["CB1", "CB2", "DST01", "DST02", "DST03", "DST04", "DST05",
1313
surface_setup: "DefaultMoninObukhov"
1414
turbconv: "diagnostic_edmfx"
1515
prognostic_tke: true
16-
edmfx_upwinding: "first_order"
1716
edmfx_entr_model: "Generalized"
1817
edmfx_detr_model: "Generalized"
1918
edmfx_nh_pressure: true

config/longrun_configs/longrun_aquaplanet_allsky_diagedmf_0M.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ dt_cloud_fraction: "1hours"
88
surface_setup: "DefaultMoninObukhov"
99
turbconv: "diagnostic_edmfx"
1010
prognostic_tke: true
11-
edmfx_upwinding: "first_order"
1211
edmfx_entr_model: "Generalized"
1312
edmfx_detr_model: "Generalized"
1413
edmfx_nh_pressure: true

config/longrun_configs/longrun_aquaplanet_allsky_progedmf_0M.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ dt_cloud_fraction: "1hours"
1414
surface_setup: "DefaultMoninObukhov"
1515
turbconv: "prognostic_edmfx"
1616
prognostic_tke: true
17-
edmfx_upwinding: "first_order"
1817
edmfx_entr_model: "Generalized"
1918
edmfx_detr_model: "Generalized"
2019
edmfx_nh_pressure: true

config/model_configs/diagnostic_edmfx_aquaplanet.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ rad: clearsky
55
co2_model: fixed
66
turbconv: diagnostic_edmfx
77
prognostic_tke: true
8-
edmfx_upwinding: first_order
98
edmfx_entr_model: "Generalized"
109
edmfx_detr_model: "Generalized"
1110
edmfx_nh_pressure: true

config/model_configs/diagnostic_edmfx_aquaplanet_gpu.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ rad: clearsky
44
co2_model: fixed
55
turbconv: diagnostic_edmfx
66
prognostic_tke: true
7-
edmfx_upwinding: first_order
87
edmfx_entr_model: "Generalized"
98
edmfx_detr_model: "Generalized"
109
edmfx_nh_pressure: true

config/model_configs/diagnostic_edmfx_bomex_box.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ turbconv: "diagnostic_edmfx"
77
implicit_diffusion: true
88
approximate_linear_solve_iters: 2
99
prognostic_tke: true
10-
edmfx_upwinding: "first_order"
1110
edmfx_entr_model: "Generalized"
1211
edmfx_detr_model: "Generalized"
1312
edmfx_nh_pressure: true

config/model_configs/diagnostic_edmfx_bomex_stretched_box.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ turbconv: "diagnostic_edmfx"
77
implicit_diffusion: true
88
approximate_linear_solve_iters: 2
99
prognostic_tke: true
10-
edmfx_upwinding: "first_order"
1110
edmfx_entr_model: "Generalized"
1211
edmfx_detr_model: "Generalized"
1312
edmfx_nh_pressure: true

0 commit comments

Comments
 (0)