EI/VirtualLeaf Changeset - b85aa64a84ee · Centrum Wiskunde & Informatica (CWI)

Changeset - b85aa64a84ee

Parent rev.

Child rev.

[Not reviewed]

default

0 4 0

Michael Guravage - 15 years ago 2010-10-18 10:05:10
michael.guravage@cwi.nl

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

4 files changed with 12 insertions and 13 deletions:

src/ChangeLog

src/VirtualLeaf.cpp

src/canvas.cpp

src/mesh.h

0 comments (0 inline, 0 general)

src/ChangeLog

➞

Show inline comments

 -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().
 -10-15    <guravage@caterpie.sen.cwi.nl>
 	* mesh.h (Mesh): Added iterations. incrementIterations() and
 	getIterations().
 	* VirtualLeaf.cpp (Plot): Replaced local frame counter with

src/VirtualLeaf.cpp

➞

Show inline comments

@@ @@ -189,14 +189,13 @@ void MainBase::Plot(int resize_stride) @@
       fname << par.datadir << "/leaf.";
       fname.fill('0');
       fname.width(6);
       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
       Save(fname.str().c_str(), "JPEG",1024,768);
+    }
@@ @@ -205,14 +204,13 @@ void MainBase::Plot(int resize_stride) @@
       fname << par.datadir << "/leaf.";
       fname.fill('0');
       fname.width(6);
       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());
+    }
+  }
  count++;
@@ @@ -281,13 +279,12 @@ TIMESTEP { @@
+    }
   } else {
     mesh.ReactDiffuse(par.rd_dt);
     Plot(par.resize_stride);
+  }
   i++;
   mesh.incrementIterations(); // WHERE SHOULD THIS GO?!
   return mesh.getTime();
+}
 /* Called if a cell is clicked */

src/canvas.cpp

➞

Show inline comments

@@ @@ -1168,15 +1168,13 @@ void Main::TimeStepWrap(void) @@
+{
   static int t;
   stringstream fname;
   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;
     fname.fill('0');
     fname.width(6);
     fname << t << ".csv";

src/mesh.h

➞

Show inline comments

@@ @@ -80,13 +80,13 @@ class Mesh { @@
     cells.reserve(2);
     nodes.reserve(500);
     time = 0.;
     plugin = 0;
     boundary_polygon=0;
-    iterations = 0;
   };
   ~Mesh(void) {
     if (boundary_polygon) {
       delete boundary_polygon;
       boundary_polygon=0;
+    }
@@ @@ -389,16 +389,12 @@ class Mesh { @@
   double Compactness(double *res_compactness=0, double *res_area=0, double *res_cell_area=0, double *hull_circumference=0);
   void CSVExportCellData(QTextStream &csv_stream) const;
   void CSVExportMeshData(QTextStream &csv_stream);
   Node* findNextBoundaryNode(Node*);
   int iterations;
   int getIterations(){return this->iterations;}
   void incrementIterations(){this->iterations++;}
  private:
   // Data members
   vector<Cell *> cells;
   vector<Node *> nodes;
   list<Wall *> walls; // we need to erase elements from this container frequently, hence a list.

0 comments (0 inline, 0 general)