Merge branch 'development' into thin_immersed_bndry

ewquon · Apr 6, 2024 · 76ae6cb · 76ae6cb
2 parents 58b00da + 22cf6ba
commit 76ae6cb
Show file tree

Hide file tree

Showing 28 changed files with 22 additions and 330 deletions.
diff --git a/Docs/sphinx_doc/RegressionTests.rst b/Docs/sphinx_doc/RegressionTests.rst
@@ -452,4 +452,4 @@ Test Location: `Tests/test_files/EkmanSpiral`_
 
 Problem Location: `Exec/RegTests/EkmanSpiral`_
 
-.. _`Exec/RegTests/EkmanSpiral`: https://github.com/erf-model/ERF/tree/development/Exec/RegTests/EkmanSpiral_ideal
+.. _`Exec/RegTests/EkmanSpiral`: https://github.com/erf-model/ERF/tree/development/Exec/RegTests/EkmanSpiral
diff --git a/Exec/CMakeLists.txt b/Exec/CMakeLists.txt
@@ -9,7 +9,7 @@ elseif (ERF_ENABLE_REGRESSION_TESTS_ONLY)
   add_subdirectory(RegTests/Couette_Poiseuille)
   add_subdirectory(RegTests/DensityCurrent)
   add_subdirectory(RegTests/DynamicRefinement)
-  add_subdirectory(RegTests/EkmanSpiral_custom)
+  add_subdirectory(RegTests/EkmanSpiral)
   add_subdirectory(RegTests/IsentropicVortex)
   add_subdirectory(RegTests/ScalarAdvDiff)
   add_subdirectory(RegTests/TaylorGreenVortex)
@@ -23,9 +23,7 @@ else ()
   add_subdirectory(RegTests/Couette_Poiseuille)
   add_subdirectory(RegTests/DensityCurrent)
   add_subdirectory(RegTests/DynamicRefinement)
-  add_subdirectory(RegTests/EkmanSpiral_custom)
-  add_subdirectory(RegTests/EkmanSpiral_ideal)
-  add_subdirectory(RegTests/EkmanSpiral_input_sounding)
+  add_subdirectory(RegTests/EkmanSpiral)
   add_subdirectory(RegTests/IsentropicVortex)
   add_subdirectory(RegTests/ParticlesOverWoA)
   add_subdirectory(RegTests/ScalarAdvDiff)

