Make GSPH package optional (#293)

* Move computeSPHVolume to Hydro package * Move ReplaceWithRatioPolicy from GSPH to DataBase * Make GSPH an optional package * Add filter for gsph tests
LLNL · Aug 19, 2024 · 1abb8bc · 1abb8bc
1 parent 8ba2e8c
commit 1abb8bc
Show file tree

Hide file tree

Showing 25 changed files with 56 additions and 41 deletions.
diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
@@ -20,6 +20,7 @@ Notable changes include:
     * Distributed source directory must always be built now.
     * Git strategies in the Gitlab CI are fixed so a clone only occurs on the first stage for each job, instead of for all stages for each job.
     * New Gitlab CI pipeline cleanup strategy deletes job directories immediately upon successful completion.
+    * The GSPH package is now optional (SPHERAL\_ENABLE\_GSPH).
     * The SVPH package is now optional (SPHERAL\_ENABLE\_SVPH).
 
   * Bug Fixes / improvements:

diff --git a/cmake/SetupSpheral.cmake b/cmake/SetupSpheral.cmake
@@ -58,6 +58,7 @@ set(ENABLE_HELMHOLTZ ON CACHE BOOL "enable the Helmholtz equation of state packa
 option(SPHERAL_ENABLE_ARTIFICIAL_CONDUCTION "Enable the artificial conduction package" ON)
 option(SPHERAL_ENABLE_EXTERNAL_FORCE "Enable the external force package" ON)
 option(SPHERAL_ENABLE_GRAVITY "Enable the gravity package" ON)
+option(SPHERAL_ENABLE_GSPH "Enable the GSPH package" ON)
 option(SPHERAL_ENABLE_SVPH "Enable the SVPH package" ON)
 
 option(ENABLE_DEV_BUILD "Build separate internal C++ libraries for faster code development" OFF)

diff --git a/scripts/CMakeLists.txt b/scripts/CMakeLists.txt
@@ -9,15 +9,23 @@ if (NOT ENABLE_CXXONLY)
   string(REGEX REPLACE "lib\/python3.9\/site-packages\/?[A-Za-z]*:" "* " VIRTUALENV_PYTHONPATH_COPY "${SPACK_PYTHONPATH}:")
 
   set(SPHERAL_ATS_BUILD_CONFIG_ARGS )
+
   if (CMAKE_BUILD_TYPE STREQUAL "Debug")
     list(APPEND SPHERAL_ATS_BUILD_CONFIG_ARGS "--filter='\"level<100\"'")
   endif()
+
   if (NOT ENABLE_MPI)
     list(APPEND SPHERAL_ATS_BUILD_CONFIG_ARGS "--filter='\"np<2\"'")
   endif()
+
+  if (NOT SPHERAL_ENABLE_GSPH)
+     list(APPEND SPHERAL_ATS_BUILD_CONFIG_ARGS "--filter='\"not gsph\"'")
+  endif()
+
   if (NOT SPHERAL_ENABLE_SVPH)
      list(APPEND SPHERAL_ATS_BUILD_CONFIG_ARGS "--filter='\"not svph\"'")
   endif()
+
   if ($ENV{SYS_TYPE} MATCHES ".*blueos.*")
     list(APPEND SPHERAL_ATS_BUILD_CONFIG_ARGS "--addOp --smpi_off")
   endif()

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -25,7 +25,6 @@ list(APPEND _packages
   Field
   FieldOperations
   FileIO
-  GSPH
   Geometry
   Hydro
   Integrator
@@ -57,6 +56,10 @@ if (SPHERAL_ENABLE_GRAVITY)
   list(APPEND _packages Gravity)
 endif()
 
+if (SPHERAL_ENABLE_GSPH)
+  list(APPEND _packages GSPH)
+endif()
+
 if (SPHERAL_ENABLE_SVPH)
   list(APPEND _packages SVPH)
 endif()

diff --git a/src/DataBase/CMakeLists.txt b/src/DataBase/CMakeLists.txt
@@ -1,6 +1,7 @@
 include_directories(.)
 set(DataBase_inst
     DataBase
+    ReplaceWithRatioPolicy
     State
     StateBase
     StateDerivatives
@@ -34,6 +35,7 @@ set(DataBase_headers
     PureReplaceBoundedStateInline.hh
     ReplaceBoundedState.hh
     ReplaceBoundedStateInline.hh
+    ReplaceWithRatioPolicy.hh
     State.hh
     StateBase.hh
     StateBaseInline.hh

diff --git a/src/GSPH/Policies/ReplaceWithRatioPolicy.cc → src/DataBase/ReplaceWithRatioPolicy.cc b/src/GSPH/Policies/ReplaceWithRatioPolicy.cc → src/DataBase/ReplaceWithRatioPolicy.cc
@@ -5,7 +5,7 @@
 // J.M. Pearl 2022
 //----------------------------------------------------------------------------//
 
-#include "GSPH/Policies/ReplaceWithRatioPolicy.hh"
+#include "DataBase/ReplaceWithRatioPolicy.hh"
 #include "DataBase/State.hh"
 #include "DataBase/StateDerivatives.hh"
 #include "Field/Field.hh"

diff --git a/src/GSPH/Policies/ReplaceWithRatioPolicy.hh → src/DataBase/ReplaceWithRatioPolicy.hh b/src/GSPH/Policies/ReplaceWithRatioPolicy.hh → src/DataBase/ReplaceWithRatioPolicy.hh
@@ -11,6 +11,10 @@
 
 namespace Spheral {
 
+// Forward declarations.
+template<typename Dimension> class State;
+template<typename Dimension> class StateDerivatives;
+
 template<typename Dimension, typename ValueType>
 class ReplaceWithRatioPolicy: public FieldUpdatePolicy<Dimension> {
 public:

diff --git a/...Policies/ReplaceWithRatioPolicyInst.cc.py → ...DataBase/ReplaceWithRatioPolicyInst.cc.py b/...Policies/ReplaceWithRatioPolicyInst.cc.py → ...DataBase/ReplaceWithRatioPolicyInst.cc.py
@@ -3,7 +3,7 @@
 // Explicit instantiation.
 //------------------------------------------------------------------------------
 #include "Geometry/Dimension.hh"
-#include "GSPH/Policies/ReplaceWithRatioPolicy.cc"
+#include "DataBase/ReplaceWithRatioPolicy.cc"
 
 namespace Spheral {
   template class ReplaceWithRatioPolicy<Dim< %(ndim)s >, Dim< %(ndim)s >::Scalar>;

diff --git a/src/FSISPH/SolidFSISPHHydroBase.cc b/src/FSISPH/SolidFSISPHHydroBase.cc
@@ -13,9 +13,7 @@
 #include "NodeList/SmoothingScaleBase.hh"
 #include "SolidMaterial/SolidEquationOfState.hh" 
 
-#include "GSPH/computeSPHVolume.hh"
-#include "GSPH/Policies/ReplaceWithRatioPolicy.hh"
-
+#include "Hydro/computeSPHVolume.hh"
 #include "Hydro/HydroFieldNames.hh"
 #include "Hydro/CompatibleDifferenceSpecificThermalEnergyPolicy.hh"
 #include "Hydro/SpecificThermalEnergyPolicy.hh"
@@ -39,6 +37,7 @@
 #include "DataBase/ReplaceBoundedState.hh"
 #include "DataBase/PureReplaceState.hh"
 #include "DataBase/updateStateFields.hh"
+#include "DataBase/ReplaceWithRatioPolicy.hh"
 
 #include "ArtificialViscosity/ArtificialViscosity.hh"
 #include "Field/FieldList.hh"

diff --git a/src/GSPH/CMakeLists.txt b/src/GSPH/CMakeLists.txt
@@ -1,7 +1,6 @@
 include_directories(.)
 
 set(GSPH_inst
-    computeSPHVolume
     computeSumVolume
     computeMFMDensity
     initializeGradients
@@ -10,7 +9,6 @@ set(GSPH_inst
     MFMHydroBase
     MFVHydroBase
     Policies/MassFluxPolicy
-    Policies/ReplaceWithRatioPolicy
     Policies/MFVIncrementVelocityPolicy
     Policies/MFVIncrementSpecificThermalEnergyPolicy
     Policies/CompatibleMFVSpecificThermalEnergyPolicy
@@ -33,7 +31,6 @@ set(GSPH_sources
     GSPHFieldNames.cc)
 
 set(GSPH_headers
-    computeSPHVolume.hh
     computeSumVolume.hh
     computeMFMDensity.hh
     initializeGradients.hh
@@ -43,7 +40,6 @@ set(GSPH_headers
     MFMHydroBase.hh
     MFVHydroBase.hh
     Policies/MassFluxPolicy.hh
-    Policies/ReplaceWithRatioPolicy.hh
     Policies/MFVIncrementVelocityPolicy.hh
     Policies/MFVIncrementSpecificThermalEnergyPolicy.hh
     Policies/CompatibleMFVSpecificThermalEnergyPolicy.hh

diff --git a/src/GSPH/GSPHHydroBase.cc b/src/GSPH/GSPHHydroBase.cc
@@ -10,6 +10,7 @@
 #include "FileIO/FileIO.hh"
 #include "NodeList/SmoothingScaleBase.hh"
 #include "SPH/computeSPHSumMassDensity.hh"
+#include "Hydro/computeSPHVolume.hh"
 #include "Hydro/HydroFieldNames.hh"
 
 #include "DataBase/DataBase.hh"
@@ -19,6 +20,7 @@
 #include "DataBase/ReplaceState.hh"
 #include "DataBase/ReplaceBoundedState.hh"
 #include "DataBase/IncrementBoundedState.hh"
+#include "DataBase/ReplaceWithRatioPolicy.hh"
 
 #include "Field/FieldList.hh"
 #include "Field/NodeIterators.hh"
@@ -29,8 +31,6 @@
 
 #include "GSPH/GSPHHydroBase.hh"
 #include "GSPH/GSPHFieldNames.hh"
-#include "GSPH/computeSPHVolume.hh"
-#include "GSPH/Policies/ReplaceWithRatioPolicy.hh"
 #include "GSPH/RiemannSolvers/RiemannSolverBase.hh"
 
 #ifdef _OPENMP

diff --git a/src/GSPH/GenericRiemannHydro.cc b/src/GSPH/GenericRiemannHydro.cc
@@ -19,6 +19,7 @@
 #include "DataBase/ReplaceBoundedState.hh"
 #include "DataBase/updateStateFields.hh"
 
+#include "Hydro/computeSPHVolume.hh"
 #include "Hydro/HydroFieldNames.hh"
 #include "Hydro/CompatibleDifferenceSpecificThermalEnergyPolicy.hh"
 #include "Hydro/SpecificFromTotalThermalEnergyPolicy.hh"
@@ -35,7 +36,6 @@
 
 #include "GSPH/GSPHFieldNames.hh"
 #include "GSPH/GenericRiemannHydro.hh"
-#include "GSPH/computeSPHVolume.hh"
 #include "GSPH/initializeGradients.hh"
 #include "GSPH/RiemannSolvers/RiemannSolverBase.hh"
 

diff --git a/src/GSPH/MFMHydroBase.cc b/src/GSPH/MFMHydroBase.cc
@@ -17,6 +17,7 @@
 #include "DataBase/ReplaceState.hh"
 #include "DataBase/ReplaceBoundedState.hh"
 #include "DataBase/IncrementBoundedState.hh"
+#include "DataBase/ReplaceWithRatioPolicy.hh"
 
 #include "Field/FieldList.hh"
 #include "Field/NodeIterators.hh"
@@ -27,7 +28,6 @@
 #include "GSPH/GSPHFieldNames.hh"
 #include "GSPH/computeSumVolume.hh"
 #include "GSPH/computeMFMDensity.hh"
-#include "GSPH/Policies/ReplaceWithRatioPolicy.hh"
 #include "GSPH/RiemannSolvers/RiemannSolverBase.hh"
 
 #ifdef _OPENMP

diff --git a/src/GSPH/MFVHydroBase.cc b/src/GSPH/MFVHydroBase.cc
@@ -41,6 +41,7 @@
 #include "DataBase/PureReplaceState.hh"
 #include "DataBase/ReplaceBoundedState.hh"
 #include "DataBase/IncrementBoundedState.hh"
+#include "DataBase/ReplaceWithRatioPolicy.hh"
 
 #include "Field/FieldList.hh"
 #include "Field/NodeIterators.hh"
@@ -52,7 +53,6 @@
 #include "GSPH/computeSumVolume.hh"
 #include "GSPH/computeMFMDensity.hh"
 #include "GSPH/Policies/MassFluxPolicy.hh"
-#include "GSPH/Policies/ReplaceWithRatioPolicy.hh"
 #include "GSPH/Policies/MFVIncrementSpecificThermalEnergyPolicy.hh"
 #include "GSPH/Policies/MFVIncrementVelocityPolicy.hh"
 #include "GSPH/Policies/CompatibleMFVSpecificThermalEnergyPolicy.hh"

diff --git a/src/Hydro/CMakeLists.txt b/src/Hydro/CMakeLists.txt
@@ -13,6 +13,7 @@ set(Hydro_inst
     GammaPolicy
     SecondMomentHourglassControl
     ThirdMomentHourglassControl
+    computeSPHVolume
    )
 
 
@@ -51,6 +52,7 @@ set(Hydro_headers
     VoronoiHourglassControl.hh
     VoronoiHourglassControlInline.hh
     VoronoiMassDensityPolicy.hh
+    computeSPHVolume.hh
     entropyWeightingFunction.hh
     )
 

diff --git a/src/GSPH/computeSPHVolume.cc → src/Hydro/computeSPHVolume.cc b/src/GSPH/computeSPHVolume.cc → src/Hydro/computeSPHVolume.cc
@@ -4,13 +4,10 @@
 // J.M. Pearl 2022
 //----------------------------------------------------------------------------//
 
-#include "GSPH/computeSPHVolume.hh"
+#include "Hydro/computeSPHVolume.hh"
 #include "Field/FieldList.hh"
-#include "Neighbor/ConnectivityMap.hh"
-#include "Kernel/TableKernel.hh"
-#include "NodeList/NodeList.hh"
 
-#include <limits.h>
+#include <limits>
 
 namespace Spheral{
 

diff --git a/src/GSPH/computeSPHVolume.hh → src/Hydro/computeSPHVolume.hh b/src/GSPH/computeSPHVolume.hh → src/Hydro/computeSPHVolume.hh
@@ -11,10 +11,8 @@
 
 namespace Spheral {
 
-  // Forward declarations.
-  template<typename Dimension> class ConnectivityMap;
-  template<typename Dimension> class TableKernel;
-  template<typename Dimension, typename DataType> class FieldList;
+// Forward declarations.
+template<typename Dimension, typename DataType> class FieldList;
 
 
 template<typename Dimension>
@@ -26,4 +24,4 @@ computeSPHVolume(const FieldList<Dimension, typename Dimension::Scalar>& mass,
 }
 
 
- #endif
+ #endif
diff --git a/src/GSPH/computeSPHVolumeInst.cc.py → src/Hydro/computeSPHVolumeInst.cc.py b/src/GSPH/computeSPHVolumeInst.cc.py → src/Hydro/computeSPHVolumeInst.cc.py
@@ -2,7 +2,7 @@
 //------------------------------------------------------------------------------
 // Explicit instantiation.
 //------------------------------------------------------------------------------
-#include "GSPH/computeSPHVolume.cc"
+#include "Hydro/computeSPHVolume.cc"
 #include "Geometry/Dimension.hh"
 
 namespace Spheral {

diff --git a/src/PYB11/CMakeLists.txt b/src/PYB11/CMakeLists.txt
@@ -24,7 +24,6 @@ set (_python_packages
   SPH
   CRKSPH
   DEM
-  GSPH
   FSISPH
   ArtificialViscosity
   Mesh
@@ -61,6 +60,10 @@ if (SPHERAL_ENABLE_GRAVITY)
   list(APPEND _python_packages Gravity)
 endif()
 
+if (SPHERAL_ENABLE_GSPH)
+  list(APPEND _python_packages GSPH)
+endif()
+
 if (SPHERAL_ENABLE_SVPH)
   list(APPEND _python_packages SVPH)
 endif()

diff --git a/tests/functional/Hydro/Noh/Noh-cylindrical-2d.py b/tests/functional/Hydro/Noh/Noh-cylindrical-2d.py
@@ -31,8 +31,8 @@
 #
 # GSPH
 #
-#ATS:gsph0 = test(         SELF, "--gsph True --nRadial 100 --cfl 0.25 --nPerh 2.01 --graphics False --restartStep 20 --clearDirectories True --steps 100", label="Noh cylindrical GSPH, nPerh=2.0", np=8)
-#ATS:gsph1 = testif(gsph0, SELF, "--gsph True --nRadial 100 --cfl 0.25 --nPerh 2.01 --graphics False --restartStep 20 --clearDirectories False --steps 60 --restoreCycle 40 --checkRestart True", label="Noh cylindrical GSPH, nPerh=2.0, restart test", np=8)
+#ATS:gsph0 = test(         SELF, "--gsph True --nRadial 100 --cfl 0.25 --nPerh 2.01 --graphics False --restartStep 20 --clearDirectories True --steps 100", label="Noh cylindrical GSPH, nPerh=2.0", np=8, gsph=True)
+#ATS:gsph1 = testif(gsph0, SELF, "--gsph True --nRadial 100 --cfl 0.25 --nPerh 2.01 --graphics False --restartStep 20 --clearDirectories False --steps 60 --restoreCycle 40 --checkRestart True", label="Noh cylindrical GSPH, nPerh=2.0, restart test", np=8, gsph=True)
 
 
 #-------------------------------------------------------------------------------

diff --git a/tests/functional/Hydro/Noh/Noh-planar-1d.py b/tests/functional/Hydro/Noh/Noh-planar-1d.py
@@ -50,12 +50,12 @@
 #
 # GSPH
 #
-#ATS:t500 = test(        SELF, "--gsph True --gsphReconstructionGradient RiemannGradient --graphics None --clearDirectories True --checkError True --restartStep 20", label="Planar Noh problem with GSPH and RiemannGradient -- 1-D (serial)")
-#ATS:t501 = testif(t500, SELF, "--gsph True --gsphReconstructionGradient RiemannGradient --graphics None --clearDirectories False --checkError False --restartStep 20 --restoreCycle 20 --steps 20 --checkRestart True", label="Planar Noh problem with GSPH and RiemannGradient -- 1-D (serial) RESTART CHECK")
-#ATS:t502 = test(        SELF, "--gsph True --gsphReconstructionGradient HydroAccelerationGradient --graphics None --clearDirectories True --checkError True --restartStep 20", label="Planar Noh problem with GSPH and and HydroAccelerationGradient -- 1-D (serial)")
-#ATS:t503 = testif(t502, SELF, "--gsph True --gsphReconstructionGradient HydroAccelerationGradient --graphics None --clearDirectories False --checkError False --restartStep 20 --restoreCycle 20 --steps 20 --checkRestart True", label="Planar Noh problem with GSPH and HydroAccelerationGradient -- 1-D (serial) RESTART CHECK")
-#ATS:t504 = test(        SELF, "--gsph True --gsphReconstructionGradient SPHGradient --graphics None --clearDirectories True --checkError True --restartStep 20", label="Planar Noh problem with GSPH and SPHGradient -- 1-D (serial)")
-#ATS:t505 = testif(t504, SELF, "--gsph True --gsphReconstructionGradient SPHGradient --graphics None --clearDirectories False --checkError False --restartStep 20 --restoreCycle 20 --steps 20 --checkRestart True", label="Planar Noh problem with GSPH and SPHGradient -- 1-D (serial) RESTART CHECK")
+#ATS:t500 = test(        SELF, "--gsph True --gsphReconstructionGradient RiemannGradient --graphics None --clearDirectories True --checkError True --restartStep 20", label="Planar Noh problem with GSPH and RiemannGradient -- 1-D (serial)", gsph=True)
+#ATS:t501 = testif(t500, SELF, "--gsph True --gsphReconstructionGradient RiemannGradient --graphics None --clearDirectories False --checkError False --restartStep 20 --restoreCycle 20 --steps 20 --checkRestart True", label="Planar Noh problem with GSPH and RiemannGradient -- 1-D (serial) RESTART CHECK", gsph=True)
+#ATS:t502 = test(        SELF, "--gsph True --gsphReconstructionGradient HydroAccelerationGradient --graphics None --clearDirectories True --checkError True --restartStep 20", label="Planar Noh problem with GSPH and and HydroAccelerationGradient -- 1-D (serial)", gsph=True)
+#ATS:t503 = testif(t502, SELF, "--gsph True --gsphReconstructionGradient HydroAccelerationGradient --graphics None --clearDirectories False --checkError False --restartStep 20 --restoreCycle 20 --steps 20 --checkRestart True", label="Planar Noh problem with GSPH and HydroAccelerationGradient -- 1-D (serial) RESTART CHECK", gsph=True)
+#ATS:t504 = test(        SELF, "--gsph True --gsphReconstructionGradient SPHGradient --graphics None --clearDirectories True --checkError True --restartStep 20", label="Planar Noh problem with GSPH and SPHGradient -- 1-D (serial)", gsph=True)
+#ATS:t505 = testif(t504, SELF, "--gsph True --gsphReconstructionGradient SPHGradient --graphics None --clearDirectories False --checkError False --restartStep 20 --restoreCycle 20 --steps 20 --checkRestart True", label="Planar Noh problem with GSPH and SPHGradient -- 1-D (serial) RESTART CHECK", gsph=True)
 #
 # MFM
 #

diff --git a/tests/functional/Hydro/Sod/Sod-planar-1d-WaterGas.py b/tests/functional/Hydro/Sod/Sod-planar-1d-WaterGas.py
@@ -6,8 +6,8 @@
 #
 # GSPH
 #
-#ATS:gsph1 = test(         SELF, "--gsph True --nx1 500 --nx2 30 --cfl 0.45 --graphics None --clearDirectories True  --restartStep 20 --steps 40", label="Planar Water-Gas Sod problem with GSPH -- 1-D (serial)")
-#ATS:gsph2 = testif(gsph1, SELF, "--gsph True --nx1 500 --nx2 30 --cfl 0.45 --graphics None --clearDirectories False --restartStep 20 --steps 20 --restoreCycle 20 --checkRestart True", label="Planar Water-Gas Sod problem with GSPH -- 1-D (serial) RESTART CHECK")
+#ATS:gsph1 = test(         SELF, "--gsph True --nx1 500 --nx2 30 --cfl 0.45 --graphics None --clearDirectories True  --restartStep 20 --steps 40", label="Planar Water-Gas Sod problem with GSPH -- 1-D (serial)", gsph=True)
+#ATS:gsph2 = testif(gsph1, SELF, "--gsph True --nx1 500 --nx2 30 --cfl 0.45 --graphics None --clearDirectories False --restartStep 20 --steps 20 --restoreCycle 20 --checkRestart True", label="Planar Water-Gas Sod problem with GSPH -- 1-D (serial) RESTART CHECK", gsph=True)
 #
 
 import os, sys

diff --git a/tests/functional/Hydro/Sod/Sod-planar-1d.py b/tests/functional/Hydro/Sod/Sod-planar-1d.py
@@ -18,8 +18,8 @@
 #
 # GSPH
 #
-#ATS:gsph1 = test(         SELF, "--gsph True --cfl 0.25 --graphics None --clearDirectories True  --restartStep 20 --steps 40", label="Planar Sod problem with GSPH -- 1-D (serial)")
-#ATS:gsph2 = testif(gsph1, SELF, "--gsph True --cfl 0.25 --graphics None --clearDirectories False --restartStep 20 --steps 20 --restoreCycle 20 --checkRestart True", label="Planar Sod problem with GSPH -- 1-D (serial) RESTART CHECK")
+#ATS:gsph1 = test(         SELF, "--gsph True --cfl 0.25 --graphics None --clearDirectories True  --restartStep 20 --steps 40", label="Planar Sod problem with GSPH -- 1-D (serial)", gsph=True)
+#ATS:gsph2 = testif(gsph1, SELF, "--gsph True --cfl 0.25 --graphics None --clearDirectories False --restartStep 20 --steps 20 --restoreCycle 20 --checkRestart True", label="Planar Sod problem with GSPH -- 1-D (serial) RESTART CHECK", gsph=True)
 #
 # MFM
 #

diff --git a/tests/functional/Hydro/Sod/Sod-spherical-1d.py b/tests/functional/Hydro/Sod/Sod-spherical-1d.py
@@ -16,8 +16,8 @@
 #
 # GSPH
 #
-#ATS:gsph1 = test(         SELF, "--gsph True --cfl 0.25 --graphics None --clearDirectories True  --restartStep 20 --steps 40", label="Spherical Sod problem with GSPH -- 1-D (serial)")
-#ATS:gsph2 = testif(gsph1, SELF, "--gsph True --cfl 0.25 --graphics None --clearDirectories False --restartStep 20 --steps 20 --restoreCycle 20 --checkRestart True", label="Spherical Sod problem with GSPH -- 1-D (serial) RESTART CHECK")
+#ATS:gsph1 = test(         SELF, "--gsph True --cfl 0.25 --graphics None --clearDirectories True  --restartStep 20 --steps 40", label="Spherical Sod problem with GSPH -- 1-D (serial)", gsph=True)
+#ATS:gsph2 = testif(gsph1, SELF, "--gsph True --cfl 0.25 --graphics None --clearDirectories False --restartStep 20 --steps 20 --restoreCycle 20 --checkRestart True", label="Spherical Sod problem with GSPH -- 1-D (serial) RESTART CHECK", gsph=True)
 #
 import os, sys
 import shutil

diff --git a/tests/integration.ats b/tests/integration.ats
@@ -4,6 +4,7 @@
 # (using the ATS) before pushing changes to that public repo!
 #-------------------------------------------------------------------------------
 
+glue(gsph = False)
 glue(svph = False)
 
 # Geometry unit tests