From 03c17545f3c911b5f681ba2881cbd4837fc67b5e Mon Sep 17 00:00:00 2001 From: "Aaron M. Lattanzi" <103702284+AMLattanzi@users.noreply.github.com> Date: Thu, 16 Nov 2023 16:05:11 -0800 Subject: [PATCH] Add moisture model name to inputs that employ moisture and update docs. (#1304) --- Docs/sphinx_doc/Inputs.rst | 2 ++ Exec/DevTests/MetGrid/inputs | 2 ++ Exec/Radiation/inputs_radiation | 2 ++ Exec/RegTests/Bubble/inputs_squall2d_x | 1 + Exec/SuperCell/inputs_moisture | 2 ++ 5 files changed, 9 insertions(+) diff --git a/Docs/sphinx_doc/Inputs.rst b/Docs/sphinx_doc/Inputs.rst index f84e5180a..779c7bfb7 100644 --- a/Docs/sphinx_doc/Inputs.rst +++ b/Docs/sphinx_doc/Inputs.rst @@ -899,6 +899,8 @@ List of Parameters | Parameter | Definition | Acceptable | Default | | | | Values | | +=============================+==========================+====================+============+ +| **erf.moisture_model** | Name of moisture model | "SAM", "Kessler" | "Null" | ++-----------------------------+--------------------------+--------------------+------------+ | **erf.do_cloud** | use basic moisture model | true / false | true | +-----------------------------+--------------------------+--------------------+------------+ | **erf.do_precip** | include precipitation | true / false | true | diff --git a/Exec/DevTests/MetGrid/inputs b/Exec/DevTests/MetGrid/inputs index 2be9c6f2e..00870c0c9 100644 --- a/Exec/DevTests/MetGrid/inputs +++ b/Exec/DevTests/MetGrid/inputs @@ -52,6 +52,8 @@ erf.les_type = "Smagorinsky" #erf.les_type = "Deardorff" erf.Cs = 0.1 +erf.moisture_model = "SAM" + #erf.terrain_z_levels = 0 130 354 583 816 1054 1549 2068 2615 3193 3803 4450 5142 5892 6709 7603 8591 9702 10967 12442 14230 16610 18711 20752 22133 23960 26579 28493 31236 33699 36068 40000 # INITIALIZATION WITH ATM DATA diff --git a/Exec/Radiation/inputs_radiation b/Exec/Radiation/inputs_radiation index 31607b085..56e7babe4 100644 --- a/Exec/Radiation/inputs_radiation +++ b/Exec/Radiation/inputs_radiation @@ -45,6 +45,8 @@ erf.use_gravity = true erf.use_coriolis = false erf.use_rayleigh_damping = false +erf.moisture_model = "SAM" + erf.les_type = "Deardorff" #erf.les_type = "None" # diff --git a/Exec/RegTests/Bubble/inputs_squall2d_x b/Exec/RegTests/Bubble/inputs_squall2d_x index 3328ad678..d561668c4 100644 --- a/Exec/RegTests/Bubble/inputs_squall2d_x +++ b/Exec/RegTests/Bubble/inputs_squall2d_x @@ -46,6 +46,7 @@ erf.use_rayleigh_damping = false # TODO: enable # PHYSICS OPTIONS erf.les_type = "Deardorff" erf.pbl_type = "None" +erf.moisture_model = "SAM" erf.molec_diff_type = "Constant" erf.rho0_trans = 1.0 # [kg/m^3], used to convert input diffusivities diff --git a/Exec/SuperCell/inputs_moisture b/Exec/SuperCell/inputs_moisture index 31607b085..56e7babe4 100644 --- a/Exec/SuperCell/inputs_moisture +++ b/Exec/SuperCell/inputs_moisture @@ -45,6 +45,8 @@ erf.use_gravity = true erf.use_coriolis = false erf.use_rayleigh_damping = false +erf.moisture_model = "SAM" + erf.les_type = "Deardorff" #erf.les_type = "None" #