spencers comments on tutorial

utilities/NekMesh/CMakeLists.txt

@@ -79,14 +79,14 @@ IF (NEKTAR_USE_MESHGEN)
             ProcessModules/ProcessVarOpti/ElUtil.h
             ProcessModules/ProcessVarOpti/Evaluator.hxx
             ProcessModules/ProcessVarOpti/Hessian.hxx
-            InputModules/InputCAD.h)
+            InputModules/InputMCF.h)
     SET(NekMeshSources ${NekMeshSources}
             ProcessModules/ProcessVarOpti/NodeOptiCAD.cpp
             ProcessModules/ProcessVarOpti/ProcessVarOpti.cpp
             ProcessModules/ProcessVarOpti/PreProcessing.cpp
             ProcessModules/ProcessVarOpti/NodeOpti.cpp
             ProcessModules/ProcessVarOpti/ElUtil.cpp
-            InputModules/InputCAD.cpp)
+            InputModules/InputMCF.cpp)
 ENDIF (NEKTAR_USE_MESHGEN)
 
 # Don't use macro -- this way we can just link against NekMeshUtils and
@@ -150,5 +150,5 @@ IF(NEKTAR_USE_MESHGEN)
     ADD_NEKTAR_TEST        (MeshGen/2d-cad)
     ADD_NEKTAR_TEST        (MeshGen/2d-naca)
     # varopti tests
-    ADD_NEKTAR_TEST        (MeshGen/varopti_cubesphere)
+    ADD_NEKTAR_TEST_LENGTHY       (MeshGen/varopti_cubesphere)
 ENDIF()

utilities/NekMesh/InputModules/InputCAD.cpp → utilities/NekMesh/InputModules/InputMCF.cpp

@@ -39,7 +39,7 @@
 
 #include <tinyxml.h>
 
-#include "InputCAD.h"
+#include "InputMCF.h"
 
 using namespace std;
 using namespace Nektar::NekMeshUtils;
@@ -49,22 +49,22 @@ namespace Nektar
 namespace Utilities
 {
 
-ModuleKey InputCAD::className = GetModuleFactory().RegisterCreatorFunction(
-    ModuleKey(eInputModule, "mcf"), InputCAD::create,
-    "Reads CAD geometry and will generate the mesh file.");
+ModuleKey InputMCF::className = GetModuleFactory().RegisterCreatorFunction(
+    ModuleKey(eInputModule, "mcf"), InputMCF::create,
+    "Reads mesh configuration and will generate the mesh file.");
 
 /**
  * @brief Set up InputCAD object.
  */
-InputCAD::InputCAD(MeshSharedPtr m) : InputModule(m)
+InputMCF::InputMCF(MeshSharedPtr m) : InputModule(m)
 {
 }
 
-InputCAD::~InputCAD()
+InputMCF::~InputMCF()
 {
 }
 
-void InputCAD::ParseFile(string nm)
+void InputMCF::ParseFile(string nm)
 {
     vector<string> filename;
     filename.push_back(nm);
@@ -159,13 +159,17 @@ void InputCAD::ParseFile(string nm)
 
     it = information.find("MeshType");
     ASSERTL0(it != information.end(), "no meshtype defined");
-    m_makeBL = it->second == "BL";
+    m_makeBL = it->second == "3DBndLayer";
     m_2D = it->second == "2D";
-    if (it->second == "2DBL")
+    if (it->second == "2DBndLayer")
     {
         m_makeBL = true;
         m_2D = true;
     }
+    if(!m_makeBL && !m_2D)
+    {
+        ASSERTL0(it->second == "3D", "unsure on MeshType")
+    }
 
 
     it = parameters.find("MinDelta");
@@ -186,20 +190,20 @@ void InputCAD::ParseFile(string nm)
 
     if (m_makeBL)
     {
-        it = parameters.find("BLSurfs");
-        ASSERTL0(it != parameters.end(), "no blsurfs defined");
+        it = parameters.find("BndLayerSurfaces");
+        ASSERTL0(it != parameters.end(), "no BndLayersurfs defined");
         m_blsurfs = it->second;
 
-        it = parameters.find("BLThick");
-        ASSERTL0(it != parameters.end(), "no blthick defined");
+        it = parameters.find("BndLayerThickness");
+        ASSERTL0(it != parameters.end(), "no BndLayerthick defined");
         m_blthick = it->second;
 
-        it = parameters.find("BLLayers");
+        it = parameters.find("BndLayerLayers");
         m_splitBL = it != parameters.end();
         if(m_splitBL)
         {
             m_bllayers = it->second;
-            it = parameters.find("BLProg");
+            it = parameters.find("BndLayerProgression");
             m_blprog = it != parameters.end() ? it->second : "2.0";
         }
     }
@@ -230,11 +234,11 @@ void InputCAD::ParseFile(string nm)
     }
 
     set<string>::iterator sit;
-    sit        = boolparameters.find("SurfOpti");
+    sit        = boolparameters.find("SurfaceOptimiser");
     m_surfopti = sit != boolparameters.end();
     sit        = boolparameters.find("WriteOctree");
     m_woct     = sit != boolparameters.end();
-    sit        = boolparameters.find("VarOpti");
+    sit        = boolparameters.find("VariationalOptimiser");
     m_varopti  = sit != boolparameters.end();
 
     m_refine = refinement.size() > 0;
@@ -251,7 +255,7 @@ void InputCAD::ParseFile(string nm)
     }
 }
 
