Fix warnings, consistent include guards, clean up (some) includes

CMakeLists.txt

@@ -160,7 +160,7 @@ endif()
 
 set(TRIBOL_DEBUG_DEFINE_STRING "${TRIBOL_DEBUG_DEFINE_STRING}" CACHE STRING "" FORCE)
 # Define AXOM_DEBUG for SLIC macros
-string(REPLACE "TRIBOL" "AXOM" AXOM_DEBUG_DEFINE_STRING TRIBOL_DEBUG_DEFINE_STRING)
+string(REPLACE "TRIBOL" "AXOM" AXOM_DEBUG_DEFINE_STRING "${TRIBOL_DEBUG_DEFINE_STRING}")
 set(AXOM_DEBUG_DEFINE_STRING "${AXOM_DEBUG_DEFINE_STRING}" CACHE STRING "" FORCE)
 
 #------------------------------------------------------------------------------

README.md

@@ -71,7 +71,7 @@ to build Tribol.
 
 The Tribol contact physics library requires:
 - CMake 3.14 or higher
-- C++14 compiler
+- C++17 compiler
 - MPI
 - mfem
 - axom

scripts/spack/packages/mfem/package.py

@@ -11,7 +11,7 @@ class Mfem(BuiltinMfem):
     # Note: Make sure this sha coincides with the git submodule
     # Note: We add a number to the end of the real version number to indicate that we have
     # moved forward past the release. Increment the last number when updating the commit sha.
-    version("4.8.0.1", commit="d9c1c34fdfaf3f7a9f56dfc82f7c083082a36fca")
+    version("4.9.0", commit="d9d6526cc1749980a2ba1da16e2c1ca1e07d82ec")
 
     variant('asan', default=False, description='Add Address Sanitizer flags')
 

scripts/spack/packages/tribol/package.py

@@ -81,6 +81,7 @@ class Tribol(CachedCMakePackage, CudaPackage, ROCmPackage):
 
     # Other libraries
     depends_on("[email protected]:+lapack")
+    depends_on("[email protected]:+lapack", when="+enzyme")
     depends_on("[email protected]:")
 
     depends_on("[email protected]:", when="+raja")
@@ -95,6 +96,8 @@ class Tribol(CachedCMakePackage, CudaPackage, ROCmPackage):
 
     depends_on("mfem+metis+mpi", when="+redecomp")
     depends_on("mfem+asan", when="+asan")
+    # Tribol uses MFEM's enzyme header
+    depends_on("mfem+enzyme", when="+enzyme")
 
     with when("+profiling"):
         depends_on("caliper+mpi")

src/examples/examples_common.hpp

@@ -3,8 +3,8 @@
 //
 // SPDX-License-Identifier: (MIT)
 
-#ifndef EXAMPLES_COMMON_HPP_
-#define EXAMPLES_COMMON_HPP_
+#ifndef SRC_EXAMPLES_EXAMPLES_COMMON_HPP_
+#define SRC_EXAMPLES_EXAMPLES_COMMON_HPP_
 
 // axom includes
 #include "axom/core.hpp"
@@ -425,4 +425,4 @@ void initialize_logger( tribol::CommT problem_comm )
  */
 void finalize_logger() { slic::finalize(); }
 
-#endif /* EXAMPLES_COMMON_HPP_ */
+#endif /* SRC_EXAMPLES_EXAMPLES_COMMON_HPP_ */

src/examples/mortar_lm_patch_test.cpp

@@ -8,13 +8,7 @@
 // Tribol includes
 #include "tribol/interface/tribol.hpp"
 #include "tribol/utils/TestUtils.hpp"
-#include "tribol/utils/Math.hpp"
 #include "tribol/common/Parameters.hpp"
-#include "tribol/mesh/MethodCouplingData.hpp"
-#include "tribol/mesh/CouplingScheme.hpp"
-#include "tribol/mesh/InterfacePairs.hpp"
-#include "tribol/mesh/MeshData.hpp"
-#include "tribol/geom/GeomUtilities.hpp"
 
 // Axom includes
 #include "axom/slic.hpp"
@@ -25,9 +19,7 @@
 #endif
 
 // C/C++ includes
-#include <cmath>    // for std::sin() and std::cos()
-#include <string>   // for std::string and operators
-#include <sstream>  // for std::ostringstream
+#include <string>  // for std::string and operators
 
 //----------------------------------------------------------------------------------
 // Example command line arguments for running this example. This test creates two
