Skip to content

Commit a58647a

Browse files
rrsettgastrrsettgast
committed
fix issue with constexpr capture
1 parent 6f83feb commit a58647a

14 files changed

+96
-39
lines changed

‎.github/workflows/continuousIntegration.yml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -92,15 +92,15 @@ jobs:
9292
- name: rocky-gcc-dbg (rockylinux8, gcc 14, Release)
9393
DOCKER_REPOSITORY: geosx/rockylinux:8-gcc
9494
RUNS_ON: ubuntu-24.04
95-
CMAKE_CXX_COMPILER: /usr/bin/g++
96-
CMAKE_C_COMPILER: /usr/bin/gcc
95+
CMAKE_CXX_COMPILER: /opt/rh/gcc-toolset-13/root/usr/bin/g++
96+
CMAKE_C_COMPILER: /opt/rh/gcc-toolset-13/root/usr/bin/gcc
9797
CMAKE_BUILD_TYPE: Debug
9898

9999
- name: rocky-gcc-rel (rockylinux8, gcc 14, Release)
100100
DOCKER_REPOSITORY: geosx/rockylinux:8-gcc
101101
RUNS_ON: ubuntu-24.04
102-
CMAKE_CXX_COMPILER: /usr/bin/g++
103-
CMAKE_C_COMPILER: /usr/bin/gcc
102+
CMAKE_CXX_COMPILER: /opt/rh/gcc-toolset-13/root/usr/bin/g++
103+
CMAKE_C_COMPILER: /opt/rh/gcc-toolset-13/root/usr/bin/gcc
104104
CMAKE_BUILD_TYPE: Release
105105

106106
- name: rocky-clang-dbg (rockylinux8, clang-15, Debug)
@@ -227,8 +227,8 @@ jobs:
227227
env:
228228
DOCKER_REPOSITORY: geosx/ubuntu:24.04-gcc-${{ needs.get_docker_image_tag_hash.outputs.DOCKER_IMAGE_TAG_HASH }}
229229
HOST_CONFIG: hostconfigs/environment.cmake
230-
CMAKE_CXX_COMPILER: /usr/bin/g++
231-
CMAKE_C_COMPILER: /usr/bin/gcc
230+
CMAKE_CXX_COMPILER: /opt/rh/gcc-toolset-13/root/usr/bin/g++
231+
CMAKE_C_COMPILER: /opt/rh/gcc-toolset-13/root/usr/bin/gcc
232232
CMAKE_BUILD_TYPE: Debug
233233
BUILD_AND_TEST_ARGS: "--build-exe --code-coverage"
234234
run: ./scripts/ci_build_and_test.sh

‎hostconfigs/LLNL/[email protected]‎

