9 files changed, 156 insertions, 71 deletions

diff --git a/science/spheral/Makefile b/science/spheral/Makefile
index 025f42fab8d0..cf2231abffd3 100644
--- a/science/spheral/Makefile
+++ b/science/spheral/Makefile
@@ -1,7 +1,6 @@
 PORTNAME=	spheral
 DISTVERSIONPREFIX=	v
-DISTVERSION=	2025.06.1
-PORTREVISION=	5
+DISTVERSION=	2025.12.0
 CATEGORIES=	science # physics
 
 MAINTAINER=	yuri@FreeBSD.org
@@ -20,7 +19,10 @@ LIB_DEPENDS=	libadiak.so:misc/adiak \
 		libconduit.so:science/conduit \
 		libfmt.so:devel/libfmt \
 		libhdf5.so:science/hdf5 \
+		libHYPRE.so:science/hypre \
 		libmfem.so:math/mfem \
+		libmetis.so:math/metis \
+		libopenblas.so:math/openblas \
 		libosdCPU.so:graphics/opensubdiv \
 		libpolytope.so:science/polytope \
 		libqhull_r.so:math/qhull \
@@ -57,14 +59,15 @@ CMAKE_ARGS=	-Daneos_DIR=${LOCALBASE} \
 CMAKE_ARGS+=	-DPYTHON_EXECUTABLE=${PYTHON_CMD} \
 		-DPython_EXECUTABLE=${PYTHON_CMD} \
 		-DPython3_EXECUTABLE=${PYTHON_CMD}
-CMAKE_OFF=	ENABLE_TESTS ENABLE_DOCS \
-		ENABLE_ANEOS \
+CMAKE_OFF=	SPHERAL_ENABLE_TESTS SPHERAL_ENABLE_DOCS \
+		SPHERAL_ENABLE_ANEOS \
+		SPHERAL_ENABLE_PYTHON \
+		SPHERAL_ENABLE_STATIC \
 		ENABLE_CUDA
-CMAKE_ON=	ENABLE_CXXONLY # disable Python support which is still for Python-2.7, see https://github.com/LLNL/spheral/issues/183
-CMAKE_ON+=	ENABLE_OPENMP \
-		USE_EXTERNAL_CHAI \
-		ENABLE_SUNDIALS
-CMAKE_TESTING_ON=	ENABLE_TESTS # tests fail to build, see https://github.com/LLNL/spheral/issues/230
+CMAKE_ON=	SPHERAL_ENABLE_SHARED \
+		ENABLE_OPENMP \
+		USE_EXTERNAL_CHAI
+CMAKE_TESTING_ON=	SPHERAL_ENABLE_TESTS # tests fail to build, see https://github.com/LLNL/spheral/issues/230
 
 CXXFLAGS+=	-I${LOCALBASE}/include/eigen3
 
diff --git a/science/spheral/distinfo b/science/spheral/distinfo
index ec724d252052..20f8527e07ed 100644
--- a/science/spheral/distinfo
+++ b/science/spheral/distinfo
@@ -1,6 +1,6 @@
-TIMESTAMP = 1761812772
-SHA256 (LLNL-spheral-v2025.06.1_GH0.tar.gz) = d4048308b5f79cf5a4e0ac7a00a16d7da9f75501283b20432f2a09c7253454ed
-SIZE (LLNL-spheral-v2025.06.1_GH0.tar.gz) = 6691841
+TIMESTAMP = 1775028071
+SHA256 (LLNL-spheral-v2025.12.0_GH0.tar.gz) = d770750cf81e8f945976c157c3401cfb3c15a67c5291c78a9378e09c32103d11
+SIZE (LLNL-spheral-v2025.12.0_GH0.tar.gz) = 6709680
 SHA256 (LLNL-PolyClipper-e1fe47c_GH0.tar.gz) = 52b358f32f523e6030ed090411c90f0811db12046b6cb6fa8e4cafe4f8b3567e
 SIZE (LLNL-PolyClipper-e1fe47c_GH0.tar.gz) = 274184
 SHA256 (LLNL-PYB11Generator-7160812_GH0.tar.gz) = 9f257b9a5b2503aaacdba48d785bd349c95849a282e1e181ccee2c0f319135cb
