bug fix and test changes

library/NekMeshUtils/Octree/Octree.cpp

@@ -959,8 +959,8 @@ void Octree::CompileSourcePointList()
 
         // these are the acutal number of sample points in each parametric
         // direction
-        int nu = ceil(DeltaU / m_minDelta) * 2;
-        int nv = ceil(DeltaV / m_minDelta) * 2;
+        int nu = ceil(DeltaU / m_minDelta) * 40 * 2;
+        int nv = ceil(DeltaV / m_minDelta) * 40 * 2;
 
         for (int j = 0; j < nu; j++)
         {

utilities/NekMesh/InputModules/InputMCF.cpp

@@ -423,19 +423,19 @@ void InputMCF::Process()
         module->RegisterConfig("maxiter", "10");
         module->RegisterConfig("numthreads",
                                     boost::lexical_cast<string>(np));
-    }
 
-    try
-    {
-        module->SetDefaults();
-        module->Process();
-    }
-    catch (runtime_error &e)
-    {
-        cout << "Variational optimisation has failed with message:" << endl;
-        cout << e.what() << endl;
-        cout << "The mesh will be written as is, it may be invalid" << endl;
-        return;
+        try
+        {
+            module->SetDefaults();
+            module->Process();
+        }
+        catch (runtime_error &e)
+        {
+            cout << "Variational optimisation has failed with message:" << endl;
+            cout << e.what() << endl;
+            cout << "The mesh will be written as is, it may be invalid" << endl;
+            return;
+        }
     }
 
     ////**** SPLIT BL ****////
@@ -448,20 +448,22 @@ void InputMCF::Process()
         module->RegisterConfig(
             "nq", boost::lexical_cast<string>(m_mesh->m_nummode));
         module->RegisterConfig("r", m_blprog);
-    }
 
-    try
-    {
-        module->SetDefaults();
-        module->Process();
-    }
-    catch (runtime_error &e)
-    {
-        cout << "Boundary layer splitting has failed with message:" << endl;
-        cout << e.what() << endl;
-        cout << "The mesh will be written as is, it may be invalid" << endl;
-        return;
+        try
+        {
+            module->SetDefaults();
+            module->Process();
+        }
+        catch (runtime_error &e)
+        {
+            cout << "Boundary layer splitting has failed with message:" << endl;
+            cout << e.what() << endl;
+            cout << "The mesh will be written as is, it may be invalid" << endl;
+            return;
+        }
     }
+
+
 }
 }
 }

utilities/NekMesh/Tests/MeshGen/cylinder.mcf

@@ -7,9 +7,9 @@
         </INFORMATION>
 
         <PARAMETERS>
-            <P PARAM="MinDelta" VALUE="0.003"    />
+            <P PARAM="MinDelta" VALUE="0.03"    />
             <P PARAM="MaxDelta" VALUE="0.2"     />
-            <P PARAM="EPS"      VALUE="0.05"     />
+            <P PARAM="EPS"      VALUE="0.5"     />
 
             <P PARAM="Order"    VALUE="4"       />
 

utilities/NekMesh/Tests/MeshGen/rev.mcf

@@ -7,9 +7,9 @@
         </INFORMATION>
 
         <PARAMETERS>
-            <P PARAM="MinDelta" VALUE="0.012"    />
+            <P PARAM="MinDelta" VALUE="0.02"    />
             <P PARAM="MaxDelta" VALUE="0.5"     />
-            <P PARAM="EPS"      VALUE="0.005"     />
+            <P PARAM="EPS"      VALUE="0.05"     />
 
             <P PARAM="Order"    VALUE="4"       />
 

utilities/NekMesh/Tests/MeshGen/sphere.mcf

@@ -7,9 +7,9 @@
         </INFORMATION>
 
         <PARAMETERS>
-            <P PARAM="MinDelta" VALUE="0.01"    />
+            <P PARAM="MinDelta" VALUE="0.05"    />
             <P PARAM="MaxDelta" VALUE="0.2"     />
-            <P PARAM="EPS"      VALUE="0.01"     />
+            <P PARAM="EPS"      VALUE="0.03"     />
 
             <P PARAM="Order"    VALUE="4"       />
         </PARAMETERS>