From c1100a32faeb1706f46fb51684f4ab803a9d8912 Mon Sep 17 00:00:00 2001 From: Alan Dayton <6393677+adayton1@users.noreply.github.com> Date: Mon, 9 Sep 2024 09:14:33 -0700 Subject: [PATCH] Make FSISPH package optional (#297) * Move damagedPressure field to SolidFieldNames (removing Hydro's dependency on FSISPH) * Disable FSISPH tests if the package is disabled --- RELEASE_NOTES.md | 1 + cmake/SetupSpheral.cmake | 1 + scripts/CMakeLists.txt | 4 ++++ src/CMakeLists.txt | 5 ++++- src/FSISPH/FSIFieldNames.cc | 3 +-- src/FSISPH/FSIFieldNames.hh | 1 - src/FSISPH/SolidFSISPHEvaluateDerivatives.cc | 4 ++-- src/FSISPH/SolidFSISPHHydroBase.cc | 8 ++++---- src/Hydro/PressurePolicy.cc | 7 +++---- src/PYB11/CMakeLists.txt | 5 ++++- src/PYB11/FSISPH/FSISPH_PYB11.py | 3 +-- src/PYB11/Strength/Strength_PYB11.py | 1 + src/Strength/SolidFieldNames.cc | 1 + src/Strength/SolidFieldNames.hh | 1 + tests/functional/Hydro/Noh/Noh-planar-1d.py | 4 ++-- tests/functional/Hydro/Sod/Sod-planar-1d-WaterGas.py | 4 ++-- tests/functional/Hydro/Sod/Sod-planar-1d.py | 4 ++-- tests/functional/Hydro/Sod/Sod-spherical-1d.py | 4 ++-- .../Porosity/PlanarCompaction/PlanarCompaction-1d.py | 6 +++--- .../Strength/DiametralCompression/DiametralCompression.py | 4 ++-- .../DiametralCompression/DiametralCompressionInlet.py | 2 +- tests/functional/Strength/Piston/Piston.py | 4 ++-- tests/integration.ats | 1 + 23 files changed, 45 insertions(+), 33 deletions(-) diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md index b4750f100..df68e6781 100644 --- 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 FSISPH package is now optional (SPHERAL\_ENABLE\_FSISPH). * The GSPH package is now optional (SPHERAL\_ENABLE\_GSPH). * The SVPH package is now optional (SPHERAL\_ENABLE\_SVPH). diff --git a/cmake/SetupSpheral.cmake b/cmake/SetupSpheral.cmake index b13c72e51..de1024cf2 100644 --- a/cmake/SetupSpheral.cmake +++ b/cmake/SetupSpheral.cmake @@ -57,6 +57,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_FSISPH "Enable the FSISPH 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) diff --git a/scripts/CMakeLists.txt b/scripts/CMakeLists.txt index 697ad87c5..2fc646513 100644 --- a/scripts/CMakeLists.txt +++ b/scripts/CMakeLists.txt @@ -18,6 +18,10 @@ if (NOT ENABLE_CXXONLY) list(APPEND SPHERAL_ATS_BUILD_CONFIG_ARGS "--filter='\"np<2\"'") endif() + if (NOT SPHERAL_ENABLE_FSISPH) + list(APPEND SPHERAL_ATS_BUILD_CONFIG_ARGS "--filter='\"not fsisph\"'") + endif() + if (NOT SPHERAL_ENABLE_GSPH) list(APPEND SPHERAL_ATS_BUILD_CONFIG_ARGS "--filter='\"not gsph\"'") endif() diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 388a9dd44..ac648aaff 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -21,7 +21,6 @@ list(APPEND _packages DataBase DataOutput Distributed - FSISPH Field FieldOperations FileIO @@ -52,6 +51,10 @@ if (SPHERAL_ENABLE_EXTERNAL_FORCE) list(APPEND _packages ExternalForce) endif() +if (SPHERAL_ENABLE_FSISPH) + list(APPEND _packages FSISPH) +endif() + if (SPHERAL_ENABLE_GRAVITY) list(APPEND _packages Gravity) endif() diff --git a/src/FSISPH/FSIFieldNames.cc b/src/FSISPH/FSIFieldNames.cc index 1c9c26ef3..7568bdae7 100644 --- a/src/FSISPH/FSIFieldNames.cc +++ b/src/FSISPH/FSIFieldNames.cc @@ -6,7 +6,6 @@ #include "FSIFieldNames.hh" -const std::string Spheral::FSIFieldNames::damagedPressure = "damaged pressure"; const std::string Spheral::FSIFieldNames::pressureGradient = "pressureGradient"; const std::string Spheral::FSIFieldNames::specificThermalEnergyGradient = "specificThermalEnergyGradient"; const std::string Spheral::FSIFieldNames::interfaceFlags = "interfaceFlags"; @@ -16,4 +15,4 @@ const std::string Spheral::FSIFieldNames::interfaceAngles = "interfaceAngles"; const std::string Spheral::FSIFieldNames::interfaceFraction = "interfaceFraction"; const std::string Spheral::FSIFieldNames::interfaceSmoothness = "interfaceSmoothness"; const std::string Spheral::FSIFieldNames::smoothedInterfaceNormals = "smoothedInterfaceNormals"; -const std::string Spheral::FSIFieldNames::interfaceSmoothnessNormalization = "interfaceSmoothnessNormalization"; \ No newline at end of file +const std::string Spheral::FSIFieldNames::interfaceSmoothnessNormalization = "interfaceSmoothnessNormalization"; diff --git a/src/FSISPH/FSIFieldNames.hh b/src/FSISPH/FSIFieldNames.hh index b1bac426d..b7208a194 100644 --- a/src/FSISPH/FSIFieldNames.hh +++ b/src/FSISPH/FSIFieldNames.hh @@ -9,7 +9,6 @@ namespace Spheral { struct FSIFieldNames { - static const std::string damagedPressure; static const std::string pressureGradient; static const std::string specificThermalEnergyGradient; static const std::string interfaceFlags; diff --git a/src/FSISPH/SolidFSISPHEvaluateDerivatives.cc b/src/FSISPH/SolidFSISPHEvaluateDerivatives.cc index c6000b4b1..96ed127a7 100644 --- a/src/FSISPH/SolidFSISPHEvaluateDerivatives.cc +++ b/src/FSISPH/SolidFSISPHEvaluateDerivatives.cc @@ -90,7 +90,7 @@ secondDerivativesLoop(const typename Dimension::Scalar time, const auto massDensity = state.fields(HydroFieldNames::massDensity, 0.0); const auto specificThermalEnergy = state.fields(HydroFieldNames::specificThermalEnergy, 0.0); const auto H = state.fields(HydroFieldNames::H, SymTensor::zero); - const auto damagedPressure = state.fields(FSIFieldNames::damagedPressure, 0.0); + const auto damagedPressure = state.fields(SolidFieldNames::damagedPressure, 0.0); const auto pressure = state.fields(HydroFieldNames::pressure, 0.0); const auto soundSpeed = state.fields(HydroFieldNames::soundSpeed, 0.0); const auto S = state.fields(SolidFieldNames::deviatoricStress, SymTensor::zero); @@ -811,7 +811,7 @@ firstDerivativesLoop(const typename Dimension::Scalar /*time*/, const auto massDensity = state.fields(HydroFieldNames::massDensity, 0.0); const auto specificThermalEnergy = state.fields(HydroFieldNames::specificThermalEnergy, 0.0); const auto H = state.fields(HydroFieldNames::H, SymTensor::zero); - const auto damagedPressure = state.fields(FSIFieldNames::damagedPressure, 0.0); + const auto damagedPressure = state.fields(SolidFieldNames::damagedPressure, 0.0); const auto fragIDs = state.fields(SolidFieldNames::fragmentIDs, int(1)); CHECK(mass.size() == numNodeLists); diff --git a/src/FSISPH/SolidFSISPHHydroBase.cc b/src/FSISPH/SolidFSISPHHydroBase.cc index fee2dc0f4..c004cc14b 100644 --- a/src/FSISPH/SolidFSISPHHydroBase.cc +++ b/src/FSISPH/SolidFSISPHHydroBase.cc @@ -230,7 +230,7 @@ SolidFSISPHHydroBase(const SmoothingScaleBase& smoothingScaleMethod, mTimeStepMask = dataBase.newFluidFieldList(int(0), HydroFieldNames::timeStepMask); mPressure = dataBase.newFluidFieldList(0.0, HydroFieldNames::pressure); - mDamagedPressure = dataBase.newFluidFieldList(0.0, FSIFieldNames::damagedPressure); + mDamagedPressure = dataBase.newFluidFieldList(0.0, SolidFieldNames::damagedPressure); mSoundSpeed = dataBase.newFluidFieldList(0.0, HydroFieldNames::soundSpeed); mBulkModulus = dataBase.newSolidFieldList(0.0, SolidFieldNames::bulkModulus); mShearModulus = dataBase.newSolidFieldList(0.0, SolidFieldNames::shearModulus); @@ -342,7 +342,7 @@ registerState(DataBase& dataBase, dataBase.resizeSolidFieldList(mShearModulus, 0.0, SolidFieldNames::shearModulus, false); dataBase.resizeSolidFieldList(mYieldStrength, 0.0, SolidFieldNames::yieldStrength, false); dataBase.resizeSolidFieldList(mPlasticStrain0, 0.0, SolidFieldNames::plasticStrain + "0", false); - dataBase.resizeSolidFieldList(mDamagedPressure, 0.0, FSIFieldNames::damagedPressure, false); + dataBase.resizeSolidFieldList(mDamagedPressure, 0.0, SolidFieldNames::damagedPressure, false); dataBase.resizeSolidFieldList(mInterfaceNormals, Vector::zero, FSIFieldNames::interfaceNormals, false); dataBase.resizeSolidFieldList(mInterfaceFraction, 0.0, FSIFieldNames::interfaceFraction, false); dataBase.resizeSolidFieldList(mInterfaceSmoothness, 0.0, FSIFieldNames::interfaceSmoothness, false); @@ -647,7 +647,7 @@ applyGhostBoundaries(State& state, FieldList specificThermalEnergy = state.fields(HydroFieldNames::specificThermalEnergy, 0.0); FieldList velocity = state.fields(HydroFieldNames::velocity, Vector::zero); FieldList pressure = state.fields(HydroFieldNames::pressure, 0.0); - FieldList damagedPressure = state.fields(FSIFieldNames::damagedPressure, 0.0); + FieldList damagedPressure = state.fields(SolidFieldNames::damagedPressure, 0.0); FieldList soundSpeed = state.fields(HydroFieldNames::soundSpeed, 0.0); FieldList S = state.fields(SolidFieldNames::deviatoricStress, SymTensor::zero); FieldList K = state.fields(SolidFieldNames::bulkModulus, 0.0); @@ -699,7 +699,7 @@ enforceBoundaries(State& state, FieldList specificThermalEnergy = state.fields(HydroFieldNames::specificThermalEnergy, 0.0); FieldList velocity = state.fields(HydroFieldNames::velocity, Vector::zero); FieldList pressure = state.fields(HydroFieldNames::pressure, 0.0); - FieldList damagedPressure = state.fields(FSIFieldNames::damagedPressure, 0.0); + FieldList damagedPressure = state.fields(SolidFieldNames::damagedPressure, 0.0); FieldList soundSpeed = state.fields(HydroFieldNames::soundSpeed, 0.0); FieldList S = state.fields(SolidFieldNames::deviatoricStress, SymTensor::zero); FieldList K = state.fields(SolidFieldNames::bulkModulus, 0.0); diff --git a/src/Hydro/PressurePolicy.cc b/src/Hydro/PressurePolicy.cc index c5970b46f..0dc859e8f 100644 --- a/src/Hydro/PressurePolicy.cc +++ b/src/Hydro/PressurePolicy.cc @@ -8,7 +8,6 @@ #include "PressurePolicy.hh" #include "Hydro/HydroFieldNames.hh" #include "Strength/SolidFieldNames.hh" -#include "FSISPH/FSIFieldNames.hh" #include "DataBase/State.hh" #include "DataBase/StateDerivatives.hh" #include "Field/Field.hh" @@ -56,7 +55,7 @@ update(const KeyType& key, KeyType fieldKey, nodeListKey; StateBase::splitFieldKey(key, fieldKey, nodeListKey); REQUIRE((fieldKey == HydroFieldNames::pressure or - fieldKey == FSIFieldNames::damagedPressure)); + fieldKey == SolidFieldNames::damagedPressure)); auto& P = state.field(key, Scalar()); // Get the eos. This cast is ugly, but is a work-around for now. @@ -99,9 +98,9 @@ update(const KeyType& key, // Is someone trying to keep the damaged pressure in an independent Field? // (I'm looking at you FSISPH) - const auto separateDamage = state.registered(buildKey(FSIFieldNames::damagedPressure)); + const auto separateDamage = state.registered(buildKey(SolidFieldNames::damagedPressure)); Field* PdPtr = nullptr; - if (separateDamage) PdPtr = &state.field(buildKey(FSIFieldNames::damagedPressure), 0.0); + if (separateDamage) PdPtr = &state.field(buildKey(SolidFieldNames::damagedPressure), 0.0); // If there's damage for this material, apply it to the pressure // This is complicated by FSISPH, which wants to keep track of the damaged pressure separately, diff --git a/src/PYB11/CMakeLists.txt b/src/PYB11/CMakeLists.txt index 600f3f5d8..1d5d3348f 100644 --- a/src/PYB11/CMakeLists.txt +++ b/src/PYB11/CMakeLists.txt @@ -24,7 +24,6 @@ set (_python_packages SPH CRKSPH DEM - FSISPH ArtificialViscosity Mesh Damage @@ -56,6 +55,10 @@ if (SPHERAL_ENABLE_EXTERNAL_FORCE) list(APPEND _python_packages ExternalForce) endif() +if (SPHERAL_ENABLE_FSISPH) + list(APPEND _python_packages FSISPH) +endif() + if (SPHERAL_ENABLE_GRAVITY) list(APPEND _python_packages Gravity) endif() diff --git a/src/PYB11/FSISPH/FSISPH_PYB11.py b/src/PYB11/FSISPH/FSISPH_PYB11.py index 76f1e3d5c..325d088ba 100644 --- a/src/PYB11/FSISPH/FSISPH_PYB11.py +++ b/src/PYB11/FSISPH/FSISPH_PYB11.py @@ -56,7 +56,6 @@ # expose our field names #------------------------------------------------------------------------------- class FSIFieldNames: - damagedPressure = PYB11readonly(static=True, returnpolicy="copy") pressureGradient = PYB11readonly(static=True, returnpolicy="copy") specificThermalEnergyGradient = PYB11readonly(static=True, returnpolicy="copy") interfaceFlags = PYB11readonly(static=True, returnpolicy="copy") @@ -66,4 +65,4 @@ class FSIFieldNames: interfaceFraction = PYB11readonly(static=True, returnpolicy="copy") interfaceSmoothness = PYB11readonly(static=True, returnpolicy="copy") smoothedInterfaceNormals = PYB11readonly(static=True, returnpolicy="copy") - interfaceSmoothnessNormalization = PYB11readonly(static=True, returnpolicy="copy") \ No newline at end of file + interfaceSmoothnessNormalization = PYB11readonly(static=True, returnpolicy="copy") diff --git a/src/PYB11/Strength/Strength_PYB11.py b/src/PYB11/Strength/Strength_PYB11.py index 41a6579fb..0cd5791c8 100644 --- a/src/PYB11/Strength/Strength_PYB11.py +++ b/src/PYB11/Strength/Strength_PYB11.py @@ -56,3 +56,4 @@ class SolidFieldNames: fragmentIDs = PYB11readonly(static=True, returnpolicy="copy") particleTypes = PYB11readonly(static=True, returnpolicy="copy") meltSpecificEnergy = PYB11readonly(static=True, returnpolicy="copy") + damagedPressure = PYB11readonly(static=True, returnpolicy="copy") diff --git a/src/Strength/SolidFieldNames.cc b/src/Strength/SolidFieldNames.cc index a630ae7e7..1bc371b31 100644 --- a/src/Strength/SolidFieldNames.cc +++ b/src/Strength/SolidFieldNames.cc @@ -37,3 +37,4 @@ const std::string Spheral::SolidFieldNames::fragmentIDs = "fragment index"; const std::string Spheral::SolidFieldNames::particleTypes = "particle type"; const std::string Spheral::SolidFieldNames::meltSpecificEnergy = "melt specific energy"; const std::string Spheral::SolidFieldNames::mask = "mask"; +const std::string Spheral::SolidFieldNames::damagedPressure = "damaged pressure"; diff --git a/src/Strength/SolidFieldNames.hh b/src/Strength/SolidFieldNames.hh index b40e40177..38d0754cb 100644 --- a/src/Strength/SolidFieldNames.hh +++ b/src/Strength/SolidFieldNames.hh @@ -42,6 +42,7 @@ struct SolidFieldNames { static const std::string particleTypes; static const std::string meltSpecificEnergy; static const std::string mask; + static const std::string damagedPressure; }; } diff --git a/tests/functional/Hydro/Noh/Noh-planar-1d.py b/tests/functional/Hydro/Noh/Noh-planar-1d.py index 6c04ef733..9e5ac1cd0 100644 --- a/tests/functional/Hydro/Noh/Noh-planar-1d.py +++ b/tests/functional/Hydro/Noh/Noh-planar-1d.py @@ -45,8 +45,8 @@ # # Solid FSISPH # -#ATS:t400 = test( SELF, "--fsisph True --solid True --graphics None --clearDirectories True --checkError True --restartStep 20", label="Planar Noh problem with FSISPH -- 1-D (serial)") -#ATS:t401 = testif(t400, SELF, "--fsisph True --solid True --graphics None --clearDirectories False --checkError False --restartStep 20 --restoreCycle 20 --steps 20 --checkRestart True", label="Planar Noh problem with FSISPH -- 1-D (serial) RESTART CHECK") +#ATS:t400 = test( SELF, "--fsisph True --solid True --graphics None --clearDirectories True --checkError True --restartStep 20", label="Planar Noh problem with FSISPH -- 1-D (serial)", fsisph=True) +#ATS:t401 = testif(t400, SELF, "--fsisph True --solid True --graphics None --clearDirectories False --checkError False --restartStep 20 --restoreCycle 20 --steps 20 --checkRestart True", label="Planar Noh problem with FSISPH -- 1-D (serial) RESTART CHECK", fsisph=True) # # GSPH # diff --git a/tests/functional/Hydro/Sod/Sod-planar-1d-WaterGas.py b/tests/functional/Hydro/Sod/Sod-planar-1d-WaterGas.py index 73ab93c6c..471c3c3e2 100644 --- a/tests/functional/Hydro/Sod/Sod-planar-1d-WaterGas.py +++ b/tests/functional/Hydro/Sod/Sod-planar-1d-WaterGas.py @@ -1,8 +1,8 @@ # Solid FSISPH # -#ATS:fsisph1 = test( SELF, "--fsisph True --solid True --nx1 500 --nx2 30 --cfl 0.45 --graphics None --clearDirectories True --restartStep 20 --steps 40", label="Planar Water-Gas Sod problem with FSISPH -- 1-D (serial)") -#ATS:fsisph2 = testif(fsisph1, SELF, "--fsisph True --solid 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 FSISPH -- 1-D (serial) RESTART CHECK") +#ATS:fsisph1 = test( SELF, "--fsisph True --solid True --nx1 500 --nx2 30 --cfl 0.45 --graphics None --clearDirectories True --restartStep 20 --steps 40", label="Planar Water-Gas Sod problem with FSISPH -- 1-D (serial)", fsisph=True) +#ATS:fsisph2 = testif(fsisph1, SELF, "--fsisph True --solid 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 FSISPH -- 1-D (serial) RESTART CHECK", fsisph=True) # # GSPH # diff --git a/tests/functional/Hydro/Sod/Sod-planar-1d.py b/tests/functional/Hydro/Sod/Sod-planar-1d.py index 101c6c6d3..9da010616 100644 --- a/tests/functional/Hydro/Sod/Sod-planar-1d.py +++ b/tests/functional/Hydro/Sod/Sod-planar-1d.py @@ -13,8 +13,8 @@ # # Solid FSISPH # -#ATS:fsisph1 = test( SELF, "--crksph False --fsisph True --solid True --cfl 0.25 --graphics None --clearDirectories True --restartStep 20 --steps 40", label="Planar Sod problem with FSISPH -- 1-D (serial)") -#ATS:fsisph2 = testif(fsisph1, SELF, "--crksph False --fsisph True --solid True --cfl 0.25 --graphics None --clearDirectories False --restartStep 20 --steps 20 --restoreCycle 20 --checkRestart True", label="Planar Sod problem with FSISPH -- 1-D (serial) RESTART CHECK") +#ATS:fsisph1 = test( SELF, "--crksph False --fsisph True --solid True --cfl 0.25 --graphics None --clearDirectories True --restartStep 20 --steps 40", label="Planar Sod problem with FSISPH -- 1-D (serial)", fsisph=True) +#ATS:fsisph2 = testif(fsisph1, SELF, "--crksph False --fsisph True --solid True --cfl 0.25 --graphics None --clearDirectories False --restartStep 20 --steps 20 --restoreCycle 20 --checkRestart True", label="Planar Sod problem with FSISPH -- 1-D (serial) RESTART CHECK", fsisph=True) # # GSPH # diff --git a/tests/functional/Hydro/Sod/Sod-spherical-1d.py b/tests/functional/Hydro/Sod/Sod-spherical-1d.py index 18f15453c..f229fcd41 100644 --- a/tests/functional/Hydro/Sod/Sod-spherical-1d.py +++ b/tests/functional/Hydro/Sod/Sod-spherical-1d.py @@ -11,8 +11,8 @@ # # Solid FSISPH # -#ATS:fsisph1 = test( SELF, "--crksph False --fsisph True --solid True --cfl 0.25 --graphics None --clearDirectories True --restartStep 20 --steps 40", label="Spherical Sod problem with FSISPH -- 1-D (serial)") -#ATS:fsisph2 = testif(fsisph1, SELF, "--crksph False --fsisph True --solid True --cfl 0.25 --graphics None --clearDirectories False --restartStep 20 --steps 20 --restoreCycle 20 --checkRestart True", label="Spherical Sod problem with FSISPH -- 1-D (serial) RESTART CHECK") +#ATS:fsisph1 = test( SELF, "--crksph False --fsisph True --solid True --cfl 0.25 --graphics None --clearDirectories True --restartStep 20 --steps 40", label="Spherical Sod problem with FSISPH -- 1-D (serial)", fsisph=True) +#ATS:fsisph2 = testif(fsisph1, SELF, "--crksph False --fsisph True --solid True --cfl 0.25 --graphics None --clearDirectories False --restartStep 20 --steps 20 --restoreCycle 20 --checkRestart True", label="Spherical Sod problem with FSISPH -- 1-D (serial) RESTART CHECK", fsisph=True) # # GSPH # diff --git a/tests/functional/Porosity/PlanarCompaction/PlanarCompaction-1d.py b/tests/functional/Porosity/PlanarCompaction/PlanarCompaction-1d.py index 20ee07bea..180a67131 100644 --- a/tests/functional/Porosity/PlanarCompaction/PlanarCompaction-1d.py +++ b/tests/functional/Porosity/PlanarCompaction/PlanarCompaction-1d.py @@ -15,9 +15,9 @@ # # FSISPH # -#ATS:t10 = test( SELF, "--graphics False --clearDirectories True --checkError True --hydroType FSISPH --dataDirBase dumps-PlanarCompaction-1d-fsisph --restartStep 100000 --postCleanup True", np=4, label="Planar porous aluminum compaction problem -- 1-D (FSISPH, 4 proc)") -#ATS:t11 = test( SELF, "--graphics False --clearDirectories True --checkError False --hydroType FSISPH --dataDirBase dumps-PlanarCompaction-1d-fsisph-restart --restartStep 100 --steps 200", label="Planar porous aluminum compaction problem -- 1-D (FSISPH, serial, restart test step 1)") -#ATS:t12 = testif(t11, SELF, "--graphics False --clearDirectories False --checkError False --hydroType FSISPH --dataDirBase dumps-PlanarCompaction-1d-fsisph-restart --restartStep 100 --steps 100 --checkRestart True --restoreCycle 100 --postCleanup True", label="Planar porous aluminum compaction problem -- 1-D (FSISPH, serial, restart test step 2)") +#ATS:t10 = test( SELF, "--graphics False --clearDirectories True --checkError True --hydroType FSISPH --dataDirBase dumps-PlanarCompaction-1d-fsisph --restartStep 100000 --postCleanup True", np=4, label="Planar porous aluminum compaction problem -- 1-D (FSISPH, 4 proc)", fsisph=True) +#ATS:t11 = test( SELF, "--graphics False --clearDirectories True --checkError False --hydroType FSISPH --dataDirBase dumps-PlanarCompaction-1d-fsisph-restart --restartStep 100 --steps 200", label="Planar porous aluminum compaction problem -- 1-D (FSISPH, serial, restart test step 1)", fsisph=True) +#ATS:t12 = testif(t11, SELF, "--graphics False --clearDirectories False --checkError False --hydroType FSISPH --dataDirBase dumps-PlanarCompaction-1d-fsisph-restart --restartStep 100 --steps 100 --checkRestart True --restoreCycle 100 --postCleanup True", label="Planar porous aluminum compaction problem -- 1-D (FSISPH, serial, restart test step 2)", fsisph=True) # # CRKSPH # diff --git a/tests/functional/Strength/DiametralCompression/DiametralCompression.py b/tests/functional/Strength/DiametralCompression/DiametralCompression.py index 35ae7e84a..eb1e86890 100644 --- a/tests/functional/Strength/DiametralCompression/DiametralCompression.py +++ b/tests/functional/Strength/DiametralCompression/DiametralCompression.py @@ -4,7 +4,7 @@ # # Solid FSISPH # -#ATS:t100 = test( SELF, "--clearDirectories True --checkError True --goalTime 5.0 --fsisph True --nrSpecimen 15 ", label="Diametral Compression Test FSISPH -- 2-D", np=8) +#ATS:t100 = test( SELF, "--clearDirectories True --checkError True --goalTime 5.0 --fsisph True --nrSpecimen 15 ", label="Diametral Compression Test FSISPH -- 2-D", np=8, fsisph=True) from Spheral2d import * @@ -759,4 +759,4 @@ def eulerianSampleVars(j,i): raise ValueError("tensile stress error bounds violated (error, error tolerance) = (%g,%g)." % (error,tol)) if leaveNoTrace: - os.system("rm -rf "+baseDir) \ No newline at end of file + os.system("rm -rf "+baseDir) diff --git a/tests/functional/Strength/DiametralCompression/DiametralCompressionInlet.py b/tests/functional/Strength/DiametralCompression/DiametralCompressionInlet.py index cad85d3ef..54d15d70f 100644 --- a/tests/functional/Strength/DiametralCompression/DiametralCompressionInlet.py +++ b/tests/functional/Strength/DiametralCompression/DiametralCompressionInlet.py @@ -4,7 +4,7 @@ # # Solid FSISPH # -#ATS:t100 = test( SELF, "--clearDirectories True --checkError True --fsisph True --goalTime 2.0 --nrSpecimen 15 ", label="Diametral Compression Test FSISPH -- 2-D", np=1) +#ATS:t100 = test( SELF, "--clearDirectories True --checkError True --fsisph True --goalTime 2.0 --nrSpecimen 15 ", label="Diametral Compression Test FSISPH -- 2-D", np=1, fsisph=True) from Spheral2d import * import sys, os diff --git a/tests/functional/Strength/Piston/Piston.py b/tests/functional/Strength/Piston/Piston.py index 4632aac38..359dea456 100644 --- a/tests/functional/Strength/Piston/Piston.py +++ b/tests/functional/Strength/Piston/Piston.py @@ -1,8 +1,8 @@ # Solid FSISPH # -#ATS:fsisph1 = test( SELF, "--fsisph True --solid True --nx1 500 --cfl 0.45 --graphics None --clearDirectories True --restartStep 20 --steps 40", label="Copper plastic-wave problem with FSISPH -- 1-D (serial)") -##ATS:fsisph2 = testif(fsisph1, SELF, "--fsisph True --solid True --nx1 500 --cfl 0.45 --graphics None --clearDirectories False --restartStep 20 --steps 20 --restoreCycle 20 --checkRestart True", label="Copper plastic-wave problem with FSISPH -- 1-D (serial) RESTART CHECK") +#ATS:fsisph1 = test( SELF, "--fsisph True --solid True --nx1 500 --cfl 0.45 --graphics None --clearDirectories True --restartStep 20 --steps 40", label="Copper plastic-wave problem with FSISPH -- 1-D (serial)", fsisph=True) +##ATS:fsisph2 = testif(fsisph1, SELF, "--fsisph True --solid True --nx1 500 --cfl 0.45 --graphics None --clearDirectories False --restartStep 20 --steps 20 --restoreCycle 20 --checkRestart True", label="Copper plastic-wave problem with FSISPH -- 1-D (serial) RESTART CHECK", fsisph=True) import os, sys, shutil diff --git a/tests/integration.ats b/tests/integration.ats index 43863d2f7..429e04ba8 100644 --- a/tests/integration.ats +++ b/tests/integration.ats @@ -4,6 +4,7 @@ # (using the ATS) before pushing changes to that public repo! #------------------------------------------------------------------------------- +glue(fsisph = False) glue(gsph = False) glue(svph = False)