diff --git a/science/spheral/files/patch-cmake_InstallTPLs.cmake b/science/spheral/files/patch-cmake_InstallTPLs.cmake
index 526dbd25c3d4..6e42e351f55d 100644
--- a/science/spheral/files/patch-cmake_InstallTPLs.cmake
+++ b/science/spheral/files/patch-cmake_InstallTPLs.cmake
@@ -1,17 +1,29 @@
---- cmake/InstallTPLs.cmake.orig	2025-07-23 20:11:18 UTC
+--- cmake/InstallTPLs.cmake.orig	2025-12-18 23:27:24 UTC
 +++ cmake/InstallTPLs.cmake
-@@ -84,7 +84,9 @@ set(SPHERAL_FP_DIRS )
+@@ -73,7 +73,7 @@ if (NOT polyclipper_DIR)
+   list(APPEND SPHERAL_BLT_DEPENDS PolyClipperAPI)
+   install(TARGETS PolyClipperAPI
+     EXPORT spheral_cxx-targets
+-    DESTINATION lib/cmake)
++    DESTINATION lib/cmake/spheral_cxx)
+   set_target_properties(PolyClipperAPI PROPERTIES EXPORT_NAME spheral::PolyClipperAPI)
+   message("Found PolyClipper External Package.")
+ else()
+@@ -88,8 +88,12 @@ set(SPHERAL_FP_DIRS )
+ set(SPHERAL_FP_TPLS )
  set(SPHERAL_FP_DIRS )
  
++# Packages on FreeBSD install cmake configs directly into lib/cmake/,
++# not in a per-package subdirectory, so we need to include that path.
++list(PREPEND CMAKE_PREFIX_PATH "${axom_DIR}/lib/cmake")
++
  # Use find_package to get axom (which brings in fmt) and patch fmt
 -find_package(axom REQUIRED NO_DEFAULT_PATH PATHS ${axom_DIR}/lib/cmake)
-+message("YURI CMAKE_PREFIX_PATH: ${CMAKE_PREFIX_PATH}")
-+set(CMAKE_PREFIX_PATH "/usr/local/lib/cmake") # not sure why this is needed here
 +find_package(axom REQUIRED)
- list(APPEND SPHERAL_BLT_DEPENDS axom )
+ list(APPEND SPHERAL_BLT_DEPENDS axom)
  list(APPEND SPHERAL_FP_TPLS axom)
  list(APPEND SPHERAL_FP_DIRS ${axom_DIR}/lib/cmake)