-void InputCAD::Process()
+void InputMCF::Process()
 {
     ParseFile(m_config["infile"].as<string>());
 

utilities/NekMesh/InputModules/InputCAD.h → utilities/NekMesh/InputModules/InputMCF.h

@@ -33,8 +33,8 @@
 //
 ////////////////////////////////////////////////////////////////////////////////
 
-#ifndef UTILITIES_NEKMESH_INPUTCAD
-#define UTILITIES_NEKMESH_INPUTCAD
+#ifndef UTILITIES_NEKMESH_INPUTMCF
+#define UTILITIES_NEKMESH_INPUTMCF
 
 #include <NekMeshUtils/Module/Module.h>
 
@@ -43,17 +43,17 @@ namespace Nektar
 namespace Utilities
 {
 
-class InputCAD : public NekMeshUtils::InputModule
+class InputMCF : public NekMeshUtils::InputModule
 {
 public:
-    InputCAD(NekMeshUtils::MeshSharedPtr m);
-    virtual ~InputCAD();
+    InputMCF(NekMeshUtils::MeshSharedPtr m);
+    virtual ~InputMCF();
     virtual void Process();
 
     /// Creates an instance of this class
     static NekMeshUtils::ModuleSharedPtr create(NekMeshUtils::MeshSharedPtr m)
     {
-        return MemoryManager<InputCAD>::AllocateSharedPtr(m);
+        return MemoryManager<InputMCF>::AllocateSharedPtr(m);
     }
     /// %ModuleKey for class.
     static NekMeshUtils::ModuleKey className;

utilities/NekMesh/Tests/MeshGen/2d-cad.mcf

@@ -3,7 +3,7 @@
 
         <INFORMATION>
             <I PROPERTY="CADFile" VALUE="2d-cad.STEP"	/>
-            <I PROPERTY="MeshType" VALUE="2DBL"			/>
+            <I PROPERTY="MeshType" VALUE="2DBndLayer"			/>
         </INFORMATION>
 
         <PARAMETERS>
@@ -13,10 +13,10 @@
 
             <P PARAM="Order"    VALUE="4"				/>
 
-            <P PARAM="BLSurfs"  VALUE="5-6"				/>
-            <P PARAM="BLThick"  VALUE="0.02"			/>
-            <P PARAM="BLLayers" VALUE="6"				/>
-            <P PARAM="BLProg"   VALUE="1.5"				/>
+            <P PARAM="BndLayerSurfaces"  VALUE="5-6"				/>
+            <P PARAM="BndLayerThickness"  VALUE="0.02"			/>
+            <P PARAM="BndLayerLayers" VALUE="6"				/>
+            <P PARAM="BndLayerProgression"   VALUE="1.5"				/>
         </PARAMETERS>
 
         <BOOLPARAMETERS>

utilities/NekMesh/Tests/MeshGen/2d-naca.mcf

@@ -3,7 +3,7 @@
 
         <INFORMATION>
             <I PROPERTY="CADFile" VALUE="0012"	/>
-            <I PROPERTY="MeshType" VALUE="2DBL"	/>
+            <I PROPERTY="MeshType" VALUE="2DBndLayer"	/>
         </INFORMATION>
 
         <PARAMETERS>
@@ -13,8 +13,8 @@
 
             <P PARAM="Order"    VALUE="4"		/>
 
-            <P PARAM="BLSurfs"  VALUE="5-6"		/>
-            <P PARAM="BLThick"  VALUE="0.05"	/>
+            <P PARAM="BndLayerSurfaces"  VALUE="5-6"		/>
+            <P PARAM="BndLayerThickness"  VALUE="0.05"	/>
 
             <P PARAM="Xmin"     VALUE="-1.0"    />
             <P PARAM="Ymin"     VALUE="-2.0"    />

utilities/NekMesh/Tests/MeshGen/cylinder.mcf

@@ -3,7 +3,7 @@
 
         <INFORMATION>
             <I PROPERTY="CADFile" VALUE="cylinder.STEP" />
-            <I PROPERTY="MeshType" VALUE="Euler" />
+            <I PROPERTY="MeshType" VALUE="3D" />
         </INFORMATION>
 
         <PARAMETERS>

utilities/NekMesh/Tests/MeshGen/sphere.mcf

@@ -3,7 +3,7 @@
 
         <INFORMATION>
             <I PROPERTY="CADFile" VALUE="sphere.STEP" />
-            <I PROPERTY="MeshType" VALUE="Euler" />
+            <I PROPERTY="MeshType" VALUE="3D" />
         </INFORMATION>
 
         <PARAMETERS>
@@ -15,7 +15,7 @@
         </PARAMETERS>
 
         <BOOLPARAMETERS>
-            <P VALUE="SurfOpti" />
+            <P VALUE="SurfaceOptimiser" />
         </BOOLPARAMETERS>
 
     </MESHING>