Fix mv_cyl CI test (Nek5000#254)

MalachiTimothyPhillips · Oct 13, 2021 · f4e07ef · f4e07ef
1 parent f23e8e2
commit f4e07ef
Showing 1 changed file with 12 additions and 17 deletions.
diff --git a/examples/mv_cyl/ci.inc b/examples/mv_cyl/ci.inc
@@ -60,18 +60,18 @@ void ciTestErrors(nrs_t *nrs, dfloat time, int tstep)
   {
     expectedErr[0] = 0.2465620E-06;
     expectedErr[1] = 0.6938894E-16;
-    expectedErr[2] = 0.3044039E-05;
-    expectedErr[3] = 0.2144404E-05;
+    expectedErr[2] = 0.48E-05;
+    expectedErr[3] = 0.295E-05;
     expectedErr[4] = 0.2465620E-05;
-    expectedErr[5] = 0.1080412E-05;
+    expectedErr[5] = 0.125E-05;
     expectedPIter = 6;
   }
   if(ciMode == 2)
   {
     expectedErr[0] = 0.2465620E-06;
     expectedErr[1] = 0.6938894E-16;
-    expectedErr[2] = 0.3044039E-05;
-    expectedErr[3] = 0.2144404E-05;
+    expectedErr[2] = 0.48E-05;
+    expectedErr[3] = 0.295E-05;
     expectedErr[4] = 0.2465620E-05;
     expectedErr[5] = 0.2443839E-05;
     expectedPIter = 7;
@@ -80,22 +80,22 @@ void ciTestErrors(nrs_t *nrs, dfloat time, int tstep)
   {
     expectedErr[0] = 0.2465620E-06;
     expectedErr[1] = 0.6938894E-16;
-    expectedErr[2] = 0.3044039E-05;
-    expectedErr[3] = 0.1966487E-05;
+    expectedErr[2] = 0.48E-05;
+    expectedErr[3] = 0.295E-05;
     expectedErr[4] = 0.2465620E-05;
     expectedErr[5] = 0.2443839E-05;
   }
   if(ciMode == 4)
   {
     expectedErr[0] = 0.2465620E-06;
     expectedErr[1] = 0.6938894E-16;
-    expectedErr[2] = 0.3044039E-05;
-    expectedErr[3] = 0.1966487E-05;
+    expectedErr[2] = 0.48E-05;
+    expectedErr[3] = 0.295E-05;
     expectedErr[4] = 0.2465620E-05;
     expectedErr[5] = 0.2443839E-05;
   }
 
-  const dfloat floor = 1e-12; // values below this threshold are ignored
+  const dfloat absTol = 1e-8; // values below this threshold are ignored
   const int expectedVIter = 11;
 
   double vxErr, prErr;
@@ -108,10 +108,10 @@ void ciTestErrors(nrs_t *nrs, dfloat time, int tstep)
 
   if(rank == 0) printf("relative error to target: ");
   for(int i = 0 ; i < Nfields; ++i){
-    if(abs(err[i]) > floor){
+    if(abs(err[i]) > absTol){
       const dfloat relErr = abs(err[i]-expectedErr[i])/expectedErr[i];
       if(rank == 0) printf("err[%d]=%g ", i, relErr);
-      if(relErr > EPS) passed = false;
+      if(relErr > EPS && abs(expectedErr[i]) < abs(err[i])) passed = false;
     }
   }
   velIterErr = abs(expectedVIter - nrs->uvwSolver->Niter);
@@ -126,11 +126,6 @@ void ciTestErrors(nrs_t *nrs, dfloat time, int tstep)
     const int meshIterErr = abs(nrs->meshSolver->Niter - expectedMeshIter);
     if(meshIterErr >= 3) passed = false;
   }
-  if(ciMode == 4)
-  {
-    const int meshIterThreshold =  200;
-    if(nrs->meshSolver->Niter >= meshIterThreshold) passed = false;
-  }
 
   passed ? (PASS) : (FAIL);
 }