Merge branch 'development' into LandSeaTemplate

erf-model · Jun 24, 2024 · fa73cb6 · fa73cb6
2 parents 53f30ee + a0ea769
commit fa73cb6
Show file tree

Hide file tree

Showing 17 changed files with 547 additions and 9 deletions.
diff --git a/CMake/BuildERFExe.cmake b/CMake/BuildERFExe.cmake
@@ -140,6 +140,7 @@ function(build_erf_lib erf_lib_name)
        ${SRC_DIR}/Initialization/ERF_init_from_metgrid.cpp
        ${SRC_DIR}/Initialization/ERF_init_uniform.cpp
        ${SRC_DIR}/Initialization/ERF_init1d.cpp
+       ${SRC_DIR}/Initialization/ERF_init_TurbPert.cpp
        ${SRC_DIR}/Initialization/ERF_input_sponge.cpp
        ${SRC_DIR}/IO/Checkpoint.cpp
        ${SRC_DIR}/IO/ERF_ReadBndryPlanes.cpp

diff --git a/Exec/ABL/GNUmakefile b/Exec/ABL/GNUmakefile
@@ -19,7 +19,7 @@ USE_HIP  = FALSE
 USE_SYCL = FALSE
 
 # Debugging
-DEBUG = FALSE
+DEBUG = TRUE
 
 TEST = TRUE
 USE_ASSERTION = TRUE

diff --git a/Source/DataStructs/DataStruct.H b/Source/DataStructs/DataStruct.H
@@ -15,6 +15,7 @@
 #include <DiffStruct.H>
 #include <SpongeStruct.H>
 #include <TurbStruct.H>
+#include <TurbPertStruct.H>
 
 enum struct ABLDriverType {
     None, PressureGradient, GeostrophicWind
@@ -60,6 +61,11 @@ enum Sponge {
        ubar_sponge, vbar_sponge, nvars_sponge
 };
 
+enum struct PerturbationType {
+    BPM, CPM, None
+    // Box perturbation method, Cell perturbation method, None
+};
+
 /**
  * Container holding many of the algorithmic options and parameters
  */
@@ -224,12 +230,28 @@ struct SolverChoice {
             abl_driver_type = ABLDriverType::PressureGradient;
         } else if (!abl_driver_type_string.compare("GeostrophicWind")) {
             abl_driver_type = ABLDriverType::GeostrophicWind;
-        } else if (!abl_driver_type_string.compare("None")){
+        } else if (!abl_driver_type_string.compare("None")) {
             abl_driver_type = ABLDriverType::None; // No ABL driver for simulating classical fluid dynamics problems
         } else {
             amrex::Error("Don't know this abl_driver_type");
         }
 
+        // Which type of inflow turbulent generation
+        static std::string turb_pert_type_string = "None";
+        pp.query("inlet_perturbation_type",turb_pert_type_string);
+        if (!turb_pert_type_string.compare("BoxPerturbation")) {
+            pert_type = PerturbationType::BPM;
+            amrex::Print() << "Box perturbation method selected\n";
+        } else if (!turb_pert_type_string.compare("CellPerturbation")) {
+            pert_type = PerturbationType::CPM;
+            amrex::Print() << "Cell perturbation method selected\n";
+        } else if (!turb_pert_type_string.compare("None")) {
+            pert_type = PerturbationType::None;
+            amrex::Print() << "No perturbation method selected\n";
+        } else {
+            amrex::Abort("Dont know this inlet_perturbation_type");
+        }
+
         amrex::Vector<amrex::Real> abl_pressure_grad_in = {0.0, 0.0, 0.0};
         pp.queryarr("abl_pressure_grad",abl_pressure_grad_in);
         for(int i = 0; i < AMREX_SPACEDIM; ++i) abl_pressure_grad[i] = abl_pressure_grad_in[i];
@@ -487,6 +509,9 @@ struct SolverChoice {
     // User wishes to output time averaged velocity fields
     bool time_avg_vel = false;
 
+    // Type of perturbation
+    PerturbationType pert_type;
+
     // Numerical diffusion
     bool use_NumDiff{false};
     amrex::Real NumDiffCoeff{0.};

diff --git a/Source/DataStructs/Make.package b/Source/DataStructs/Make.package
@@ -3,3 +3,4 @@ CEXE_headers += DiffStruct.H
 CEXE_headers += AdvStruct.H
 CEXE_headers += SpongeStruct.H
 CEXE_headers += TurbStruct.H
+CEXE_headers += TurbPertStruct.H