From eb4a5864d1ff2b24d63dbfbd7a755c91d169a0eb Mon Sep 17 00:00:00 2001 From: Brody Richard Bassett Date: Wed, 29 Mar 2023 13:31:17 -0700 Subject: [PATCH 01/10] Added helper function for connectivity. Added comments. --- src/KernelIntegrator/FlatConnectivity.hh | 19 +++++++++++++++++-- .../FlatConnectivityInline.hh | 15 +++++++++++++++ 2 files changed, 32 insertions(+), 2 deletions(-) diff --git a/src/KernelIntegrator/FlatConnectivity.hh b/src/KernelIntegrator/FlatConnectivity.hh index 90d912244..83771ba8b 100644 --- a/src/KernelIntegrator/FlatConnectivity.hh +++ b/src/KernelIntegrator/FlatConnectivity.hh @@ -46,10 +46,17 @@ public: int firstGlobalIndex() const; int lastGlobalIndex() const; - // Local and global number of elements + // Number of nodes owned by this processor, including constant boundary nodes int numNodes() const; + + // Number of variable nodes owned by this processor int numInternalNodes() const; + + // Total number of variable nodes among all processors int numGlobalNodes() const; + + // Number of constant boundary nodes on this processor + // This doesn't include ghost nodes that are variable and owned by this or another processor int numBoundaryNodes() const; // Get local index from NodeList and Node indices @@ -64,10 +71,18 @@ public: // Number of neighbors, including self, for this point int numNeighbors(const int locali) const; int numOverlapNeighbors(const int locali) const; + + // Number of neighbors that are constant due to boundaries int numConstNeighbors(const int locali) const; int numConstOverlapNeighbors(const int locali) const; + + // Number of neighbors that are variables, on this proc or another int numNonConstNeighbors(const int locali) const; int numNonConstOverlapNeighbors(const int locali) const; + + // The sum of non-const neighbors over all internal nodes + // Corresponds to the size of the flattened connectivity in a matrix solve + int totalNumNonConstNeighbors() const; // For the point i, for its neighbor j, get the flattened index for point j int localToFlat(const int locali, const int localj) const; // return flatj @@ -169,7 +184,7 @@ private: // Size information int mNumLocalNodes; int mNumInternalLocalNodes; - int mNumConnectivityNodes; + int mNumConnectivityNodes; int mNumGlobalNodes; int mNumBoundaryNodes; int mFirstGlobalIndex; diff --git a/src/KernelIntegrator/FlatConnectivityInline.hh b/src/KernelIntegrator/FlatConnectivityInline.hh index 712527e21..9275fc0bc 100644 --- a/src/KernelIntegrator/FlatConnectivityInline.hh +++ b/src/KernelIntegrator/FlatConnectivityInline.hh @@ -243,6 +243,21 @@ numNonConstOverlapNeighbors(const int locali) const { return mNumOverlapNeighbors[locali] - mNumConstantBoundaryOverlapNeighbors[locali]; } +template +inline +int +FlatConnectivity:: +totalNumNonConstNeighbors() const { + CHECK(mIndexingInitialized); + CHECK(mBoundaryInformationInitialized); + auto total = 0; + for (auto locali = 0; locali < mNumInternalLocalNodes; ++locali) + { + total += mNumNeigbors[locali] - mNumConstantBoundaryNeighbors[locali]; + } + return total; +} + //------------------------------------------------------------------------------ // For the point i, for its neighbor j, get the flattened index for point j //------------------------------------------------------------------------------ From 3b3dbfc7586f3a9882d5e8e842c2347422880c8a Mon Sep 17 00:00:00 2001 From: Brody Richard Bassett Date: Wed, 29 Mar 2023 16:51:57 -0700 Subject: [PATCH 02/10] Updates for axom version. --- CMakeLists.txt | 2 +- cmake/InstallTPLs.cmake | 4 ++-- src/KernelIntegrator/FlatConnectivityInline.hh | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 2ebb5f77c..38eaa5b1e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,7 +1,7 @@ # CMakeLists to build the Spheral library. cmake_minimum_required(VERSION 3.10) -project(spheral LANGUAGES CXX Fortran) +project(spheral LANGUAGES C CXX Fortran) set(SPHERAL_ROOT_DIR ${CMAKE_CURRENT_SOURCE_DIR}) set(SPHERAL_TEST_INSTALL_PREFIX ${CMAKE_INSTALL_PREFIX}) diff --git a/cmake/InstallTPLs.cmake b/cmake/InstallTPLs.cmake index ae1d758a4..09caca862 100644 --- a/cmake/InstallTPLs.cmake +++ b/cmake/InstallTPLs.cmake @@ -19,8 +19,8 @@ Spheral_Handle_TPL(silo spheral_depends cxx) #Spheral_Handle_TPL(conduit spheral_depends cxx) find_package(axom REQUIRED QUIET NO_DEFAULT_PATH PATHS ${axom_DIR}/lib/cmake) if(axom_FOUND) - list(APPEND spheral_blt_cxx_depends axom fmt) - blt_patch_target(NAME fmt TREAT_INCLUDES_AS_SYSTEM On) + list(APPEND spheral_blt_cxx_depends axom axom::fmt) + blt_patch_target(NAME axom::fmt TREAT_INCLUDES_AS_SYSTEM On) message(STATUS "Found axom: ${axom_DIR} (found version ${axom_VERSION})") endif() diff --git a/src/KernelIntegrator/FlatConnectivityInline.hh b/src/KernelIntegrator/FlatConnectivityInline.hh index 9275fc0bc..b1fe618e9 100644 --- a/src/KernelIntegrator/FlatConnectivityInline.hh +++ b/src/KernelIntegrator/FlatConnectivityInline.hh @@ -253,7 +253,7 @@ totalNumNonConstNeighbors() const { auto total = 0; for (auto locali = 0; locali < mNumInternalLocalNodes; ++locali) { - total += mNumNeigbors[locali] - mNumConstantBoundaryNeighbors[locali]; + total += mNumNeighbors[locali] - mNumConstantBoundaryNeighbors[locali]; } return total; } From 57773d0e5ee6d37c74ed2e55203fdd89b1a5c6f7 Mon Sep 17 00:00:00 2001 From: Brody Richard Bassett Date: Thu, 30 Mar 2023 11:30:01 -0700 Subject: [PATCH 03/10] Removed space. --- src/KernelIntegrator/FlatConnectivity.hh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/KernelIntegrator/FlatConnectivity.hh b/src/KernelIntegrator/FlatConnectivity.hh index 83771ba8b..f1c9b0c4b 100644 --- a/src/KernelIntegrator/FlatConnectivity.hh +++ b/src/KernelIntegrator/FlatConnectivity.hh @@ -184,7 +184,7 @@ private: // Size information int mNumLocalNodes; int mNumInternalLocalNodes; - int mNumConnectivityNodes; + int mNumConnectivityNodes; int mNumGlobalNodes; int mNumBoundaryNodes; int mFirstGlobalIndex; From 0da40f173bb1488f29c67d56555bb4e6093bafd4 Mon Sep 17 00:00:00 2001 From: Brody Richard Bassett Date: Wed, 12 Apr 2023 16:01:00 -0700 Subject: [PATCH 04/10] Fixing incorrect sizes due to size of nodeLists vs fluidNodeLists. --- src/KernelIntegrator/BilinearIndex.cc | 4 +-- src/KernelIntegrator/FlatConnectivity.cc | 32 ++++++++++++------------ src/KernelIntegrator/KernelIntegrator.cc | 6 ++--- 3 files changed, 21 insertions(+), 21 deletions(-) diff --git a/src/KernelIntegrator/BilinearIndex.cc b/src/KernelIntegrator/BilinearIndex.cc index e28f32b41..c4373d6e6 100644 --- a/src/KernelIntegrator/BilinearIndex.cc +++ b/src/KernelIntegrator/BilinearIndex.cc @@ -36,7 +36,7 @@ computeConnectivity(const DataBase& dataBase) { mConnectivityInitialized = true; } - const auto numNodeLists = dataBase.numNodeLists(); + const auto numNodeLists = dataBase.numFluidNodeLists(); const auto& connectivityMap = dataBase.connectivityMap(); // Clear the index arrays and make a guess about how many indices there will be @@ -128,7 +128,7 @@ computeSurfaceIndexing(const DataBase& dataBase, } // Get DataBase values - const auto numNodeLists = dataBase.numNodeLists(); + const auto numNodeLists = dataBase.numFluidNodeLists(); const auto& connectivityMap = dataBase.connectivityMap(); // Get State values diff --git a/src/KernelIntegrator/FlatConnectivity.cc b/src/KernelIntegrator/FlatConnectivity.cc index 28d22ec67..482707081 100644 --- a/src/KernelIntegrator/FlatConnectivity.cc +++ b/src/KernelIntegrator/FlatConnectivity.cc @@ -47,9 +47,9 @@ void FlatConnectivity:: computeIndices(const DataBase& dataBase) { // Get information from DataBase - const auto numNodeListsDB = dataBase.numNodeLists(); - const auto numNodesDB = dataBase.numNodes(); - const auto numInternalNodesDB = dataBase.numInternalNodes(); + const auto numNodeListsDB = dataBase.numFluidNodeLists(); + const auto numNodesDB = dataBase.numFluidNodes(); + const auto numInternalNodesDB = dataBase.numFluidInternalNodes(); const auto& connectivity = dataBase.connectivityMap(); const auto requireGhostConnectivity = connectivity.buildGhostConnectivity(); @@ -188,9 +188,9 @@ computeOverlapIndices(const DataBase& dataBase) { VERIFY(mIndexingInitialized); // Get information from DataBase - const auto numNodeListsDB = dataBase.numNodeLists(); - const auto numNodesDB = dataBase.numNodes(); - const auto numInternalNodesDB = dataBase.numInternalNodes(); + const auto numNodeListsDB = dataBase.numFluidNodeLists(); + const auto numNodesDB = dataBase.numFluidNodes(); + const auto numInternalNodesDB = dataBase.numFluidInternalNodes(); const auto& connectivity = dataBase.connectivityMap(); const auto requireGhostConnectivity = connectivity.buildGhostConnectivity(); VERIFY(connectivity.buildOverlapConnectivity()); @@ -299,10 +299,10 @@ computeGlobalIndices(const DataBase& dataBase, VERIFY(mIndexingInitialized); // Get information from DataBase - const auto numNodeListsDB = dataBase.numNodeLists(); - const auto numNodesDB = dataBase.numNodes(); - const auto numInternalNodesDB = dataBase.numInternalNodes(); - const auto numGlobalNodesDB = dataBase.globalNumInternalNodes(); + const auto numNodeListsDB = dataBase.numFluidNodeLists(); + const auto numNodesDB = dataBase.numFluidNodes(); + const auto numInternalNodesDB = dataBase.numFluidInternalNodes(); + const auto numGlobalNodesDB = dataBase.globalNumFluidInternalNodes(); // Make sure number of nodes has not changed since computing indices VERIFY(numNodesDB == mNumLocalNodes); @@ -387,9 +387,9 @@ computeSurfaceIndices(const DataBase& dataBase, VERIFY(mGhostIndexingInitialized); // Could consider editing to not require this // Get information from the DataBase and State - const auto numNodeListsDB = dataBase.numNodeLists(); - const auto numNodesDB = dataBase.numNodes(); - const auto numInternalNodesDB = dataBase.numInternalNodes(); + const auto numNodeListsDB = dataBase.numFluidNodeLists(); + const auto numNodesDB = dataBase.numFluidNodes(); + const auto numInternalNodesDB = dataBase.numFluidInternalNodes(); const auto& connectivity = dataBase.connectivityMap(); const auto cells = state.fields(HydroFieldNames::cells, FacetedVolume()); const auto cellFaceFlags = state.fields(HydroFieldNames::cellFaceFlags, std::vector()); @@ -535,9 +535,9 @@ computeBoundaryInformation(const DataBase& dataBase, VERIFY(mIndexingInitialized); // Get information from the dataBase - const auto numNodeListsDB = dataBase.numNodeLists(); - const auto numNodesDB = dataBase.numNodes(); - const auto numInternalNodesDB = dataBase.numInternalNodes(); + const auto numNodeListsDB = dataBase.numFluidNodeLists(); + const auto numNodesDB = dataBase.numFluidNodes(); + const auto numInternalNodesDB = dataBase.numFluidInternalNodes(); // Make sure the sizes haven't changed since the indexing was initialized VERIFY(numNodesDB == mNumLocalNodes); diff --git a/src/KernelIntegrator/KernelIntegrator.cc b/src/KernelIntegrator/KernelIntegrator.cc index 2334d7b30..a3a838b2f 100644 --- a/src/KernelIntegrator/KernelIntegrator.cc +++ b/src/KernelIntegrator/KernelIntegrator.cc @@ -82,15 +82,15 @@ performIntegration() { VERIFY2(omp_get_num_threads() == 1, "integration fails for > 1 OpenMP thread"); // Get some data out of database and state - const auto numNodeLists = mDataBase.numNodeLists(); + const auto numNodeLists = mDataBase.numFluidNodeLists(); const auto position = mState.fields(HydroFieldNames::position, Vector::zero); const auto H = mState.fields(HydroFieldNames::H, SymTensor::zero); const auto volume = mState.fields(HydroFieldNames::volume, 0.0); const auto cells = mState.fields(HydroFieldNames::cells, FacetedVolume()); // Since we may be receiving state from user, we need to make sure FieldLists aren't empty - VERIFY(position.size() == numNodeLists && - H.size() == numNodeLists && + VERIFY(position.size() >= numNodeLists && + H.size() >= numNodeLists && cells.size() == numNodeLists); // Initialize the integration quadrature for a single triangle From 65850bb17cd284cc6f4ed1c72969c1d640f0ed28 Mon Sep 17 00:00:00 2001 From: Brody Richard Bassett Date: Wed, 12 Apr 2023 17:55:42 -0700 Subject: [PATCH 05/10] More fluid vs regular node fixes for flat connectivity. --- src/KernelIntegrator/FlatConnectivity.cc | 22 +++++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) diff --git a/src/KernelIntegrator/FlatConnectivity.cc b/src/KernelIntegrator/FlatConnectivity.cc index 482707081..6ca9fb91c 100644 --- a/src/KernelIntegrator/FlatConnectivity.cc +++ b/src/KernelIntegrator/FlatConnectivity.cc @@ -20,6 +20,22 @@ #include "Utilities/DBC.hh" #include "Utilities/globalNodeIDs.hh" +namespace { // anonymous +template +int +numFluidNeighbors(const DataBase& dataBase, + const std::vector>& connectivity) +{ + auto numNeighbors = 0; + for (auto nodeListItrj = dataBase.fluidNodeListBegin(); + nodeListItrj != dataBase.fluidNodeListEnd(); + ++nodeListItrj, ++nodeListj) { + numNeighbors += connectivity[nodeListj].size(); + } + return numNeighbors; +} +} // end namespace anonymous + namespace Spheral { //------------------------------------------------------------------------------ @@ -109,10 +125,10 @@ computeIndices(const DataBase& dataBase) { const auto numNodesi = requireGhostConnectivity ? (*nodeListItri)->numNodes() : (*nodeListItri)->numInternalNodes(); for (auto nodei = 0u; nodei < numNodesi; ++nodei) { // Get data from the connectivity map - const auto numNeighborsi = connectivity.numNeighborsForNode(nodeListi, nodei); const auto connectivityi = connectivity.connectivityForNode(nodeListi, nodei); const auto locali = mNodeToLocalIndex[nodeListi][nodei]; - + const auto numNeighborsi = numFluidNeighbors(connectivityi, dataBase); + // Resize the arrays CHECK(locali < mNumConnectivityNodes); mNumNeighbors[locali] = numNeighborsi + 1; @@ -213,9 +229,9 @@ computeOverlapIndices(const DataBase& dataBase) { const auto numNodesi = requireGhostConnectivity ? (*nodeListItri)->numNodes() : (*nodeListItri)->numInternalNodes(); for (auto nodei = 0u; nodei < numNodesi; ++nodei) { // Get data from the connectivity map - const auto numNeighborsi = connectivity.numOverlapNeighborsForNode(nodeListi, nodei); const auto connectivityi = connectivity.overlapConnectivityForNode(nodeListi, nodei); const auto locali = mNodeToLocalIndex[nodeListi][nodei]; + const auto numNeighborsi = numFluidNeighbors(connectivityi, dataBase); // Resize the arrays mNumOverlapNeighbors[locali] = numNeighborsi + 1; From 76af0825b1d94ef0c08b21d4840f744c8a6160e6 Mon Sep 17 00:00:00 2001 From: Brody Richard Bassett Date: Fri, 14 Apr 2023 16:30:38 -0700 Subject: [PATCH 06/10] Compilation error. --- src/KernelIntegrator/FlatConnectivity.cc | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/KernelIntegrator/FlatConnectivity.cc b/src/KernelIntegrator/FlatConnectivity.cc index 6ca9fb91c..cc67c6ded 100644 --- a/src/KernelIntegrator/FlatConnectivity.cc +++ b/src/KernelIntegrator/FlatConnectivity.cc @@ -20,13 +20,16 @@ #include "Utilities/DBC.hh" #include "Utilities/globalNodeIDs.hh" +namespace Spheral { + namespace { // anonymous template int -numFluidNeighbors(const DataBase& dataBase, - const std::vector>& connectivity) +numFluidNeighbors(const std::vector>& connectivity, + const DataBase& dataBase) { auto numNeighbors = 0; + auto nodeListj = 0; for (auto nodeListItrj = dataBase.fluidNodeListBegin(); nodeListItrj != dataBase.fluidNodeListEnd(); ++nodeListItrj, ++nodeListj) { @@ -36,8 +39,6 @@ numFluidNeighbors(const DataBase& dataBase, } } // end namespace anonymous -namespace Spheral { - //------------------------------------------------------------------------------ // Constructor //------------------------------------------------------------------------------ From 95fa659d4766d72a70306faef9eb56819e37f89f Mon Sep 17 00:00:00 2001 From: Brody Richard Bassett Date: Tue, 25 Apr 2023 10:07:31 -0700 Subject: [PATCH 07/10] Added checks to make sure NodeList ordering assumptions are correct. --- src/KernelIntegrator/FlatConnectivity.cc | 24 ++++++++++++++++++++++++ src/KernelIntegrator/FlatConnectivity.hh | 14 +++++++++++++- src/KernelIntegrator/KernelIntegral.cc | 2 +- 3 files changed, 38 insertions(+), 2 deletions(-) diff --git a/src/KernelIntegrator/FlatConnectivity.cc b/src/KernelIntegrator/FlatConnectivity.cc index cc67c6ded..35be4fd65 100644 --- a/src/KernelIntegrator/FlatConnectivity.cc +++ b/src/KernelIntegrator/FlatConnectivity.cc @@ -63,6 +63,8 @@ template void FlatConnectivity:: computeIndices(const DataBase& dataBase) { + VERIFY(fluidNodeListsFirst(dataBase)); + // Get information from DataBase const auto numNodeListsDB = dataBase.numFluidNodeLists(); const auto numNodesDB = dataBase.numFluidNodes(); @@ -804,6 +806,28 @@ globalOverlapNeighborIndices(const int locali, CHECK(index == numNonConstNeighbors); } +//------------------------------------------------------------------------------ +// Check whether NodeList ordering is appropriate for this function +//------------------------------------------------------------------------------ +template +bool +FlatConnectivity:: +fluidNodeListsFirst(const DataBase& dataBase) const +{ + const auto numFluidNodeLists = dataBase.numFluidNodeLists(); + auto nodeListi = 0; + auto nodeListItri = dataBase.nodeListBegin(); + auto nodeListItrj = dataBase.fluidNodeListBegin(); + for (; nodeListItrj != dataBase.fluidNodeListEnd(); + ++nodeListItri, ++nodeListItrj, ++nodeListi) { + if (*nodeListItri != *nodeListItrj) + { + return false; + } + } + return true; +} + // //------------------------------------------------------------------------------ // // Check whether two points overlap, given the H values // //------------------------------------------------------------------------------ diff --git a/src/KernelIntegrator/FlatConnectivity.hh b/src/KernelIntegrator/FlatConnectivity.hh index f1c9b0c4b..b503daa44 100644 --- a/src/KernelIntegrator/FlatConnectivity.hh +++ b/src/KernelIntegrator/FlatConnectivity.hh @@ -172,7 +172,7 @@ public: // const Scalar extent) const; private: - + // Keep track of what has been initialized bool mIndexingInitialized; bool mGhostIndexingInitialized; @@ -233,6 +233,18 @@ private: // Scratch mutable ArrayDim mScratchArray; + + // The functions in this class assume that the FluidNodeLists come first in the + // connectivity order; that is, that the standard NodeLists are at the end of + // the alphabetical ordering in the DataBase. This is not generally true, but + // this class isn't used at the moment when this is not true. This function + // checks whether the standard NodeLists are at the end of the ordering. + // The root of the issue is that the connectivity for a point takes an integer index, + // while we iterate over NodeList iterators. We could either have the point connectivity + // accept a NodeList iterator or we could iterate over FluidNodeList indices. + // This function checks that the NodeLists are ordered as expected. + bool fluidNodeListsFirst(const DataBase& dataBase) const; + }; } // end namespace Spheral diff --git a/src/KernelIntegrator/KernelIntegral.cc b/src/KernelIntegrator/KernelIntegral.cc index f5ecd8a7c..93d55f7e1 100644 --- a/src/KernelIntegrator/KernelIntegral.cc +++ b/src/KernelIntegrator/KernelIntegral.cc @@ -60,7 +60,7 @@ LinearKernelVector:: addToIntegral(const KernelIntegrationData& kid) { const auto coeff = this->mCoefficient->evaluateCoefficient(kid); const auto numIndices = kid.indices.size(); - CHECK(kid.dvalues.size() == numIndices); + CHECK(kid.values.size() == numIndices); CHECK(kid.indices.size() == numIndices); for (auto i = 0u; i < numIndices; ++i) { const size_t locali = kid.indices[i]; From 43358876b4aeb2c7f5f7af47b6b2f96ad4861151 Mon Sep 17 00:00:00 2001 From: Brody Richard Bassett Date: Mon, 5 Jun 2023 10:56:41 -0700 Subject: [PATCH 08/10] Changed axom version. --- scripts/spack/packages/spheral/package.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/spack/packages/spheral/package.py b/scripts/spack/packages/spheral/package.py index 11f3881b0..5a75f5386 100644 --- a/scripts/spack/packages/spheral/package.py +++ b/scripts/spack/packages/spheral/package.py @@ -52,8 +52,8 @@ class Spheral(CachedCMakePackage, CudaPackage): depends_on('conduit@0.8.2 +shared +mpi +hdf5 -test ~parmetis', type='build', when='+mpi') depends_on('conduit@0.8.2 +shared ~mpi +hdf5 -test ~parmetis', type='build', when='~mpi') - depends_on('axom@0.5.0 ~shared +mpi +hdf5 -lua -examples -python -fortran -umpire -raja', type='build', when='+mpi') - depends_on('axom@0.5.0 ~shared ~mpi +hdf5 -lua -examples -python -fortran -umpire -raja', type='build', when='~mpi') + depends_on('axom@0.7.0 ~shared +mpi +hdf5 -lua -examples -python -fortran -umpire -raja', type='build', when='+mpi') + depends_on('axom@0.7.0 ~shared ~mpi +hdf5 -lua -examples -python -fortran -umpire -raja', type='build', when='~mpi') depends_on('caliper@2.8.0 ~shared ~adiak ~libdw ~papi ~libunwind +pic', type='build') From 97298534a658e4b818999d7c2276043fc1585a72 Mon Sep 17 00:00:00 2001 From: mdavis36 Date: Fri, 9 Jun 2023 06:03:33 -0700 Subject: [PATCH 09/10] axom::fmt -> fmt --- cmake/InstallTPLs.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cmake/InstallTPLs.cmake b/cmake/InstallTPLs.cmake index be85c925c..76182950c 100644 --- a/cmake/InstallTPLs.cmake +++ b/cmake/InstallTPLs.cmake @@ -58,8 +58,8 @@ Spheral_Handle_TPL(silo spheral_depends cxx) #Spheral_Handle_TPL(conduit spheral_depends cxx) find_package(axom REQUIRED QUIET NO_DEFAULT_PATH PATHS ${axom_DIR}/lib/cmake) if(axom_FOUND) - list(APPEND spheral_blt_cxx_depends axom axom::fmt) - blt_patch_target(NAME axom::fmt TREAT_INCLUDES_AS_SYSTEM On) + list(APPEND spheral_blt_cxx_depends axom fmt) + blt_patch_target(NAME fmt TREAT_INCLUDES_AS_SYSTEM On) message(STATUS "Found axom: ${axom_DIR} (found version ${axom_VERSION})") endif() From 234bb48233891610a92f55174513756c0ec42297 Mon Sep 17 00:00:00 2001 From: Brody Richard Bassett Date: Fri, 9 Jun 2023 10:04:13 -0700 Subject: [PATCH 10/10] Removed unused variable. --- src/KernelIntegrator/FlatConnectivity.cc | 1 - 1 file changed, 1 deletion(-) diff --git a/src/KernelIntegrator/FlatConnectivity.cc b/src/KernelIntegrator/FlatConnectivity.cc index 35be4fd65..4645a1476 100644 --- a/src/KernelIntegrator/FlatConnectivity.cc +++ b/src/KernelIntegrator/FlatConnectivity.cc @@ -814,7 +814,6 @@ bool FlatConnectivity:: fluidNodeListsFirst(const DataBase& dataBase) const { - const auto numFluidNodeLists = dataBase.numFluidNodeLists(); auto nodeListi = 0; auto nodeListItri = dataBase.nodeListBegin(); auto nodeListItrj = dataBase.fluidNodeListBegin();