Rename DataFiles to TrajectoryDataFiles.

Author: steffi7574

include/output.hpp

@@ -55,8 +55,8 @@ class Output{
     void writeGradient(Vec grad);
 
     /* Open, write and close files for fullstate and expected energy levels over time */
-    void openDataFiles(std::string prefix, int initid);
-    void writeDataFiles(int timestep, double time, const Vec state, MasterEq* mastereq);
-    void closeDataFiles();
+    void openTrajectoryDataFiles(std::string prefix, int initid);
+    void writeTrajectoryDataFiles(int timestep, double time, const Vec state, MasterEq* mastereq);
+    void closeTrajectoryDataFiles();
 
 };

include/timestepper.hpp

@@ -28,7 +28,7 @@ class TimeStepper{
     int ntime;           // number of time steps
     double total_time;   // final time
     double dt;           // time step size
-    bool writeDataFiles;  /* Flag to determine whether or not trajectory data will be written to files during forward simulation */
+    bool writeTrajectoryDataFiles;  /* Flag to determine whether or not trajectory data will be written to files during forward simulation */
 
     Vec redgrad;                   /* Reduced gradient */
 

src/main.cpp

@@ -413,7 +413,7 @@ int main(int argc,char **argv)
     optimctx->getStartingPoint(xinit);
     VecCopy(xinit, optimctx->xinit); // Store the initial guess
     if (mpirank_world == 0 && !quietmode) printf("\nStarting primal solver... \n");
-    optimctx->timestepper->writeDataFiles = true;
+    optimctx->timestepper->writeTrajectoryDataFiles = true;
     objective = optimctx->evalF(xinit);
     if (mpirank_world == 0 && !quietmode) printf("\nTotal objective = %1.14e, \n", objective);
     optimctx->getSolution(&opt);
@@ -424,7 +424,7 @@ int main(int argc,char **argv)
     optimctx->getStartingPoint(xinit);
     VecCopy(xinit, optimctx->xinit); // Store the initial guess
     if (mpirank_world == 0 && !quietmode) printf("\nStarting adjoint solver...\n");
-    optimctx->timestepper->writeDataFiles = true;
+    optimctx->timestepper->writeTrajectoryDataFiles = true;
     optimctx->evalGradF(xinit, grad);
     VecNorm(grad, NORM_2, &gnorm);
     // VecView(grad, PETSC_VIEWER_STDOUT_WORLD);
@@ -440,7 +440,7 @@ int main(int argc,char **argv)
     optimctx->getStartingPoint(xinit);
     VecCopy(xinit, optimctx->xinit); // Store the initial guess
     if (mpirank_world == 0 && !quietmode) printf("\nStarting Optimization solver ... \n");
-    optimctx->timestepper->writeDataFiles = false;
+    optimctx->timestepper->writeTrajectoryDataFiles = false;
     optimctx->solve(xinit);
     optimctx->getSolution(&opt);
   }

src/optimproblem.cpp

@@ -633,7 +633,7 @@ PetscErrorCode TaoMonitor(Tao tao,void*ptr){
     ctx->output->writeControls(params, ctx->timestepper->mastereq, ctx->timestepper->ntime, ctx->timestepper->dt);
 
     // do one last forward evaluation while writing trajectory files
-    ctx->timestepper->writeDataFiles = true;
+    ctx->timestepper->writeTrajectoryDataFiles = true;
     ctx->evalF(params); 
 
     // Print stopping reason to screen

src/output.cpp

@@ -156,7 +156,7 @@ void Output::writeControls(Vec params, MasterEq* mastereq, int ntime, double dt)
 }
 
 
-void Output::openDataFiles(std::string prefix, int initid){
+void Output::openTrajectoryDataFiles(std::string prefix, int initid){
   char filename[255];
 
   // On the first petsc rank, open required files and print header information
@@ -200,7 +200,7 @@ void Output::openDataFiles(std::string prefix, int initid){
   }
 }
 
-void Output::writeDataFiles(int timestep, double time, const Vec state, MasterEq* mastereq){
+void Output::writeTrajectoryDataFiles(int timestep, double time, const Vec state, MasterEq* mastereq){
 
   /* Write output only every <num> time-steps */
   if (timestep % output_frequency == 0) {
@@ -272,7 +272,7 @@ void Output::writeDataFiles(int timestep, double time, const Vec state, MasterEq
   }
 }
 
-void Output::closeDataFiles(){
+void Output::closeTrajectoryDataFiles(){
 
   /* Close output data files */
   if (ufile != NULL) {

src/timestepper.cpp

@@ -9,7 +9,7 @@ TimeStepper::TimeStepper() {
   dt = 0.0;
   storeFWD = false;
   MPI_Comm_rank(MPI_COMM_WORLD, &mpirank_world);
-  writeDataFiles = false;
+  writeTrajectoryDataFiles = false;
 }
 
 TimeStepper::TimeStepper(MasterEq* mastereq_, int ntime_, double total_time_, Output* output_, bool storeFWD_) : TimeStepper() {
@@ -86,8 +86,8 @@ Vec TimeStepper::getState(size_t tindex){
 Vec TimeStepper::solveODE(int initid, Vec rho_t0){
 
   /* Open output files */
-  if (writeDataFiles) {
-    output->openDataFiles("rho", initid);
+  if (writeTrajectoryDataFiles) {
+    output->openTrajectoryDataFiles("rho", initid);
   }
 
   /* Set initial condition  */
@@ -118,8 +118,8 @@ Vec TimeStepper::solveODE(int initid, Vec rho_t0){
 
     /* store and write current state. */
     if (storeFWD) VecCopy(x, store_states[n]);
-    if (writeDataFiles) {
-      output->writeDataFiles(n, tstart, x, mastereq);
+    if (writeTrajectoryDataFiles) {
+      output->writeTrajectoryDataFiles(n, tstart, x, mastereq);
     }
 
     /* Take one time step */
@@ -159,9 +159,9 @@ Vec TimeStepper::solveODE(int initid, Vec rho_t0){
   }
 
   /* Write last time step and close files */
-  if (writeDataFiles) {
-    output->writeDataFiles(ntime, ntime*dt, x, mastereq);
-    output->closeDataFiles();
+  if (writeTrajectoryDataFiles) {
+    output->writeTrajectoryDataFiles(ntime, ntime*dt, x, mastereq);
+    output->closeTrajectoryDataFiles();
   }