Skip to content

Commit a6763b5

Browse files
rrsettgastrrsettgast
committed
uncrustify
1 parent 30d9563 commit a6763b5

File tree

4 files changed

+38
-39
lines changed

4 files changed

+38
-39
lines changed

‎src/reactions/bulkGeneric/EquilibriumReactions.hpp‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -44,19 +44,19 @@ class EquilibriumReactions
4444
static HPCREACT_HOST_DEVICE
4545
void
4646
enforceEquilibrium_Extents( RealType const & temperature,
47-
PARAMS_DATA const & params,
48-
ARRAY_1D_TO_CONST const & speciesConcentration0,
49-
ARRAY_1D & speciesConcentration );
47+
PARAMS_DATA const & params,
48+
ARRAY_1D_TO_CONST const & speciesConcentration0,
49+
ARRAY_1D & speciesConcentration );
5050

5151
template< typename PARAMS_DATA,
5252
typename ARRAY_1D,
5353
typename ARRAY_1D_TO_CONST >
5454
static HPCREACT_HOST_DEVICE
5555
void
5656
enforceEquilibrium_Aggregate( RealType const & temperature,
57-
PARAMS_DATA const & params,
58-
ARRAY_1D_TO_CONST const & speciesConcentration0,
59-
ARRAY_1D & speciesConcentration );
57+
PARAMS_DATA const & params,
58+
ARRAY_1D_TO_CONST const & speciesConcentration0,
59+
ARRAY_1D & speciesConcentration );
6060

6161
private:
6262
template< typename PARAMS_DATA,
@@ -87,7 +87,6 @@ class EquilibriumReactions
8787

8888

8989

90-
9190
} // namespace bulkGeneric
9291
} // namespace hpcReact
9392

‎src/reactions/bulkGeneric/EquilibriumReactionsAggregatePrimaryConcentration_impl.hpp‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,10 @@ template< typename REAL_TYPE,
1414
typename INT_TYPE,
1515
typename INDEX_TYPE >
1616
template< typename PARAMS_DATA,
17-
typename ARRAY_1D,
18-
typename ARRAY_1D_TO_CONST,
19-
typename ARRAY_2D >
20-
HPCREACT_HOST_DEVICE
17+
typename ARRAY_1D,
18+
typename ARRAY_1D_TO_CONST,
19+
typename ARRAY_2D >
20+
HPCREACT_HOST_DEVICE
2121
inline
2222
void
2323
EquilibriumReactions< REAL_TYPE,
@@ -36,12 +36,12 @@ EquilibriumReactions< REAL_TYPE,
3636

3737
RealType aggregatePrimaryConcentrations[numPrimarySpecies] = {0.0};
3838
ARRAY_2D dAggregatePrimarySpeciesConcentrationsDerivatives_dLogPrimarySpeciesConcentrations = {{{0.0}}};
39-
calculateAggregatePrimaryConcentrationsWrtLogC<REAL_TYPE, INT_TYPE, INDEX_TYPE >( params,
40-
logPrimarySpeciesConcentration,
41-
aggregatePrimaryConcentrations,
42-
dAggregatePrimarySpeciesConcentrationsDerivatives_dLogPrimarySpeciesConcentrations );
39+
calculateAggregatePrimaryConcentrationsWrtLogC< REAL_TYPE, INT_TYPE, INDEX_TYPE >( params,
40+
logPrimarySpeciesConcentration,
41+
aggregatePrimaryConcentrations,
42+
dAggregatePrimarySpeciesConcentrationsDerivatives_dLogPrimarySpeciesConcentrations );
43+
4344

