add a basic test to varopti

utilities/NekMesh/CMakeLists.txt

@@ -143,9 +143,11 @@ ADD_NEKTAR_TEST        (Nek5000/r1854a)
 ADD_NEKTAR_TEST        (StarTec/CubePer)
 ADD_NEKTAR_TEST_LENGTHY(StarTec/StraightRW)
 
+# varopti tests
+ADD_NEKTAR_TEST         (MeshGen/varopti_cubesphere)
+
 # MeshGen test
 IF(NEKTAR_USE_MESHGEN)
     ADD_NEKTAR_TEST        (MeshGen/cylinder)
     ADD_NEKTAR_TEST        (MeshGen/sphere)
-#    ADD_NEKTAR_TEST_LENGTHY(MeshGen/predator) disabled for now
 ENDIF()

utilities/NekMesh/ProcessModules/ProcessVarOpti/ProcessVarOpti.cpp

@@ -374,8 +374,8 @@ void ProcessVarOpti::Process()
     t.Stop();
     cout << "Time to compute: " << t.TimePerTest(1) << endl;
 
-    cout << "Invalid at end:\t\t" << m_res->startInv << endl;
-    cout << "Worst at end:\t\t" << m_res->worstJac << endl;
+    cout << "Invalid at end: " << m_res->startInv << endl;
+    cout << "Worst at end: " << m_res->worstJac << endl;
 }
 
 class NodalUtilTriMonomial : public LibUtilities::NodalUtilTriangle

utilities/NekMesh/Tests/MeshGen/predator.mcf

-<NEKTAR>
-    <CONDITIONS>
-
-        <SOLVERINFO>
-            <I PROPERTY="CADFile" VALUE="predator.STEP" />
-            <I PROPERTY="MeshType" VALUE="Euler" />
-        </SOLVERINFO>
-
-        <PARAMETERS>
-            <P> MinDelta = 0.05 </P>
-            <P> MaxDelta = 1.0 </P>
-            <P> EPS = 0.5 </P>
-            <P> Order = 4 </P>
-        </PARAMETERS>
-
-    </CONDITIONS>
-</NEKTAR>

utilities/NekMesh/Tests/MeshGen/predator.tst

-<?xml version="1.0" encoding="utf-8" ?>
-<test>
-    <description>Complex geometry of predator drone, no bl</description>
-    <executable>NekMesh</executable>
-    <parameters>-m jac:list predator.mcf predator.xml:xml:test</parameters>
-    <files>
-        <file description="Input File">predator.mcf</file>
-        <file description="Input File 2">predator.STEP</file>
-    </files>
-    <metrics>
-        <metric type="regex" id="1">
-            <regex>^Total negative Jacobians: (\d+)</regex>
-            <matches>
-                <match>
-                    <field id="0">0</field>
-                </match>
-            </matches>
-        </metric>
-    </metrics>
-</test>

utilities/NekMesh/Tests/MeshGen/rev.mcf

-<NEKTAR>
-    <CONDITIONS>
-
-        <SOLVERINFO>
-            <I PROPERTY="CADFile" VALUE="rev-rotated.STEP" />
-            <I PROPERTY="MeshType" VALUE="BL" />
-            <I PROPERTY="BLSurfs" VALUE="7,8,9" />
-        </SOLVERINFO>
-
-        <PARAMETERS>
-            <P> MinDelta = 0.005 </P>
-            <P> MaxDelta = 0.2 </P>
-            <P> EPS = 0.075 </P>
-            <P> Order = 4 </P>
-            <P> BLThick = 0.02 </P>
-        </PARAMETERS>
-
-    </CONDITIONS>
-</NEKTAR>

utilities/NekMesh/Tests/MeshGen/rev.tst → utilities/NekMesh/Tests/MeshGen/varopti_cubesphere.tst

 <?xml version="1.0" encoding="utf-8" ?>
 <test>
-    <description>High AoA naca0012 wing with bl</description>
+    <description>Variational optimiser test on all tet cube/sphere</description>
     <executable>NekMesh</executable>
-    <parameters>-m jac:list rev.mcf rev.xml:xml:test</parameters>
+    <parameters>cube-sphere.msh test.xml:xml:test -m varopti:hyperelastic:maxiter=5</parameters>
     <files>
-        <file description="Input File">rev.mcf</file>
-        <file description="Input File 2">rev-rotated.STEP</file>
+        <file description="Input File">cube-sphere.msh</file>
     </files>
     <metrics>
-        <metric type="regex" id="1">
-            <regex>^Total negative Jacobians: (\d+)</regex>
+        <metric type="regex" id="0">
+            <regex>Worst at end: (-?\d+(?:\.\d*)?(?:[eE][+\-]?\d+)?)</regex>
             <matches>
                 <match>
-                    <field id="0">0</field>
+                    <field id="0">7.564169e-01</field>
                 </match>
             </matches>
         </metric>