@@ -196,10 +188,8 @@ int main( int argc, char** argv )
     // instantiate mfem vector for RHS contributions
     int rhs_size = mesh.dim * mesh.numTotalNodes +  // equilibrium equations
                    mesh.numNonmortarSurfaceNodes;   // gap equations
-    RealT b[rhs_size];
-    tribol::initRealArray( &b[0], rhs_size, 0. );
-    mfem::Vector rhs( &b[0], rhs_size );
-    rhs = 0.;  // initialize
+    mfem::Vector rhs( rhs_size );
+    rhs = 0.0;  // initialize
 
     SLIC_INFO( "Finalized initial oversized sparse matrix and created rhs vector." );
 
@@ -230,7 +220,7 @@ int main( int argc, char** argv )
     /////////////////////////////////////////
     // populate RHS with gap contributions //
     /////////////////////////////////////////
-    mesh.getGapEvals( &b[0] );
+    mesh.getGapEvals( rhs.GetData() );
 
     SLIC_INFO( "Populated RHS gap contributions." );
 

src/redecomp/transfer/GridFnTransfer.hpp

@@ -3,8 +3,8 @@
 //
 // SPDX-License-Identifier: (MIT)
 
-#ifndef SRC_REDECOMP_GRIDFNTRANSFER_HPP_
-#define SRC_REDECOMP_GRIDFNTRANSFER_HPP_
+#ifndef SRC_REDECOMP_TRANSFER_GRIDFNTRANSFER_HPP_
+#define SRC_REDECOMP_TRANSFER_GRIDFNTRANSFER_HPP_
 
 #include "mfem.hpp"
 
@@ -43,4 +43,4 @@ class GridFnTransfer {
 
 }  // end namespace redecomp
 
-#endif /* SRC_REDECOMP_GRIDFNTRANSFER_HPP_ */
+#endif /* SRC_REDECOMP_TRANSFER_GRIDFNTRANSFER_HPP_ */

src/redecomp/transfer/MatrixTransfer.hpp

@@ -3,8 +3,8 @@
 //
 // SPDX-License-Identifier: (MIT)
 
-#ifndef SRC_REDECOMP_MATRIXTRANSFER_HPP_
-#define SRC_REDECOMP_MATRIXTRANSFER_HPP_
+#ifndef SRC_REDECOMP_TRANSFER_MATRIXTRANSFER_HPP_
+#define SRC_REDECOMP_TRANSFER_MATRIXTRANSFER_HPP_
 
 #include "mfem.hpp"
 
@@ -202,4 +202,4 @@ class MatrixTransfer {
 
 }  // end namespace redecomp
 
-#endif /* SRC_REDECOMP_MATRIXTRANSFER_HPP_ */
+#endif /* SRC_REDECOMP_TRANSFER_MATRIXTRANSFER_HPP_ */

src/redecomp/transfer/SparseMatrixTransfer.hpp

@@ -3,8 +3,8 @@
 //
 // SPDX-License-Identifier: (MIT)
 
-#ifndef SRC_REDECOMP_SPARSEMATRIXTRANSFER_HPP_
-#define SRC_REDECOMP_SPARSEMATRIXTRANSFER_HPP_
+#ifndef SRC_REDECOMP_TRANSFER_SPARSEMATRIXTRANSFER_HPP_
+#define SRC_REDECOMP_TRANSFER_SPARSEMATRIXTRANSFER_HPP_
 
 #include <memory>
 
@@ -113,4 +113,4 @@ class SparseMatrixTransfer {
 
 }  // end namespace redecomp
 
-#endif /* SRC_REDECOMP_SPARSEMATRIXTRANSFER_HPP_ */
+#endif /* SRC_REDECOMP_TRANSFER_SPARSEMATRIXTRANSFER_HPP_ */

src/redecomp/transfer/TransferByElements.hpp

@@ -3,8 +3,8 @@
 //
 // SPDX-License-Identifier: (MIT)
 
-#ifndef SRC_REDECOMP_TRANSFERBYELEMENTS_HPP_
-#define SRC_REDECOMP_TRANSFERBYELEMENTS_HPP_
+#ifndef SRC_REDECOMP_TRANSFER_TRANSFERBYELEMENTS_HPP_
+#define SRC_REDECOMP_TRANSFER_TRANSFERBYELEMENTS_HPP_
 
 #include "redecomp/transfer/GridFnTransfer.hpp"
 
