Solve warmup added and timings reorganized

IPPL-framework · Feb 21, 2022 · 228ae5a · 228ae5a
1 parent 7481831
commit 228ae5a
Show file tree

Hide file tree

Showing 4 changed files with 36 additions and 11 deletions.
diff --git a/alpine/BumponTailInstability.cpp b/alpine/BumponTailInstability.cpp
@@ -183,6 +183,7 @@ int main(int argc, char *argv[]){
     static IpplTimings::TimerRef PTimer = IpplTimings::getTimer("kick");
     static IpplTimings::TimerRef RTimer = IpplTimings::getTimer("drift");
     static IpplTimings::TimerRef updateTimer = IpplTimings::getTimer("update");
+    static IpplTimings::TimerRef DummySolveTimer = IpplTimings::getTimer("solveWarmup");
     static IpplTimings::TimerRef SolveTimer = IpplTimings::getTimer("solve");
     static IpplTimings::TimerRef domainDecomposition = IpplTimings::getTimer("domainDecomp");
 
@@ -366,6 +367,12 @@ int main(int argc, char *argv[]){
     //The update after the particle creation is not needed as the 
     //particles are generated locally
 
+    IpplTimings::startTimer(DummySolveTimer);
+    P->rho_m = 0.0;
+    P->solver_mp->solve();
+    IpplTimings::stopTimer(DummySolveTimer);
+
+
     P->scatterCIC(totalP, 0, hr);
 
     IpplTimings::startTimer(SolveTimer);

diff --git a/alpine/LandauDamping.cpp b/alpine/LandauDamping.cpp
@@ -168,6 +168,7 @@ int main(int argc, char *argv[]){
     static IpplTimings::TimerRef PTimer = IpplTimings::getTimer("kick");
     static IpplTimings::TimerRef RTimer = IpplTimings::getTimer("drift");
     static IpplTimings::TimerRef updateTimer = IpplTimings::getTimer("update");
+    static IpplTimings::TimerRef DummySolveTimer = IpplTimings::getTimer("solveWarmup");
     static IpplTimings::TimerRef SolveTimer = IpplTimings::getTimer("solve");
     static IpplTimings::TimerRef domainDecomposition = IpplTimings::getTimer("domainDecomp");
 
@@ -315,6 +316,11 @@ int main(int argc, char *argv[]){
     //The update after the particle creation is not needed as the 
     //particles are generated locally
 
+    IpplTimings::startTimer(DummySolveTimer);
+    P->rho_m = 0.0;
+    P->solver_mp->solve();
+    IpplTimings::stopTimer(DummySolveTimer);
+
     P->scatterCIC(totalP, 0, hr);
 
     IpplTimings::startTimer(SolveTimer);

diff --git a/alpine/PenningTrap.cpp b/alpine/PenningTrap.cpp
@@ -168,7 +168,18 @@ int main(int argc, char *argv[]){
     };
 
     static IpplTimings::TimerRef mainTimer = IpplTimings::getTimer("mainTimer");
+    static IpplTimings::TimerRef particleCreation = IpplTimings::getTimer("particlesCreation");
+    static IpplTimings::TimerRef dumpDataTimer = IpplTimings::getTimer("dumpData");
+    static IpplTimings::TimerRef PTimer = IpplTimings::getTimer("kick");
+    static IpplTimings::TimerRef RTimer = IpplTimings::getTimer("drift");
+    static IpplTimings::TimerRef updateTimer = IpplTimings::getTimer("update");
+    static IpplTimings::TimerRef DummySolveTimer = IpplTimings::getTimer("solveWarmup");
+    static IpplTimings::TimerRef SolveTimer = IpplTimings::getTimer("Solve");
+    static IpplTimings::TimerRef domainDecomposition = IpplTimings::getTimer("domainDecomp");
+
+
     IpplTimings::startTimer(mainTimer);
+
     size_type totalP = std::atol(argv[4]);
     const unsigned int nt     = std::atoi(argv[5]);
 
@@ -217,13 +228,6 @@ int main(int argc, char *argv[]){
 
     P->nr_m = nr;
 
-    static IpplTimings::TimerRef particleCreation = IpplTimings::getTimer("particlesCreation");
-    static IpplTimings::TimerRef updateTimer = IpplTimings::getTimer("update");
-    static IpplTimings::TimerRef domainDecomposition = IpplTimings::getTimer("domainDecomp");
-    static IpplTimings::TimerRef SolveTimer = IpplTimings::getTimer("Solve");
-    static IpplTimings::TimerRef dumpDataTimer = IpplTimings::getTimer("dumpData");
-    static IpplTimings::TimerRef PTimer = IpplTimings::getTimer("velocityPush");
-    static IpplTimings::TimerRef RTimer = IpplTimings::getTimer("positionPush");
 
     Vector_t length = rmax - rmin;
 
@@ -333,6 +337,11 @@ int main(int argc, char *argv[]){
     //The update after the particle creation is not needed as the 
     //particles are generated locally
 
+    IpplTimings::startTimer(DummySolveTimer);
+    P->rho_m = 0.0;
+    P->solver_mp->solve();
+    IpplTimings::stopTimer(DummySolveTimer);
+
     P->scatterCIC(totalP, 0, hr);
 
     IpplTimings::startTimer(SolveTimer);

diff --git a/alpine/UniformPlasmaTest.cpp b/alpine/UniformPlasmaTest.cpp
@@ -92,12 +92,12 @@ int main(int argc, char *argv[]){
 
     static IpplTimings::TimerRef mainTimer = IpplTimings::getTimer("mainTimer");
     static IpplTimings::TimerRef particleCreation = IpplTimings::getTimer("particlesCreation");
-    static IpplTimings::TimerRef FirstUpdateTimer = IpplTimings::getTimer("initialisation");
     static IpplTimings::TimerRef dumpDataTimer = IpplTimings::getTimer("dumpData");
     static IpplTimings::TimerRef PTimer = IpplTimings::getTimer("kick");
     static IpplTimings::TimerRef temp = IpplTimings::getTimer("randomMove");
     static IpplTimings::TimerRef RTimer = IpplTimings::getTimer("drift");
     static IpplTimings::TimerRef updateTimer = IpplTimings::getTimer("update");
+    static IpplTimings::TimerRef DummySolveTimer = IpplTimings::getTimer("solveWarmup");
     static IpplTimings::TimerRef SolveTimer = IpplTimings::getTimer("solve");
     static IpplTimings::TimerRef domainDecomposition = IpplTimings::getTimer("domainDecomp");
 
@@ -172,7 +172,6 @@ int main(int argc, char *argv[]){
     P->P = 0.0;
     IpplTimings::stopTimer(particleCreation);
 
-    IpplTimings::startTimer(FirstUpdateTimer);
     P->E_m.initialize(mesh, FL);
     P->rho_m.initialize(mesh, FL);
 
@@ -188,7 +187,12 @@ int main(int argc, char *argv[]){
     P->initSolver();
     P->time_m = 0.0;
     P->loadbalancefreq_m = std::atoi(argv[7]);
-
+
+    IpplTimings::startTimer(DummySolveTimer);
+    P->rho_m = 0.0;
+    P->solver_mp->solve();
+    IpplTimings::stopTimer(DummySolveTimer);
+
 
     P->scatterCIC(totalP, 0, hr);
     P->initializeORB(FL, mesh);
@@ -205,7 +209,6 @@ int main(int argc, char *argv[]){
     P->gatherStatistics(totalP);
     IpplTimings::stopTimer(dumpDataTimer);
 
-    IpplTimings::stopTimer(FirstUpdateTimer);
 
     // begin main timestep loop
     msg << "Starting iterations ..." << endl;