Skip to content

Commit e6fcbbd

Browse files
ldowenldowen
committed
Reverted setting SPH class timers as advanced
1 parent ecebb98 commit e6fcbbd

8 files changed

Lines changed: 78 additions & 78 deletions

File tree

‎src/CRKSPH/CRKSPH.cc‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ void
9191
CRKSPH<Dimension>::
9292
registerState(DataBase<Dimension>& dataBase,
9393
State<Dimension>& state) {
94-
ADV_TIME_BEGIN("CRKregisterState");
94+
TIME_BEGIN("CRKregisterState");
9595

9696
CRKSPHBase<Dimension>::registerState(dataBase, state);
9797

@@ -116,7 +116,7 @@ registerState(DataBase<Dimension>& dataBase,
116116
// Otherwise we're just time-evolving the specific energy.
117117
state.enroll(specificThermalEnergy, make_policy<IncrementState<Dimension, Scalar>>());
118118
}
119-
ADV_TIME_END("CRKregisterState");
119+
TIME_END("CRKregisterState");
120120
}
121121

122122
//------------------------------------------------------------------------------
@@ -127,7 +127,7 @@ void
127127
CRKSPH<Dimension>::
128128
registerDerivatives(DataBase<Dimension>& dataBase,
129129
StateDerivatives<Dimension>& derivs) {
130-
ADV_TIME_BEGIN("CRKregisterDerivatives");
130+
TIME_BEGIN("CRKregisterDerivatives");
131131

132132
CRKSPHBase<Dimension>::registerDerivatives(dataBase, derivs);
133133
const auto compatibleEnergy = this->compatibleEnergyEvolution();
@@ -136,7 +136,7 @@ registerDerivatives(DataBase<Dimension>& dataBase,
136136
mPairAccelerationsPtr = std::make_unique<PairAccelerationsType>(connectivityMap);
137137
}
138138
derivs.enroll(HydroFieldNames::pairAccelerations, *mPairAccelerationsPtr);
139-
ADV_TIME_END("CRKregisterDerivatives");
139+
TIME_END("CRKregisterDerivatives");
140140
}
141141

142142
//------------------------------------------------------------------------------

‎src/CRKSPH/CRKSPHBase.cc‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -113,13 +113,13 @@ CRKSPHBase<Dimension>::
113113
initializeProblemStartupDependencies(DataBase<Dimension>& dataBase,
114114
State<Dimension>& state,
115115
StateDerivatives<Dimension>& derivs) {
116-
ADV_TIME_BEGIN("CRKBaseInitializeProblemStartupDependencies");
116+
TIME_BEGIN("CRKBaseInitializeProblemStartupDependencies");
117117

118118
// Initialize the pressure, sound speed, and entropy.
119119
updateStateFields<Dimension>(HydroFieldNames::pressure, state, derivs);
120120
updateStateFields<Dimension>(HydroFieldNames::soundSpeed, state, derivs);
121121
updateStateFields<Dimension>(HydroFieldNames::entropy, state, derivs);
122-
ADV_TIME_END("CRKBaseInitializeProblemStartupDependencies");
122+
TIME_END("CRKBaseInitializeProblemStartupDependencies");
123123
}
124124

