Use CCTK functions to advance interation number

git-svn-id: http://svn.cactuscode.org/arrangements/CactusPUGH/PUGH/trunk@231 b61c5cb5-eaca-4651-9a7a-d64986f99364

1 files changed, 2 insertions, 42 deletions

diff --git a/src/Evolve.c b/src/Evolve.c
index e5b100b..a315784 100644
--- a/src/Evolve.c
+++ b/src/Evolve.c
@@ -49,46 +49,6 @@ static int DoneMainLoop (CCTK_REAL cctk_time, int iteration);
 static int StepGH(cGH *GH);
 static void RotateTimeLevelsGH(cGH *cgh); 
 
-/* the iteration counter used in the evolution loop */
-static int iteration = 0;
-
-
- /*@@
-   @routine    PUGH_SetMainLoopIndex
-   @date       Sep 22 1999
-   @author     Thomas Radke
-   @desc 
-               Sets the iteration counter variable of the evolution loop.
-               This is used for recovery.
-   @enddesc 
-   @calls     
-   @calledby   
-
-@@*/
-int PUGH_SetMainLoopIndex (int main_loop_index)
-{
-  iteration = main_loop_index;
-  return 0;
-}
-
-
- /*@@
-   @routine    PUGH_MainLoopIndex
-   @date       Sep 22 1999
-   @author     Thomas Radke
-   @desc 
-               Returns the iteration counter variable of the evolution loop.
-               This is used for checkpointing.
-   @enddesc 
-   @calls     
-   @calledby   
-
-@@*/
-int PUGH_MainLoopIndex (void)
-{
-  return (iteration);
-}
-
 
  /*@@
    @routine    PUGH_Evolve
@@ -112,7 +72,7 @@ int PUGH_MainLoopIndex (void)
 int PUGH_Evolve(tFleshConfig *config)
 {
   int convergence_level;
-
+  int iteration=CCTK_MainLoopIndex();
 
   /*** Call OUTPUT for this GH (this routine    ***/
   /*** checks if output is necessary) and makes ***/
@@ -126,7 +86,7 @@ int PUGH_Evolve(tFleshConfig *config)
 
   while (! DoneMainLoop (config->GH[0]->cctk_time, iteration))
   {
-    iteration++;
+    iteration = CCTK_SetMainLoopIndex(++iteration);
 
     /* Step each convergence level */