Skip to content

Commit ef01424

Browse files
committed
Merge branch 'atmosphere/hide_dynamics_options' into develop (PR #1083)
This merge removes several dynamics options from the default namelist.atmosphere file. These options are rarely changed by users, and for idealized cases where non-default values should be used, prepared idealized case setups provide namelist.atmosphere files with appropriate values. Specifically, the following options are now hidden: config_h_mom_eddy_visc2 config_h_mom_eddy_visc4 config_v_mom_eddy_visc2 config_h_theta_eddy_visc2 config_h_theta_eddy_visc4 config_v_theta_eddy_visc2 config_w_adv_order config_theta_adv_order config_scalar_adv_order config_u_vadv_order config_w_vadv_order config_theta_vadv_order config_scalar_vadv_order config_positive_definite Although these options no longer appear in the default namelist.atmosphere file, they can be added to the &nhyd_model namelist group.
2 parents 4e3780b + d359292 commit ef01424

1 file changed

Lines changed: 14 additions & 14 deletions

File tree

src/core_atmosphere/Registry.xml

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -107,32 +107,32 @@
107107
description="When config_split_dynamics_transport = T, the number of RK steps per transport step"
108108
possible_values="Positive integer values"/>
109109

110-
<nml_option name="config_h_mom_eddy_visc2" type="real" default_value="0.0"
110+
<nml_option name="config_h_mom_eddy_visc2" type="real" default_value="0.0" in_defaults="false"
111111
units="m^2 s^{-1}"
112112
description="$\nabla^2$ eddy viscosity for horizontal diffusion of momentum"
113113
possible_values="Positive real values"/>
114114

115-
<nml_option name="config_h_mom_eddy_visc4" type="real" default_value="0.0"
115+
<nml_option name="config_h_mom_eddy_visc4" type="real" default_value="0.0" in_defaults="false"
116116
units="m^4 s^{-1}"
117117
description="$\nabla^4$ eddy hyper-viscosity for horizontal diffusion of momentum"
118118
possible_values="Positive real values"/>
119119

120-
<nml_option name="config_v_mom_eddy_visc2" type="real" default_value="0.0"
120+
<nml_option name="config_v_mom_eddy_visc2" type="real" default_value="0.0" in_defaults="false"
121121
units="m^2 s^{-1}"
122122
description="$\nabla^2$ eddy viscosity for vertical diffusion of momentum"
123123
possible_values="Positive real values"/>
124124

125-
<nml_option name="config_h_theta_eddy_visc2" type="real" default_value="0.0"
125+
<nml_option name="config_h_theta_eddy_visc2" type="real" default_value="0.0" in_defaults="false"
126126
units="m^2 s^{-1}"
127127
description="$\nabla^2$ eddy viscosity for horizontal diffusion of theta"
128128
possible_values="Positive real values"/>
129129

130-
<nml_option name="config_h_theta_eddy_visc4" type="real" default_value="0.0"
130+
<nml_option name="config_h_theta_eddy_visc4" type="real" default_value="0.0" in_defaults="false"
131131
units="m^4 s^{-1}"
132132
description="$\nabla^4$ eddy hyper-viscosity for horizontal diffusion of theta"
133133
possible_values="Positive real values"/>
134134

135-
<nml_option name="config_v_theta_eddy_visc2" type="real" default_value="0.0"
135+
<nml_option name="config_v_theta_eddy_visc2" type="real" default_value="0.0" in_defaults="false"
136136
units="m^2 s^{-1}"
137137
description="$\nabla^2$ eddy viscosity for vertical diffusion of theta"
138138
possible_values="Positive real values"/>
@@ -157,37 +157,37 @@
157157
description="Scaling factor for the divergent component of $\nabla^4 u$ calculation"
158158
possible_values="Positive real values"/>
159159

160-
<nml_option name="config_w_adv_order" type="integer" default_value="3"
160+
<nml_option name="config_w_adv_order" type="integer" default_value="3" in_defaults="false"
161161
units="-"
162162
description="Horizontal advection order for w"
163163
possible_values="2, 3, or 4"/>
164164

165-
<nml_option name="config_theta_adv_order" type="integer" default_value="3"
165+
<nml_option name="config_theta_adv_order" type="integer" default_value="3" in_defaults="false"
166166
units="-"
167167
description="Horizontal advection order for theta"
168168
possible_values="2, 3, or 4"/>
169169

170-
<nml_option name="config_scalar_adv_order" type="integer" default_value="3"
170+
<nml_option name="config_scalar_adv_order" type="integer" default_value="3" in_defaults="false"
171171
units="-"
172172
description="Horizontal advection order for scalars"
173173
possible_values="2, 3, or 4"/>
174174

175-
<nml_option name="config_u_vadv_order" type="integer" default_value="3"
175+
<nml_option name="config_u_vadv_order" type="integer" default_value="3" in_defaults="false"
176176
units="-"
177177
description="Vertical advection order for normal velocities (u)"
178178
possible_values="2, 3, or 4"/>
179179

180-
<nml_option name="config_w_vadv_order" type="integer" default_value="3"
180+
<nml_option name="config_w_vadv_order" type="integer" default_value="3" in_defaults="false"
181181
units="-"
182182
description="Vertical advection order for w"
183183
possible_values="2, 3, or 4"/>
184184

185-
<nml_option name="config_theta_vadv_order" type="integer" default_value="3"
185+
<nml_option name="config_theta_vadv_order" type="integer" default_value="3" in_defaults="false"
186186
units="-"
187187
description="Vertical advection order for theta"
188188
possible_values="2, 3, or 4"/>
189189

190-
<nml_option name="config_scalar_vadv_order" type="integer" default_value="3"
190+
<nml_option name="config_scalar_vadv_order" type="integer" default_value="3" in_defaults="false"
191191
units="-"
192192
description="Vertical advection order for scalars"
193193
possible_values="2, 3, or 4"/>
@@ -197,7 +197,7 @@
197197
description="Whether to advect scalar fields"
198198
possible_values=".true. or .false."/>
199199

200-
<nml_option name="config_positive_definite" type="logical" default_value="false"
200+
<nml_option name="config_positive_definite" type="logical" default_value="false" in_defaults="false"
201201
units="-"
202202
description="Whether to enable positive-definite advection of scalars"
203203
possible_values=".true. or .false."/>

0 commit comments

Comments
 (0)