Skip to content

Commit 5065190

Browse files
rrsettgastrrsettgast
committed
GEOSX_USE to GEOS_USE
1 parent 6c82021 commit 5065190

73 files changed

Lines changed: 279 additions & 279 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎src/cmake/GeosxConfig.cmake‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,9 @@ set( PREPROCESSOR_DEFINES ARRAY_BOUNDS_CHECK
3030
foreach( DEP in ${PREPROCESSOR_DEFINES} )
3131
if( ${DEP}_FOUND OR ENABLE_${DEP} OR GEOSX_ENABLE_${DEP} )
3232
set( USE_${DEP} TRUE )
33-
set( GEOSX_USE_${DEP} TRUE )
3433
set( GEOS_USE_${DEP} TRUE )
35-
message(STATUS "GEOSX_USE_${DEP} = ${GEOSX_USE_${DEP}}")
34+
set( GEOS_USE_${DEP} TRUE )
35+
message(STATUS "GEOS_USE_${DEP} = ${GEOS_USE_${DEP}}")
3636
endif()
3737
endforeach()
3838

@@ -42,9 +42,9 @@ set( STRICT_PPD OPENMP )
4242
foreach( DEP in ${STRICT_PPD} )
4343
if( ${DEP}_FOUND AND ( ENABLE_${DEP} OR GEOSX_ENABLE_${DEP} ) )
4444
set( USE_${DEP} TRUE )
45-
set( GEOSX_USE_${DEP} TRUE )
4645
set( GEOS_USE_${DEP} TRUE )
47-
message(STATUS "GEOSX_USE_${DEP} = ${GEOSX_USE_${DEP}}")
46+
set( GEOS_USE_${DEP} TRUE )
47+
message(STATUS "GEOS_USE_${DEP} = ${GEOS_USE_${DEP}}")
4848
endif()
4949
endforeach( )
5050

‎src/coreComponents/common/BufferAllocator.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#include "BufferAllocator.hpp"
22
#include "DataTypes.hpp"
33

4-
#ifdef GEOSX_USE_CHAI
4+
#ifdef GEOS_USE_CHAI
55
namespace geos
66
{
77

‎src/coreComponents/common/BufferAllocator.hpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121

2222
#include "common/GeosxConfig.hpp"
2323

24-
#ifdef GEOSX_USE_CHAI
24+
#ifdef GEOS_USE_CHAI
2525
#include <umpire/ResourceManager.hpp>
2626
#include <umpire/TypedAllocator.hpp>
2727

‎src/coreComponents/common/DataLayouts.hpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ static constexpr int ACCELERATION_USD = LvArray::typeManipulation::getStrideOneD
102102
namespace particles
103103
{
104104

105-
#if defined( GEOSX_USE_CUDA )
105+
#if defined( GEOS_USE_CUDA )
106106

107107
/// Particle reference position permutation when using cuda.
108108
using REFERENCE_POSITION_PERM = RAJA::PERM_JI;

‎src/coreComponents/common/DataTypes.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424

2525
namespace geos
2626
{
27-
#ifdef GEOSX_USE_MPI
27+
#ifdef GEOS_USE_MPI
2828
MPI_Comm MPI_COMM_GEOSX;
2929
#else
3030
int MPI_COMM_GEOSX = 0;

‎src/coreComponents/common/DataTypes.hpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
#include <camp/camp.hpp>
4646

4747
// System includes
48-
#ifdef GEOSX_USE_MPI
48+
#ifdef GEOS_USE_MPI
4949
#include <mpi.h>
5050
#endif
5151

@@ -105,7 +105,7 @@ NEW_TYPE dynamicCast( EXISTING_TYPE & val )
105105
}
106106

107107
/// Global MPI communicator used by GEOSX.
108-
#ifdef GEOSX_USE_MPI
108+
#ifdef GEOS_USE_MPI
109109
extern MPI_Comm MPI_COMM_GEOSX;
110110
#else
111111
extern int MPI_COMM_GEOSX;
@@ -149,7 +149,7 @@ using real64 = double;
149149
/// Type stored in communication buffers.
150150
using buffer_unit_type = signed char;
151151

152-
#ifdef GEOSX_USE_CHAI
152+
#ifdef GEOS_USE_CHAI
153153
/// Type of storage for communication buffers.
154154
using buffer_type = std::vector< buffer_unit_type, BufferAllocator< buffer_unit_type > >;
155155
#else

‎src/coreComponents/common/FixedSizeDequeWithMutexes.hpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ class FixedSizeDequeWithMutexes : public FixedSizeDeque< T, INDEX_TYPE >
5050
* @param space Space used to store que queue.
5151
*/
5252
FixedSizeDequeWithMutexes( int maxEntries, int valuesPerEntry, LvArray::MemorySpace space ): FixedSizeDeque< T, INDEX_TYPE >( maxEntries, valuesPerEntry, space,
53-
#ifdef GEOSX_USE_CUDA
53+
#ifdef GEOS_USE_CUDA
5454
camp::resources::Resource{ camp::resources::Cuda{} }
5555
#else
5656
camp::resources::Resource{ camp::resources::Host{} }

‎src/coreComponents/common/Format.hpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,10 @@
1818
#include <type_traits>
1919

2020
#if __cplusplus < 202002L
21-
#define GEOSX_USE_FMT
21+
#define GEOS_USE_FMT
2222
#endif
2323

24-
#ifdef GEOSX_USE_FMT
24+
#ifdef GEOS_USE_FMT
2525
#define FMT_HEADER_ONLY
2626
// Differentiate between standalone fmt path and umpire's fmt path
2727
#include "../include/fmt/core.h"
@@ -34,7 +34,7 @@
3434
#define GEOS_FMT_NS std
3535
#endif
3636

37-
#ifdef GEOSX_USE_FMT
37+
#ifdef GEOS_USE_FMT
3838
/**
3939
* @brief fmtlib formatter for enum classes.
4040
* @tparam T The type of the object being formatted. This should be an

‎src/coreComponents/common/GEOS_RAJA_Interface.hpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ using serialReduce = RAJA::seq_reduce;
3939
using serialStream = RAJA::resources::Host;
4040
using serialEvent = RAJA::resources::HostEvent;
4141

42-
#if defined( GEOSX_USE_OPENMP )
42+
#if defined( GEOS_USE_OPENMP )
4343

4444
auto const parallelHostMemorySpace = hostMemorySpace;
4545

@@ -160,7 +160,7 @@ struct PolicyMap< serialPolicy >
160160
using reduce = serialReduce;
161161
};
162162

163-
#if defined(GEOSX_USE_OPENMP)
163+
#if defined(GEOS_USE_OPENMP)
164164
template<>
165165
struct PolicyMap< RAJA::omp_parallel_for_exec >
166166
{

‎src/coreComponents/common/GeosxConfig.hpp.in‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -9,28 +9,28 @@
99
#define GEOS_COMMON_CONFIG_HPP
1010

1111
/// Enables floating point exceptions
12-
#cmakedefine GEOSX_USE_FPE
12+
#cmakedefine GEOS_USE_FPE
1313

1414
/// Enables bounds check in LvArray classes (CMake option ARRAY_BOUNDS_CHECK)
15-
#cmakedefine GEOSX_USE_ARRAY_BOUNDS_CHECK
15+
#cmakedefine GEOS_USE_ARRAY_BOUNDS_CHECK
1616

1717
/// Enables use of Caliper (CMake option ENABLE_CALIPER)
18-
#cmakedefine GEOSX_USE_CALIPER
18+
#cmakedefine GEOS_USE_CALIPER
1919

2020
/// Enables use of Caliper (CMake option ENABLE_ADIAK)
21-
#cmakedefine GEOSX_USE_ADIAK
21+
#cmakedefine GEOS_USE_ADIAK
2222

2323
/// Enables use of CHAI (CMake option ENABLE_CHAI)
24-
#cmakedefine GEOSX_USE_CHAI
24+
#cmakedefine GEOS_USE_CHAI
2525

2626
/// Enables use of Mathpresso library (CMake option ENABLE_MATHPRESSO)
27-
#cmakedefine GEOSX_USE_MATHPRESSO
27+
#cmakedefine GEOS_USE_MATHPRESSO
2828

2929
/// Enables use of MPI (CMake option ENABLE_MPI)
30-
#cmakedefine GEOSX_USE_MPI
30+
#cmakedefine GEOS_USE_MPI
3131

3232
/// Enables use of OpenMP (CMake option ENABLE_OPENMP)
33-
#cmakedefine GEOSX_USE_OPENMP
33+
#cmakedefine GEOS_USE_OPENMP
3434

3535
/// Enables use of CUDA (CMake option ENABLE_CUDA)
3636
#cmakedefine GEOS_USE_CUDA
@@ -45,28 +45,28 @@
4545
#cmakedefine GEOS_USE_FMT_CONST_FORMATTER_WORKAROUND
4646

4747
/// Enables use of PVTPackage (CMake option ENABLE_PVTPackage)
48-
#cmakedefine GEOSX_USE_PVTPackage
48+
#cmakedefine GEOS_USE_PVTPackage
4949

5050
/// Enables use of Python (CMake option ENABLE_PYTHON)
51-
#cmakedefine GEOSX_USE_PYGEOSX
51+
#cmakedefine GEOS_USE_PYGEOSX
5252

5353
/// Enables use of RAJA (CMake option ENABLE_RAJA)
54-
#cmakedefine GEOSX_USE_RAJA
54+
#cmakedefine GEOS_USE_RAJA
5555

5656
/// Enables use of sys/time.h based timers (CMake option ENABLE_TIMERS)
57-
#cmakedefine GEOSX_USE_TIMERS
57+
#cmakedefine GEOS_USE_TIMERS
5858

5959
/// Enables use of additional debugging interface for TotalView (Cmake option ENABLE_TOTALVIEW_OUTPUT)
60-
#cmakedefine GEOSX_USE_TOTALVIEW_OUTPUT
60+
#cmakedefine GEOS_USE_TOTALVIEW_OUTPUT
6161

6262
/// Enables use of Intel MKL (CMake option ENABLE_MKL)
63-
#cmakedefine GEOSX_USE_MKL
63+
#cmakedefine GEOS_USE_MKL
6464

6565
/// Enables use of Trilinos library (CMake option ENABLE_TRILINOS)
66-
#cmakedefine GEOSX_USE_TRILINOS
66+
#cmakedefine GEOS_USE_TRILINOS
6767

6868
/// Enables use of Hypre library (CMake option ENABLE_HYPRE)
69-
#cmakedefine GEOSX_USE_HYPRE
69+
#cmakedefine GEOS_USE_HYPRE
7070

7171
/// Denotes HYPRE using CPU
7272
#define GEOS_USE_HYPRE_CPU 0
@@ -78,13 +78,13 @@
7878
#cmakedefine GEOS_USE_HYPRE_DEVICE @GEOS_USE_HYPRE_DEVICE@
7979

8080
/// Enables use of SuperLU_dist library through HYPRE (CMake option ENABLE_SUPERLU_DIST)
81-
#cmakedefine GEOSX_USE_SUPERLU_DIST
81+
#cmakedefine GEOS_USE_SUPERLU_DIST
8282

8383
/// Enables use of PETSc library (CMake option ENABLE_PETSC)
84-
#cmakedefine GEOSX_USE_PETSC
84+
#cmakedefine GEOS_USE_PETSC
8585

8686
/// Enables use of Scotch library (CMake option ENABLE_SCOTCH)
87-
#cmakedefine GEOSX_USE_SCOTCH
87+
#cmakedefine GEOS_USE_SCOTCH
8888

8989
/// Choice of global linear algebra interface (CMake option GEOSX_LA_INTERFACE)
9090
#cmakedefine GEOSX_LA_INTERFACE @GEOSX_LA_INTERFACE@
@@ -99,7 +99,7 @@
9999
#cmakedefine FORTRAN_MANGLE_NO_UNDERSCORE
100100

101101
/// USE OF SEPARATION COEFFICIENT IN FRACTURE FLOW
102-
#cmakedefine GEOSX_USE_SEPARATION_COEFFICIENT
102+
#cmakedefine GEOS_USE_SEPARATION_COEFFICIENT
103103

104104
/// CMake option CMAKE_BUILD_TYPE
105105
#cmakedefine GEOSX_CMAKE_BUILD_TYPE @GEOSX_CMAKE_BUILD_TYPE@

0 commit comments

Comments
 (0)