add compute_file_suffix given a string

geodynamics · Feb 11, 2022 · 7beb75c · 7beb75c
1 parent ad59f47
commit 7beb75c
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/src/CheckPoint.C b/src/CheckPoint.C
@@ -299,6 +299,10 @@ void CheckPoint::compute_file_suffix(int cycle, std::stringstream& fileSuffix) {
   fileSuffix << ".sw4checkpoint";
 }
 
+void CheckPoint::compute_file_suffix(const char* cycle, std::stringstream& fileSuffix) {
+  fileSuffix << mCheckPointFile << "." << cycle << ".sw4checkpoint";
+}
+
 //-----------------------------------------------------------------------
 void CheckPoint::write_checkpoint(float_sw4 a_time, int a_cycle,
                                   vector<Sarray>& a_Um, vector<Sarray>& a_U,
@@ -606,7 +610,7 @@ float_sw4 CheckPoint::getDt() {
     // TODO: this is not right, but you get the idea...
     std::stringstream fileSuffix;
     compute_file_suffix(cycle_num, fileSuffix);
-    s << fileSuffix;
+    s << fileSuffix.str();
 
     // Ask SCR for the path to open our checkpoint file
     char scr_file[SCR_MAX_FILENAME];
@@ -1382,7 +1386,7 @@ void CheckPoint::read_checkpoint_hdf5(float_sw4& a_time, int& a_cycle,
   // TODO: this is not right, but you get the idea...
   std::stringstream fileSuffix;
   compute_file_suffix(cycle_num, fileSuffix);
-  s << fileSuffix;
+  s << fileSuffix.str();
 
   // Ask SCR for the path to open our checkpoint file
   char scr_file[SCR_MAX_FILENAME];

diff --git a/src/CheckPoint.h b/src/CheckPoint.h
@@ -75,6 +75,7 @@ void write_checkpoint_scr(float_sw4 a_time, int a_cycle,
   void define_pio();
   void setSteps(int a_steps);
   void compute_file_suffix(int cycle, std::stringstream& fileSuffix);
+  void compute_file_suffix(const char* cycle, std::stringstream& fileSuffix);
   void cycle_checkpoints(string fname);
   void write_header(int& fid, float_sw4 a_time, int a_cycle, int& hsize);
   void read_header(int& fid, float_sw4& a_time, int& a_cycle, int& hsize);