44-
4545
for( IndexType i=0; i<numPrimarySpecies; ++i )
4646
{
4747
residual[i] = -(1.0 - aggregatePrimaryConcentrations[i] / targetAggregatePrimaryConcentrations[i]);
@@ -63,9 +63,9 @@ void
6363
EquilibriumReactions< REAL_TYPE,
6464
INT_TYPE,
6565
INDEX_TYPE >::enforceEquilibrium_Aggregate( REAL_TYPE const & temperature,
66-
PARAMS_DATA const & params,
67-
ARRAY_1D_TO_CONST const & logPrimarySpeciesConcentration0,
68-
ARRAY_1D & logPrimarySpeciesConcentration )
66+
PARAMS_DATA const & params,
67+
ARRAY_1D_TO_CONST const & logPrimarySpeciesConcentration0,
68+
ARRAY_1D & logPrimarySpeciesConcentration )
6969
{
7070
HPCREACT_UNUSED_VAR( temperature );
7171
constexpr int numSpecies = PARAMS_DATA::numSpecies;
@@ -78,23 +78,23 @@ EquilibriumReactions< REAL_TYPE,
7878
double dLogCp[numPrimarySpecies] = { 0.0 };
7979
CArrayWrapper< double, numPrimarySpecies, numPrimarySpecies > jacobian;
8080

81-
81+
8282
for( int i=0; i<numPrimarySpecies; ++i )
8383
{
8484
targetAggregatePrimarySpeciesConcentration[i] = exp( logPrimarySpeciesConcentration0[i] );
85-
logPrimarySpeciesConcentration[i] = logPrimarySpeciesConcentration0[i] ;
85+
logPrimarySpeciesConcentration[i] = logPrimarySpeciesConcentration0[i];
8686
}
8787

8888

8989
REAL_TYPE residualNorm = 0.0;
9090
for( int k=0; k<30; ++k )
9191
{
9292
computeResidualAndJacobianAggregatePrimaryConcentrations( temperature,
93-
params,
94-
targetAggregatePrimarySpeciesConcentration,
95-
logPrimarySpeciesConcentration,
96-
residual,
97-
jacobian );
93+
params,
94+
targetAggregatePrimarySpeciesConcentration,
95+
logPrimarySpeciesConcentration,
96+
residual,
97+
jacobian );
9898

9999
residualNorm = 0.0;
100100
for( int j = 0; j < numPrimarySpecies; ++j )
@@ -120,4 +120,4 @@ EquilibriumReactions< REAL_TYPE,
120120
}
121121
}
122122
} // namespace bulkGeneric
123-
} // namespace hpcReact
123+
} // namespace hpcReact

‎src/reactions/bulkGeneric/EquilibriumReactionsReactionExtents_impl.hpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -110,9 +110,9 @@ void
110110
EquilibriumReactions< REAL_TYPE,
111111
INT_TYPE,
112112
INDEX_TYPE >::enforceEquilibrium_Extents( REAL_TYPE const & temperature,
113-
PARAMS_DATA const & params,
114-
ARRAY_1D_TO_CONST const & speciesConcentration0,
115-
ARRAY_1D & speciesConcentration )
113+
PARAMS_DATA const & params,
114+
ARRAY_1D_TO_CONST const & speciesConcentration0,
115+
ARRAY_1D & speciesConcentration )
116116
{
117117
HPCREACT_UNUSED_VAR( temperature );
118118
constexpr int numSpecies = PARAMS_DATA::numSpecies;
@@ -196,4 +196,4 @@ EquilibriumReactions< REAL_TYPE,
196196

197197

198198
} // namespace bulkGeneric
199-
} // namespace hpcReact
199+
} // namespace hpcReact

‎src/reactions/bulkGeneric/unitTests/testEquilibriumReactions.cpp‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -119,9 +119,9 @@ void testEnforceEquilibrium( PARAMS_DATA const & params,
119119
}
120120

121121
EquilibriumReactionsType::enforceEquilibrium_Extents( temperature,
122-
params,
123-
speciesConcentration0,
124-
speciesConcentration );
122+
params,
123+
speciesConcentration0,
124+
speciesConcentration );
125125

126126
for( int r=0; r<numSpecies; ++r )
127127
{
@@ -228,14 +228,14 @@ TEST( testEquilibriumReactions, testCarbonateSystem2 )
228228
3.76e-1, // HCO3-
229229
3.87e-2, // Ca+2
230230
3.21e-2, // SO4-2
231-
1.89, // Cl-
231+
1.89, // Cl-
232232
1.65e-2, // Mg+2
233-
1.09 // Na+1
233+
1.09 // Na+1
234234
};
235235

236236

237237

238-
double const logInitialPrimarySpeciesConcentration[numPrimarySpecies] =
238+
double const logInitialPrimarySpeciesConcentration[numPrimarySpecies] =
239239
{
240240
log( initialPrimarySpeciesConcentration[0] ),
241241
log( initialPrimarySpeciesConcentration[1] ),
@@ -246,7 +246,7 @@ TEST( testEquilibriumReactions, testCarbonateSystem2 )
246246
log( initialPrimarySpeciesConcentration[6] )
247247
};
248248

249-
double logPrimarySpeciesConcentration[numPrimarySpecies] =
249+
double logPrimarySpeciesConcentration[numPrimarySpecies] =
250250
{
251251
logInitialPrimarySpeciesConcentration[0],
252252
logInitialPrimarySpeciesConcentration[1],
@@ -263,7 +263,7 @@ TEST( testEquilibriumReactions, testCarbonateSystem2 )
263263
logPrimarySpeciesConcentration );
264264

265265
double const expectedPrimarySpeciesConcentrations[numPrimarySpecies] =
266-
{
266+
{
267267
4.396954721488358e-04, // H+
268268
3.723009698453808e-04, // HCO3-
269269
1.471656530812871e-02, // Ca+2

0 commit comments

Comments
 (0)