Lines changed: 57 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,57 @@
1+
#################################################################################
2+
# Generated host-config - Edit at own risk!
3+
#################################################################################
4+
#--------------------------------------------------------------------------------
5+
# SYS_TYPE: toss_4_x86_64_ib
6+
# Compiler Spec: clang@=19.1.3
7+
# CMake executable path: /usr/tce/backend/installations/linux-rhel8-x86_64/gcc-10.3.1/cmake-3.26.3-nz532rvfpaf5lf74zxmplgiobuhol7lu/bin/cmake
8+
#--------------------------------------------------------------------------------
9+
10+
#--------------------------------------------------------------------------------
11+
# Compilers
12+
#--------------------------------------------------------------------------------
13+
14+
set(CMAKE_C_COMPILER "/usr/tce/packages/clang/clang-19.1.3-magic/bin/clang" CACHE PATH "")
15+
16+
set(CMAKE_CXX_COMPILER "/usr/tce/packages/clang/clang-19.1.3-magic/bin/clang++" CACHE PATH "")
17+
18+
set(CMAKE_CXX_FLAGS_RELEASE "-O3 -DNDEBUG -march=native -mtune=native" CACHE STRING "")
19+
20+
set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O2 -g -DNDEBUG" CACHE STRING "")
21+
22+
set(CMAKE_CXX_FLAGS_DEBUG "-g" CACHE STRING "")
23+
24+
#--------------------------------------------------------------------------------
25+
# CMake Standard
26+
#--------------------------------------------------------------------------------
27+
28+
set(BLT_CXX_STD "c++17" CACHE STRING "")
29+
30+
31+
#--------------------------------------------------------------------------------
32+
# OpenMP
33+
#--------------------------------------------------------------------------------
34+
35+
set(ENABLE_OPENMP ON CACHE BOOL "")
36+
37+
#--------------------------------------------------------------------------------
38+
# Cuda
39+
#--------------------------------------------------------------------------------
40+
41+
set(ENABLE_CUDA OFF CACHE BOOL "")
42+
43+
#--------------------------------------------------------------------------------
44+
# System Math Libraries
45+
#--------------------------------------------------------------------------------
46+
47+
set(ENABLE_MKL ON CACHE BOOL "")
48+
49+
set(MKL_INCLUDE_DIRS "/usr/tce/packages/mkl/mkl-2022.1.0/include" CACHE PATH "")
50+
51+
set(MKL_LIBRARIES /usr/tce/packages/mkl/mkl-2022.1.0/mkl/2022.1.0/lib/intel64/libmkl_intel_lp64.so
52+
/usr/tce/packages/mkl/mkl-2022.1.0/mkl/2022.1.0/lib/intel64/libmkl_gnu_thread.so
53+
/usr/tce/packages/mkl/mkl-2022.1.0/mkl/2022.1.0/lib/intel64/libmkl_core.so
54+
/usr/tce/backend/installations/linux-rhel8-x86_64/gcc-13.3.1/llvm-19.1.3-gy2lu5xbi4csr2k47emlajzfs5mlsd4g/bin/../lib/x86_64-unknown-linux-gnu/libomp.so
55+
/lib64/libpthread.so
56+
/lib64/libm.so
57+
/lib64/libdl.so CACHE STRING "")

‎src/reactions/exampleSystems/unitTests/testMomasEasyCase.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ void testMoMasAllEquilibriumHelper()
2727
int,
2828
int >;
2929

30-
constexpr int numPrimarySpecies = hpcReact::MoMasBenchmark::easyCaseParams.numPrimarySpecies();
30+
static constexpr int numPrimarySpecies = hpcReact::MoMasBenchmark::easyCaseParams.numPrimarySpecies();
3131

3232
double logPrimarySpeciesConcentration[numPrimarySpecies];
3333

‎src/reactions/exampleSystems/unitTests/testMomasMediumCase.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ void testMoMasMediumEquilibriumHelper()
2626
int,
2727
int >;
2828

29-
constexpr int numPrimarySpecies = hpcReact::MoMasBenchmark::mediumCaseParams.numPrimarySpecies();
29+
static constexpr int numPrimarySpecies = hpcReact::MoMasBenchmark::mediumCaseParams.numPrimarySpecies();
3030

3131

3232

‎src/reactions/geochemistry/unitTests/testGeochemicalEquilibriumReactions.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ TEST( testEquilibriumReactions, testcarbonateSystemAllEquilibrium2 )
105105
int,
106106
int >;
107107

108-
constexpr int numPrimarySpecies = hpcReact::geochemistry::carbonateSystemAllEquilibrium.numPrimarySpecies();
108+
static constexpr int numPrimarySpecies = hpcReact::geochemistry::carbonateSystemAllEquilibrium.numPrimarySpecies();
109109

