New ASPH H update algorithm

.gitlab/specs.yml

@@ -4,7 +4,7 @@
 .gcc_mvapich2_cxxonly:
   variables:
     SPEC: 'gcc@$GCC_VERSION^mvapich2'
-    EXTRA_CMAKE_ARGS: '-DENABLE_CXXONLY=On'
+    EXTRA_CMAKE_ARGS: '-DENABLE_CXXONLY=On -DENABLE_WARNINGS_AS_ERRORS=On'
 
 .gcc_mvapich2:
   variables:
@@ -28,6 +28,7 @@
 .clang_mvapich2:
   variables:
     SPEC: 'clang@$CLANG_VERSION^mvapich2'
+    EXTRA_CMAKE_ARGS: '-DENABLE_WARNINGS_AS_ERRORS=On'
 
 .cuda_11_gcc_~mpi:
   variables:

RELEASE_NOTES.md

@@ -15,6 +15,16 @@ Notable changes include:
     * TPL builds have been split off into a separate Gitlab CI stage to help with timeouts on allocations.
     * Failed ATS runs are automatically retested once in the Gitlab CI.
     * Python execute command is centralized in scripts/spheralutils.py now.
+    * New ASPH idealH algorithm implemented, which is much more robust and accurate as H elongations become extreme.
+    * New experimental hourglass control algorithm implemented, along with some basic tests/demonstrations.
+    * H update algorithms converted to their own independent physics packages, no longer part of the various hydro packages.
+    * Physics interface updated slightly:
+      * Physics::postStateUpdate now returns a bool indicating if boundary conditions should be enforced again.
+      * Physics packages can now have Physics sub-packages, which can be run before or after the main package.  The SpheralController
+        now checks for these packages and adds them to the physics package list as needed.
+      * Physics packages can indicate if they require Voronoi cell information be available.  If so, a new package which computes and
+        updates the Voronoi information is automatically added to the package list by the SpheralController (similar to how the
+        Reproducing Kernel corrections are handled).
 
   * Build changes / improvements:
     * Distributed source directory must always be built now.
@@ -23,10 +33,14 @@ Notable changes include:
     * 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).
+    * Added a GCC flag to prevent building variable tracking symbols when building PYB11 modules.  This is unnecessary, and
+      on some platforms trying to build such symbols is very expensive and in some cases fails.
 
   * Bug Fixes / improvements:
     * Wrappers for MPI calls are simplified and improved.
     * Time step estimate due to velocity divergence in RZ space has been fixed.
+    * Fixed tolerances for ANEOS equation of state temperature lookup
+    * Clang C++ warnings have eliminated, so the Clang CI tests have been updated to treat warnings as errors.
 
 Version v2024.06.1 -- Release date 2024-07-09
 ==============================================

cmake/Compilers.cmake

@@ -14,7 +14,7 @@ option(ENABLE_MISSING_INCLUDE_DIR_WARNINGS "show unused parameter warnings" ON)
 set(CXX_WARNING_FLAGS "")
 if (ENABLE_WARNINGS)
   if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
-    list(APPEND CXX_WARNING_FLAGS -Wno-unused-command-line-argument -Wno-c++17-extensions)
+    list(APPEND CXX_WARNING_FLAGS -fdiagnostics-show-option -Wno-unused-command-line-argument -Wno-c++17-extensions)
   endif()
 else()
   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -w")
@@ -59,7 +59,6 @@ message("-- using warning flags ${CXX_WARNING_FLAGS}")
 set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -Wno-missing-include-dirs")
 message("-- Fortran flags: ${CMAKE_Fortran_FLAGS}")
 
-
 #-------------------------------------------------------------------------------
 # PYB11 Target Flags
 #-------------------------------------------------------------------------------
@@ -75,7 +74,8 @@ if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
     -Wno-delete-abstract-non-virtual-dtor)
 elseif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
   list(APPEND SPHERAL_PYB11_TARGET_FLAGS
-    -Wno-pedantic)
+    -Wno-pedantic
+    -fno-var-tracking-assignments)
 endif()
 
 #-------------------------------------------------------------------------------
