Does not compile with templated Microphysics.H but does compile with …

…the case select version (commented out).
erf-model · Nov 16, 2023 · e248a47 · e248a47
1 parent 7fe006a
commit e248a47
Show file tree

Hide file tree

Showing 29 changed files with 1,729 additions and 170 deletions.
diff --git a/CMake/BuildERFExe.cmake b/CMake/BuildERFExe.cmake
@@ -58,13 +58,13 @@ function(build_erf_lib erf_lib_name)
 
   if(ERF_ENABLE_MOISTURE)
     target_sources(${erf_lib_name} PRIVATE
-       ${SRC_DIR}/Microphysics/Init.cpp
-       ${SRC_DIR}/Microphysics/Cloud.cpp
-       ${SRC_DIR}/Microphysics/IceFall.cpp
-       ${SRC_DIR}/Microphysics/Precip.cpp
-       ${SRC_DIR}/Microphysics/PrecipFall.cpp
-       ${SRC_DIR}/Microphysics/Diagnose.cpp
-       ${SRC_DIR}/Microphysics/Update.cpp)
+       ${SRC_DIR}/Microphysics/SAM/Init.cpp
+       ${SRC_DIR}/Microphysics/SAM/Cloud.cpp
+       ${SRC_DIR}/Microphysics/SAM/IceFall.cpp
+       ${SRC_DIR}/Microphysics/SAM/Precip.cpp
+       ${SRC_DIR}/Microphysics/SAM/PrecipFall.cpp
+       ${SRC_DIR}/Microphysics/SAM/Diagnose.cpp
+       ${SRC_DIR}/Microphysics/SAM/Update.cpp)
     target_compile_definitions(${erf_lib_name} PUBLIC ERF_USE_MOISTURE)
   endif()
 
@@ -184,6 +184,8 @@ function(build_erf_lib erf_lib_name)
 
   if(ERF_ENABLE_MOISTURE)
     target_include_directories(${erf_lib_name} PUBLIC ${SRC_DIR}/Microphysics)
+    target_include_directories(${erf_lib_name} PUBLIC ${SRC_DIR}/Microphysics/Null)
+    target_include_directories(${erf_lib_name} PUBLIC ${SRC_DIR}/Microphysics/SAM)
   endif()
 
   if(ERF_ENABLE_RRTMGP)

diff --git a/Exec/Make.ERF b/Exec/Make.ERF
@@ -107,6 +107,16 @@ ifeq ($(USE_MOISTURE), TRUE)
   include $(ERF_MOISTURE_DIR)/Make.package
   VPATH_LOCATIONS   += $(ERF_MOISTURE_DIR)
   INCLUDE_LOCATIONS += $(ERF_MOISTURE_DIR)
+
+  ERF_MOISTURE_NULL_DIR = $(ERF_SOURCE_DIR)/Microphysics/Null
+  include $(ERF_MOISTURE_NULL_DIR)/Make.package
+  VPATH_LOCATIONS   += $(ERF_MOISTURE_NULL_DIR)
+  INCLUDE_LOCATIONS += $(ERF_MOISTURE_NULL_DIR)
+
+  ERF_MOISTURE_SAM_DIR = $(ERF_SOURCE_DIR)/Microphysics/SAM
+  include $(ERF_MOISTURE_SAM_DIR)/Make.package
+  VPATH_LOCATIONS   += $(ERF_MOISTURE_SAM_DIR)
+  INCLUDE_LOCATIONS += $(ERF_MOISTURE_SAM_DIR) 
 endif
 
 ifeq ($(USE_WARM_NO_PRECIP), TRUE)

diff --git a/Exec/RegTests/WPS_Test/inputs_real_ChisholmView b/Exec/RegTests/WPS_Test/inputs_real_ChisholmView
@@ -53,6 +53,8 @@ erf.use_gravity = true
 erf.use_terrain = true
 erf.use_terrain = false
 
+erf.moisture_model = "SAM"
+
 erf.les_type         = "None"
 erf.molec_diff_type  = "Constant"
 erf.dynamicViscosity = 5.0

diff --git a/Source/ERF.H b/Source/ERF.H
@@ -543,7 +543,8 @@ private:
     amrex::Vector<amrex::MultiFab> rW_new;
 
 #if defined(ERF_USE_MOISTURE)
-    Microphysics micro;
+    std::string moisture_model = "NullMoist";
+    Microphysics<NullMoist> micro;
     amrex::Vector<amrex::MultiFab> qmoist; // This has 6 components: qv, qc, qi, qr, qs, qg
 #endif
 

diff --git a/Source/ERF.cpp b/Source/ERF.cpp
@@ -967,6 +967,17 @@ ERF::ReadParameters ()
         pp.query("use_tracer_particles", use_tracer_particles);
 #endif
 
+#ifdef ERF_USE_MOISTURE
+        // What type of moisture model to use
+        pp.query("moisture_model", moisture_model);
+        if (moisture_model == "SAM") {
+            SAM T;
+            micro.SetModel(T);
+        }
+
+        //micro.SetModel(moisture_model);
+#endif
+
         // If this is set, it must be even
         if (fixed_mri_dt_ratio > 0 && (fixed_mri_dt_ratio%2 != 0) )
         {

diff --git a/Source/Microphysics/Make.package b/Source/Microphysics/Make.package
@@ -1,9 +1,2 @@
-CEXE_sources += Cloud.cpp
-CEXE_sources += Init.cpp
-CEXE_sources += Diagnose.cpp
-CEXE_sources += Update.cpp
-CEXE_sources += IceFall.cpp
-CEXE_sources += Precip.cpp
-CEXE_sources += PrecipFall.cpp
 CEXE_headers += Microphysics.H