125125
//------------------------------------------------------------------------------
@@ -130,7 +130,7 @@ void
130130
CRKSPHBase<Dimension>::
131131
registerState(DataBase<Dimension>& dataBase,
132132
State<Dimension>& state) {
133-
ADV_TIME_BEGIN("CRKBaseRegisterState");
133+
TIME_BEGIN("CRKBaseRegisterState");
134134

135135
// Create the local storage for time step mask, pressure, sound speed, and correction fields.
136136
dataBase.resizeFluidFieldList(mTimeStepMask, 1, HydroFieldNames::timeStepMask);
@@ -183,7 +183,7 @@ registerState(DataBase<Dimension>& dataBase,
183183
// Register the pressure and sound speed.
184184
state.enroll(mPressure, make_policy<PressurePolicy<Dimension>>());
185185
state.enroll(mSoundSpeed, make_policy<SoundSpeedPolicy<Dimension>>());
186-
ADV_TIME_END("CRKBaseRegisterState");
186+
TIME_END("CRKBaseRegisterState");
187187
}
188188

189189
//------------------------------------------------------------------------------
@@ -194,7 +194,7 @@ void
194194
CRKSPHBase<Dimension>::
195195
registerDerivatives(DataBase<Dimension>& dataBase,
196196
StateDerivatives<Dimension>& derivs) {
197-
ADV_TIME_BEGIN("CRKBaseRegisterDerivatives");
197+
TIME_BEGIN("CRKBaseRegisterDerivatives");
198198

199199
const auto DxDtName = IncrementState<Dimension, Vector>::prefix() + HydroFieldNames::position;
200200
const auto DvDtName = HydroFieldNames::hydroAcceleration;
@@ -223,7 +223,7 @@ registerDerivatives(DataBase<Dimension>& dataBase,
223223
derivs.enroll(mDspecificThermalEnergyDt);
224224
derivs.enroll(mDvDx);
225225
derivs.enroll(mInternalDvDx);
226-
ADV_TIME_END("CRKBaseRegisterDerivatives");
226+
TIME_END("CRKBaseRegisterDerivatives");
227227
}
228228

229229
//------------------------------------------------------------------------------
@@ -235,7 +235,7 @@ CRKSPHBase<Dimension>::
235235
preStepInitialize(const DataBase<Dimension>& dataBase,
236236
State<Dimension>& state,
237237
StateDerivatives<Dimension>& /*derivs*/) {
238-
ADV_TIME_BEGIN("CRKBasePreStepInitialize");
238+
TIME_BEGIN("CRKBasePreStepInitialize");
239239

240240
// Depending on the mass density advancement selected, we may want to replace the
241241
// mass density.
@@ -258,7 +258,7 @@ preStepInitialize(const DataBase<Dimension>& dataBase,
258258
for (auto boundaryPtr: range(this->boundaryBegin(), this->boundaryEnd())) boundaryPtr->applyFieldListGhostBoundary(massDensity);
259259
for (auto boundaryPtr: range(this->boundaryBegin(), this->boundaryEnd())) boundaryPtr->finalizeGhostBoundary();
260260
}
261-
ADV_TIME_END("CRKBasePreStepInitialize");
261+
TIME_END("CRKBasePreStepInitialize");
262262
}
263263

264264
//------------------------------------------------------------------------------
@@ -272,7 +272,7 @@ finalizeDerivatives(const typename Dimension::Scalar /*time*/,
272272
const DataBase<Dimension>& /*dataBase*/,
273273
const State<Dimension>& /*state*/,
274274
StateDerivatives<Dimension>& derivs) const {
275-
ADV_TIME_BEGIN("CRKBaseFinalizeDerivatives");
275+
TIME_BEGIN("CRKBaseFinalizeDerivatives");
276276

277277
// If we're using the compatible energy discretization, we need to enforce
278278
// boundary conditions on the accelerations.
@@ -285,7 +285,7 @@ finalizeDerivatives(const typename Dimension::Scalar /*time*/,
285285
}
286286
for (auto boundaryPtr: range(this->boundaryBegin(), this->boundaryEnd())) boundaryPtr->finalizeGhostBoundary();
287287
}
288-
ADV_TIME_END("CRKBaseFinalizeDerivatives");
288+
TIME_END("CRKBaseFinalizeDerivatives");
289289
}
290290

291291
//------------------------------------------------------------------------------
@@ -296,7 +296,7 @@ void
296296
CRKSPHBase<Dimension>::
297297
applyGhostBoundaries(State<Dimension>& state,
298298
StateDerivatives<Dimension>& /*derivs*/) {
299-
ADV_TIME_BEGIN("CRKBaseApplyGhostBoundaries");
299+
TIME_BEGIN("CRKBaseApplyGhostBoundaries");
300300

301301
// Apply boundary conditions to the basic fluid state Fields.
302302
// volume, mass, and massDensity handled by RKCorrections
@@ -313,7 +313,7 @@ applyGhostBoundaries(State<Dimension>& state,
313313
boundaryPtr->applyFieldListGhostBoundary(soundSpeed);
314314
boundaryPtr->applyFieldListGhostBoundary(entropy);
315315
}
316-
ADV_TIME_END("CRKBaseApplyGhostBoundaries");
316+
TIME_END("CRKBaseApplyGhostBoundaries");
317317
}
318318

319319
//------------------------------------------------------------------------------
@@ -324,7 +324,7 @@ void
324324
CRKSPHBase<Dimension>::
325325
enforceBoundaries(State<Dimension>& state,
326326
StateDerivatives<Dimension>& /*derivs*/) {
327-
ADV_TIME_BEGIN("CRKBaseEnforceBoundaries");
327+
TIME_BEGIN("CRKBaseEnforceBoundaries");
328328

329329
// Enforce boundary conditions on the fluid state Fields.
330330
// volume, mass, and massDensity handled by RKCorrections
@@ -341,7 +341,7 @@ enforceBoundaries(State<Dimension>& state,
341341
boundaryPtr->enforceFieldListBoundary(soundSpeed);
342342
boundaryPtr->enforceFieldListBoundary(entropy);
343343
}
344-
ADV_TIME_END("CRKBaseEnforceBoundaries");
344+
TIME_END("CRKBaseEnforceBoundaries");
345345
}
346346

347347
//------------------------------------------------------------------------------

‎src/CRKSPH/SolidCRKSPH.cc‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ SolidCRKSPH<Dimension>::
141141
initializeProblemStartupDependencies(DataBase<Dimension>& dataBase,
142142
State<Dimension>& state,
143143
StateDerivatives<Dimension>& derivs) {
144-
ADV_TIME_BEGIN("SolidCRKinitializeProblemStartupDependencies");
144+
TIME_BEGIN("SolidCRKinitializeProblemStartupDependencies");
145145

146146
// Call the ancestor.
147147
CRKSPH<Dimension>::initializeProblemStartupDependencies(dataBase, state, derivs);
@@ -150,7 +150,7 @@ initializeProblemStartupDependencies(DataBase<Dimension>& dataBase,
150150
updateStateFields(SolidFieldNames::bulkModulus, state, derivs);
151151
updateStateFields(SolidFieldNames::shearModulus, state, derivs);
152152
updateStateFields(SolidFieldNames::yieldStrength, state, derivs);
153-
ADV_TIME_END("SolidCRKinitializeProblemStartupDependencies");
153+
TIME_END("SolidCRKinitializeProblemStartupDependencies");
154154
}
155155

156156

@@ -162,7 +162,7 @@ void
162162
SolidCRKSPH<Dimension>::
163163
registerState(DataBase<Dimension>& dataBase,
164164
State<Dimension>& state) {
165-
ADV_TIME_BEGIN("SolidCRKregisterState");
165+
TIME_BEGIN("SolidCRKregisterState");
166166

167167
// Invoke CRKSPHHydro's state.
168168
CRKSPH<Dimension>::registerState(dataBase, state);
@@ -201,7 +201,7 @@ registerState(DataBase<Dimension>& dataBase,
201201
mPlasticStrain0.copyFields();
202202
for (auto* fptr: mPlasticStrain0) fptr->name(SolidFieldNames::plasticStrain + "0");
203203
state.enroll(mPlasticStrain0);
204-
ADV_TIME_END("SolidCRKregisterState");
204+
TIME_END("SolidCRKregisterState");
205205
}
206206

207207
//------------------------------------------------------------------------------
@@ -212,7 +212,7 @@ void
212212
SolidCRKSPH<Dimension>::
213213
registerDerivatives(DataBase<Dimension>& dataBase,
214214
StateDerivatives<Dimension>& derivs) {
215-
ADV_TIME_BEGIN("SolidCRKregisterDerivatives");
215+
TIME_BEGIN("SolidCRKregisterDerivatives");
216216

217217
// Call the ancestor method.
218218
CRKSPH<Dimension>::registerDerivatives(dataBase, derivs);
@@ -227,7 +227,7 @@ registerDerivatives(DataBase<Dimension>& dataBase,
227227

228228
auto psr = dataBase.solidPlasticStrainRate();
229229
derivs.enroll(psr);
230-
ADV_TIME_END("SolidCRKregisterDerivatives");
230+
TIME_END("SolidCRKregisterDerivatives");
231231
}
232232

233233
//------------------------------------------------------------------------------
@@ -594,7 +594,7 @@ void
594594
SolidCRKSPH<Dimension>::
595595
applyGhostBoundaries(State<Dimension>& state,
596596
StateDerivatives<Dimension>& derivs) {
597-
ADV_TIME_BEGIN("SolidCRKapplyGhostBoundaries");
597+
TIME_BEGIN("SolidCRKapplyGhostBoundaries");
598598

599599
// Ancestor method.
600600
CRKSPH<Dimension>::applyGhostBoundaries(state, derivs);
@@ -615,7 +615,7 @@ applyGhostBoundaries(State<Dimension>& state,
615615
boundaryPtr->applyFieldListGhostBoundary(fragIDs);
616616
boundaryPtr->applyFieldListGhostBoundary(pTypes);
617617
}
618-
ADV_TIME_END("SolidCRKapplyGhostBoundaries");
618+
TIME_END("SolidCRKapplyGhostBoundaries");
619619
}
620620

621621
//------------------------------------------------------------------------------
@@ -626,7 +626,7 @@ void
626626
SolidCRKSPH<Dimension>::
627627
enforceBoundaries(State<Dimension>& state,
628628
StateDerivatives<Dimension>& derivs) {
629-
ADV_TIME_BEGIN("SolidCRKenforceBoundaries");
629+
TIME_BEGIN("SolidCRKenforceBoundaries");
630630

631631
// Ancestor method.
632632
CRKSPH<Dimension>::enforceBoundaries(state, derivs);
@@ -647,7 +647,7 @@ enforceBoundaries(State<Dimension>& state,
647647
boundaryPtr->enforceFieldListBoundary(fragIDs);
648648
boundaryPtr->enforceFieldListBoundary(pTypes);
649649
}
650-
ADV_TIME_END("SolidCRKenforceBoundaries");
650+
TIME_END("SolidCRKenforceBoundaries");
651651
}
652652

653653
//------------------------------------------------------------------------------

‎src/FSISPH/SolidFSISPH.cc‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -263,7 +263,7 @@ void
263263
SolidFSISPH<Dimension>::
264264
registerState(DataBase<Dimension>& dataBase,
265265
State<Dimension>& state) {
266-
ADV_TIME_BEGIN("SolidFSISPHregisterState");
266+
TIME_BEGIN("SolidFSISPHregisterState");
267267

268268
VERIFY2(not (mCompatibleEnergyEvolution and mEvolveTotalEnergy),
269269
"FSISPH error : you cannot simultaneously use both compatibleEnergyEvolution and evolveTotalEnergy");
@@ -363,7 +363,7 @@ registerState(DataBase<Dimension>& dataBase,
363363
state.enroll(pTypes);
364364
state.enroll(mPlasticStrain0);
365365

366-
ADV_TIME_END("SolidFSISPHregisterState");
366+
TIME_END("SolidFSISPHregisterState");
367367
}
368368

369369
//------------------------------------------------------------------------------
@@ -374,7 +374,7 @@ void
374374
SolidFSISPH<Dimension>::
375375
registerDerivatives(DataBase<Dimension>& dataBase,
376376
StateDerivatives<Dimension>& derivs) {
377-
ADV_TIME_BEGIN("SolidFSISPHregisterDerivs");
377+
TIME_BEGIN("SolidFSISPHregisterDerivs");
378378

379379
FieldList<Dimension, Scalar> plasticStrainRate = dataBase.solidPlasticStrainRate();
380380

@@ -436,7 +436,7 @@ registerDerivatives(DataBase<Dimension>& dataBase,
436436
derivs.enroll(mNewInterfaceSmoothness);
437437
derivs.enroll(mInterfaceAngles);
438438

439-
ADV_TIME_END("SolidFSISPHregisterDerivs");
439+
TIME_END("SolidFSISPHregisterDerivs");
440440
}
441441

442442
//------------------------------------------------------------------------------

‎src/GSPH/GSPH.cc‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -94,9 +94,9 @@ GSPH<Dimension>::
9494
initializeProblemStartupDependencies(DataBase<Dimension>& dataBase,
9595
State<Dimension>& state,
9696
StateDerivatives<Dimension>& derivs) {
97-
ADV_TIME_BEGIN("GSPHinitializeStartup");
97+
TIME_BEGIN("GSPHinitializeStartup");
9898
GenericRiemannHydro<Dimension>::initializeProblemStartupDependencies(dataBase, state, derivs);
99-
ADV_TIME_END("GSPHinitializeStartup");
99+
TIME_END("GSPHinitializeStartup");
100100
}
101101

102102
//------------------------------------------------------------------------------
@@ -107,7 +107,7 @@ void
107107
GSPH<Dimension>::
108108
registerState(DataBase<Dimension>& dataBase,
109109
State<Dimension>& state) {
110-
ADV_TIME_BEGIN("GSPHregister");
110+
TIME_BEGIN("GSPHregister");
111111

112112
GenericRiemannHydro<Dimension>::registerState(dataBase,state);
113113

@@ -126,7 +126,7 @@ registerState(DataBase<Dimension>& dataBase,
126126
HydroFieldNames::massDensity));
127127

128128

129-
ADV_TIME_END("GSPHregister");
129+
TIME_END("GSPHregister");
130130
}
131131

132132
//------------------------------------------------------------------------------
@@ -137,14 +137,14 @@ void
137137
GSPH<Dimension>::
138138
registerDerivatives(DataBase<Dimension>& dataBase,
139139
StateDerivatives<Dimension>& derivs) {
140-
ADV_TIME_BEGIN("GSPHregisterDerivs");
140+
TIME_BEGIN("GSPHregisterDerivs");
141141

142142
GenericRiemannHydro<Dimension>::registerDerivatives(dataBase,derivs);
143143

144144
dataBase.resizeFluidFieldList(mDmassDensityDt, 0.0, IncrementState<Dimension, Scalar>::prefix() + HydroFieldNames::massDensity, false);
145145
derivs.enroll(mDmassDensityDt);
146146

147-
ADV_TIME_END("GSPHregisterDerivs");
147+
TIME_END("GSPHregisterDerivs");
148148
}
149149

150150
//------------------------------------------------------------------------------
@@ -156,7 +156,7 @@ GSPH<Dimension>::
156156
preStepInitialize(const DataBase<Dimension>& dataBase,
157157
State<Dimension>& state,
158158
StateDerivatives<Dimension>& derivs) {
159-
ADV_TIME_BEGIN("GSPHpreStepInitialize");
159+
TIME_BEGIN("GSPHpreStepInitialize");
160160
GenericRiemannHydro<Dimension>::preStepInitialize(dataBase,state,derivs);
161161

162162
if(this->densityUpdate() == MassDensityType::RigorousSumDensity){
@@ -180,7 +180,7 @@ preStepInitialize(const DataBase<Dimension>& dataBase,
180180
boundaryItr < this->boundaryEnd();
181181
++boundaryItr) (*boundaryItr)->finalizeGhostBoundary();
182182
}
183-
ADV_TIME_END("GSPHpreStepInitialize");
183+
TIME_END("GSPHpreStepInitialize");
184184
}
185185

186186
//------------------------------------------------------------------------------
@@ -194,9 +194,9 @@ initialize(const typename Dimension::Scalar time,
194194
const DataBase<Dimension>& dataBase,
195195
State<Dimension>& state,
196196
StateDerivatives<Dimension>& derivs) {
197-
ADV_TIME_BEGIN("GSPHinitialize");
197+
TIME_BEGIN("GSPHinitialize");
198198
auto result = GenericRiemannHydro<Dimension>::initialize(time,dt,dataBase,state,derivs);
199-
ADV_TIME_END("GSPHinitialize");
199+
TIME_END("GSPHinitialize");
200200
return result;
201201
}
202202

@@ -211,9 +211,9 @@ finalizeDerivatives(const typename Dimension::Scalar time,
211211
const DataBase<Dimension>& dataBase,
212212
const State<Dimension>& state,
213213
StateDerivatives<Dimension>& derivs) const {
214-
ADV_TIME_BEGIN("GSPHfinalizeDerivs");
214+
TIME_BEGIN("GSPHfinalizeDerivs");
215215
GenericRiemannHydro<Dimension>::finalizeDerivatives(time,dt,dataBase,state,derivs);
216-
ADV_TIME_END("GSPHfinalizeDerivs");
216+
TIME_END("GSPHfinalizeDerivs");
217217
}
218218

219219
//------------------------------------------------------------------------------
@@ -224,9 +224,9 @@ void
224224
GSPH<Dimension>::
225225
applyGhostBoundaries(State<Dimension>& state,
226226
StateDerivatives<Dimension>& derivs) {
227-
ADV_TIME_BEGIN("GSPHghostBounds");
227+
TIME_BEGIN("GSPHghostBounds");
228228
GenericRiemannHydro<Dimension>::applyGhostBoundaries(state,derivs);
229-
ADV_TIME_END("GSPHghostBounds");
229+
TIME_END("GSPHghostBounds");
230230
}
231231

232232
//------------------------------------------------------------------------------
@@ -237,9 +237,9 @@ void
237237
GSPH<Dimension>::
238238
enforceBoundaries(State<Dimension>& state,
239239
StateDerivatives<Dimension>& derivs) {
240-
ADV_TIME_BEGIN("GSPHenforceBounds");
240+
TIME_BEGIN("GSPHenforceBounds");
241241
GenericRiemannHydro<Dimension>::enforceBoundaries(state,derivs);
242-
ADV_TIME_END("GSPHenforceBounds");
242+
TIME_END("GSPHenforceBounds");
243243
}
244244

245245

0 commit comments

Comments
 (0)