-@@ -102,7 +104,7 @@ message("---------------------------------------------
+@@ -106,7 +110,7 @@ message("---------------------------------------------
  
  message("-----------------------------------------------------------------------------")
  # Use find_package to get adiak
@@ -20,7 +32,7 @@
  if(adiak_FOUND)
    list(APPEND SPHERAL_BLT_DEPENDS adiak::adiak)
    list(APPEND SPHERAL_FP_TPLS adiak)
-@@ -112,7 +114,7 @@ message("---------------------------------------------
+@@ -116,7 +120,7 @@ message("---------------------------------------------
  
  message("-----------------------------------------------------------------------------")
  # Use find_package to get polytope
@@ -29,7 +41,7 @@
  if(POLYTOPE_FOUND)
    list(APPEND SPHERAL_BLT_DEPENDS polytope)
    list(APPEND SPHERAL_FP_TPLS polytope)
-@@ -141,7 +143,7 @@ if (ENABLE_TIMER)
+@@ -144,7 +148,7 @@ if (SPHERAL_ENABLE_TIMERS)
      # Only save if it does not exists already
      set(CONFIG_CALIPER_DIR "${caliper_DIR}" CACHE PATH "Configuration Caliper directory")
    endif()
@@ -38,48 +50,72 @@
    if(caliper_FOUND)
      list(APPEND SPHERAL_BLT_DEPENDS caliper)
      list(APPEND SPHERAL_FP_TPLS caliper)
-@@ -151,14 +153,14 @@ message("---------------------------------------------
+@@ -164,7 +168,7 @@ if(NOT ENABLE_STATIC_TPL)
+ 
+ 
+ if(NOT ENABLE_STATIC_TPL)
+-  find_package(hdf5 REQUIRED NO_DEFAULT_PATH PATHS ${hdf5_DIR})
++  find_package(hdf5 REQUIRED)
+   message("Found HDF5 External Package.")
+   list(APPEND SPHERAL_FP_TPLS hdf5)
+   list(APPEND SPHERAL_FP_DIRS ${hdf5_DIR})
+@@ -178,22 +182,24 @@ message("---------------------------------------------
  endif()
  
  message("-----------------------------------------------------------------------------")
 -find_package(RAJA REQUIRED NO_DEFAULT_PATH PATHS ${raja_DIR})
 +find_package(RAJA REQUIRED)
- if (RAJA_FOUND) 
+ if (RAJA_FOUND)
    message("Found RAJA External Package.")
-   blt_convert_to_system_includes(TARGET RAJA)
  endif()
  
  message("-----------------------------------------------------------------------------")
 -find_package(umpire REQUIRED NO_DEFAULT_PATH PATHS ${umpire_DIR})
 +find_package(umpire REQUIRED)
- if (umpire_FOUND) 
+ if (umpire_FOUND)
    message("Found umpire External Package.")
-   blt_convert_to_system_includes(TARGET umpire)
-@@ -166,8 +168,8 @@ message("---------------------------------------------
+ endif()
  
  message("-----------------------------------------------------------------------------")
  # Chai
--if(chai_DIR AND USE_EXTERNAL_CHAI)
--  find_package(chai REQUIRED NO_DEFAULT_PATH PATHS ${chai_DIR})
+-find_package(chai REQUIRED NO_DEFAULT_PATH PATHS ${chai_DIR})
+-if(chai_FOUND)
+-  message("Found chai External Package.")
 +if(USE_EXTERNAL_CHAI)
 +  find_package(chai REQUIRED)
-   if (chai_FOUND) 
-     message("Found chai External Package.")
-   endif()
-@@ -190,12 +192,11 @@ if (ENABLE_SUNDIALS)
++  if(chai_FOUND)
++    message("Found chai External Package.")
++  endif()
+ endif()
+ 
+ list(APPEND SPHERAL_BLT_DEPENDS chai camp RAJA umpire)
+@@ -204,13 +210,12 @@ if (SPHERAL_ENABLE_SUNDIALS)
  # Use find_package to get Sundials
- if (ENABLE_SUNDIALS)
+ if (SPHERAL_ENABLE_SUNDIALS)
    set(SUNDIALS_DIR "${sundials_DIR}")
 -  find_package(SUNDIALS REQUIRED NO_DEFAULT_PATH
--    COMPONENTS kinsol nvecparallel nvecmpiplusx nvecserial 
+-    COMPONENTS kinsol nvecparallel nvecmpiplusx nvecserial
 -    PATHS ${sundials_DIR}/lib64/cmake/sundials ${sundials_DIR}/lib/cmake/sundials)
 +  find_package(SUNDIALS REQUIRED
-+    COMPONENTS kinsol nvecparallel nvecmpiplusx nvecserial )
++    COMPONENTS kinsol nvecparallel nvecmpiplusx nvecserial)
    if(SUNDIALS_FOUND)
--    list(APPEND SPHERAL_BLT_DEPENDS SUNDIALS::kinsol_static SUNDIALS::nvecparallel_static SUNDIALS::nvecmpiplusx_static SUNDIALS::nvecserial_static)
--    list(APPEND SPHERAL_FP_TPLS SUNDIALS::kinsol_static SUNDIALS::nvecparallel_static SUNDIALS::nvecmpiplusx_static SUNDIALS::nvecserial_static)
-+    list(APPEND SPHERAL_BLT_DEPENDS SUNDIALS::kinsol SUNDIALS::nvecparallel SUNDIALS::nvecmpiplusx SUNDIALS::nvecserial)
-+    list(APPEND SPHERAL_FP_TPLS SUNDIALS::kinsol SUNDIALS::nvecparallel SUNDIALS::nvecmpiplusx SUNDIALS::nvecserial)
+     set(SUNDIAL_LIBS kinsol nvecparallel nvecmpiplusx nvecserial)
+     foreach(_lib ${SUNDIAL_LIBS})
+-      list(APPEND SPHERAL_BLT_DEPENDS SUNDIALS::${_lib}_static)
++      list(APPEND SPHERAL_BLT_DEPENDS SUNDIALS::${_lib})
+     endforeach()
+     list(APPEND SPHERAL_FP_TPLS SUNDIALS)
      list(APPEND SPHERAL_FP_DIRS ${sundials_DIR})
-     message("Found SUNDIALS External Package")
+@@ -238,7 +243,11 @@ endforeach()
    endif()
+   list(APPEND SPHERAL_BLT_DEPENDS ${lib})
+ endforeach()
+-blt_convert_to_system_includes(TARGETS "${SPHERAL_BLT_DEPENDS}")
++foreach(_dep ${SPHERAL_BLT_DEPENDS})
++  if(TARGET ${_dep})
++    blt_convert_to_system_includes(TARGET ${_dep})
++  endif()
++endforeach()
+ # Note: SPHERAL_BLT_DEPENDS is made global after this in SetupSpheral.cmake
+ 
+ # This calls LLNLSpheralInstallTPLs.cmake
diff --git a/science/spheral/files/patch-cmake_SetupSpheral.cmake b/science/spheral/files/patch-cmake_SetupSpheral.cmake
index 86ef0b406a80..3e210340fa15 100644
--- a/science/spheral/files/patch-cmake_SetupSpheral.cmake
+++ b/science/spheral/files/patch-cmake_SetupSpheral.cmake
@@ -1,8 +1,8 @@
 - eliminate the need to use git
 
---- cmake/SetupSpheral.cmake.orig	2025-07-23 20:11:18 UTC
+--- cmake/SetupSpheral.cmake.orig	2026-04-01 07:49:10 UTC
 +++ cmake/SetupSpheral.cmake
-@@ -27,8 +27,8 @@ include(Compilers)
+@@ -28,8 +28,8 @@ include(Compilers)
  #-------------------------------------------------------------------------------
  
  # Need to define Python paths here as BLT finds it's own Python package.
diff --git a/science/spheral/files/patch-cmake_SpheralConfig.cmake b/science/spheral/files/patch-cmake_SpheralConfig.cmake
new file mode 100644
index 000000000000..0daaec512ee8
--- /dev/null
+++ b/science/spheral/files/patch-cmake_SpheralConfig.cmake
@@ -0,0 +1,11 @@
+--- cmake/SpheralConfig.cmake.orig	2026-04-01 08:49:15 UTC
++++ cmake/SpheralConfig.cmake
+@@ -5,7 +5,7 @@ set(SPHERAL_INSTALL_BIN_DIR "bin" CACHE STRING "")
+ set(SPHERAL_INSTALL_CONFIG_DIR "lib" CACHE STRING "")
+ set(SPHERAL_INSTALL_LIB_DIR "lib" CACHE STRING "")
+ set(SPHERAL_INSTALL_BIN_DIR "bin" CACHE STRING "")
+-set(SPHERAL_INSTALL_CMAKE_MODULE_DIR "${SPHERAL_INSTALL_CONFIG_DIR}/cmake" CACHE STRING "")
++set(SPHERAL_INSTALL_CMAKE_MODULE_DIR "${SPHERAL_INSTALL_CONFIG_DIR}/cmake/spheral_cxx" CACHE STRING "")
+ set(SPHERAL_INSTALL_PREFIX ${CMAKE_INSTALL_PREFIX} CACHE STRING "" FORCE)
+ set(SPHERAL_INSTALL_SPHERAL "Spheral" CACHE STRING "")
+ 
diff --git a/science/spheral/files/patch-cmake_spheral_SpheralAddLibs.cmake b/science/spheral/files/patch-cmake_spheral_SpheralAddLibs.cmake
new file mode 100644
index 000000000000..e3f72f0cc217
--- /dev/null
+++ b/science/spheral/files/patch-cmake_spheral_SpheralAddLibs.cmake
@@ -0,0 +1,11 @@
+--- cmake/spheral/SpheralAddLibs.cmake.orig	2026-04-01 08:49:15 UTC
++++ cmake/spheral/SpheralAddLibs.cmake
+@@ -138,7 +138,7 @@ function(spheral_add_cxx_library package_name _cxx_obj
+     EXPORT        ${export_target_name})
+ 
+   # Export Spheral target
+-  install(EXPORT ${export_target_name} DESTINATION lib/cmake)
++  install(EXPORT ${export_target_name} DESTINATION lib/cmake/spheral_cxx)
+ 
+   # Set the r-path of the C++ lib such that it is independent of the build dir when installed
+   set_target_properties(Spheral_${package_name} PROPERTIES INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib")
diff --git a/science/spheral/files/patch-cmake_spheral_SpheralHandleTPL.cmake b/science/spheral/files/patch-cmake_spheral_SpheralHandleTPL.cmake
new file mode 100644
index 000000000000..8ac696c63481
--- /dev/null
+++ b/science/spheral/files/patch-cmake_spheral_SpheralHandleTPL.cmake
@@ -0,0 +1,11 @@
+--- cmake/spheral/SpheralHandleTPL.cmake.orig	2026-04-01 08:49:15 UTC
++++ cmake/spheral/SpheralHandleTPL.cmake
+@@ -95,7 +95,7 @@ function(Spheral_Handle_TPL lib_name TPL_CMAKE_DIR)
+   if(NOT ${_is_imported})
+     install(TARGETS ${lib_name}
+       EXPORT spheral_cxx-targets
+-      DESTINATION lib/cmake)
++      DESTINATION lib/cmake/spheral_cxx)
+   endif()
+   set_target_properties(${lib_name} PROPERTIES EXPORT_NAME spheral::${lib_name})
+ endfunction()
diff --git a/science/spheral/files/patch-cmake_spheral__cxx-config.cmake.in b/science/spheral/files/patch-cmake_spheral__cxx-config.cmake.in
new file mode 100644
index 000000000000..02433092e09b
--- /dev/null
+++ b/science/spheral/files/patch-cmake_spheral__cxx-config.cmake.in
@@ -0,0 +1,13 @@
+--- cmake/spheral_cxx-config.cmake.in.orig	2026-04-01 08:49:15 UTC
++++ cmake/spheral_cxx-config.cmake.in
+@@ -45,8 +45,8 @@ if(NOT SPHERAL_FOUND)
+       set(MPI_Fortran_COMPILER "@MPI_Fortran_COMPILER@" CACHE PATH "")
+     endif()
+   endif()
+-  include("${SPHERAL_CXX_INSTALL_PREFIX}/lib/cmake/spheral_cxx-targets.cmake")
+-  include("${SPHERAL_CXX_INSTALL_PREFIX}/lib/cmake/BLTSetupTargets.cmake")
++  include("${SPHERAL_CXX_INSTALL_PREFIX}/lib/cmake/spheral_cxx/spheral_cxx-targets.cmake")
++  include("${SPHERAL_CXX_INSTALL_PREFIX}/lib/cmake/spheral_cxx/BLTSetupTargets.cmake")
+   set_property(TARGET Spheral_CXX
+     APPEND PROPERTY
+     INTERFACE_INCLUDE_DIRECTORIES ${SPHERAL_CXX_INCLUDE_DIRS})
diff --git a/science/spheral/pkg-plist b/science/spheral/pkg-plist
index a6108abb6a13..7fb296e37408 100644
--- a/science/spheral/pkg-plist
+++ b/science/spheral/pkg-plist
@@ -153,7 +153,6 @@ include/DataOutput/RestartableObject.hh
 include/DataOutput/registerWithRestart.hh
 include/DeviceTestLib/DeviceTest.hh
 include/Distributed/BoundingVolumeDistributedBoundary.hh
-include/Distributed/BoundingVolumeDistributedBoundaryInline.hh
 include/Distributed/Communicator.hh
 include/Distributed/CompareDomainNodesByPosition.hh
 include/Distributed/DistributeByXPosition.hh
@@ -161,7 +160,6 @@ include/Distributed/DistributedBoundary.hh
 include/Distributed/DistributedBoundaryInline.hh
 include/Distributed/MortonOrderRedistributeNodes.hh
 include/Distributed/NestedGridDistributedBoundary.hh
-include/Distributed/NestedGridDistributedBoundaryInline.hh
 include/Distributed/NestedGridRedistributeNodes.hh
 include/Distributed/NestedGridRedistributeNodesInline.hh
 include/Distributed/NestedGridUtilities.hh
@@ -172,7 +170,6 @@ include/Distributed/Process.hh
 include/Distributed/RedistributeNodes.hh
 include/Distributed/RedistributeNodesInline.hh
 include/Distributed/RegisterMPIDataTypes.hh
-include/Distributed/RegisterMPIDataTypesInline.hh
 include/Distributed/SortAndDivideRedistributeNodes.hh
 include/Distributed/SortAndDivideRedistributeNodes1d.hh
 include/Distributed/SortAndDivideRedistributeNodes2d.hh
@@ -180,7 +177,6 @@ include/Distributed/SortAndDivideRedistributeNodes3d.hh
 include/Distributed/SortAndDivideRedistributeNodesInline.hh
 include/Distributed/SpaceFillingCurveRedistributeNodes.hh
 include/Distributed/TreeDistributedBoundary.hh
-include/Distributed/TreeDistributedBoundaryInline.hh
 include/Distributed/VoronoiRedistributeNodes.hh
 include/Distributed/allReduce.hh
 include/Distributed/waitAllWithDeadlockDetection.hh
@@ -214,8 +210,11 @@ include/Field/FieldListBase.hh
 include/Field/FieldListBaseInline.hh
 include/Field/FieldListInline.hh
 include/Field/FieldListSet.hh
-include/Field/FieldListSetInline.hh
 include/Field/FieldListThreadWrapper.hh
+include/Field/FieldListView.hh
+include/Field/FieldListViewInline.hh
+include/Field/FieldView.hh
+include/Field/FieldViewInline.hh
 include/Field/GhostNodeIterator.hh
 include/Field/GhostNodeIteratorInline.hh
 include/Field/InternalNodeIterator.hh
@@ -283,8 +282,6 @@ include/Geometry/EigenStruct.hh
 include/Geometry/EigenStructInline.hh
 include/Geometry/EigenStruct_fwd.hh
 include/Geometry/FacetedVolumeUtilities.hh
-include/Geometry/Geom3Vector.hh
-include/Geometry/Geom3VectorInline.hh
 include/Geometry/GeomFacet1d.hh
 include/Geometry/GeomFacet1dInline.hh
 include/Geometry/GeomFacet2d.hh
@@ -305,32 +302,20 @@ include/Geometry/GeomPolyhedron.hh
 include/Geometry/GeomPolyhedronInline.hh
 include/Geometry/GeomSymmetricTensor.hh
 include/Geometry/GeomSymmetricTensorBase.hh
-include/Geometry/GeomSymmetricTensorInline_default.hh
-include/Geometry/GeomSymmetricTensorInline_eigen.hh
-include/Geometry/GeomSymmetricTensor_default.hh
-include/Geometry/GeomSymmetricTensor_eigen.hh
+include/Geometry/GeomSymmetricTensorInline.hh
 include/Geometry/GeomSymmetricTensor_fwd.hh
 include/Geometry/GeomTensor.hh
 include/Geometry/GeomTensorBase.hh
-include/Geometry/GeomTensorInline_default.hh
-include/Geometry/GeomTensorInline_eigen.hh
-include/Geometry/GeomTensor_default.hh
-include/Geometry/GeomTensor_eigen.hh
+include/Geometry/GeomTensorInline.hh
 include/Geometry/GeomTensor_fwd.hh
 include/Geometry/GeomThirdRankTensor.hh
 include/Geometry/GeomThirdRankTensorInline.hh
 include/Geometry/GeomThirdRankTensor_fwd.hh
 include/Geometry/GeomVector.hh
-include/Geometry/GeomVectorBase_default.hh
-include/Geometry/GeomVectorInline_array.hh
-include/Geometry/GeomVectorInline_default.hh
-include/Geometry/GeomVectorInline_eigen.hh
-include/Geometry/GeomVector_array.hh
-include/Geometry/GeomVector_default.hh
-include/Geometry/GeomVector_eigen.hh
+include/Geometry/GeomVectorBase.hh
+include/Geometry/GeomVectorInline.hh
 include/Geometry/GeomVector_fwd.hh
 include/Geometry/GeometryRegistrar.hh
-include/Geometry/GeometryRegistrarInline.hh
 include/Geometry/Jacobi.hh
 include/Geometry/Jacobi2.hh
 include/Geometry/MathTraits.hh
@@ -412,6 +397,8 @@ include/Kernel/SuperGaussianKernel.hh
 include/Kernel/SuperGaussianKernelInline.hh
 include/Kernel/TableKernel.hh
 include/Kernel/TableKernelInline.hh
+include/Kernel/TableKernelView.hh
+include/Kernel/TableKernelViewInline.hh
 include/Kernel/VolumeIntegrationFunctions.hh
 include/Kernel/W4SplineKernel.hh
 include/Kernel/W4SplineKernelInline.hh
@@ -483,6 +470,7 @@ include/Neighbor/NestedGridNeighbor.hh
 include/Neighbor/NestedGridNeighborInline.hh
 include/Neighbor/NodePairIdxType.hh
 include/Neighbor/NodePairList.hh
+include/Neighbor/NodePairListView.hh
 include/Neighbor/PairwiseField.hh
 include/Neighbor/PairwiseFieldElementAccessor.hh
 include/Neighbor/PairwiseFieldInline.hh
@@ -500,7 +488,6 @@ include/NodeList/FluidNodeList.hh
 include/NodeList/FluidNodeListInline.hh
 include/NodeList/FluidNodeTraits.hh
 include/NodeList/NodeList.hh
-include/NodeList/NodeListInline.hh
 include/NodeList/NodeListRegistrar.hh
 include/NodeList/NodeListRegistrarInline.hh
 include/NodeList/SolidNodeList.hh
@@ -619,9 +606,12 @@ include/Utilities/BiLinearInterpolatorInline.hh
 include/Utilities/BiQuadraticInterpolator.hh
 include/Utilities/BiQuadraticInterpolatorInline.hh
 include/Utilities/BuildData.hh
+include/Utilities/CHAI_MA_wrapper.hh
 include/Utilities/CounterClockwiseComparator.hh
 include/Utilities/CubicHermiteInterpolator.hh
 include/Utilities/CubicHermiteInterpolatorInline.hh
+include/Utilities/CubicHermiteInterpolatorView.hh
+include/Utilities/CubicHermiteInterpolatorViewInline.hh
 include/Utilities/DBC.hh
 include/Utilities/DataTypeTraits.hh
 include/Utilities/DomainNode.hh
@@ -630,9 +620,11 @@ include/Utilities/FastMath.hh
 include/Utilities/FieldDataTypeTraits.hh
 include/Utilities/Functors.hh
 include/Utilities/GeometricUtilities.hh
+include/Utilities/Hashes.hh
 include/Utilities/KeyTraits.hh
 include/Utilities/LinearInterpolator.hh
 include/Utilities/LinearInterpolatorInline.hh
+include/Utilities/Logger.hh
 include/Utilities/NodeCoupling.hh
 include/Utilities/NodeListHashMap.hh
 include/Utilities/OpenMP_wrapper.hh
@@ -640,6 +632,8 @@ include/Utilities/PairComparisons.hh
 include/Utilities/PeanoHilbertTransform.hh
 include/Utilities/QuadraticInterpolator.hh
 include/Utilities/QuadraticInterpolatorInline.hh
+include/Utilities/QuadraticInterpolatorView.hh
+include/Utilities/QuadraticInterpolatorViewInline.hh
 include/Utilities/RedistributionNotification.hh
 include/Utilities/RedistributionNotificationHandle.hh
 include/Utilities/RedistributionRegistrar.hh
@@ -664,11 +658,10 @@ include/Utilities/comparisons.hh
 include/Utilities/computeConvexHull.hh
 include/Utilities/computeShepardsInterpolation.hh
 include/Utilities/erff.hh
-include/Utilities/fakestl.hh
 include/Utilities/globalBoundingVolumes.hh
 include/Utilities/globalNodeIDs.hh
 include/Utilities/globalNodeIDsInline.hh
-include/Utilities/hashes.hh
+include/Utilities/initializeAxom.hh
 include/Utilities/initializeTau.hh
 include/Utilities/integrateThroughMeshAlongSegment.hh
 include/Utilities/intpow2.hh
@@ -702,6 +695,7 @@ include/Utilities/setGlobalFlags.hh
 include/Utilities/simpsonsIntegration.hh
 include/Utilities/size_t_bits.hh
 include/Utilities/sort_permutation.hh
+include/Utilities/span.hh
 include/Utilities/testBoxIntersection.hh
 include/Utilities/timingUtilities.hh
 include/Utilities/uniform_random.hh
@@ -709,7 +703,13 @@ include/Utilities/uniform_random_Inline.hh
 include/VoronoiCells/SubPointPressureHourglassControl.hh
 include/VoronoiCells/VoronoiCells.hh
 include/VoronoiCells/computeVoronoiVolume.hh
-lib/cmake/spheral_cxx-config.cmake
-lib/cmake/spheral_cxx-targets-%%CMAKE_BUILD_TYPE%%.cmake
-lib/cmake/spheral_cxx-targets.cmake
+include/config.hh
+lib/cmake/spheral_cxx/BLTInstallableMacros.cmake
+lib/cmake/spheral_cxx/BLTSetupTargets.cmake
+lib/cmake/spheral_cxx/BLTThirdPartyConfigFlags.cmake
+lib/cmake/spheral_cxx/spheral_cxx-config.cmake
+lib/cmake/spheral_cxx/spheral_cxx-targets-%%CMAKE_BUILD_TYPE%%.cmake
+lib/cmake/spheral_cxx/spheral_cxx-targets.cmake
+lib/cmake/spheral_cxx/thirdparty/BLTSetupMPI.cmake
+lib/cmake/spheral_cxx/thirdparty/BLTSetupOpenMP.cmake
 lib/libSpheral_CXX.so