get rid of EB cylinder

erf-model · Jan 6, 2025 · 7f31b82 · 7f31b82
1 parent b967760
commit 7f31b82
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 74 deletions.
diff --git a/CMake/BuildERFExe.cmake b/CMake/BuildERFExe.cmake
@@ -127,7 +127,6 @@ function(build_erf_lib erf_lib_name)
        ${SRC_DIR}/Diffusion/ERF_ComputeTurbulentViscosity.cpp
        ${SRC_DIR}/EB/ERF_InitEB.cpp
        ${SRC_DIR}/EB/ERF_EBBox.cpp
-       ${SRC_DIR}/EB/ERF_EBCylinder.cpp
        ${SRC_DIR}/EB/ERF_EBRegular.cpp
        ${SRC_DIR}/EB/ERF_InitEB.cpp
        ${SRC_DIR}/EB/ERF_WriteEBSurface.cpp 

diff --git a/Source/EB/ERF_EBCylinder.cpp b/Source/EB/ERF_EBCylinder.cpp
diff --git a/Source/EB/ERF_InitEB.cpp b/Source/EB/ERF_InitEB.cpp
@@ -11,8 +11,8 @@ using namespace amrex;
 void ERF::MakeEBGeometry()
 {
    /******************************************************************************
-   * ERF.geometry=<string> specifies the EB geometry. <string> can be one of    *
-   * box, cylinder, or terrain */
+   * ERF.geometry=<string> specifies the EB geometry. <string> can be either     *
+   * box or terrain */
 
     ParmParse pp("eb2");
 
@@ -32,11 +32,7 @@ void ERF::MakeEBGeometry()
         max_coarsening_level = 0;
     }
 
-    if(geom_type == "cylinder") {
-        amrex::Print() << "\n Building cylinder geometry." << std::endl;
-        make_eb_cylinder();
-
-    } else if (geom_type == "terrain") {
+    if (geom_type == "terrain") {
         amrex::Print() << "\n Building EB geometry based on idealized terrain." << std::endl;
         Real dummy_time = 0.0;
         Box bx(surroundingNodes(Geom(0).Domain())); bx.grow(2);

diff --git a/Source/EB/Make.package b/Source/EB/Make.package
@@ -2,7 +2,6 @@
 CEXE_sources += main.cpp
 CEXE_sources += ERF_InitEB.cpp
 CEXE_sources += ERF_EBBox.cpp
-CEXE_sources += ERF_EBCylinder.cpp
 CEXE_sources += ERF_EBRegular.cpp
 CEXE_sources += ERF_Redistribute.cpp
 CEXE_sources += ERF_WriteEBSurface.cpp

diff --git a/Source/ERF.H b/Source/ERF.H
@@ -474,7 +474,6 @@ public:
 
     void MakeEBGeometry ();
     void make_eb_box ();
-    void make_eb_cylinder ();
     void make_eb_regular ();
     void redistribute_term ( int lev,
                         amrex::MultiFab& result,