@@ -85,3 +85,21 @@ if(${CMAKE_CXX_COMPILER_ID} STREQUAL "Intel")
   set(CMAKE_CXX_FLAGS -wd11074,11076,654)
   set(SPHERAL_PYB11_TARGET_FLAGS )
 endif()
+
+#-------------------------------------------------------------------------------
+# BlueOS specific flags
+#-------------------------------------------------------------------------------
+if (DEFINED ENV{SYS_TYPE})
+  if ("$ENV{SYS_TYPE}" STREQUAL "blueos_3_ppc64le_ib_p9")
+    if (CMAKE_BUILD_TYPE STREQUAL "Debug")
+      set(CXX_BLUEOS_FLAGS "-Os")    # Needed to prevent relocation overflow errors during link
+      add_compile_options("$<$<COMPILE_LANGUAGE:CXX>:${CXX_BLUEOS_FLAGS}>")
+      message("-- Adding ${CXX_BLUEOS_FLAGS} to C++ compile flags")
+    endif()
+  endif()
+endif()
+#set(CXX_STRIP_FLAGS "-fdata-sections;-ffunction-sections")
+#set(CXX_LINK_STRIP_FLAGS "-Wl,--gc-sections")
+#set(CXX_LINK_STRIP_FLAGS "-Wl,-z combreloc")
+#add_link_options("${CXX_LINK_STRIP_FLAGS}")
+

scripts/spack/configs/blueos_3_ppc64le_ib/compilers.yaml

@@ -25,3 +25,16 @@ compilers:
     modules: []
     environment: {}
     extra_rpaths: []
+- compiler:
+    spec: gcc@10.2.1
+    paths:
+      cc: /usr/tce/packages/gcc/gcc-10.2.1/bin/gcc
+      cxx: /usr/tce/packages/gcc/gcc-10.2.1/bin/g++
+      f77: /usr/tce/packages/gcc/gcc-10.2.1/bin/gfortran
+      fc: /usr/tce/packages/gcc/gcc-10.2.1/bin/gfortran
+    flags: {}
+    operating_system: rhel7
+    target: ppc64le
+    modules: []
+    environment: {}
+    extra_rpaths: []

src/Boundary/ConstantBoundary.cc

