diff --git a/.gitmodules b/.gitmodules index 6c72b1712e3..b714e941553 100644 --- a/.gitmodules +++ b/.gitmodules @@ -8,4 +8,4 @@ [submodule "src/cmake/blt"] path = src/cmake/blt - url = git@github.com:LLNL/blt.git + url = ../../LLNL/blt.git diff --git a/src/components/CMakeLists.txt b/src/components/CMakeLists.txt index a9e64cd8f85..3a7b2589106 100644 --- a/src/components/CMakeLists.txt +++ b/src/components/CMakeLists.txt @@ -1,6 +1,4 @@ message( "Entering /src/components/CMakeLists.txt") -blt_append_custom_compiler_flag(FLAGS_VAR CMAKE_CXX_FLAGS DEFAULT -I${CMAKE_SOURCE_DIR}/components/core/src) -blt_append_custom_compiler_flag(FLAGS_VAR CMAKE_CXX_FLAGS DEFAULT -I${PROJECT_BINARY_DIR}/include ) # Python config diff --git a/src/components/PhysicsSolverPackage1 b/src/components/PhysicsSolverPackage1 index c7c75a4138a..b9d21a00eec 160000 --- a/src/components/PhysicsSolverPackage1 +++ b/src/components/PhysicsSolverPackage1 @@ -1 +1 @@ -Subproject commit c7c75a4138abc3071ac73074835192a7c9878be2 +Subproject commit b9d21a00eecc0f5a78b0d1b64850d7617a2973b6 diff --git a/src/components/core/src/CMakeLists.txt b/src/components/core/src/CMakeLists.txt index eea20f9c8ef..45a3fdaaee6 100644 --- a/src/components/core/src/CMakeLists.txt +++ b/src/components/core/src/CMakeLists.txt @@ -9,23 +9,36 @@ set(geosx_headers "" ) # set(geosx_core_sources "" ) - -add_subdirectory(codingUtilities) -add_subdirectory(common) -add_subdirectory(constitutive) -add_subdirectory(dataRepository) -add_subdirectory(fileIO) -add_subdirectory(finiteElement) -#add_subdirectory(legacy) -add_subdirectory(math) -add_subdirectory(mesh) -add_subdirectory(schema) -add_subdirectory(managers) -add_subdirectory(MeshUtilities) -add_subdirectory(MPI_Communications) -add_subdirectory(PhysicsSolvers) -add_subdirectory(python) -add_subdirectory(systemSolverInterface) + + + + +set( coreLibs + codingUtilities + common + constitutive + dataRepository + fileIO + finiteElement + math + mesh + managers + meshUtilities + MPI_Communications + physicsSolvers + python + systemSolverInterface + ) + + +set( coreLibLinkLine "") +foreach( lib ${coreLibs} ) + add_subdirectory(${lib}) + if( NOT ( ${lib} STREQUAL "math" OR ${lib} STREQUAL "python" ) ) + set( coreLibLinkLine ${coreLibLinkLine} ${GEOSX_LINK_PREPEND_FLAG} ${lib} ${GEOSX_LINK_POSTPEND_FLAG} ) + endif() +endforeach() + # Python config @@ -49,14 +62,19 @@ endif() #message( "extraComponentsListLink = ${extraComponentsListLink}" ) message("adding geosx_core library") -blt_add_library( NAME geosx_core - SOURCES ${geosx_core_sources} - HEADERS ${geosx_headers} - DEPENDS_ON optionparser cxx-utilities pugixml - ${extraComponentsListLink} - ${thirdPartyLibs} - SHARED TRUE - ) - +#blt_add_library( NAME geosx_core +# SOURCES ${geosx_core_sources} +# HEADERS ${geosx_headers} +# DEPENDS_ON ${coreLibs} +# ${extraComponentsListLink} +# ${thirdPartyLibs} +# SHARED TRUE +# ) + + +message( "coreLibLinkLine = ${coreLibLinkLine}" ) +add_library ( geosx_core SHARED ${coreLibs} ) +target_link_libraries(geosx_core ${coreLibLinkLine}) + geosx_add_code_checks(PREFIX core ) diff --git a/src/components/core/src/MPI_Communications/CMakeLists.txt b/src/components/core/src/MPI_Communications/CMakeLists.txt index 9c5bf3df7df..cf216573633 100644 --- a/src/components/core/src/MPI_Communications/CMakeLists.txt +++ b/src/components/core/src/MPI_Communications/CMakeLists.txt @@ -2,27 +2,39 @@ # # Specify all headers # -set(geosx_headers - ${geosx_headers} - MPI_Communications/CommBufferOps.hpp - MPI_Communications/CommBufferOps_inline.hpp - MPI_Communications/CommunicationTools.hpp - MPI_Communications/NeighborCommunicator.hpp - MPI_Communications/NeighborCommunication.hpp - MPI_Communications/PartitionBase.hpp - MPI_Communications/SpatialPartition.hpp - PARENT_SCOPE ) +set(MPI_Communications_headers + CommunicationTools.hpp + NeighborCommunicator.hpp + NeighborCommunication.hpp + PartitionBase.hpp + SpatialPartition.hpp + ) # # Specify all sources # -set(geosx_core_sources - ${geosx_core_sources} - MPI_Communications/CommBufferOps.cpp - MPI_Communications/CommunicationTools.cpp - MPI_Communications/NeighborCommunicator.cpp - MPI_Communications/NeighborCommunication.cpp - MPI_Communications/PartitionBase.cpp - MPI_Communications/SpatialPartition.cpp - PARENT_SCOPE ) \ No newline at end of file +set(MPI_Communications_sources + CommunicationTools.cpp + NeighborCommunicator.cpp + NeighborCommunication.cpp + PartitionBase.cpp + SpatialPartition.cpp + ) + +set( dependencyList fileIO common ) +set( dependencyList2 trilinos ) +foreach( lib ${dependencyList} ) + set( dependencyList2 ${dependencyList2} ${GEOSX_LINK_PREPEND_FLAG} ${lib} ${GEOSX_LINK_POSTPEND_FLAG} ) +endforeach() +message( "dependencyList2 = ${dependencyList2}" ) + +blt_add_library( NAME MPI_Communications + SOURCES ${MPI_Communications_sources} + HEADERS ${MPI_Communications_headers} + DEPENDS_ON ${dependencyList2} + SHARED FALSE + ) + +target_include_directories( MPI_Communications PUBLIC ${CMAKE_SOURCE_DIR}/components/core/src) +geosx_add_code_checks(PREFIX MPI_Communications ) \ No newline at end of file diff --git a/src/components/core/src/MeshUtilities/CMakeLists.txt b/src/components/core/src/MeshUtilities/CMakeLists.txt deleted file mode 100644 index fc0d2c37d0e..00000000000 --- a/src/components/core/src/MeshUtilities/CMakeLists.txt +++ /dev/null @@ -1,29 +0,0 @@ - -# -# Specify all headers -# -set(geosx_headers - ${geosx_headers} - MeshUtilities/MeshManager.hpp - MeshUtilities/MeshGeneratorBase.hpp - MeshUtilities/InternalMeshGenerator.hpp - MeshUtilities/MeshUtilities.hpp - MeshUtilities/SimpleGeometricObjects/GeometricObjectManager.hpp - MeshUtilities/SimpleGeometricObjects/SimpleGeometricObjectBase.hpp - MeshUtilities/SimpleGeometricObjects/Box.hpp - MeshUtilities/StructuredGridUtilities.hpp - PARENT_SCOPE ) - -# -# Specify all sources -# -set(geosx_core_sources - ${geosx_core_sources} - MeshUtilities/MeshManager.cpp - MeshUtilities/MeshGeneratorBase.cpp - MeshUtilities/InternalMeshGenerator.cpp - MeshUtilities/MeshUtilities.cpp - MeshUtilities/SimpleGeometricObjects/GeometricObjectManager.cpp - MeshUtilities/SimpleGeometricObjects/SimpleGeometricObjectBase.cpp - MeshUtilities/SimpleGeometricObjects/Box.cpp - PARENT_SCOPE ) diff --git a/src/components/core/src/PhysicsSolvers/CMakeLists.txt b/src/components/core/src/PhysicsSolvers/CMakeLists.txt deleted file mode 100644 index 986925773e6..00000000000 --- a/src/components/core/src/PhysicsSolvers/CMakeLists.txt +++ /dev/null @@ -1,26 +0,0 @@ - -# -# Specify all headers -# -set(geosx_headers - ${geosx_headers} - PhysicsSolvers/PhysicsSolverManager.hpp - PhysicsSolvers/SolverBase.hpp - PhysicsSolvers/BoundaryConditions/BoundaryConditionBase.hpp - PhysicsSolvers/BoundaryConditions/BoundaryConditionManager.hpp - PhysicsSolvers/BoundaryConditions/DirichletBoundaryCondition.hpp - PhysicsSolvers/SimpleSolvers/LaplaceFEM.hpp - PARENT_SCOPE ) - -# -# Specify all sources -# -set(geosx_core_sources - ${geosx_core_sources} - PhysicsSolvers/PhysicsSolverManager.cpp - PhysicsSolvers/SolverBase.cpp - PhysicsSolvers/BoundaryConditions/BoundaryConditionBase.cpp - PhysicsSolvers/BoundaryConditions/BoundaryConditionManager.cpp - PhysicsSolvers/BoundaryConditions/DirichletBoundaryCondition.cpp - PhysicsSolvers/SimpleSolvers/LaplaceFEM.cpp - PARENT_SCOPE ) diff --git a/src/components/core/src/codingUtilities/CMakeLists.txt b/src/components/core/src/codingUtilities/CMakeLists.txt index 2e9b2b2c4eb..50991cd3707 100644 --- a/src/components/core/src/codingUtilities/CMakeLists.txt +++ b/src/components/core/src/codingUtilities/CMakeLists.txt @@ -2,16 +2,31 @@ # # Specify all headers # -set(geosx_headers - ${geosx_headers} - codingUtilities/StringUtilities.hpp - codingUtilities/IOUtilities.hpp - PARENT_SCOPE ) +set( codingUtilities_headers + StringUtilities.hpp + IOUtilities.hpp + ) # # Specify all sources # -set(geosx_core_sources - ${geosx_core_sources} - codingUtilities/StringUtilities.cpp - PARENT_SCOPE ) +set( codingUtilities_sources + StringUtilities.cpp + ) + +set( dependencyList common ) +set( dependencyList2 RAJA ) +foreach( lib ${dependencyList} ) + set( dependencyList2 ${dependencyList2} ${GEOSX_LINK_PREPEND_FLAG} ${lib} ${GEOSX_LINK_POSTPEND_FLAG} ) +endforeach() +message( "dependencyList2 = ${dependencyList2}" ) + +blt_add_library( NAME codingUtilities + SOURCES ${codingUtilities_sources} + HEADERS ${codingUtilities_headers} + DEPENDS_ON ${dependencyList2} + SHARED FALSE + ) + +target_include_directories( codingUtilities PUBLIC ${CMAKE_SOURCE_DIR}/components/core/src) +geosx_add_code_checks(PREFIX codingUtilities ) \ No newline at end of file diff --git a/src/components/core/src/common/CMakeLists.txt b/src/components/core/src/common/CMakeLists.txt index 048e9b07713..1282468266d 100644 --- a/src/components/core/src/common/CMakeLists.txt +++ b/src/components/core/src/common/CMakeLists.txt @@ -2,19 +2,37 @@ # # Specify all headers # -set(geosx_headers - ${geosx_headers} - common/integer_conversion.hpp - common/DataTypes.hpp - common/InterObjectRelation.hpp - common/Logger.hpp - common/SortedArray.hpp - PARENT_SCOPE ) +set(common_headers + integer_conversion.hpp + DataTypes.hpp + InterObjectRelation.hpp + Logger.hpp + SortedArray.hpp ) # # Specify all sources # -set(geosx_core_sources - ${geosx_core_sources} - common/Logger.cpp - PARENT_SCOPE ) +set(common_sources + Logger.cpp ) + + +set( dependencyList cxx-utilities ) +set( dependencyList2 mpi ) +foreach( lib ${dependencyList} ) + set( dependencyList2 ${dependencyList2} ${GEOSX_LINK_PREPEND_FLAG} ${lib} ${GEOSX_LINK_POSTPEND_FLAG} ) +endforeach() +message( "dependencyList2 = ${dependencyList2}" ) + + +blt_add_library( NAME common + SOURCES ${common_sources} + HEADERS ${common_headers} + DEPENDS_ON ${dependencyList2} + SHARED FALSE + ) + + + +target_include_directories( common PUBLIC ${CMAKE_SOURCE_DIR}/components/core/src) + +geosx_add_code_checks(PREFIX common ) \ No newline at end of file diff --git a/src/components/core/src/common/Logger.cpp b/src/components/core/src/common/Logger.cpp index 3628b655ebb..94987a17711 100644 --- a/src/components/core/src/common/Logger.cpp +++ b/src/components/core/src/common/Logger.cpp @@ -18,18 +18,18 @@ void geos_abort( std::string message ) { std::cerr< -#include "common/GeosxConfig.hpp" +#include "GeosxConfig.hpp" #include #ifdef USE_ATK #include "slic/slic.hpp" diff --git a/src/components/core/src/constitutive/CMakeLists.txt b/src/components/core/src/constitutive/CMakeLists.txt index 5f3a97be9e5..8f948d936b9 100644 --- a/src/components/core/src/constitutive/CMakeLists.txt +++ b/src/components/core/src/constitutive/CMakeLists.txt @@ -1,18 +1,33 @@ # # Specify all headers # -set(geosx_core_sources - ${geosx_core_sources} - constitutive/ConstitutiveManager.hpp - constitutive/ConstitutiveBase.hpp - constitutive/LinearElasticIsotropic.hpp - PARENT_SCOPE ) +set( constitutive_headers + ConstitutiveManager.hpp + ConstitutiveBase.hpp + LinearElasticIsotropic.hpp + ) # # Specify all sources # -set(geosx_core_sources - ${geosx_core_sources} - constitutive/ConstitutiveManager.cpp - constitutive/ConstitutiveBase.cpp - constitutive/LinearElasticIsotropic.cpp - PARENT_SCOPE ) +set( constitutive_sources + ConstitutiveManager.cpp + ConstitutiveBase.cpp + LinearElasticIsotropic.cpp + ) + +set( dependencyList dataRepository ) +set( dependencyList2 "" ) +foreach( lib ${dependencyList} ) + set( dependencyList2 ${dependencyList2} ${GEOSX_LINK_PREPEND_FLAG} ${lib} ${GEOSX_LINK_POSTPEND_FLAG} ) +endforeach() +message( "dependencyList2 = ${dependencyList2}" ) + +blt_add_library( NAME constitutive + SOURCES ${constitutive_sources} + HEADERS ${constitutive_headers} + DEPENDS_ON ${dependencyList2} + SHARED FALSE + ) + +target_include_directories( constitutive PUBLIC ${CMAKE_SOURCE_DIR}/components/core/src) +geosx_add_code_checks(PREFIX constitutive ) \ No newline at end of file diff --git a/src/components/core/src/dataRepository/CMakeLists.txt b/src/components/core/src/dataRepository/CMakeLists.txt index 02448e0521f..a7a6c267b6f 100644 --- a/src/components/core/src/dataRepository/CMakeLists.txt +++ b/src/components/core/src/dataRepository/CMakeLists.txt @@ -2,26 +2,59 @@ # # Specify all headers # -set(geosx_headers - ${geosx_headers} - dataRepository/KeyIndexT.hpp - dataRepository/ManagedGroup.hpp - dataRepository/MappedVector.hpp - dataRepository/SidreWrapper.hpp - dataRepository/ViewWrapper.hpp - dataRepository/ViewWrapperBase.hpp - dataRepository/Buffer.hpp - dataRepository/RestartFlags.hpp - PARENT_SCOPE ) +set(dataRepository_headers + CommBufferOps.hpp + CommBufferOps_inline.hpp + KeyIndexT.hpp + ManagedGroup.hpp + MappedVector.hpp + SidreWrapper.hpp + ViewWrapper.hpp + ViewWrapperBase.hpp + Buffer.hpp + RestartFlags.hpp ) # # Specify all sources # -set(geosx_core_sources - ${geosx_core_sources} - dataRepository/ManagedGroup.cpp - dataRepository/SidreWrapper.cpp - dataRepository/ViewWrapper.cpp - dataRepository/ViewWrapperBase.cpp - PARENT_SCOPE ) +set(dataRepository_sources + CommBufferOps.cpp + ManagedGroup.cpp + SidreWrapper.cpp + ViewWrapper.cpp + ViewWrapperBase.cpp ) + + +set( extraComponentsListLink "") + + +if( ENABLE_MPI ) + set( extraComponentsListLink ${extraComponentsListLink} mpi ) +endif() + +if( USE_ATK ) + set( extraComponentsListLink ${extraComponentsListLink} ) +endif() + +#message( "extraComponentsListLink = ${extraComponentsListLink}" ) +message("adding geosx_core library") + +set( dependencyList common cxx-utilities ) +set( dependencyList2 pugixml ) +foreach( lib ${dependencyList} ) + set( dependencyList2 ${dependencyList2} ${GEOSX_LINK_PREPEND_FLAG} ${lib} ${GEOSX_LINK_POSTPEND_FLAG} ) +endforeach() +message( "dependencyList2 = ${dependencyList2}" ) + +blt_add_library( NAME dataRepository + SOURCES ${dataRepository_sources} + HEADERS ${dataRepository_headers} + DEPENDS_ON + ${dependencyList2} + SHARED FALSE + ) + +target_include_directories( common PUBLIC ${CMAKE_SOURCE_DIR}/components/core/src) + +geosx_add_code_checks(PREFIX dataRepository ) \ No newline at end of file diff --git a/src/components/core/src/MPI_Communications/CommBufferOps.cpp b/src/components/core/src/dataRepository/CommBufferOps.cpp similarity index 100% rename from src/components/core/src/MPI_Communications/CommBufferOps.cpp rename to src/components/core/src/dataRepository/CommBufferOps.cpp diff --git a/src/components/core/src/MPI_Communications/CommBufferOps.hpp b/src/components/core/src/dataRepository/CommBufferOps.hpp similarity index 99% rename from src/components/core/src/MPI_Communications/CommBufferOps.hpp rename to src/components/core/src/dataRepository/CommBufferOps.hpp index 0834869a751..5b6e61e4a44 100644 --- a/src/components/core/src/MPI_Communications/CommBufferOps.hpp +++ b/src/components/core/src/dataRepository/CommBufferOps.hpp @@ -4,7 +4,7 @@ #define COMMBUFFEROPS_H_ #include "common/DataTypes.hpp" -#include "codingUtilities/Utilities.hpp" +//#include "codingUtilities/Utilities.hpp" #include "common/Logger.hpp" #include "codingUtilities/static_if.hpp" #include "codingUtilities/GeosxTraits.hpp" diff --git a/src/components/core/src/MPI_Communications/CommBufferOps_inline.hpp b/src/components/core/src/dataRepository/CommBufferOps_inline.hpp similarity index 100% rename from src/components/core/src/MPI_Communications/CommBufferOps_inline.hpp rename to src/components/core/src/dataRepository/CommBufferOps_inline.hpp diff --git a/src/components/core/src/dataRepository/ViewWrapper.hpp b/src/components/core/src/dataRepository/ViewWrapper.hpp index fe02ad84861..a9600f3cb1e 100644 --- a/src/components/core/src/dataRepository/ViewWrapper.hpp +++ b/src/components/core/src/dataRepository/ViewWrapper.hpp @@ -9,26 +9,23 @@ #define GEOSX_DATAREPOSITORY_WRAPPERVIEW_HPP_ #include "ViewWrapperBase.hpp" + +#include "CommBufferOps.hpp" #include "KeyNames.hpp" #include "common/integer_conversion.hpp" #include "common/DataTypes.hpp" #include "common/Logger.hpp" #include "SFINAE_Macros.hpp" #include -#include "StringUtilities.hpp" + #include "Macros.hpp" #include "Buffer.hpp" #include "RestartFlags.hpp" -#include "codingUtilities/Utilities.hpp" #include "codingUtilities/GeosxTraits.hpp" #include "common/GeosxConfig.hpp" - -#include "MPI_Communications/CommBufferOps.hpp" - - #ifdef USE_ATK #include "sidre/sidre.hpp" #include "sidre/SidreTypes.hpp" diff --git a/src/components/core/src/fileIO/CMakeLists.txt b/src/components/core/src/fileIO/CMakeLists.txt index 123d74434a3..b15d158b8d7 100644 --- a/src/components/core/src/fileIO/CMakeLists.txt +++ b/src/components/core/src/fileIO/CMakeLists.txt @@ -2,20 +2,36 @@ # # Specify all headers # -set(geosx_headers - ${geosx_headers} - fileIO/xmlWrapper.hpp - fileIO/silo/SiloFile.hpp - fileIO/blueprint/Blueprint.hpp - fileIO/utils/utils.hpp - PARENT_SCOPE ) +set(fileIO_headers + xmlWrapper.hpp + silo/SiloFile.hpp + blueprint/Blueprint.hpp + schema/SchemaUtilities.hpp + utils/utils.hpp ) # # Specify all sources # -set(geosx_core_sources - ${geosx_core_sources} - fileIO/xmlWrapper.cpp - fileIO/silo/SiloFile.cpp - fileIO/blueprint/Blueprint.cpp - PARENT_SCOPE ) +set(fileIO_sources + xmlWrapper.cpp + silo/SiloFile.cpp + schema/SchemaUtilities.cpp + blueprint/Blueprint.cpp ) + +set( dependencyList common ) +set( dependencyList2 silo hdf5 mpi pugixml RAJA ) +foreach( lib ${dependencyList} ) + set( dependencyList2 ${dependencyList2} ${GEOSX_LINK_PREPEND_FLAG} ${lib} ${GEOSX_LINK_POSTPEND_FLAG} ) +endforeach() +message( "dependencyList2 = ${dependencyList2}" ) + +blt_add_library( NAME fileIO + SOURCES ${fileIO_sources} + HEADERS ${fileIO_headers} + DEPENDS_ON ${dependencyList2} + SHARED FALSE + ) + +target_include_directories( fileIO PUBLIC ${CMAKE_SOURCE_DIR}/components/core/src) + +geosx_add_code_checks(PREFIX fileIO ) \ No newline at end of file diff --git a/src/components/core/src/schema/SchemaUtilities.cpp b/src/components/core/src/fileIO/schema/SchemaUtilities.cpp similarity index 99% rename from src/components/core/src/schema/SchemaUtilities.cpp rename to src/components/core/src/fileIO/schema/SchemaUtilities.cpp index be76c848b8e..192ac83d1d5 100644 --- a/src/components/core/src/schema/SchemaUtilities.cpp +++ b/src/components/core/src/fileIO/schema/SchemaUtilities.cpp @@ -60,7 +60,7 @@ * @author sherman */ -#include "schema/SchemaUtilities.hpp" +#include "SchemaUtilities.hpp" namespace geosx { diff --git a/src/components/core/src/schema/SchemaUtilities.hpp b/src/components/core/src/fileIO/schema/SchemaUtilities.hpp similarity index 100% rename from src/components/core/src/schema/SchemaUtilities.hpp rename to src/components/core/src/fileIO/schema/SchemaUtilities.hpp diff --git a/src/components/core/src/schema/gpac_new.xsd b/src/components/core/src/fileIO/schema/gpac_new.xsd similarity index 100% rename from src/components/core/src/schema/gpac_new.xsd rename to src/components/core/src/fileIO/schema/gpac_new.xsd diff --git a/src/components/core/src/finiteElement/CMakeLists.txt b/src/components/core/src/finiteElement/CMakeLists.txt index 25e1b0e31ab..b0273f49c2f 100644 --- a/src/components/core/src/finiteElement/CMakeLists.txt +++ b/src/components/core/src/finiteElement/CMakeLists.txt @@ -1,38 +1,53 @@ # # Specify all headers # -set(geosx_core_sources - ${geosx_core_sources} - finiteElement/FiniteElementSpace.hpp - finiteElement/FiniteElementManager.hpp - finiteElement/ElementLibrary/FiniteElement.h - finiteElement/ElementLibrary/FiniteElementBase.h - finiteElement/Kinematics.h - finiteElement/basis/BasisBase.hpp - finiteElement/basis/LagrangeBasis.hpp - finiteElement/basis/Polynomial.hpp - finiteElement/quadrature/QuadratureBase.hpp - finiteElement/quadrature/GaussQuadrature.hpp - finiteElement/FiniteElementSpaceManager.hpp - finiteElement/basis/BasisFunctionManager.hpp - finiteElement/quadrature/QuadratureRuleManager.hpp - PARENT_SCOPE ) +set( finiteElement_sources + FiniteElementSpace.hpp + FiniteElementManager.hpp + ElementLibrary/FiniteElement.h + ElementLibrary/FiniteElementBase.h + Kinematics.h + basis/BasisBase.hpp + basis/LagrangeBasis.hpp + basis/Polynomial.hpp + quadrature/QuadratureBase.hpp + quadrature/GaussQuadrature.hpp + FiniteElementSpaceManager.hpp + basis/BasisFunctionManager.hpp + quadrature/QuadratureRuleManager.hpp + ) # # Specify all sources # -set(geosx_core_sources - ${geosx_core_sources} - finiteElement/FiniteElementSpace.cpp - finiteElement/FiniteElementManager.cpp - finiteElement/ElementLibrary/FiniteElement.cpp - finiteElement/ElementLibrary/FiniteElementBase.cpp - finiteElement/Kinematics.cpp - finiteElement/basis/BasisBase.cpp - finiteElement/basis/LagrangeBasis.cpp - finiteElement/basis/Polynomial.cpp - finiteElement/quadrature/QuadratureBase.cpp - finiteElement/quadrature/GaussQuadrature.cpp - finiteElement/FiniteElementSpaceManager.cpp - finiteElement/basis/BasisFunctionManager.cpp - finiteElement/quadrature/QuadratureRuleManager.cpp - PARENT_SCOPE ) +set( finiteElement_sources + FiniteElementSpace.cpp + FiniteElementManager.cpp + ElementLibrary/FiniteElement.cpp + ElementLibrary/FiniteElementBase.cpp + Kinematics.cpp + basis/BasisBase.cpp + basis/LagrangeBasis.cpp + basis/Polynomial.cpp + quadrature/QuadratureBase.cpp + quadrature/GaussQuadrature.cpp + FiniteElementSpaceManager.cpp + basis/BasisFunctionManager.cpp + quadrature/QuadratureRuleManager.cpp + ) + +set( dependencyList dataRepository codingUtilities ) +set( dependencyList2 "" ) +foreach( lib ${dependencyList} ) + set( dependencyList2 ${dependencyList2} ${GEOSX_LINK_PREPEND_FLAG} ${lib} ${GEOSX_LINK_POSTPEND_FLAG} ) +endforeach() +message( "dependencyList2 = ${dependencyList2}" ) + +blt_add_library( NAME finiteElement + SOURCES ${finiteElement_sources} + HEADERS ${finiteElement_headers} + DEPENDS_ON ${dependencyList2} + SHARED FALSE + ) + +target_include_directories( finiteElement PUBLIC ${CMAKE_SOURCE_DIR}/components/core/src) +geosx_add_code_checks(PREFIX finiteElement ) \ No newline at end of file diff --git a/src/components/core/src/finiteElement/basis/LagrangeBasis.cpp b/src/components/core/src/finiteElement/basis/LagrangeBasis.cpp index c4b4a3322f8..33664d4a3c3 100644 --- a/src/components/core/src/finiteElement/basis/LagrangeBasis.cpp +++ b/src/components/core/src/finiteElement/basis/LagrangeBasis.cpp @@ -57,7 +57,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// #include "LagrangeBasis.hpp" -#include "MeshUtilities/StructuredGridUtilities.hpp" +#include "meshUtilities/StructuredGridUtilities.hpp" /* * Constructor. */ diff --git a/src/components/core/src/finiteElement/quadrature/GaussQuadrature.cpp b/src/components/core/src/finiteElement/quadrature/GaussQuadrature.cpp index 32a3da33f0d..89a690c8781 100644 --- a/src/components/core/src/finiteElement/quadrature/GaussQuadrature.cpp +++ b/src/components/core/src/finiteElement/quadrature/GaussQuadrature.cpp @@ -56,7 +56,7 @@ // /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// #include "finiteElement/quadrature/GaussQuadrature.hpp" -#include "MeshUtilities/StructuredGridUtilities.hpp" +#include "meshUtilities/StructuredGridUtilities.hpp" /* * Constructor. Compute weights and unit integration points * for a Gauss-Legendre quadrature rule of degree p > 0, where diff --git a/src/components/core/src/managers/CMakeLists.txt b/src/components/core/src/managers/CMakeLists.txt index ea7b4abd219..1fd64317489 100644 --- a/src/components/core/src/managers/CMakeLists.txt +++ b/src/components/core/src/managers/CMakeLists.txt @@ -2,51 +2,47 @@ # # Specify all headers # -set(geosx_headers - ${geosx_headers} - managers/CommandLineParser.hpp - managers/DomainPartition.hpp - managers/EventManager.hpp - managers/Functions/FunctionBase.hpp - managers/Functions/SymbolicFunction.hpp - managers/Functions/TableFunction.hpp - managers/Functions/CompositeFunction.hpp - managers/Functions/NewFunctionManager.hpp - managers/ObjectManagerBase.hpp - managers/ProblemManager.hpp - PARENT_SCOPE ) +set(managers_headers + DomainPartition.hpp + EventManager.hpp + Functions/FunctionBase.hpp + Functions/SymbolicFunction.hpp + Functions/TableFunction.hpp + Functions/CompositeFunction.hpp + Functions/NewFunctionManager.hpp + ObjectManagerBase.hpp + ProblemManager.hpp ) # # Specify all sources # -set(geosx_core_sources - ${geosx_core_sources} - managers/CommandLineParser.cpp - managers/DomainPartition.cpp - managers/EventManager.cpp - managers/Functions/FunctionBase.cpp - managers/Functions/SymbolicFunction.cpp - managers/Functions/TableFunction.cpp - managers/Functions/CompositeFunction.cpp - managers/Functions/NewFunctionManager.cpp - managers/ObjectManagerBase.cpp - managers/ProblemManager.cpp - PARENT_SCOPE ) +set(managers_sources + DomainPartition.cpp + EventManager.cpp + Functions/FunctionBase.cpp + Functions/SymbolicFunction.cpp + Functions/TableFunction.cpp + Functions/CompositeFunction.cpp + Functions/NewFunctionManager.cpp + ObjectManagerBase.cpp + ProblemManager.cpp ) -if( 0 ) -set(geosx_headers - ${geosx_headers} - managers/EdgeManager.hpp - managers/ElementManager.hpp - managers/ElementRegionT.hpp - managers/FaceManager.hpp - PARENT_SCOPE ) - -set(geosx_core_sources - ${geosx_core_sources} - managers/ElementManager.cpp - managers/ElementRegionT.cpp - managers/FaceManager.cpp - PARENT_SCOPE ) -endif() \ No newline at end of file +set( dependencyList dataRepository fileIO ) +set( dependencyList2 optionparser mathpresso RAJA trilinos ) +foreach( lib ${dependencyList} ) + set( dependencyList2 ${dependencyList2} ${GEOSX_LINK_PREPEND_FLAG} ${lib} ${GEOSX_LINK_POSTPEND_FLAG} ) +endforeach() +message( "dependencyList2 = ${dependencyList2}" ) + + +blt_add_library( NAME managers + SOURCES ${managers_sources} + HEADERS ${managers_headers} + DEPENDS_ON ${dependencyList2} + SHARED FALSE + ) + +target_include_directories( managers PUBLIC ${CMAKE_SOURCE_DIR}/components/core/src) + +geosx_add_code_checks(PREFIX managers ) \ No newline at end of file diff --git a/src/components/core/src/managers/ProblemManager.cpp b/src/components/core/src/managers/ProblemManager.cpp index 7a39e727384..60806bac913 100644 --- a/src/components/core/src/managers/ProblemManager.cpp +++ b/src/components/core/src/managers/ProblemManager.cpp @@ -16,23 +16,23 @@ #include "DomainPartition.hpp" -#include "PhysicsSolvers/SolverBase.hpp" +#include "physicsSolvers/SolverBase.hpp" #include "codingUtilities/StringUtilities.hpp" #include "finiteElement/FiniteElementManager.hpp" -#include "MeshUtilities/MeshManager.hpp" -#include "MeshUtilities/SimpleGeometricObjects/GeometricObjectManager.hpp" +#include "meshUtilities/MeshManager.hpp" +#include "meshUtilities/SimpleGeometricObjects/GeometricObjectManager.hpp" #include "constitutive/ConstitutiveManager.hpp" #include "fileIO/silo/SiloFile.hpp" #include "fileIO/blueprint/Blueprint.hpp" #include "fileIO/utils/utils.hpp" -#include "PhysicsSolvers/BoundaryConditions/BoundaryConditionManager.hpp" +#include "physicsSolvers/BoundaryConditions/BoundaryConditionManager.hpp" #include "MPI_Communications/SpatialPartition.hpp" -#include "MeshUtilities/SimpleGeometricObjects/SimpleGeometricObjectBase.hpp" +#include "meshUtilities/SimpleGeometricObjects/SimpleGeometricObjectBase.hpp" #include "dataRepository/SidreWrapper.hpp" #include "dataRepository/RestartFlags.hpp" #include "mesh/MeshBody.hpp" -#include "MeshUtilities/MeshUtilities.hpp" +#include "meshUtilities/MeshUtilities.hpp" // #include "managers/MeshLevel.hpp" namespace geosx { diff --git a/src/components/core/src/managers/ProblemManager.hpp b/src/components/core/src/managers/ProblemManager.hpp index 7acad5aabf8..97a8af8f7b4 100644 --- a/src/components/core/src/managers/ProblemManager.hpp +++ b/src/components/core/src/managers/ProblemManager.hpp @@ -22,11 +22,10 @@ #include "optionparser.h" #include "ObjectManagerBase.hpp" -// #include "PhysicsSolvers/PhysicsSolverManager.hpp" -#include "PhysicsSolvers/SolverBase.hpp" +#include "physicsSolvers/SolverBase.hpp" #include "EventManager.hpp" #include "managers/Functions/NewFunctionManager.hpp" -#include "schema/SchemaUtilities.hpp" +#include "fileIO/schema/SchemaUtilities.hpp" #include "../../../cxx-utilities/src/src/DocumentationNode.hpp" namespace geosx diff --git a/src/components/core/src/math/CMakeLists.txt b/src/components/core/src/math/CMakeLists.txt index fd082301004..198cdfbedc7 100644 --- a/src/components/core/src/math/CMakeLists.txt +++ b/src/components/core/src/math/CMakeLists.txt @@ -2,14 +2,13 @@ # # Specify all headers # -set(geosx_headers - ${geosx_headers} - math/TensorT/TensorT.h - math/TensorT/R1TensorT.h - math/TensorT/R2TensorT.h - math/TensorT/R2SymTensorT.h - math/TensorT/TensorBaseT.h - PARENT_SCOPE ) +set(math_headers + TensorT/TensorT.h + TensorT/R1TensorT.h + TensorT/R2TensorT.h + TensorT/R2SymTensorT.h + TensorT/TensorBaseT.h + ) # # Specify all sources @@ -17,3 +16,14 @@ set(geosx_headers #set(geosx_core_sources # ${geosx_core_sources} # PARENT_SCOPE ) + + +blt_add_library( NAME math + SOURCES + HEADERS ${math_headers} + DEPENDS_ON + SHARED FALSE + ) + +target_include_directories( math INTERFACE ${CMAKE_SOURCE_DIR}/components/core/src) +geosx_add_code_checks(PREFIX math ) \ No newline at end of file diff --git a/src/components/core/src/mesh/CMakeLists.txt b/src/components/core/src/mesh/CMakeLists.txt index 653752bd100..359a92c55c1 100644 --- a/src/components/core/src/mesh/CMakeLists.txt +++ b/src/components/core/src/mesh/CMakeLists.txt @@ -2,32 +2,48 @@ # # Specify all headers # -set(geosx_headers - ${geosx_headers} - mesh/CellBlockManager.hpp - mesh/CellBlock.hpp - mesh/CellBlockSubRegion.hpp - mesh/FaceManager.hpp - mesh/NodeManager.hpp - mesh/ElementRegion.hpp - mesh/ElementRegionManager.hpp - mesh/MeshBody.hpp - mesh/MeshLevel.hpp - PARENT_SCOPE ) +set(mesh_headers + CellBlockManager.hpp + CellBlock.hpp + CellBlockSubRegion.hpp + FaceManager.hpp + NodeManager.hpp + ElementRegion.hpp + ElementRegionManager.hpp + MeshBody.hpp + MeshLevel.hpp + ) # # Specify all sources # -set(geosx_core_sources - ${geosx_core_sources} - mesh/CellBlockManager.cpp - mesh/CellBlock.cpp - mesh/CellBlockSubRegion.cpp - mesh/FaceManager.cpp - mesh/NodeManager.cpp - mesh/ElementRegion.cpp - mesh/ElementRegionManager.cpp - mesh/MeshBody.cpp - mesh/MeshLevel.cpp - PARENT_SCOPE ) \ No newline at end of file +set(mesh_sources + CellBlockManager.cpp + CellBlock.cpp + CellBlockSubRegion.cpp + FaceManager.cpp + NodeManager.cpp + ElementRegion.cpp + ElementRegionManager.cpp + MeshBody.cpp + MeshLevel.cpp + ) + + +set( dependencyList managers ) +set( dependencyList2 "" ) +foreach( lib ${dependencyList} ) + set( dependencyList2 ${dependencyList2} ${GEOSX_LINK_PREPEND_FLAG} ${lib} ${GEOSX_LINK_POSTPEND_FLAG} ) +endforeach() +message( "dependencyList2 = ${dependencyList2}" ) + +blt_add_library( NAME mesh + SOURCES ${mesh_sources} + HEADERS ${mesh_headers} + DEPENDS_ON ${dependencyList2} + SHARED FALSE + ) + +target_include_directories( mesh PUBLIC ${CMAKE_SOURCE_DIR}/components/core/src) +geosx_add_code_checks(PREFIX mesh ) \ No newline at end of file diff --git a/src/components/core/src/mesh/EdgeManager.hpp b/src/components/core/src/mesh/EdgeManager.hpp index 0603e1b46e7..a1b22c9f923 100644 --- a/src/components/core/src/mesh/EdgeManager.hpp +++ b/src/components/core/src/mesh/EdgeManager.hpp @@ -64,7 +64,6 @@ #ifndef EDGEMANAGERT_H_ #define EDGEMANAGERT_H_ -#include "../MPI_Communications/CommBufferOps.hpp" #include "managers/ObjectManagerBase.hpp" diff --git a/src/components/core/src/meshUtilities/CMakeLists.txt b/src/components/core/src/meshUtilities/CMakeLists.txt new file mode 100644 index 00000000000..05e3d1720a9 --- /dev/null +++ b/src/components/core/src/meshUtilities/CMakeLists.txt @@ -0,0 +1,45 @@ + +# +# Specify all headers +# +set(meshUtilities_headers + MeshManager.hpp + MeshGeneratorBase.hpp + InternalMeshGenerator.hpp + MeshUtilities.hpp + SimpleGeometricObjects/GeometricObjectManager.hpp + SimpleGeometricObjects/SimpleGeometricObjectBase.hpp + SimpleGeometricObjects/Box.hpp + StructuredGridUtilities.hpp + ) + +# +# Specify all sources +# +set(meshUtilities_sources + MeshManager.cpp + MeshGeneratorBase.cpp + InternalMeshGenerator.cpp + MeshUtilities.cpp + SimpleGeometricObjects/GeometricObjectManager.cpp + SimpleGeometricObjects/SimpleGeometricObjectBase.cpp + SimpleGeometricObjects/Box.cpp + ) + + +set( dependencyList fileIO common ) +set( dependencyList2 trilinos ) +foreach( lib ${dependencyList} ) + set( dependencyList2 ${dependencyList2} ${GEOSX_LINK_PREPEND_FLAG} ${lib} ${GEOSX_LINK_POSTPEND_FLAG} ) +endforeach() +message( "dependencyList2 = ${dependencyList2}" ) + +blt_add_library( NAME meshUtilities + SOURCES ${meshUtilities_sources} + HEADERS ${meshUtilities_headers} + DEPENDS_ON ${dependencyList2} + SHARED FALSE + ) + +target_include_directories( meshUtilities PUBLIC ${CMAKE_SOURCE_DIR}/components/core/src) +geosx_add_code_checks(PREFIX meshUtilities ) \ No newline at end of file diff --git a/src/components/core/src/MeshUtilities/InternalMeshGenerator.cpp b/src/components/core/src/meshUtilities/InternalMeshGenerator.cpp similarity index 100% rename from src/components/core/src/MeshUtilities/InternalMeshGenerator.cpp rename to src/components/core/src/meshUtilities/InternalMeshGenerator.cpp diff --git a/src/components/core/src/MeshUtilities/InternalMeshGenerator.hpp b/src/components/core/src/meshUtilities/InternalMeshGenerator.hpp similarity index 100% rename from src/components/core/src/MeshUtilities/InternalMeshGenerator.hpp rename to src/components/core/src/meshUtilities/InternalMeshGenerator.hpp diff --git a/src/components/core/src/MeshUtilities/MeshGeneratorBase.cpp b/src/components/core/src/meshUtilities/MeshGeneratorBase.cpp similarity index 100% rename from src/components/core/src/MeshUtilities/MeshGeneratorBase.cpp rename to src/components/core/src/meshUtilities/MeshGeneratorBase.cpp diff --git a/src/components/core/src/MeshUtilities/MeshGeneratorBase.hpp b/src/components/core/src/meshUtilities/MeshGeneratorBase.hpp similarity index 100% rename from src/components/core/src/MeshUtilities/MeshGeneratorBase.hpp rename to src/components/core/src/meshUtilities/MeshGeneratorBase.hpp diff --git a/src/components/core/src/MeshUtilities/MeshManager.cpp b/src/components/core/src/meshUtilities/MeshManager.cpp similarity index 100% rename from src/components/core/src/MeshUtilities/MeshManager.cpp rename to src/components/core/src/meshUtilities/MeshManager.cpp diff --git a/src/components/core/src/MeshUtilities/MeshManager.hpp b/src/components/core/src/meshUtilities/MeshManager.hpp similarity index 100% rename from src/components/core/src/MeshUtilities/MeshManager.hpp rename to src/components/core/src/meshUtilities/MeshManager.hpp diff --git a/src/components/core/src/MeshUtilities/MeshUtilities.cpp b/src/components/core/src/meshUtilities/MeshUtilities.cpp similarity index 100% rename from src/components/core/src/MeshUtilities/MeshUtilities.cpp rename to src/components/core/src/meshUtilities/MeshUtilities.cpp diff --git a/src/components/core/src/MeshUtilities/MeshUtilities.hpp b/src/components/core/src/meshUtilities/MeshUtilities.hpp similarity index 100% rename from src/components/core/src/MeshUtilities/MeshUtilities.hpp rename to src/components/core/src/meshUtilities/MeshUtilities.hpp diff --git a/src/components/core/src/MeshUtilities/MesquiteRelaxer.cpp b/src/components/core/src/meshUtilities/MesquiteRelaxer.cpp similarity index 100% rename from src/components/core/src/MeshUtilities/MesquiteRelaxer.cpp rename to src/components/core/src/meshUtilities/MesquiteRelaxer.cpp diff --git a/src/components/core/src/MeshUtilities/MesquiteRelaxer.h b/src/components/core/src/meshUtilities/MesquiteRelaxer.h similarity index 100% rename from src/components/core/src/MeshUtilities/MesquiteRelaxer.h rename to src/components/core/src/meshUtilities/MesquiteRelaxer.h diff --git a/src/components/core/src/MeshUtilities/SimpleGeometricObjects/Box.cpp b/src/components/core/src/meshUtilities/SimpleGeometricObjects/Box.cpp similarity index 100% rename from src/components/core/src/MeshUtilities/SimpleGeometricObjects/Box.cpp rename to src/components/core/src/meshUtilities/SimpleGeometricObjects/Box.cpp diff --git a/src/components/core/src/MeshUtilities/SimpleGeometricObjects/Box.hpp b/src/components/core/src/meshUtilities/SimpleGeometricObjects/Box.hpp similarity index 100% rename from src/components/core/src/MeshUtilities/SimpleGeometricObjects/Box.hpp rename to src/components/core/src/meshUtilities/SimpleGeometricObjects/Box.hpp diff --git a/src/components/core/src/MeshUtilities/SimpleGeometricObjects/GeometricObjectManager.cpp b/src/components/core/src/meshUtilities/SimpleGeometricObjects/GeometricObjectManager.cpp similarity index 100% rename from src/components/core/src/MeshUtilities/SimpleGeometricObjects/GeometricObjectManager.cpp rename to src/components/core/src/meshUtilities/SimpleGeometricObjects/GeometricObjectManager.cpp diff --git a/src/components/core/src/MeshUtilities/SimpleGeometricObjects/GeometricObjectManager.hpp b/src/components/core/src/meshUtilities/SimpleGeometricObjects/GeometricObjectManager.hpp similarity index 100% rename from src/components/core/src/MeshUtilities/SimpleGeometricObjects/GeometricObjectManager.hpp rename to src/components/core/src/meshUtilities/SimpleGeometricObjects/GeometricObjectManager.hpp diff --git a/src/components/core/src/MeshUtilities/SimpleGeometricObjects/SimpleGeometricObjectBase.cpp b/src/components/core/src/meshUtilities/SimpleGeometricObjects/SimpleGeometricObjectBase.cpp similarity index 100% rename from src/components/core/src/MeshUtilities/SimpleGeometricObjects/SimpleGeometricObjectBase.cpp rename to src/components/core/src/meshUtilities/SimpleGeometricObjects/SimpleGeometricObjectBase.cpp diff --git a/src/components/core/src/MeshUtilities/SimpleGeometricObjects/SimpleGeometricObjectBase.hpp b/src/components/core/src/meshUtilities/SimpleGeometricObjects/SimpleGeometricObjectBase.hpp similarity index 100% rename from src/components/core/src/MeshUtilities/SimpleGeometricObjects/SimpleGeometricObjectBase.hpp rename to src/components/core/src/meshUtilities/SimpleGeometricObjects/SimpleGeometricObjectBase.hpp diff --git a/src/components/core/src/MeshUtilities/StructuredGridUtilities.hpp b/src/components/core/src/meshUtilities/StructuredGridUtilities.hpp similarity index 100% rename from src/components/core/src/MeshUtilities/StructuredGridUtilities.hpp rename to src/components/core/src/meshUtilities/StructuredGridUtilities.hpp diff --git a/src/components/core/src/PhysicsSolvers/BoundaryConditions/ApplyBoundaryConditions.cpp b/src/components/core/src/physicsSolvers/BoundaryConditions/ApplyBoundaryConditions.cpp similarity index 100% rename from src/components/core/src/PhysicsSolvers/BoundaryConditions/ApplyBoundaryConditions.cpp rename to src/components/core/src/physicsSolvers/BoundaryConditions/ApplyBoundaryConditions.cpp diff --git a/src/components/core/src/PhysicsSolvers/BoundaryConditions/ApplyBoundaryConditions.h b/src/components/core/src/physicsSolvers/BoundaryConditions/ApplyBoundaryConditions.h similarity index 100% rename from src/components/core/src/PhysicsSolvers/BoundaryConditions/ApplyBoundaryConditions.h rename to src/components/core/src/physicsSolvers/BoundaryConditions/ApplyBoundaryConditions.h diff --git a/src/components/core/src/PhysicsSolvers/BoundaryConditions/BoundaryConditionBase.cpp b/src/components/core/src/physicsSolvers/BoundaryConditions/BoundaryConditionBase.cpp similarity index 100% rename from src/components/core/src/PhysicsSolvers/BoundaryConditions/BoundaryConditionBase.cpp rename to src/components/core/src/physicsSolvers/BoundaryConditions/BoundaryConditionBase.cpp diff --git a/src/components/core/src/PhysicsSolvers/BoundaryConditions/BoundaryConditionBase.hpp b/src/components/core/src/physicsSolvers/BoundaryConditions/BoundaryConditionBase.hpp similarity index 100% rename from src/components/core/src/PhysicsSolvers/BoundaryConditions/BoundaryConditionBase.hpp rename to src/components/core/src/physicsSolvers/BoundaryConditions/BoundaryConditionBase.hpp diff --git a/src/components/core/src/PhysicsSolvers/BoundaryConditions/BoundaryConditionManager.cpp b/src/components/core/src/physicsSolvers/BoundaryConditions/BoundaryConditionManager.cpp similarity index 100% rename from src/components/core/src/PhysicsSolvers/BoundaryConditions/BoundaryConditionManager.cpp rename to src/components/core/src/physicsSolvers/BoundaryConditions/BoundaryConditionManager.cpp diff --git a/src/components/core/src/PhysicsSolvers/BoundaryConditions/BoundaryConditionManager.hpp b/src/components/core/src/physicsSolvers/BoundaryConditions/BoundaryConditionManager.hpp similarity index 100% rename from src/components/core/src/PhysicsSolvers/BoundaryConditions/BoundaryConditionManager.hpp rename to src/components/core/src/physicsSolvers/BoundaryConditions/BoundaryConditionManager.hpp diff --git a/src/components/core/src/PhysicsSolvers/BoundaryConditions/BoundaryConditions.cpp b/src/components/core/src/physicsSolvers/BoundaryConditions/BoundaryConditions.cpp similarity index 100% rename from src/components/core/src/PhysicsSolvers/BoundaryConditions/BoundaryConditions.cpp rename to src/components/core/src/physicsSolvers/BoundaryConditions/BoundaryConditions.cpp diff --git a/src/components/core/src/PhysicsSolvers/BoundaryConditions/BoundaryConditions.h b/src/components/core/src/physicsSolvers/BoundaryConditions/BoundaryConditions.h similarity index 100% rename from src/components/core/src/PhysicsSolvers/BoundaryConditions/BoundaryConditions.h rename to src/components/core/src/physicsSolvers/BoundaryConditions/BoundaryConditions.h diff --git a/src/components/core/src/PhysicsSolvers/BoundaryConditions/DirichletBoundaryCondition.cpp b/src/components/core/src/physicsSolvers/BoundaryConditions/DirichletBoundaryCondition.cpp similarity index 100% rename from src/components/core/src/PhysicsSolvers/BoundaryConditions/DirichletBoundaryCondition.cpp rename to src/components/core/src/physicsSolvers/BoundaryConditions/DirichletBoundaryCondition.cpp diff --git a/src/components/core/src/PhysicsSolvers/BoundaryConditions/DirichletBoundaryCondition.hpp b/src/components/core/src/physicsSolvers/BoundaryConditions/DirichletBoundaryCondition.hpp similarity index 100% rename from src/components/core/src/PhysicsSolvers/BoundaryConditions/DirichletBoundaryCondition.hpp rename to src/components/core/src/physicsSolvers/BoundaryConditions/DirichletBoundaryCondition.hpp diff --git a/src/components/core/src/physicsSolvers/CMakeLists.txt b/src/components/core/src/physicsSolvers/CMakeLists.txt new file mode 100644 index 00000000000..5f794041f21 --- /dev/null +++ b/src/components/core/src/physicsSolvers/CMakeLists.txt @@ -0,0 +1,40 @@ + +# +# Specify all headers +# +set(physicsSolvers_headers + PhysicsSolverManager.hpp + SolverBase.hpp + BoundaryConditions/BoundaryConditionBase.hpp + BoundaryConditions/BoundaryConditionManager.hpp + BoundaryConditions/DirichletBoundaryCondition.hpp + SimpleSolvers/LaplaceFEM.hpp ) + +# +# Specify all sources +# +set(physicsSolvers_sources + PhysicsSolverManager.cpp + SolverBase.cpp + BoundaryConditions/BoundaryConditionBase.cpp + BoundaryConditions/BoundaryConditionManager.cpp + BoundaryConditions/DirichletBoundaryCondition.cpp + SimpleSolvers/LaplaceFEM.cpp ) + +set( dependencyList dataRepository systemSolverInterface ) +set( dependencyList2 "" ) +foreach( lib ${dependencyList} ) + set( dependencyList2 ${dependencyList2} ${GEOSX_LINK_PREPEND_FLAG} ${lib} ${GEOSX_LINK_POSTPEND_FLAG} ) +endforeach() +message( "dependencyList2 = ${dependencyList2}" ) + + +blt_add_library( NAME physicsSolvers + SOURCES ${physicsSolvers_sources} + HEADERS ${physicsSolvers_headers} + DEPENDS_ON ${dependencyList2} + SHARED FALSE + ) + +target_include_directories( physicsSolvers PUBLIC ${CMAKE_SOURCE_DIR}/components/core/src) +geosx_add_code_checks(PREFIX physicsSolvers ) \ No newline at end of file diff --git a/src/components/core/src/PhysicsSolvers/InitialConditions/InitialConditions.cpp b/src/components/core/src/physicsSolvers/InitialConditions/InitialConditions.cpp similarity index 100% rename from src/components/core/src/PhysicsSolvers/InitialConditions/InitialConditions.cpp rename to src/components/core/src/physicsSolvers/InitialConditions/InitialConditions.cpp diff --git a/src/components/core/src/PhysicsSolvers/InitialConditions/InitialConditions.h b/src/components/core/src/physicsSolvers/InitialConditions/InitialConditions.h similarity index 100% rename from src/components/core/src/PhysicsSolvers/InitialConditions/InitialConditions.h rename to src/components/core/src/physicsSolvers/InitialConditions/InitialConditions.h diff --git a/src/components/core/src/PhysicsSolvers/PhysicsSolverManager.cpp b/src/components/core/src/physicsSolvers/PhysicsSolverManager.cpp similarity index 100% rename from src/components/core/src/PhysicsSolvers/PhysicsSolverManager.cpp rename to src/components/core/src/physicsSolvers/PhysicsSolverManager.cpp diff --git a/src/components/core/src/PhysicsSolvers/PhysicsSolverManager.hpp b/src/components/core/src/physicsSolvers/PhysicsSolverManager.hpp similarity index 100% rename from src/components/core/src/PhysicsSolvers/PhysicsSolverManager.hpp rename to src/components/core/src/physicsSolvers/PhysicsSolverManager.hpp diff --git a/src/components/core/src/PhysicsSolvers/SimpleSolvers/LaplaceFEM.cpp b/src/components/core/src/physicsSolvers/SimpleSolvers/LaplaceFEM.cpp similarity index 99% rename from src/components/core/src/PhysicsSolvers/SimpleSolvers/LaplaceFEM.cpp rename to src/components/core/src/physicsSolvers/SimpleSolvers/LaplaceFEM.cpp index 7407511ebf7..80f02ef0d6d 100644 --- a/src/components/core/src/PhysicsSolvers/SimpleSolvers/LaplaceFEM.cpp +++ b/src/components/core/src/physicsSolvers/SimpleSolvers/LaplaceFEM.cpp @@ -24,7 +24,7 @@ #include "finiteElement/ElementLibrary/FiniteElement.h" #include "finiteElement/Kinematics.h" //#include "finiteElement/ElementLibrary/FiniteElementUtilities.h" -#include "PhysicsSolvers/BoundaryConditions/BoundaryConditionManager.hpp" +#include "physicsSolvers/BoundaryConditions/BoundaryConditionManager.hpp" #include "codingUtilities/Utilities.hpp" diff --git a/src/components/core/src/PhysicsSolvers/SimpleSolvers/LaplaceFEM.hpp b/src/components/core/src/physicsSolvers/SimpleSolvers/LaplaceFEM.hpp similarity index 99% rename from src/components/core/src/PhysicsSolvers/SimpleSolvers/LaplaceFEM.hpp rename to src/components/core/src/physicsSolvers/SimpleSolvers/LaplaceFEM.hpp index b5981efe00e..0c8e9b96b8f 100644 --- a/src/components/core/src/PhysicsSolvers/SimpleSolvers/LaplaceFEM.hpp +++ b/src/components/core/src/physicsSolvers/SimpleSolvers/LaplaceFEM.hpp @@ -8,7 +8,7 @@ #ifndef SOLID_MECHANICS_LAGRANGIAN_FEM_HPP_ #define SOLID_MECHANICS_LAGRANGIAN_FEM_HPP_ -#include "PhysicsSolvers/SolverBase.hpp" +#include "physicsSolvers/SolverBase.hpp" #include "systemSolverInterface/LinearSolverWrapper.hpp" diff --git a/src/components/core/src/PhysicsSolvers/SolverBase.cpp b/src/components/core/src/physicsSolvers/SolverBase.cpp similarity index 100% rename from src/components/core/src/PhysicsSolvers/SolverBase.cpp rename to src/components/core/src/physicsSolvers/SolverBase.cpp diff --git a/src/components/core/src/PhysicsSolvers/SolverBase.hpp b/src/components/core/src/physicsSolvers/SolverBase.hpp similarity index 100% rename from src/components/core/src/PhysicsSolvers/SolverBase.hpp rename to src/components/core/src/physicsSolvers/SolverBase.hpp diff --git a/src/components/core/src/schema/CMakeLists.txt b/src/components/core/src/schema/CMakeLists.txt deleted file mode 100644 index e82f5b66e1f..00000000000 --- a/src/components/core/src/schema/CMakeLists.txt +++ /dev/null @@ -1,16 +0,0 @@ - -# -# Specify all headers -# -set(geosx_headers - ${geosx_headers} - schema/SchemaUtilities.hpp - PARENT_SCOPE ) - -# -# Specify all sources -# -set(geosx_core_sources - ${geosx_core_sources} - schema/SchemaUtilities.cpp - PARENT_SCOPE ) diff --git a/src/components/core/src/systemSolverInterface/CMakeLists.txt b/src/components/core/src/systemSolverInterface/CMakeLists.txt index b8facc569c5..b96bfda3188 100644 --- a/src/components/core/src/systemSolverInterface/CMakeLists.txt +++ b/src/components/core/src/systemSolverInterface/CMakeLists.txt @@ -2,19 +2,35 @@ # # Specify all headers # -set(geosx_headers - ${geosx_headers} - systemSolverInterface/EpetraBlockSystem.hpp - systemSolverInterface/LinearSolverWrapper.hpp - systemSolverInterface/SystemSolverParameters.hpp - PARENT_SCOPE ) +set(systemSolverInterface_headers + EpetraBlockSystem.hpp + LinearSolverWrapper.hpp + SystemSolverParameters.hpp + ) # # Specify all sources # -set(geosx_core_sources - ${geosx_core_sources} - systemSolverInterface/EpetraBlockSystem.cpp - systemSolverInterface/SystemSolverParameters.cpp - systemSolverInterface/LinearSolverWrapper.cpp - PARENT_SCOPE ) +set(systemSolverInterface_sources + EpetraBlockSystem.cpp + SystemSolverParameters.cpp + LinearSolverWrapper.cpp + ) + + +set( dependencyList fileIO common ) +set( dependencyList2 trilinos ) +foreach( lib ${dependencyList} ) + set( dependencyList2 ${dependencyList2} ${GEOSX_LINK_PREPEND_FLAG} ${lib} ${GEOSX_LINK_POSTPEND_FLAG} ) +endforeach() +message( "dependencyList2 = ${dependencyList2}" ) + +blt_add_library( NAME systemSolverInterface + SOURCES ${systemSolverInterface_sources} + HEADERS ${systemSolverInterface_headers} + DEPENDS_ON ${dependencyList2} + SHARED FALSE + ) + +target_include_directories( systemSolverInterface PUBLIC ${CMAKE_SOURCE_DIR}/components/core/src) +geosx_add_code_checks(PREFIX systemSolverInterface ) \ No newline at end of file diff --git a/src/components/cxx-utilities b/src/components/cxx-utilities index 854c9d419a0..ab7499c417f 160000 --- a/src/components/cxx-utilities +++ b/src/components/cxx-utilities @@ -1 +1 @@ -Subproject commit 854c9d419a0b739e5c3e58473bb542e3ffa1974c +Subproject commit ab7499c417f947fae6ed2429c6c5902401f81541 diff --git a/src/components/newComponentTemplate/src/NewComponent.hpp b/src/components/newComponentTemplate/src/NewComponent.hpp index 68de8536b58..43e358587d2 100644 --- a/src/components/newComponentTemplate/src/NewComponent.hpp +++ b/src/components/newComponentTemplate/src/NewComponent.hpp @@ -7,7 +7,7 @@ #ifndef COMPONENTS_NEWCOMPONENTTEMPLATE_SRC_NEWCOMPONENT_HPP_ #define COMPONENTS_NEWCOMPONENTTEMPLATE_SRC_NEWCOMPONENT_HPP_ -#include "PhysicsSolvers/SolverBase.hpp" +#include "physicsSolvers/SolverBase.hpp" namespace geosx