Skip to content

Commit 1abb8bc

Browse files
adayton1adayton1
authored
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
1 parent 8ba2e8c commit 1abb8bc

25 files changed

+56
-41
lines changed

‎RELEASE_NOTES.md

+1
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ Notable changes include:
2020
* Distributed source directory must always be built now.
2121
* 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.
2222
* New Gitlab CI pipeline cleanup strategy deletes job directories immediately upon successful completion.
23+
* The GSPH package is now optional (SPHERAL\_ENABLE\_GSPH).
2324
* The SVPH package is now optional (SPHERAL\_ENABLE\_SVPH).
2425
2526
* Bug Fixes / improvements:

‎cmake/SetupSpheral.cmake

+1
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,7 @@ set(ENABLE_HELMHOLTZ ON CACHE BOOL "enable the Helmholtz equation of state packa
5858
option(SPHERAL_ENABLE_ARTIFICIAL_CONDUCTION "Enable the artificial conduction package" ON)
5959
option(SPHERAL_ENABLE_EXTERNAL_FORCE "Enable the external force package" ON)
6060
option(SPHERAL_ENABLE_GRAVITY "Enable the gravity package" ON)
61+
option(SPHERAL_ENABLE_GSPH "Enable the GSPH package" ON)
6162
option(SPHERAL_ENABLE_SVPH "Enable the SVPH package" ON)
6263

6364
option(ENABLE_DEV_BUILD "Build separate internal C++ libraries for faster code development" OFF)

‎scripts/CMakeLists.txt

+8
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,23 @@ if (NOT ENABLE_CXXONLY)
99
string(REGEX REPLACE "lib\/python3.9\/site-packages\/?[A-Za-z]*:" "* " VIRTUALENV_PYTHONPATH_COPY "${SPACK_PYTHONPATH}:")
1010

1111
set(SPHERAL_ATS_BUILD_CONFIG_ARGS )
12+
1213
if (CMAKE_BUILD_TYPE STREQUAL "Debug")
1314
list(APPEND SPHERAL_ATS_BUILD_CONFIG_ARGS "--filter='\"level<100\"'")
1415
endif()
16+
1517
if (NOT ENABLE_MPI)
1618
list(APPEND SPHERAL_ATS_BUILD_CONFIG_ARGS "--filter='\"np<2\"'")
1719
endif()
20+
21+
if (NOT SPHERAL_ENABLE_GSPH)
22+
list(APPEND SPHERAL_ATS_BUILD_CONFIG_ARGS "--filter='\"not gsph\"'")
23+
endif()
24+
1825
if (NOT SPHERAL_ENABLE_SVPH)
1926
list(APPEND SPHERAL_ATS_BUILD_CONFIG_ARGS "--filter='\"not svph\"'")
2027
endif()
28+
2129
if ($ENV{SYS_TYPE} MATCHES ".*blueos.*")
2230
list(APPEND SPHERAL_ATS_BUILD_CONFIG_ARGS "--addOp --smpi_off")
2331
endif()

‎src/CMakeLists.txt

+4-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ list(APPEND _packages
2525
Field
2626
FieldOperations
2727
FileIO
28-
GSPH
2928
Geometry
3029
Hydro
3130
Integrator
@@ -57,6 +56,10 @@ if (SPHERAL_ENABLE_GRAVITY)
5756
list(APPEND _packages Gravity)
5857
endif()
5958

59+
if (SPHERAL_ENABLE_GSPH)
60+
list(APPEND _packages GSPH)
61+
endif()
62+
6063
if (SPHERAL_ENABLE_SVPH)
6164
list(APPEND _packages SVPH)
6265
endif()

‎src/DataBase/CMakeLists.txt

+2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
include_directories(.)
22
set(DataBase_inst
33
DataBase
4+
ReplaceWithRatioPolicy
45
State
56
StateBase
67
StateDerivatives
@@ -34,6 +35,7 @@ set(DataBase_headers
3435
PureReplaceBoundedStateInline.hh
3536
ReplaceBoundedState.hh
3637
ReplaceBoundedStateInline.hh
38+
ReplaceWithRatioPolicy.hh
3739
State.hh
3840
StateBase.hh
3941
StateBaseInline.hh

‎src/GSPH/Policies/ReplaceWithRatioPolicy.cc ‎src/DataBase/ReplaceWithRatioPolicy.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
// J.M. Pearl 2022
66
//----------------------------------------------------------------------------//
77

8-
#include "GSPH/Policies/ReplaceWithRatioPolicy.hh"
8+
#include "DataBase/ReplaceWithRatioPolicy.hh"
99
#include "DataBase/State.hh"
1010
#include "DataBase/StateDerivatives.hh"
1111
#include "Field/Field.hh"

‎src/GSPH/Policies/ReplaceWithRatioPolicy.hh ‎src/DataBase/ReplaceWithRatioPolicy.hh

+4
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,10 @@
1111

1212
namespace Spheral {
1313

14+
// Forward declarations.
15+
template<typename Dimension> class State;
16+
template<typename Dimension> class StateDerivatives;
17+
1418
template<typename Dimension, typename ValueType>
1519
class ReplaceWithRatioPolicy: public FieldUpdatePolicy<Dimension> {
1620
public:

‎src/GSPH/Policies/ReplaceWithRatioPolicyInst.cc.py ‎src/DataBase/ReplaceWithRatioPolicyInst.cc.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
// Explicit instantiation.
44
//------------------------------------------------------------------------------
55
#include "Geometry/Dimension.hh"
6-
#include "GSPH/Policies/ReplaceWithRatioPolicy.cc"
6+
#include "DataBase/ReplaceWithRatioPolicy.cc"
77
88
namespace Spheral {
99
template class ReplaceWithRatioPolicy<Dim< %(ndim)s >, Dim< %(ndim)s >::Scalar>;

‎src/FSISPH/SolidFSISPHHydroBase.cc

+2-3
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,7 @@
1313
#include "NodeList/SmoothingScaleBase.hh"
1414
#include "SolidMaterial/SolidEquationOfState.hh"
1515

16-
#include "GSPH/computeSPHVolume.hh"
17-
#include "GSPH/Policies/ReplaceWithRatioPolicy.hh"
18-
16+
#include "Hydro/computeSPHVolume.hh"
1917
#include "Hydro/HydroFieldNames.hh"
2018
#include "Hydro/CompatibleDifferenceSpecificThermalEnergyPolicy.hh"
2119
#include "Hydro/SpecificThermalEnergyPolicy.hh"
@@ -39,6 +37,7 @@
3937
#include "DataBase/ReplaceBoundedState.hh"
4038
#include "DataBase/PureReplaceState.hh"
4139
#include "DataBase/updateStateFields.hh"
40+
#include "DataBase/ReplaceWithRatioPolicy.hh"
4241

4342
#include "ArtificialViscosity/ArtificialViscosity.hh"
4443
#include "Field/FieldList.hh"

‎src/GSPH/CMakeLists.txt

-4
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
include_directories(.)
22

33
set(GSPH_inst
4-
computeSPHVolume
54
computeSumVolume
65
computeMFMDensity
76
initializeGradients
@@ -10,7 +9,6 @@ set(GSPH_inst
109
MFMHydroBase
1110
MFVHydroBase
1211
Policies/MassFluxPolicy
13-
Policies/ReplaceWithRatioPolicy
1412
Policies/MFVIncrementVelocityPolicy
1513
Policies/MFVIncrementSpecificThermalEnergyPolicy
1614
Policies/CompatibleMFVSpecificThermalEnergyPolicy
@@ -33,7 +31,6 @@ set(GSPH_sources
3331
GSPHFieldNames.cc)
3432

3533
set(GSPH_headers
36-
computeSPHVolume.hh
3734
computeSumVolume.hh
3835
computeMFMDensity.hh
3936
initializeGradients.hh
@@ -43,7 +40,6 @@ set(GSPH_headers
4340
MFMHydroBase.hh
4441
MFVHydroBase.hh
4542
Policies/MassFluxPolicy.hh
46-
Policies/ReplaceWithRatioPolicy.hh
4743
Policies/MFVIncrementVelocityPolicy.hh
4844
Policies/MFVIncrementSpecificThermalEnergyPolicy.hh
4945
Policies/CompatibleMFVSpecificThermalEnergyPolicy.hh

‎src/GSPH/GSPHHydroBase.cc

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
#include "FileIO/FileIO.hh"
1111
#include "NodeList/SmoothingScaleBase.hh"
1212
#include "SPH/computeSPHSumMassDensity.hh"
13+
#include "Hydro/computeSPHVolume.hh"
1314
#include "Hydro/HydroFieldNames.hh"
1415

1516
#include "DataBase/DataBase.hh"
@@ -19,6 +20,7 @@
1920
#include "DataBase/ReplaceState.hh"
2021
#include "DataBase/ReplaceBoundedState.hh"
2122
#include "DataBase/IncrementBoundedState.hh"
23+
#include "DataBase/ReplaceWithRatioPolicy.hh"
2224

2325
#include "Field/FieldList.hh"
2426
#include "Field/NodeIterators.hh"
@@ -29,8 +31,6 @@
2931

3032
#include "GSPH/GSPHHydroBase.hh"
3133
#include "GSPH/GSPHFieldNames.hh"
32-
#include "GSPH/computeSPHVolume.hh"
33-
#include "GSPH/Policies/ReplaceWithRatioPolicy.hh"
3434
#include "GSPH/RiemannSolvers/RiemannSolverBase.hh"
3535

3636
#ifdef _OPENMP

‎src/GSPH/GenericRiemannHydro.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
#include "DataBase/ReplaceBoundedState.hh"
2020
#include "DataBase/updateStateFields.hh"
2121

22+
#include "Hydro/computeSPHVolume.hh"
2223
#include "Hydro/HydroFieldNames.hh"
2324
#include "Hydro/CompatibleDifferenceSpecificThermalEnergyPolicy.hh"
2425
#include "Hydro/SpecificFromTotalThermalEnergyPolicy.hh"
@@ -35,7 +36,6 @@
3536

3637
#include "GSPH/GSPHFieldNames.hh"
3738
#include "GSPH/GenericRiemannHydro.hh"
38-
#include "GSPH/computeSPHVolume.hh"
3939
#include "GSPH/initializeGradients.hh"
4040
#include "GSPH/RiemannSolvers/RiemannSolverBase.hh"
4141

‎src/GSPH/MFMHydroBase.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
#include "DataBase/ReplaceState.hh"
1818
#include "DataBase/ReplaceBoundedState.hh"
1919
#include "DataBase/IncrementBoundedState.hh"
20+
#include "DataBase/ReplaceWithRatioPolicy.hh"
2021

2122
#include "Field/FieldList.hh"
2223
#include "Field/NodeIterators.hh"
@@ -27,7 +28,6 @@
2728
#include "GSPH/GSPHFieldNames.hh"
2829
#include "GSPH/computeSumVolume.hh"
2930
#include "GSPH/computeMFMDensity.hh"
30-
#include "GSPH/Policies/ReplaceWithRatioPolicy.hh"
3131
#include "GSPH/RiemannSolvers/RiemannSolverBase.hh"
3232

3333
#ifdef _OPENMP

‎src/GSPH/MFVHydroBase.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@
4141
#include "DataBase/PureReplaceState.hh"
4242
#include "DataBase/ReplaceBoundedState.hh"
4343
#include "DataBase/IncrementBoundedState.hh"
44+
#include "DataBase/ReplaceWithRatioPolicy.hh"
4445

4546
#include "Field/FieldList.hh"
4647
#include "Field/NodeIterators.hh"
@@ -52,7 +53,6 @@
5253
#include "GSPH/computeSumVolume.hh"
5354
#include "GSPH/computeMFMDensity.hh"
5455
#include "GSPH/Policies/MassFluxPolicy.hh"
55-
#include "GSPH/Policies/ReplaceWithRatioPolicy.hh"
5656
#include "GSPH/Policies/MFVIncrementSpecificThermalEnergyPolicy.hh"
5757
#include "GSPH/Policies/MFVIncrementVelocityPolicy.hh"
5858
#include "GSPH/Policies/CompatibleMFVSpecificThermalEnergyPolicy.hh"

‎src/Hydro/CMakeLists.txt

+2
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ set(Hydro_inst
1313
GammaPolicy
1414
SecondMomentHourglassControl
1515
ThirdMomentHourglassControl
16+
computeSPHVolume
1617
)
1718

1819

@@ -51,6 +52,7 @@ set(Hydro_headers
5152
VoronoiHourglassControl.hh
5253
VoronoiHourglassControlInline.hh
5354
VoronoiMassDensityPolicy.hh
55+
computeSPHVolume.hh
5456
entropyWeightingFunction.hh
5557
)
5658

‎src/GSPH/computeSPHVolume.cc ‎src/Hydro/computeSPHVolume.cc

+2-5
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,10 @@
44
// J.M. Pearl 2022
55
//----------------------------------------------------------------------------//
66

7-
#include "GSPH/computeSPHVolume.hh"
7+
#include "Hydro/computeSPHVolume.hh"
88
#include "Field/FieldList.hh"
9-
#include "Neighbor/ConnectivityMap.hh"
10-
#include "Kernel/TableKernel.hh"
11-
#include "NodeList/NodeList.hh"
129

13-
#include <limits.h>
10+
#include <limits>
1411

1512
namespace Spheral{
1613

‎src/GSPH/computeSPHVolume.hh ‎src/Hydro/computeSPHVolume.hh

+3-5
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,8 @@
1111

1212
namespace Spheral {
1313

14-
// Forward declarations.
15-
template<typename Dimension> class ConnectivityMap;
16-
template<typename Dimension> class TableKernel;
17-
template<typename Dimension, typename DataType> class FieldList;
14+
// Forward declarations.
15+
template<typename Dimension, typename DataType> class FieldList;
1816

1917

2018
template<typename Dimension>
@@ -26,4 +24,4 @@ computeSPHVolume(const FieldList<Dimension, typename Dimension::Scalar>& mass,
2624
}
2725

2826

29-
#endif
27+
#endif

‎src/GSPH/computeSPHVolumeInst.cc.py ‎src/Hydro/computeSPHVolumeInst.cc.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
//------------------------------------------------------------------------------
33
// Explicit instantiation.
44
//------------------------------------------------------------------------------
5-
#include "GSPH/computeSPHVolume.cc"
5+
#include "Hydro/computeSPHVolume.cc"
66
#include "Geometry/Dimension.hh"
77
88
namespace Spheral {

‎src/PYB11/CMakeLists.txt

+4-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ set (_python_packages
2424
SPH
2525
CRKSPH
2626
DEM
27-
GSPH
2827
FSISPH
2928
ArtificialViscosity
3029
Mesh
@@ -61,6 +60,10 @@ if (SPHERAL_ENABLE_GRAVITY)
6160
list(APPEND _python_packages Gravity)
6261
endif()
6362

63+
if (SPHERAL_ENABLE_GSPH)
64+
list(APPEND _python_packages GSPH)
65+
endif()
66+
6467
if (SPHERAL_ENABLE_SVPH)
6568
list(APPEND _python_packages SVPH)
6669
endif()

‎tests/functional/Hydro/Noh/Noh-cylindrical-2d.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@
3131
#
3232
# GSPH
3333
#
34-
#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)
35-
#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)
34+
#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)
35+
#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)
3636

3737

3838
#-------------------------------------------------------------------------------

‎tests/functional/Hydro/Noh/Noh-planar-1d.py

+6-6
Original file line numberDiff line numberDiff line change
@@ -50,12 +50,12 @@
5050
#
5151
# GSPH
5252
#
53-
#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)")
54-
#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")
55-
#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)")
56-
#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")
57-
#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)")
58-
#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")
53+
#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)
54+
#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)
55+
#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)
56+
#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)
57+
#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)
58+
#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)
5959
#
6060
# MFM
6161
#

‎tests/functional/Hydro/Sod/Sod-planar-1d-WaterGas.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
#
77
# GSPH
88
#
9-
#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)")
10-
#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")
9+
#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)
10+
#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)
1111
#
1212

1313
import os, sys

‎tests/functional/Hydro/Sod/Sod-planar-1d.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@
1818
#
1919
# GSPH
2020
#
21-
#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)")
22-
#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")
21+
#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)
22+
#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)
2323
#
2424
# MFM
2525
#

‎tests/functional/Hydro/Sod/Sod-spherical-1d.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@
1616
#
1717
# GSPH
1818
#
19-
#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)")
20-
#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")
19+
#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)
20+
#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)
2121
#
2222
import os, sys
2323
import shutil

‎tests/integration.ats

+1
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
# (using the ATS) before pushing changes to that public repo!
55
#-------------------------------------------------------------------------------
66

7+
glue(gsph = False)
78
glue(svph = False)
89

910
# Geometry unit tests

0 commit comments

Comments
 (0)