110110
double const initialPrimarySpeciesConcentration[numPrimarySpecies] =
111111
{

‎src/reactions/geochemistry/unitTests/testGeochemicalMixedReactions.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ TEST( testMixedReactions, testTimeStep_carbonateSystem )
2121
{
2222
using namespace hpcReact::geochemistry;
2323

24-
constexpr int numPrimarySpecies = carbonateSystemType::numPrimarySpecies();
24+
static constexpr int numPrimarySpecies = carbonateSystemType::numPrimarySpecies();
2525

2626
double const surfaceArea[carbonateSystemType::numKineticReactions()] =
2727
{

‎src/reactions/massActions/MassActions.hpp‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,8 @@ void calculateLogSecondarySpeciesConcentration( PARAMS_DATA const & params,
3838
ARRAY_1D & logSecondarySpeciesConcentrations,
3939
FUNC && derivativeFunc )
4040
{
41-
constexpr int numSecondarySpecies = PARAMS_DATA::numSecondarySpecies();
42-
constexpr int numPrimarySpecies = PARAMS_DATA::numPrimarySpecies();
41+
static constexpr int numSecondarySpecies = PARAMS_DATA::numSecondarySpecies();
42+
static constexpr int numPrimarySpecies = PARAMS_DATA::numPrimarySpecies();
4343

4444
for( INDEX_TYPE i = 0; i < numSecondarySpecies; ++i )
4545
{
@@ -120,8 +120,8 @@ void calculateAggregatePrimaryConcentrationsWrtLogC( PARAMS_DATA const & params,
120120
ARRAY_1D_PRIMARY & aggregatePrimarySpeciesConcentrations,
121121
ARRAY_2D & dAggregatePrimarySpeciesConcentrationsDerivatives_dLogPrimarySpeciesConcentrations )
122122
{
123-
constexpr int numPrimarySpecies = PARAMS_DATA::numPrimarySpecies();
124-
constexpr int numSecondarySpecies = PARAMS_DATA::numSecondarySpecies();
123+
static constexpr int numPrimarySpecies = PARAMS_DATA::numPrimarySpecies();
124+
static constexpr int numSecondarySpecies = PARAMS_DATA::numSecondarySpecies();
125125

126126

127127
calculateLogSecondarySpeciesConcentration< REAL_TYPE,
@@ -171,7 +171,7 @@ void calculateAggregatePrimaryConcentrationsWrtLogC( PARAMS_DATA const & params,
171171
ARRAY_1D & aggregatePrimarySpeciesConcentrations,
172172
ARRAY_2D & dAggregatePrimarySpeciesConcentrationsDerivatives_dLogPrimarySpeciesConcentrations )
173173
{
174-
constexpr int numSecondarySpecies = PARAMS_DATA::numSecondarySpecies();
174+
static constexpr int numSecondarySpecies = PARAMS_DATA::numSecondarySpecies();
175175

176176
REAL_TYPE logSecondarySpeciesConcentrations[numSecondarySpecies] = {0};
177177

@@ -203,8 +203,8 @@ void calculateTotalAndMobileAggregatePrimaryConcentrationsWrtLogC( PARAMS_DATA c
203203
ARRAY_2D & dAggregatePrimarySpeciesConcentrationsDerivatives_dLogPrimarySpeciesConcentrations,
204204
ARRAY_2D & dMobileAggregatePrimarySpeciesConcentrationsDerivatives_dLogPrimarySpeciesConcentrations )
205205
{
206-
constexpr int numPrimarySpecies = PARAMS_DATA::numPrimarySpecies();
207-
constexpr int numSecondarySpecies = PARAMS_DATA::numSecondarySpecies();
206+
static constexpr int numPrimarySpecies = PARAMS_DATA::numPrimarySpecies();
207+
static constexpr int numSecondarySpecies = PARAMS_DATA::numSecondarySpecies();
208208

209209
calculateLogSecondarySpeciesConcentration< REAL_TYPE,
210210
INT_TYPE,

‎src/reactions/massActions/unitTests/testMassActions.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,8 @@ struct CalculateLogSecondarySpeciesConcentrationData
4242

4343
void test_calculateLogSecondarySpeciesConcentration_helper()
4444
{
45-
constexpr int numPrimarySpecies = carbonateSystemAllEquilibrium.numPrimarySpecies();
46-
constexpr int numSecondarySpecies = carbonateSystemAllEquilibrium.numSecondarySpecies();
45+
static constexpr int numPrimarySpecies = carbonateSystemAllEquilibrium.numPrimarySpecies();
46+
static constexpr int numSecondarySpecies = carbonateSystemAllEquilibrium.numSecondarySpecies();
4747

4848
CalculateLogSecondarySpeciesConcentrationData<numPrimarySpecies, numSecondarySpecies> data;
4949

@@ -142,7 +142,7 @@ struct CalculateAggregatePrimaryConcentrationsWrtLogCHelperData
142142

143143
void testcalculateAggregatePrimaryConcentrationsWrtLogCHelper()
144144
{
145-
constexpr int numPrimarySpecies = carbonateSystemAllEquilibrium.numPrimarySpecies();
145+
static constexpr int numPrimarySpecies = carbonateSystemAllEquilibrium.numPrimarySpecies();
146146

147147
CalculateAggregatePrimaryConcentrationsWrtLogCHelperData<numPrimarySpecies> data;
148148

‎src/reactions/reactionsSystems/EquilibriumReactionsAggregatePrimaryConcentration_impl.hpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ EquilibriumReactions< REAL_TYPE,
4242
ARRAY_2D & jacobian )
4343
{
4444
HPCREACT_UNUSED_VAR( temperature );
45-
constexpr int numPrimarySpecies = PARAMS_DATA::numPrimarySpecies();
45+
static constexpr int numPrimarySpecies = PARAMS_DATA::numPrimarySpecies();
4646

4747
RealType aggregatePrimaryConcentrations[numPrimarySpecies] = {0.0};
4848
ARRAY_2D dAggregatePrimarySpeciesConcentrationsDerivatives_dLogPrimarySpeciesConcentrations = {{{0.0}}};
@@ -78,7 +78,7 @@ EquilibriumReactions< REAL_TYPE,
7878
ARRAY_1D & logPrimarySpeciesConcentration )
7979
{
8080
HPCREACT_UNUSED_VAR( temperature );
81-
constexpr int numPrimarySpecies = PARAMS_DATA::numPrimarySpecies();
81+
static constexpr int numPrimarySpecies = PARAMS_DATA::numPrimarySpecies();
8282
double targetAggregatePrimarySpeciesConcentration[numPrimarySpecies] = { 0.0 };
8383

8484

@@ -114,7 +114,7 @@ EquilibriumReactions< REAL_TYPE,
114114
ARRAY_1D & logPrimarySpeciesConcentration )
115115
{
116116
HPCREACT_UNUSED_VAR( temperature );
117-
constexpr int numPrimarySpecies = PARAMS_DATA::numPrimarySpecies();
117+
static constexpr int numPrimarySpecies = PARAMS_DATA::numPrimarySpecies();
118118

119119
double residual[numPrimarySpecies] = { 0.0 };
120120
// double aggregatePrimarySpeciesConcentration[numPrimarySpecies] = { 0.0 };

‎src/reactions/reactionsSystems/EquilibriumReactionsReactionExtents_impl.hpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,8 @@ EquilibriumReactions< REAL_TYPE,
4343
{
4444

4545
HPCREACT_UNUSED_VAR( temperature );
46-
constexpr int numSpecies = PARAMS_DATA::numSpecies();
47-
constexpr int numReactions = PARAMS_DATA::numReactions();
46+
static constexpr int numSpecies = PARAMS_DATA::numSpecies();
47+
static constexpr int numReactions = PARAMS_DATA::numReactions();
4848

4949
// initialize the species concentration
5050
RealType speciesConcentration[numSpecies];
@@ -126,8 +126,8 @@ EquilibriumReactions< REAL_TYPE,
126126
ARRAY_1D & speciesConcentration )
127127
{
128128
HPCREACT_UNUSED_VAR( temperature );
129-
constexpr int numSpecies = PARAMS_DATA::numSpecies();
130-
constexpr int numReactions = PARAMS_DATA::numReactions();
129+
static constexpr int numSpecies = PARAMS_DATA::numSpecies();
130+
static constexpr int numReactions = PARAMS_DATA::numReactions();
131131
double residual[numReactions] = { 0.0 };
132132
double xi[numReactions] = { 0.0 };
133133
double dxi[numReactions] = { 0.0 };

0 commit comments

Comments
 (0)