Skip to content

Commit 3a82a72

Browse files
authored
Revert accidental merge of implicit microphysics branch (#4333)
Reverts commits d588180..6bea709 which were accidentally pushed to main. These changes belong on ts/implicit-CMP-rebase-v2.
1 parent 6bea709 commit 3a82a72

35 files changed

Lines changed: 148 additions & 602 deletions

.gitignore

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,4 +58,3 @@ Artifacts.toml
5858
.DS_Store
5959
.qodo
6060
AGENTS.md
61-
MEMORY.md

config/default_configs/default_config.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -244,13 +244,13 @@ cloud_nn_architecture:
244244
value: "arch_2layers_8nodes.jld2"
245245
implicit_microphysics:
246246
help: "Whether to treat microphysics tendencies implicitly (placeholder for now) [`true`, `false` (default)]"
247-
value: true
247+
value: false
248248
use_sgs_quadrature:
249249
help: "Enable subgrid-scale quadrature integration for microphysics tendencies. When true, microphysics tendencies are integrated over the joint SGS PDF of (T, q_tot). [`true`, `false` (default)]"
250250
value: true
251251
sgs_distribution:
252-
help: "Distribution type for SGS quadrature over microphysics. [`gaussian`, `lognormal` (default), `mean` (grid-mean only, no SGS sampling)]"
253-
value: "lognormal"
252+
help: "Distribution type for SGS quadrature over microphysics. [`gaussian` (default), `lognormal`, `mean` (grid-mean only, no SGS sampling)]"
253+
value: "gaussian"
254254
quadrature_order:
255255
help: "Quadrature order for SGS integration (1-5). Higher orders are more accurate but slower. Default: 2"
256256
value: 3

config/model_configs/aquaplanet_nonequil_allsky_gw_res_2M.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ t_end: "12hours"
44
dt_save_state_to_disk: "24hours"
55
vert_diff: "DecayWithHeightDiffusion"
66
microphysics_model: "2M"
7-
use_sgs_quadrature: true
7+
use_sgs_quadrature: false
88
rad: "allskywithclear"
99
aerosol_radiation: true
1010
prescribe_clouds_in_radiation: true

config/model_configs/baroclinic_wave_nonequil_conservation_source.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ surface_setup: DefaultMoninObukhov
66
prognostic_surface: "SlabOceanSST"
77
rad: "clearsky"
88
microphysics_model: "1M"
9-
use_sgs_quadrature: true
9+
use_sgs_quadrature: false
1010
vert_diff: true
1111
dt_save_state_to_disk: "5days"
1212
check_conservation: true

config/model_configs/diagnostic_edmfx_dycoms_rf02_box.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ edmfx_nh_pressure: true
1414
edmfx_sgs_mass_flux: true
1515
edmfx_sgs_diffusive_flux: true
1616
microphysics_model: "1M"
17-
use_sgs_quadrature: true
17+
use_sgs_quadrature: false
1818
config: box
1919
x_max: 1e8
2020
y_max: 1e8

config/model_configs/diagnostic_edmfx_rico_box.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ edmfx_nh_pressure: true
1313
edmfx_sgs_mass_flux: true
1414
edmfx_sgs_diffusive_flux: true
1515
microphysics_model: "1M"
16-
use_sgs_quadrature: true
16+
use_sgs_quadrature: false
1717
config: box
1818
x_max: 1e8
1919
y_max: 1e8

config/model_configs/diagnostic_edmfx_trmm_box.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ edmfx_nh_pressure: true
1212
edmfx_sgs_mass_flux: true
1313
edmfx_sgs_diffusive_flux: true
1414
microphysics_model: "1M"
15-
use_sgs_quadrature: true
15+
use_sgs_quadrature: false
1616
config: box
1717
x_max: 1e8
1818
y_max: 1e8

config/model_configs/kinematic_driver.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ surface_setup: ShipwayHill2012
55
energy_q_tot_upwinding: first_order
66
tracer_upwinding: first_order
77
microphysics_model: "1M"
8-
use_sgs_quadrature: true
8+
use_sgs_quadrature: false
99
#moist: "equil"
1010
#precip_model: "0M"
1111
cloud_model: "grid_scale"

config/model_configs/les_isdac_box.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ rad: "ISDAC"
88
config: "box"
99
# microphysics
1010
microphysics_model: "1M"
11-
use_sgs_quadrature: true
11+
use_sgs_quadrature: false
1212
# diffusion
1313
implicit_diffusion: false
1414
approximate_linear_solve_iters: 2

config/model_configs/prognostic_edmfx_dycoms_rf02_column.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ edmfx_vertical_diffusion: true
1616
edmfx_filter: true
1717
prognostic_tke: true
1818
microphysics_model: "1M"
19-
use_sgs_quadrature: true
19+
use_sgs_quadrature: false
2020
config: "column"
2121
x_elem: 2
2222
y_elem: 2

0 commit comments

Comments
 (0)