Remove _cpp from outputs (and tests) (SimVascular#200)

Author: mrp089

Code/Source/svFSI/distribute.cpp

@@ -1582,7 +1582,7 @@ void part_msh(Simulation* simulation, int iM, mshType& lM, Vector<int>& gmtl, in
 
   Vector<int> part(nEl);
 
-  std::string fTmp = chnl_mod.appPath + "partitioning_" + lM.name + "_cpp.bin";
+  std::string fTmp = chnl_mod.appPath + "partitioning_" + lM.name + ".bin";
   bool flag = false;
   FILE *fp = nullptr; 
   if (com_mod.rmsh.isReqd) { 

Code/Source/svFSI/initialize.cpp

@@ -639,7 +639,7 @@ void initialize(Simulation* simulation, Vector<double>& timeP)
 
     } else {
       if (com_mod.stFileFlag) {
-        std::string fTmp = com_mod.stFileName + "_last_cpp.bin";
+        std::string fTmp = com_mod.stFileName + "_last.bin";
 
         if (FILE *file = fopen(fTmp.c_str(), "r")) {
           fclose(file);
@@ -702,8 +702,8 @@ void initialize(Simulation* simulation, Vector<double>& timeP)
 
   for (int iM = 0; iM < nMsh; iM++) { 
     if (cm.mas(cm_mod)) {
-      std::string fTmp = chnl_mod.appPath + "partitioning_" + com_mod.msh[iM].name + "_cpp.bin";
-      std::string sTmp = chnl_mod.appPath + "partitioning_" + com_mod.msh[iM].name + "_" + std::to_string(com_mod.cTS) + "_cpp.bin";
+      std::string fTmp = chnl_mod.appPath + "partitioning_" + com_mod.msh[iM].name + ".bin";
+      std::string sTmp = chnl_mod.appPath + "partitioning_" + com_mod.msh[iM].name + "_" + std::to_string(com_mod.cTS) + ".bin";
 
       if (FILE *file = fopen(fTmp.c_str(), "r")) {
         fclose(file);

Code/Source/svFSI/output.cpp

@@ -232,7 +232,7 @@ void write_restart(Simulation* simulation, std::array<double,3>& timeP)
   int fid = 27;
   int myID = cm.tF(cm_mod);
 
-  auto fName = stFileName + "_last_cpp.bin";
+  auto fName = stFileName + "_last.bin";
   auto tmpS = fName;
   #ifdef debug_write_restart
   dmsg;
@@ -255,7 +255,7 @@ void write_restart(Simulation* simulation, std::array<double,3>& timeP)
     } else {
       sprintf(fName_num, "%03d", cTS);
     }
-    fName = stFileName + "_" + fName_num + "_cpp.bin";
+    fName = stFileName + "_" + fName_num + ".bin";
   }
 
   // Create the file.

Code/Source/svFSI/remesh.cpp

@@ -166,7 +166,7 @@ void dist_msh_srf(ComMod& com_mod, ChnlMod& chnl_mod, faceType& lFa, mshType& lM
     }
 
     if (iOpt == 1) {
-      std::string fTmp = sTmp + "/" + lM.fa[iFa].name + "_" + std::to_string(rmsh.rTS) + "_cpp.vtp";
+      std::string fTmp = sTmp + "/" + lM.fa[iFa].name + "_" + std::to_string(rmsh.rTS) + ".vtp";
       Vector<int> incNd(lM.gnNo);
 
       for (int a = 0; a < lM.fa[iFa].nNo; a++) {
@@ -1466,7 +1466,7 @@ void remesh_restart(Simulation* simulation)
   auto& stFileName = com_mod.stFileName;
   auto& rmsh = com_mod.rmsh;
 
-  auto sTmp = stFileName + "_last_cpp.bin";
+  auto sTmp = stFileName + "_last.bin";
   #ifdef debug_remesh_restart 
   dmsg << "rmsh.rTS: " << rmsh.rTS;
   dmsg << "tDof: " << com_mod.tDof;
@@ -1485,7 +1485,7 @@ void remesh_restart(Simulation* simulation)
 
   // Write something.
   //
-  auto fTmp = stFileName + "_" + std::to_string(rmsh.rTS) + "_cpp.bin";
+  auto fTmp = stFileName + "_" + std::to_string(rmsh.rTS) + ".bin";
   auto const recLn = com_mod.recLn;
   const bool dFlag = com_mod.dFlag;
   auto& timeP = com_mod.timeP;
@@ -1715,7 +1715,7 @@ void remesh_restart(Simulation* simulation)
         dist_msh_srf(com_mod, chnl_mod, tMsh.fa[0], msh, 1);
 
         sTmp = chnl_mod.appPath + "/" + ".remesh_tmp.dir";
-        fTmp = sTmp + "/" + msh.name +  "_" + std::to_string(rmsh.rTS) + "_cpp.vtu";
+        fTmp = sTmp + "/" + msh.name +  "_" + std::to_string(rmsh.rTS) + ".vtu";
         vtk_xml::write_vtu(com_mod, msh, fTmp);
       } 
 

Code/Source/svFSI/txt.cpp

@@ -324,12 +324,12 @@ void txt(Simulation* simulation, const bool flag)
       fName[1] = fName[0];
 
       if (l == nsd) {
-        fName[0] = appPath + "B_" + fName[0] + "_flux_cpp.txt";
+        fName[0] = appPath + "B_" + fName[0] + "_flux.txt";
       } else {
-        fName[0] = appPath + "B_" + fName[0] + "_average_cpp.txt";
+        fName[0] = appPath + "B_" + fName[0] + "_average.txt";
       }
 
-      fName[1] = appPath + "V_" + fName[1] + "_flux_cpp.txt";
+      fName[1] = appPath + "V_" + fName[1] + "_flux.txt";
       #ifdef debug_txt
       dmsg << "flag: " << flag;
       dmsg << "fName[0]: " << fName[0];

Code/Source/svFSI/vtk_xml.cpp

@@ -1274,7 +1274,7 @@ void write_vtus(Simulation* simulation, const Array<double>& lA, const Array<dou
     fName = ss.str();
   }
 
-  fName = com_mod.saveName + "_" + fName + "_cpp.vtu";
+  fName = com_mod.saveName + "_" + fName + ".vtu";
   auto vtk_writer = VtkData::create_writer(fName);
 
   // Writing the position data

tests/cases/cmm/pipe_3d/1-rigid-solution/calcMeanPressTrac.py

@@ -128,9 +128,9 @@ def writeSrfPressure(p, fout, fwall):
         ntime = nstart + i*nfreq
         time  = float(ntime)*dt
         if (ntime < 100):
-            fname = "%s/result_%03d_cpp.vtu" %(srcdir, ntime)
+            fname = "%s/result_%03d.vtu" %(srcdir, ntime)
         else:
-            fname = "%s/result_%d_cpp.vtu" %(srcdir, ntime)
+            fname = "%s/result_%d.vtu" %(srcdir, ntime)
         print ("Reading file    <-----   {}".format(fname))
         vtuMesh = loadVTU(fname)
         mean_h = mean_h + getSurfaceData(vtuMesh, wall_ids, 'Traction')

tests/cases/cmm/pipe_3d/1-rigid-solution/result_800_cpp.vtu renamed to tests/cases/cmm/pipe_3d/1-rigid-solution/result_800.vtu

@@ -40,8 +40,8 @@
       <Face_file_path> ../../../fluid/pipe_RCR_3d/mesh/mesh-surfaces/lumen_wall.vtp </Face_file_path>
   </Add_face>  
 
-  <Initial_velocities_file_path> ../1-rigid-solution/result_800_cpp.vtu </Initial_velocities_file_path>
-  <Initial_pressures_file_path> ../1-rigid-solution/result_800_cpp.vtu </Initial_pressures_file_path>
+  <Initial_velocities_file_path> ../1-rigid-solution/result_800.vtu </Initial_velocities_file_path>
+  <Initial_pressures_file_path> ../1-rigid-solution/result_800.vtu </Initial_pressures_file_path>
 
 </Add_mesh>
 

tests/cases/cmm/pipe_3d/3a-inflate-cmm/svFSI.xml

@@ -40,8 +40,8 @@
       <Face_file_path> ../../../fluid/pipe_RCR_3d/mesh/mesh-surfaces/lumen_wall.vtp </Face_file_path>
   </Add_face>  
 
-  <Initial_velocities_file_path> ../1-rigid-solution/result_800_cpp.vtu </Initial_velocities_file_path>
-  <Initial_pressures_file_path> ../1-rigid-solution/result_800_cpp.vtu </Initial_pressures_file_path>
+  <Initial_velocities_file_path> ../1-rigid-solution/result_800.vtu </Initial_velocities_file_path>
+  <Initial_pressures_file_path> ../1-rigid-solution/result_800.vtu </Initial_pressures_file_path>
 
 </Add_mesh>
 

tests/cases/cmm/pipe_3d/3b-prestress-cmm/svFSI.xml

@@ -78,8 +78,8 @@ For faster convergence, we initialize the flow for the FSI simulation using data
 
 <Add_mesh name="msh" >
 ...
-  <Initial_velocities_file_path> ../1-rigid-solution/result_800_cpp.vtu </Initial_velocities_file_path>
-  <Initial_pressures_file_path> ../1-rigid-solution/result_800_cpp.vtu </Initial_pressures_file_path>
+  <Initial_velocities_file_path> ../1-rigid-solution/result_800.vtu </Initial_velocities_file_path>
+  <Initial_pressures_file_path> ../1-rigid-solution/result_800.vtu </Initial_pressures_file_path>
 ...
 </Add_mesh>
 

tests/cases/cmm/pipe_3d/README.md

@@ -64,7 +64,7 @@ def run_by_name(folder, name, t_max, n_proc=1):
 
     # read results
     fname = os.path.join(
-        folder, str(n_proc) + "-procs", "result_" + str(t_max).zfill(3) + "_cpp.vtu"
+        folder, str(n_proc) + "-procs", "result_" + str(t_max).zfill(3) + ".vtu"
     )
     if not os.path.exists(fname):
         raise RuntimeError("No svFSIplus output: " + fname)