Added input flag (writeCGNSFiles 1 in adapt.inp) to call writeCGNS th…

…ough it does not yet actually write a CGNS file in the function writeCNGS
SCOREC · KennethEJansen · Mar 10, 2023 · Jul 1, 2023 · Jul 31, 2023 · Aug 5, 2023
commit b920292e20d7b0c3c3648ba7635c12a0bc97581b
diff --git a/phasta/phCGNSgbc.cc b/phasta/phCGNSgbc.cc
@@ -180,7  180,7 @@ static lcorp_t count_owned(int* ilwork, int nlwork,gcorp_t* ncorp_tmp, int num_n
 
 
 // renamed, retained but not yet updated
-static std::string buildCGNSgbcFileName(std::string timestep_or_dat)
 static std::string buildCGNSFileName(std::string timestep_or_dat)
 {
   std::stringstream ss;
   int rank = PCU_Comm_Self()   1;
@@ -283,13  283,12 @@ void writeBlocksCGNS(FILE* f, Output& o)
 
 
 
-// retaining in case it is useful but only renamed at this point
-void writeCGNSgbc(Output& o, std::string path, int timestep)
 // WIP
 void writeCGNS(Output& o, std::string path)
 {
   double t0 = PCU_Time();
   apf::Mesh* m = o.mesh;
   std::stringstream tss; 
-  std::string timestep_or_dat;
 // copied gen_ncorp from PHASTA to help map on-rank numbering to CGNS/PETSC friendly global numbering
   gen_ncorp( o );
 //  o carries
@@ -313,20  312,14 @@ void writeCGNSgbc(Output& o, std::string path, int timestep)
   }
 
 
-  if (! timestep)
-    timestep_or_dat = "dat";
-  else {
-    tss << timestep;   
-    timestep_or_dat = tss.str();
-  }
-  path  = buildCGNSgbcFileName(timestep_or_dat);
-  phastaio_setfile(GEOMBC_WRITE);
-  FILE* f = o.openfile_write(o, path.c_str());
-  if (!f) {
-    lion_eprint(1,"failed to open \"%s\"!\n", path.c_str());
-    abort();
-  }
-  ph_write_preamble(f);
 //  path  = buildCGNSFileName(timestep_or_dat);
 //  phastaio_setfile(GEOMBC_WRITE);
 //  FILE* f = o.openfile_write(o, path.c_str());
 //  if (!f) {
 //    lion_eprint(1,"failed to open \"%s\"!\n", path.c_str());
 //    abort();
 //  }
 //  ph_write_preamble(f);
   int params[MAX_PARAMS];
 
 /* all of these strings are looked for by the other programs

diff --git a/phasta/phCook.cc b/phasta/phCook.cc
@@ -224,6  224,8 @@ namespace ph {
       out.openfile_write = fn;
     }
     ph::writeGeomBC(out, subDirPath); //write geombc
     if ( in.writeCGNSFiles ) 
     ph::writeCGNS(out, subDirPath); //write CGNS
     if(!PCU_Comm_Self())
       ph::writeAuxiliaryFiles(path, in.timeStepNumber);
     m->verify();

diff --git a/phasta/phInput.cc b/phasta/phInput.cc
@@ -60,6  60,7 @@ static void setDefaults(Input& in)
   in.axisymmetry = 0;
   in.parmaLoops = 3; //a magical value
   in.parmaVerbosity = 1; //fairly quiet
   in.writeCGNSFiles = 0;  // write CGNS Files 
   in.writeGeomBCFiles = 0;  // write additional geombc file for vis in streaming
   in.writeRestartFiles = 0;  // write additional restart file for vis in streaming
   in.writeVTK = 0; 
@@ -153,6  154,7 @@ static void formMaps(Input& in, StringMap& stringMap, IntMap& intMap, DblMap& db
   intMap["parmaLoops"] = &in.parmaLoops;
   intMap["parmaVerbosity"] = &in.parmaVerbosity;
   intMap["writeVTK"] = &in.writeVTK;
   intMap["writeCGNSFiles"] = &in.writeCGNSFiles;
   intMap["writeGeomBCFiles"] = &in.writeGeomBCFiles;
   intMap["writeRestartFiles"] = &in.writeRestartFiles;
   intMap["ramdisk"] = &in.ramdisk;

diff --git a/phasta/phInput.h b/phasta/phInput.h
@@ -147,6  147,8 @@ class Input
     /** \brief write the geombc file during in-memory data transfer
        between phasta and chef. */
     int writeGeomBCFiles;
     /* \brief write CGNS files for pre-processing */
     int writeCGNSFiles;
     /** \brief write the restart file during in-memory data transfer
        between phasta and chef. */
     int writeRestartFiles;

diff --git a/phasta/phOutput.h b/phasta/phOutput.h
@@ -172,7  172,7 @@ struct Output
 
 void generateOutput(Input& in, BCs& bcs, apf::Mesh* mesh, Output& o);
 void writeGeomBC(Output& o, std::string path, int timestep_or_dat = 0);
-void writeCGNSgbc(Output& o, std::string path, int timestep_or_dat = 0);
 void writeCGNS(Output& o, std::string path);
 
 }