@@ -284,7 +284,7 @@ restoreState(const FileIO& file, const string& pathName)  {
   vector<std::string> keys;
   file.read(keys, pathName + "/keys");
   mBufferedValues.clear();
-  for (const auto key: keys) {
+  for (const auto& key: keys) {
     std::string val;
     file.read(val, pathName + "/BufferedValues/" + key);
     mBufferedValues[key] = vector<char>(val.begin(), val.end());

src/Boundary/ReflectingBoundary.cc

@@ -31,8 +31,9 @@ namespace {
 //------------------------------------------------------------------------------
 // Reflect a faceted volume
 //------------------------------------------------------------------------------
+inline
 Dim<1>::FacetedVolume 
-static inline reflectFacetedVolume(const ReflectingBoundary<Dim<1>>& bc,
+reflectFacetedVolume(const ReflectingBoundary<Dim<1>>& bc,
                      const Dim<1>::FacetedVolume& poly) {
   const auto& plane = bc.enterPlane();
   return Dim<1>::FacetedVolume(bc.mapPosition(poly.center(),
@@ -41,10 +42,11 @@ static inline reflectFacetedVolume(const ReflectingBoundary<Dim<1>>& bc,
                                poly.extent());
 }
 
+inline
 Dim<2>::FacetedVolume 
-static inline reflectFacetedVolume(const ReflectingBoundary<Dim<2>>& bc,
+reflectFacetedVolume(const ReflectingBoundary<Dim<2>>& bc,
                      const Dim<2>::FacetedVolume& poly) {
-  typedef Dim<2>::Vector Vector;
+  using Vector = Dim<2>::Vector;
   const auto& plane = bc.enterPlane();
   const auto& verts0 = poly.vertices();
   const auto& facets = poly.facetVertices();
@@ -53,8 +55,9 @@ static inline reflectFacetedVolume(const ReflectingBoundary<Dim<2>>& bc,
   return Dim<2>::FacetedVolume(verts1, facets);
 }
 
+inline
 Dim<3>::FacetedVolume 
-static inline reflectFacetedVolume(const ReflectingBoundary<Dim<3>>& bc,
+reflectFacetedVolume(const ReflectingBoundary<Dim<3>>& bc,
                      const Dim<3>::FacetedVolume& poly) {
   const auto& plane = bc.enterPlane();
   auto verts = poly.vertices();
@@ -65,8 +68,70 @@ static inline reflectFacetedVolume(const ReflectingBoundary<Dim<3>>& bc,
   return Dim<3>::FacetedVolume(verts, facets);
 }
 
+//------------------------------------------------------------------------------
+// Clip a faceted volume
+//------------------------------------------------------------------------------
+inline
+void
+clipFacetedVolume(const ReflectingBoundary<Dim<1>>& bc,
+                  Dim<1>::FacetedVolume& poly) {
+  using FacetedVolume = Dim<1>::FacetedVolume;
+  const auto& plane = bc.enterPlane();
+  if (min(plane.compare(poly.xmin()), plane.compare(poly.xmax())) == -1) {
+    auto xmin = poly.xmin();
+    auto xmax = poly.xmax();
+    if (plane.compare(xmin) == -1) xmin = plane.point();
+    if (plane.compare(xmax) == -1) xmax = plane.point();
+    poly = FacetedVolume({xmin, xmax});
+  }
+}
+
+inline
+void
+clipFacetedVolume(const ReflectingBoundary<Dim<2>>& bc,
+                  Dim<2>::FacetedVolume& poly) {
+  const auto& plane = bc.enterPlane();
+  const auto& verts = poly.vertices();
+  const auto  nverts = verts.size();
+  bool ok = true;
+  auto ivert = 0u;
+  while (ok and ivert < nverts) {
+    if (plane.compare(verts[ivert]) == -1) {
+      ok = false;
+      PolyClipperPolygon PCpoly;
+      convertToPolyClipper(PCpoly, poly);
+      PolyClipperPlane2d PCplane(plane.point(), plane.normal());
+      PolyClipper::clipPolygon(PCpoly, {PCplane});
+      convertFromPolyClipper(poly, PCpoly);
+    }
+    ++ivert;
+  }
 }
 
+inline
+void
+clipFacetedVolume(const ReflectingBoundary<Dim<3>>& bc,
+                  Dim<3>::FacetedVolume& poly) {
+  const auto& plane = bc.enterPlane();
+  const auto& verts = poly.vertices();
+  const auto  nverts = verts.size();
+  bool ok = true;
+  auto ivert = 0u;
+  while (ok and ivert < nverts) {
+    if (plane.compare(verts[ivert]) == -1) {
+      ok = false;
+      PolyClipperPolyhedron PCpoly;
+      convertToPolyClipper(PCpoly, poly);
+      PolyClipperPlane3d PCplane(plane.point(), plane.normal());
+      PolyClipper::clipPolyhedron(PCpoly, {PCplane});
+      convertFromPolyClipper(poly, PCpoly);
+    }
+    ++ivert;
+  }
+}
+
+}   // anonymous
+
 //------------------------------------------------------------------------------
 // Empty constructor.
 //------------------------------------------------------------------------------
@@ -572,6 +637,7 @@ enforceBoundary(Field<Dimension, typename Dimension::FacetedVolume>& field) cons
        ++itr) {
     CHECK(*itr >= 0 && *itr < (int)nodeList.numInternalNodes());
     field(*itr) = reflectFacetedVolume(*this, field(*itr));
+    clipFacetedVolume(*this, field(*itr));
   }
 }
 

src/CMakeLists.txt

@@ -37,10 +37,12 @@ list(APPEND _packages
   Physics
   Porosity
   RK
+  VoronoiCells
   SPH
   SolidMaterial
   Strength
   Utilities
+  SmoothingScale
   )
 
 if (SPHERAL_ENABLE_ARTIFICIAL_CONDUCTION)