changes to solidshocktube intel cfg

quinoacomputing · Apr 2, 2024 · 7413af8 · 7413af8
1 parent fa21b89
commit 7413af8
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 3 deletions.
diff --git a/tests/regression/inciter/multimat/SolidShocktube/CMakeLists.txt b/tests/regression/inciter/multimat/SolidShocktube/CMakeLists.txt
@@ -1,16 +1,25 @@
 # See cmake/add_regression_test.cmake for documentation on the arguments to
 # add_regression_test().
 
-# Parallel
+# Serial
+if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Intel")
+  set(multimat_solid_shocktube_p0p1_BIN_DIFF_PROG_CONF exodiff_dg_intel.cfg)
+  set(multimat_solid_shocktube_p0p1_TXT_DIFF_PROG_CONF ndiff_intel.cfg)
+else()
+  set(multimat_solid_shocktube_p0p1_BIN_DIFF_PROG_CONF exodiff_dg.cfg)
+  set(multimat_solid_shocktube_p0p1_TXT_DIFF_PROG_CONF ndiff.cfg)
+endif()
 add_regression_test(multimat_solid_shocktube_p0p1 ${INCITER_EXECUTABLE}
                     NUMPES 1
                     INPUTFILES solid_shocktube_p0p1.q rectangle_01_int50_struc896.exo
                     ARGS -c solid_shocktube_p0p1.q -i rectangle_01_int50_struc896.exo -v
                     BIN_BASELINE solid_shocktube_p0p1.std.exo.0
                     BIN_RESULT out.e-s.0.1.0
-                    BIN_DIFF_PROG_CONF exodiff_dg.cfg
+                    BIN_DIFF_PROG_CONF
+                      ${multimat_solid_shocktube_p0p1_BIN_DIFF_PROG_CONF}
                     BIN_DIFF_PROG_ARGS -m
                     TEXT_BASELINE diag_p0p1.std
                     TEXT_RESULT diag
-                    TEXT_DIFF_PROG_CONF ndiff.cfg
+                    TEXT_DIFF_PROG_CONF
+                      ${multimat_solid_shocktube_p0p1_TXT_DIFF_PROG_CONF}
                     LABELS dg multimat solids)
diff --git a/tests/regression/inciter/multimat/SolidShocktube/exodiff_dg_intel.cfg b/tests/regression/inciter/multimat/SolidShocktube/exodiff_dg_intel.cfg
@@ -0,0 +1,18 @@
+COORDINATES absolute 1.0e-6
+TIME STEPS absolute 1.0e-8
+ELEMENT VARIABLES absolute 5.0e-6 floor 1.0e-8
+	F1
+	density relative 1.0e-6
+	x-velocity relative 1.0e-2
+	y-velocity relative 7.5e-2 floor 5e-4
+	z-velocity relative 7.5e-2 floor 5e-4
+	specific_total_energy relative 1.0e-6
+	g11 relative 2e-5
+	g12
+	g13
+	g21
+	g22 relative 2e-5
+	g23
+	g31
+	g32
+	g33 relative 2e-5
diff --git a/tests/regression/inciter/multimat/SolidShocktube/ndiff_intel.cfg b/tests/regression/inciter/multimat/SolidShocktube/ndiff_intel.cfg
@@ -0,0 +1,3 @@
+#rows   cols    constraints
+*       1                                   # iteration count: no constraint: smallest representable float
+*       2-$     any abs=1.0e-08 rel=1.0e-4  # tolerance for t, dt, and L2 of conserved variables