Merge remote-tracking branch 'upstream/development' into Terrain_Turb…

…ines
erf-model · Dec 16, 2024 · e818eea · e818eea
2 parents aeaa8a1 + f4beeaf
commit e818eea
Show file tree

Hide file tree

Showing 53 changed files with 2,140 additions and 206 deletions.
diff --git a/CMake/BuildERFExe.cmake b/CMake/BuildERFExe.cmake
@@ -170,6 +170,7 @@ function(build_erf_lib erf_lib_name)
        ${SRC_DIR}/SourceTerms/ERF_MoistSetRhs.cpp
        ${SRC_DIR}/SourceTerms/ERF_NumericalDiffusion.cpp
        ${SRC_DIR}/SourceTerms/ERF_ForestDrag.cpp
+       ${SRC_DIR}/SourceTerms/ERF_TerrainDrag.cpp       
        ${SRC_DIR}/TimeIntegration/ERF_ComputeTimestep.cpp
        ${SRC_DIR}/TimeIntegration/ERF_Advance.cpp
        ${SRC_DIR}/TimeIntegration/ERF_TimeStep.cpp
@@ -206,6 +207,9 @@ function(build_erf_lib erf_lib_name)
        ${SRC_DIR}/Microphysics/Kessler/ERF_InitKessler.cpp
        ${SRC_DIR}/Microphysics/Kessler/ERF_Kessler.cpp
        ${SRC_DIR}/Microphysics/Kessler/ERF_UpdateKessler.cpp
+       ${SRC_DIR}/Microphysics/SatAdj/ERF_InitSatAdj.cpp
+       ${SRC_DIR}/Microphysics/SatAdj/ERF_SatAdj.cpp
+       ${SRC_DIR}/Microphysics/SatAdj/ERF_UpdateSatAdj.cpp
        ${SRC_DIR}/WindFarmParametrization/Fitch/ERF_AdvanceFitch.cpp
        ${SRC_DIR}/WindFarmParametrization/EWP/ERF_AdvanceEWP.cpp
        ${SRC_DIR}/WindFarmParametrization/SimpleActuatorDisk/ERF_AdvanceSimpleAD.cpp
@@ -254,6 +258,7 @@ endif()
   target_include_directories(${erf_lib_name} PUBLIC $<BUILD_INTERFACE:${CMAKE_SOURCE_DIR}/Source/Microphysics/Null>)
   target_include_directories(${erf_lib_name} PUBLIC $<BUILD_INTERFACE:${CMAKE_SOURCE_DIR}/Source/Microphysics/SAM>)
   target_include_directories(${erf_lib_name} PUBLIC $<BUILD_INTERFACE:${CMAKE_SOURCE_DIR}/Source/Microphysics/Kessler>)
+  target_include_directories(${erf_lib_name} PUBLIC $<BUILD_INTERFACE:${CMAKE_SOURCE_DIR}/Source/Microphysics/SatAdj>)
   target_include_directories(${erf_lib_name} PUBLIC $<BUILD_INTERFACE:${CMAKE_SOURCE_DIR}/Source/WindFarmParametrization>)
   target_include_directories(${erf_lib_name} PUBLIC $<BUILD_INTERFACE:${CMAKE_SOURCE_DIR}/Source/WindFarmParametrization/Null>)
   target_include_directories(${erf_lib_name} PUBLIC $<BUILD_INTERFACE:${CMAKE_SOURCE_DIR}/Source/WindFarmParametrization/Fitch>)

diff --git a/Docs/sphinx_doc/Inputs.rst b/Docs/sphinx_doc/Inputs.rst
@@ -432,10 +432,12 @@ List of Parameters
 | **erf.no_substepping**     | Should we turn off   | int (0 or 1)   | 0                 |
 |                            | substepping in time? |                |                   |
 +----------------------------+----------------------+----------------+-------------------+
-| **erf.cfl**                | CFL number for       | Real > 0 and   | 0.8               |
-|                            | hydro                | <= 1           |                   |
-|                            |                      |                |                   |
-|                            |                      |                |                   |
+| **erf.cfl**                | CFL number used to   | Real > 0 and   | 0.8               |
+|                            | compute level 0 dt   | <= 1           |                   |
++----------------------------+----------------------+----------------+-------------------+
+| **erf.substepping_cfl**    | CFL number used to   | Real > 0 and   | 1.0               |
+|                            | compute the number   | <= 1           |                   |
+|                            | of substeps          |                |                   |
 +----------------------------+----------------------+----------------+-------------------+
 | **erf.fixed_dt**           | set level 0 dt       | Real > 0       | unused if not     |
 |                            | as this value        |                | set               |
@@ -1443,7 +1445,7 @@ List of Parameters
 |                             |                          | Values             |            |
 +=============================+==========================+====================+============+
 | **erf.moisture_model**      | Name of moisture model   |  "SAM", "Kessler", | "Null"     |
-|                             |                          |  "FastEddy"        |            |
+|                             |                          |  "SatAdj"          |            |
 +-----------------------------+--------------------------+--------------------+------------+
 | **erf.do_cloud**            | use basic moisture model |  true / false      | true       |
 +-----------------------------+--------------------------+--------------------+------------+

diff --git a/Docs/sphinx_doc/theory/Microphysics.rst b/Docs/sphinx_doc/theory/Microphysics.rst
@@ -170,3 +170,8 @@ The evaporation rate of rain is
 .. math::
    Q_{revp} = 2\pi(S-1)n_{0R}[0.78\lambda_{R}^{-2}+0.31S_{c}^{1/3}\Gamma[(b+5)/2]a^{1/2}\mu^{-1/2}(\frac{\rho_{0}}{\rho})^{1/4}\lambda_{R}^{(b+5)/2}](\frac{1}{\rho})(\frac{L_{v}^{2}}{K_{0}R_{w}T^{2}}+\frac{1}{\rho r_{s}\psi})^{-1}
 
+
+   Saturation Adjustment Microphysics Model
+----------------------------------
+The saturation adjustment microphysics model is the simplest possible moisture model and only transports the
+water vapor mixing ratio, :math:`q_v`, and the cloud water mixing ration, :math:`q_c`. Evaporation, :math:`q_v \longrightarrow q_c`, and condensation, :math:`q_c \longrightarrow q_v`, are the only relevant mechanisms. The final saturation state, :math:`q_v = q_{vs}(T)` is obtained from Newton-Raphson iterations on the thermal temperature :math:`T`.