@@ -47,4 +47,4 @@ class TransferByElements : public GridFnTransfer {
 
 }  // end namespace redecomp
 
-#endif /* SRC_REDECOMP_TRANSFERBYELEMENTS_HPP_ */
+#endif /* SRC_REDECOMP_TRANSFER_TRANSFERBYELEMENTS_HPP_ */

src/redecomp/transfer/TransferByNodes.hpp

@@ -3,8 +3,8 @@
 //
 // SPDX-License-Identifier: (MIT)
 
-#ifndef SRC_REDECOMP_TRANSFERBYNODES_HPP_
-#define SRC_REDECOMP_TRANSFERBYNODES_HPP_
+#ifndef SRC_REDECOMP_TRANSFER_TRANSFERBYNODES_HPP_
+#define SRC_REDECOMP_TRANSFER_TRANSFERBYNODES_HPP_
 
 #include "mfem.hpp"
 
@@ -120,4 +120,4 @@ class TransferByNodes : public GridFnTransfer {
 
 }  // end namespace redecomp
 
-#endif /* SRC_REDECOMP_TRANSFERBYNODES_HPP_ */
+#endif /* SRC_REDECOMP_TRANSFER_TRANSFERBYNODES_HPP_ */

src/redecomp/utils/BisecTree.hpp

@@ -331,4 +331,4 @@ class BisecTree {
 
 }  // end namespace redecomp
 
-#endif /* SRC_REDECOMP_BISECTREE_HPP_ */
+#endif /* SRC_REDECOMP_UTILS_BISECTREE_HPP_ */

src/shared/mesh/MeshBuilder.hpp

@@ -1,5 +1,5 @@
-#ifndef SRC_SHARED_MESHBUILDER_HPP_
-#define SRC_SHARED_MESHBUILDER_HPP_
+#ifndef SRC_SHARED_MESH_MESHBUILDER_HPP_
+#define SRC_SHARED_MESH_MESHBUILDER_HPP_
 
 #include <initializer_list>
 
@@ -220,4 +220,4 @@ class ParMeshBuilder {
 
 }  // namespace shared
 
-#endif  // SRC_SHARED_MESHBUILDER_HPP_
+#endif  // SRC_SHARED_MESH_MESHBUILDER_HPP_

src/tests/tribol_common_plane_gpu.cpp

@@ -3,6 +3,8 @@
 //
 // SPDX-License-Identifier: (MIT)
 
+#include "tribol/config.hpp"
+
 #include "gtest/gtest.h"
 
 #include "mfem.hpp"

src/tests/tribol_comp_geom_3d.cpp

