SolidFSISPHRZ

RELEASE_NOTES.md

@@ -21,6 +21,7 @@ Notable changes include:
         * Stack allocation of tensor data; Static casting for CRTP implementation.
       * GeomTensor & GeomSymmetricTensor have been refactored for use on the GPU.
       * New Logging utility for runtime debug messages.
+      * FSISPH has an RZ mode (see Noh-RZ and Verney-RZ tests for examples)
 
   * Build changes / improvements:
     * Changed `int` to `size_t` for Field and FieldList.

src/FSISPH/CMakeLists.txt

@@ -10,6 +10,7 @@ set(FSISPH_inst
 
 
 set(FSISPH_sources
+    SolidFSISPHRZ.cc
     FSIFieldNames.cc )
 
 
@@ -18,6 +19,7 @@ instantiate(FSISPH_inst FSISPH_sources)
 set(FSISPH_headers
     SolidFSISPH.hh
     SolidFSISPHInline.hh
+    SolidFSISPHRZ.hh
     computeFSISPHSumMassDensity.hh
     computeHWeightedFSISPHSumMassDensity.hh
     computeInterfacePressureCorrectedSumMassDensity.hh

src/FSISPH/FSISPHHydros.py

@@ -29,14 +29,14 @@ def FSISPH(dataBase,
            nTensile = 4.0,
            xmin = (-1e100, -1e100, -1e100),
            xmax = ( 1e100,  1e100,  1e100),
+           etaMinAxis = 0.1,
            ASPH = False,
-           RZ = False,
            smoothingScaleMethod = None):
 
     ######################################################################
     # some of these parameters are inactive and possible on there was out.
     # strengthInDamage and damageRelieveRubble are old switches and are not
-    # implemented in the code. RZ has not been implemented in FSISPH
+    # implemented in the code.
     ######################################################################
 
     if compatibleEnergyEvolution and evolveTotalEnergy:
@@ -70,8 +70,15 @@ def FSISPH(dataBase,
         raise RuntimeError("Cannot mix solid and fluid NodeLists.")
 
     # Decide on the hydro object.
-    if RZ:
-        raise RuntimeError("RZ is not implemented yet")
+    if GeometryRegistrar.coords() == CoordinateType.Spherical:
+        assert ndim == 1
+        raise RuntimeError("not implemented for spherical coordinates")
+    if GeometryRegistrar.coords() == CoordinateType.RZ:
+        assert ndim == 2
+        if nsolid > 0:
+            Constructor = SolidFSISPHRZ
+        else:
+            raise RuntimeError("currently only implemented for solid nodelists")
     else:
         # Cartesian ---------------------------------
         if nsolid > 0:
@@ -139,6 +146,10 @@ def FSISPH(dataBase,
     result._smoothingScaleMethod = smoothingScaleMethod
     result.appendSubPackage(smoothingScaleMethod)
 
+    if GeometryRegistrar.coords() == CoordinateType.RZ:
+        result.zaxisBC = AxisBoundaryRZ(etaMinAxis)
+        result.appendBoundary(result.zaxisBC)
+
     return result
 
 #-------------------------------------------------------------------------------

src/FSISPH/SolidFSISPH.cc

@@ -31,7 +31,7 @@
 #include "DataBase/State.hh"
 #include "DataBase/StateDerivatives.hh"
 #include "DataBase/IncrementState.hh"
-#include "DataBase/ReplaceBoundedState.hh"
+#include "DataBase/ReplaceState.hh"
 #include "DataBase/IncrementBoundedState.hh"
 #include "DataBase/ReplaceBoundedState.hh"
 #include "DataBase/PureReplaceState.hh"

src/FSISPH/SolidFSISPH.hh

@@ -269,7 +269,7 @@ public:
   virtual void restoreState(const FileIO& file, const std::string& pathName);
  //****************************************************************************
 
-private:
+protected:
   const TableKernel<Dimension>& mKernel;
   SlideSurface<Dimension>& mSlideSurface;
 
@@ -338,7 +338,6 @@ private:
   FieldList<Dimension, Scalar> mNewInterfaceSmoothness;           // smoothness metric (0-1) next time step 
   FieldList<Dimension, Scalar> mInterfaceAngles;                  // check the angle for free-surface master nodes (type 2 -> type 3)
 
-protected:
   //--------------------------- Protected Interface ---------------------------//
   // The restart registration.
   RestartRegistrationType mRestart;