diff --git a/...RegTests/EkmanSpiral_ideal/CMakeLists.txt → Exec/RegTests/EkmanSpiral/CMakeLists.txt b/...RegTests/EkmanSpiral_ideal/CMakeLists.txt → Exec/RegTests/EkmanSpiral/CMakeLists.txt
@@ -1,4 +1,4 @@
-set(erf_exe_name erf_ekman_spiral_ideal)
+set(erf_exe_name erf_ekman_spiral)
 
 add_executable(${erf_exe_name} "")
 target_sources(${erf_exe_name}

diff --git a/Exec/RegTests/EkmanSpiral_custom/GNUmakefile → Exec/RegTests/EkmanSpiral/GNUmakefile b/Exec/RegTests/EkmanSpiral_custom/GNUmakefile → Exec/RegTests/EkmanSpiral/GNUmakefile
@@ -29,5 +29,5 @@ Bpack := ./Make.package
 Blocs := .
 
 ERF_HOME := ../../..
-ERF_PROBLEM_DIR = $(ERF_HOME)/Exec/RegTests/EkmanSpiral_custom
+ERF_PROBLEM_DIR = $(ERF_HOME)/Exec/RegTests/EkmanSpiral
 include $(ERF_HOME)/Exec/Make.ERF
diff --git a/.../RegTests/EkmanSpiral_custom/Make.package → Exec/RegTests/EkmanSpiral/Make.package b/.../RegTests/EkmanSpiral_custom/Make.package → Exec/RegTests/EkmanSpiral/Make.package
diff --git a/Exec/RegTests/EkmanSpiral_ideal/README → Exec/RegTests/EkmanSpiral/README b/Exec/RegTests/EkmanSpiral_ideal/README → Exec/RegTests/EkmanSpiral/README
@@ -5,6 +5,13 @@ internally and at no-slip walls.
 A description of the problem, including the exact solution, can be found at 
 https://exawind.github.io/amr-wind/developer/verification.html#ekman-spiral .
 
-The version of the Ekman spiral test in this directory initializes the solution
+When the executable here is run with inputs_custom, the solution is initialized
+in prob.cpp from the exact solution.
+
+When the executable here is run with inputs_ideal, the solution is initialized
 from the wrfinput_ekman_d01 file, thus this is also a test of ERF's ability to 
 initialize from WPS "ideal" files.
+
+When the executable here is run with inputs_input_sounding, the solution is initialized
+from the input_sounding_file,  thus this is also a test of ERF's ability to 
+initialize from input soundings.
diff --git a/...s/EkmanSpiral_custom/check_convergence.py → ...RegTests/EkmanSpiral/check_convergence.py b/...s/EkmanSpiral_custom/check_convergence.py → ...RegTests/EkmanSpiral/check_convergence.py
diff --git a/...Spiral_input_sounding/input_sounding_file → .../RegTests/EkmanSpiral/input_sounding_file b/...Spiral_input_sounding/input_sounding_file → .../RegTests/EkmanSpiral/input_sounding_file
diff --git a/Exec/RegTests/EkmanSpiral_custom/inputs_ex → Exec/RegTests/EkmanSpiral/inputs_custom b/Exec/RegTests/EkmanSpiral_custom/inputs_ex → Exec/RegTests/EkmanSpiral/inputs_custom
diff --git a/...kmanSpiral_ideal/inputs_ideal_EkmanSpiral → Exec/RegTests/EkmanSpiral/inputs_ideal b/...kmanSpiral_ideal/inputs_ideal_EkmanSpiral → Exec/RegTests/EkmanSpiral/inputs_ideal
diff --git a/...ounding/inputs_input_sounding_EkmanSpiral → ...egTests/EkmanSpiral/inputs_input_sounding b/...ounding/inputs_input_sounding_EkmanSpiral → ...egTests/EkmanSpiral/inputs_input_sounding
diff --git a/Exec/RegTests/EkmanSpiral_custom/prob.H → Exec/RegTests/EkmanSpiral/prob.H b/Exec/RegTests/EkmanSpiral_custom/prob.H → Exec/RegTests/EkmanSpiral/prob.H
diff --git a/Exec/RegTests/EkmanSpiral_custom/prob.cpp → Exec/RegTests/EkmanSpiral/prob.cpp b/Exec/RegTests/EkmanSpiral_custom/prob.cpp → Exec/RegTests/EkmanSpiral/prob.cpp
@@ -41,17 +41,17 @@ Problem::init_custom_pert(
     Array4<Real const> const& /*mf_v*/,
     const SolverChoice& sc)
 {
+    //
+    // NOTE: this routine is only called when doing custom initialization!
+    //
+    // In the case of initializng from an input sounding or from a wrfinput file,
+    // this routine will not be called.
+    //
+
     const bool use_moisture = (sc.moisture_type != MoistureType::None);
 
     ParallelFor(bx, [=, parms=parms] AMREX_GPU_DEVICE(int i, int j, int k) noexcept
     {
-        // Geometry
-        //const Real* prob_lo = geomdata.ProbLo();
-        //const auto dx = geomdata.CellSize();
-        //const Real x = prob_lo[0] + (i + 0.5) * dx[0];
-        //const Real y = prob_lo[1] + (j + 0.5) * dx[1];
-        //const Real z = prob_lo[2] + (k + 0.5) * dx[2];
-
         // Set scalar = 0 everywhere
         state_pert(i, j, k, RhoScalar_comp) = 0.0;
 
@@ -79,7 +79,6 @@ Problem::init_custom_pert(
     const Real u_0 = abl_geo_wind[0];
 
     const Real DE = std::sqrt(2.0 * Az / coriolis_factor);
-    //amrex::Print() << "Ekman depth = " << DE << " m" << std::endl;
     const Real a = 1.0 / DE;
 
     // Set the x-velocity

diff --git a/...manSpiral_custom/run_convergence_study.sh → ...ests/EkmanSpiral/run_convergence_study.sh b/...manSpiral_custom/run_convergence_study.sh → ...ests/EkmanSpiral/run_convergence_study.sh
diff --git a/...ests/EkmanSpiral_ideal/wrfinput_ekman_d01 → Exec/RegTests/EkmanSpiral/wrfinput_ekman_d01 b/...ests/EkmanSpiral_ideal/wrfinput_ekman_d01 → Exec/RegTests/EkmanSpiral/wrfinput_ekman_d01
diff --git a/Exec/RegTests/EkmanSpiral_custom/CMakeLists.txt b/Exec/RegTests/EkmanSpiral_custom/CMakeLists.txt
diff --git a/Exec/RegTests/EkmanSpiral_custom/README b/Exec/RegTests/EkmanSpiral_custom/README
diff --git a/Exec/RegTests/EkmanSpiral_ideal/GNUmakefile b/Exec/RegTests/EkmanSpiral_ideal/GNUmakefile
diff --git a/Exec/RegTests/EkmanSpiral_ideal/Make.package b/Exec/RegTests/EkmanSpiral_ideal/Make.package
diff --git a/Exec/RegTests/EkmanSpiral_ideal/prob.H b/Exec/RegTests/EkmanSpiral_ideal/prob.H
diff --git a/Exec/RegTests/EkmanSpiral_ideal/prob.cpp b/Exec/RegTests/EkmanSpiral_ideal/prob.cpp
diff --git a/Exec/RegTests/EkmanSpiral_input_sounding/CMakeLists.txt b/Exec/RegTests/EkmanSpiral_input_sounding/CMakeLists.txt
diff --git a/Exec/RegTests/EkmanSpiral_input_sounding/GNUmakefile b/Exec/RegTests/EkmanSpiral_input_sounding/GNUmakefile
diff --git a/Exec/RegTests/EkmanSpiral_input_sounding/Make.package b/Exec/RegTests/EkmanSpiral_input_sounding/Make.package
diff --git a/Exec/RegTests/EkmanSpiral_input_sounding/README b/Exec/RegTests/EkmanSpiral_input_sounding/README
diff --git a/Exec/RegTests/EkmanSpiral_input_sounding/prob.H b/Exec/RegTests/EkmanSpiral_input_sounding/prob.H