@@ -55,7 +55,7 @@ class CompGeomTest : public ::testing::Test {
   {
     // if element thickness is not registered by test, then register dummy
     // element thickness in order to use auto contact
-    RealT element_thickness[numCells];
+    tribol::Array1D<tribol::RealT> element_thickness( numCells );
     if ( !m_isElementThicknessRegistered ) {
       for ( int i = 0; i < numCells; ++i ) {
         element_thickness[i] = 1.0;

src/tests/tribol_coupling_scheme.cpp

@@ -8,30 +8,16 @@
 #include "tribol/utils/TestUtils.hpp"
 #include "tribol/utils/Math.hpp"
 #include "tribol/common/Parameters.hpp"
-#include "tribol/mesh/MethodCouplingData.hpp"
 #include "tribol/mesh/CouplingScheme.hpp"
-#include "tribol/mesh/InterfacePairs.hpp"
-#include "tribol/mesh/MeshData.hpp"
-#include "tribol/geom/GeomUtilities.hpp"
 
 #ifdef TRIBOL_USE_UMPIRE
 // Umpire includes
 #include "umpire/ResourceManager.hpp"
 #endif
 
-// Axom includes
-#include "axom/slic.hpp"
-
 // gtest includes
 #include "gtest/gtest.h"
 
-// c++ includes
-#include <cmath>  // std::abs, std::cos, std::sin
-#include <iostream>
-#include <sstream>
-#include <iomanip>
-#include <fstream>
-
 using RealT = tribol::RealT;
 
 /*!
@@ -211,8 +197,8 @@ TEST_F( CouplingSchemeTest, single_mortar_2D )
 
   // register dummy nodal fields so error doesn't return from field
   // registration
-  RealT gaps[this->m_lengthNodalData];
-  RealT pressures[this->m_lengthNodalData];
+  tribol::Array1D<RealT> gaps( this->m_lengthNodalData );
+  tribol::Array1D<RealT> pressures( this->m_lengthNodalData );
 
   tribol::registerMortarGaps( 1, &gaps[0] );
   tribol::registerMortarPressures( 1, &pressures[0] );
@@ -240,8 +226,8 @@ TEST_F( CouplingSchemeTest, aligned_mortar_2D )
 
   // register dummy nodal fields so error doesn't return from field
   // registration
-  RealT gaps[this->m_lengthNodalData];
-  RealT pressures[this->m_lengthNodalData];
+  tribol::Array1D<RealT> gaps( this->m_lengthNodalData );
+  tribol::Array1D<RealT> pressures( this->m_lengthNodalData );
 
   tribol::registerMortarGaps( 1, &gaps[0] );
   tribol::registerMortarPressures( 1, &pressures[0] );
@@ -290,8 +276,8 @@ TEST_F( CouplingSchemeTest, single_mortar_3D_penalty )
 
   // register dummy nodal fields so error doesn't return from field
   // registration
-  RealT gaps[this->m_lengthNodalData];
-  RealT pressures[this->m_lengthNodalData];
+  tribol::Array1D<RealT> gaps( this->m_lengthNodalData );
+  tribol::Array1D<RealT> pressures( this->m_lengthNodalData );
 
   tribol::registerMortarGaps( 1, &gaps[0] );
   tribol::registerMortarPressures( 1, &pressures[0] );
@@ -358,8 +344,8 @@ TEST_F( CouplingSchemeTest, mortar_tied )
 
   // register dummy nodal fields so error doesn't return from field
   // registration
-  RealT gaps[this->m_lengthNodalData];
-  RealT pressures[this->m_lengthNodalData];
+  tribol::Array1D<RealT> gaps( this->m_lengthNodalData );
+  tribol::Array1D<RealT> pressures( this->m_lengthNodalData );
 
   tribol::registerMortarGaps( 1, &gaps[0] );
   tribol::registerMortarPressures( 1, &pressures[0] );
@@ -387,8 +373,8 @@ TEST_F( CouplingSchemeTest, mortar_coulomb )
 
   // register dummy nodal fields so error doesn't return from field
   // registration
-  RealT gaps[this->m_lengthNodalData];
-  RealT pressures[this->m_lengthNodalData];
+  tribol::Array1D<RealT> gaps( this->m_lengthNodalData );
+  tribol::Array1D<RealT> pressures( this->m_lengthNodalData );
 
   tribol::registerMortarGaps( 1, &gaps[0] );
   tribol::registerMortarPressures( 1, &pressures[0] );
@@ -818,8 +804,8 @@ TEST_F( CouplingSchemeTest, single_mortar_null_response_pointers )
   registerDummy3DMesh( 0, numCells, setResponse );
   registerDummy3DMesh( 1, numCells, setResponse );
 
-  RealT gaps[this->m_lengthNodalData];
-  RealT pressures[this->m_lengthNodalData];
+  tribol::Array1D<RealT> gaps( this->m_lengthNodalData );
+  tribol::Array1D<RealT> pressures( this->m_lengthNodalData );
 
   tribol::registerMortarGaps( 1, &gaps[0] );
   tribol::registerMortarPressures( 1, &pressures[0] );

src/tests/tribol_enzyme_nodal_normal.cpp

@@ -67,7 +67,7 @@ class EnzymeNodalNormalTest : public testing::Test {
 
     mfem::DenseMatrix dndx_fd( num_dofs );
     auto mesh_view = mesh.getView();
-    Array2D<RealT> n_base = mesh_view.getNodalNormals();
+    axom::Array<RealT, 2> n_base = mesh_view.getNodalNormals();
     for ( int dx{ 0 }; dx < mesh.spatialDimension(); ++dx ) {
       for ( int nx{ 0 }; nx < mesh.numberOfNodes(); ++nx ) {
         auto x_idx = dx * mesh.numberOfNodes() + nx;