# HG changeset patch
# User Michael Guravage <michael.guravage@cwi.nl>
# Date 2010-10-18 10:05:10
# Node ID b85aa64a84ee8c8c3e345866f9c846137942cebb
# Parent  ec439fed4af87605b8c99c910764cc5c1cea274e

Replaced getIterations() with getTime().

 --
 user: Michael Guravage <michael.guravage@cwi.nl>
 branch 'default'
 changed src/ChangeLog
 changed src/VirtualLeaf.cpp
 changed src/canvas.cpp
 changed src/mesh.h

diff --git a/src/ChangeLog b/src/ChangeLog
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,11 @@
+2010-10-18    <guravage@caterpie.sen.cwi.nl>
+
+	* VirtualLeaf.cpp (TIMESTEP): Removed getIterations().
+
+	* mesh.h (Mesh): Removed {increment,get}Iterations().
+
+	* canvas.cpp (TimeStepWrap): Replaced getIterations() with getTime().
+
 2010-10-15    <guravage@caterpie.sen.cwi.nl>
 
 	* mesh.h (Mesh): Added iterations. incrementIterations() and
diff --git a/src/VirtualLeaf.cpp b/src/VirtualLeaf.cpp
--- a/src/VirtualLeaf.cpp
+++ b/src/VirtualLeaf.cpp
@@ -192,8 +192,7 @@ void MainBase::Plot(int resize_stride)
 
       fname << frame << ".jpg";
       if (par.storage_stride <= par.xml_storage_stride) {
-	//frame = (int)mesh.getTime();
-	frame = mesh.getIterations();
+	frame = (int)mesh.getTime();
       }
 
       // Write high-res JPG snapshot every plot step
@@ -208,8 +207,7 @@ void MainBase::Plot(int resize_stride)
       fname << frame << ".xml";
 
       if (par.xml_storage_stride < par.storage_stride) {
-	//frame = (int)mesh.getTime();
-	frame = mesh.getIterations();
+	frame = (int)mesh.getTime();
       }
       // Write XML file every ten plot steps
       mesh.XMLSave(fname.str().c_str(), XMLSettingsTree());
@@ -284,7 +282,6 @@ TIMESTEP {
     Plot(par.resize_stride);
   }
   i++;
-  mesh.incrementIterations(); // WHERE SHOULD THIS GO?!
   return mesh.getTime();
 }
 
diff --git a/src/canvas.cpp b/src/canvas.cpp
--- a/src/canvas.cpp
+++ b/src/canvas.cpp
@@ -1171,9 +1171,7 @@ void Main::TimeStepWrap(void)
 
   TimeStep();
 
-  //mesh.incrementIterations();
-  t = mesh.getIterations();
-  //t = (int)mesh.getTime();
+  t = (int)mesh.getTime();
 
   if ((par.export_interval > 0) && !(t%par.export_interval)){
     fname << par.datadir << "/" << par.export_fn_prefix;
diff --git a/src/mesh.h b/src/mesh.h
--- a/src/mesh.h
+++ b/src/mesh.h
@@ -83,7 +83,7 @@ class Mesh {
     time = 0.;
     plugin = 0;
     boundary_polygon=0;
-    iterations = 0;
+
   };
   ~Mesh(void) {
     if (boundary_polygon) {
@@ -392,10 +392,6 @@ class Mesh {
   
   Node* findNextBoundaryNode(Node*);
 
-  int iterations;
-  int getIterations(){return this->iterations;}
-  void incrementIterations(){this->iterations++;}
-
  private:
 
   // Data members