move dealing with extensions up to the getfile functions

Author: bigfooted

Common/include/CConfig.hpp

@@ -4932,11 +4932,7 @@ class CConfig {
    */
   bool GetInlet_Profile_From_File(void) const { return Inlet_From_File; }
 
-  /*!
-   * \brief Get name of the input file for the specified inlet profile.
-   * \return Name of the input file for the specified inlet profile.
-   */
-  string GetInlet_FileName(void) const { return Inlet_Filename; }
+
 
   /*!
    * \brief Get name of the input file for the specified actuator disk.
@@ -5382,19 +5378,19 @@ class CConfig {
   bool GetWrt_Volume_Overwrite(void) const { return Wrt_Volume_Overwrite; }
 
   /*!
-   * \brief Provides the number of varaibles.
+   * \brief Provides the number of variables.
    * \return Number of variables.
    */
   unsigned short GetnVar(void);
 
   /*!
-   * \brief Provides the number of varaibles.
+   * \brief Provides the number of variables.
    * \return Number of variables.
    */
   unsigned short GetnZone(void) const { return nZone; }
 
   /*!
-   * \brief Provides the number of varaibles.
+   * \brief Provides the number of variables.
    * \return Number of variables.
    */
   unsigned short GetiZone(void) const { return iZone; }
@@ -5454,20 +5450,83 @@ class CConfig {
    * \brief Get name of the input grid.
    * \return File name of the input grid.
    */
-  string GetMesh_FileName(void) const { return Mesh_FileName; }
+  string GetMesh_FileName(void) const {
+
+    /*--- we keep the original Mesh_FileName  ---*/
+    string meshFilename = Mesh_FileName;
+
+    /*--- strip the extension, only if it is .su2 or .cgns ---*/
+    auto extIndex = meshFilename.rfind(".su2");
+    if (extIndex != std::string::npos) meshFilename.resize(extIndex);
+    extIndex = meshFilename.rfind(".cgns");
+    if (extIndex != std::string::npos) meshFilename.resize(extIndex);
+
+    cout << "mesh file format = " << GetMesh_FileFormat() << " , file = " << meshFilename<< endl;
+
+    switch (GetMesh_FileFormat()) {
+      case SU2:
+      case RECTANGLE:
+      case BOX:
+        meshFilename += ".su2";
+        break;
+      case CGNS_GRID:
+        meshFilename += ".cgns";
+        break;
+      default:
+        SU2_MPI::Error("Unrecognized mesh format specified!", CURRENT_FUNCTION);
+      break;
+    }
+
+    return meshFilename;
+  }
 
   /*!
    * \brief Get name of the output grid, this parameter is important for grid
    *        adaptation and deformation.
    * \return File name of the output grid.
    */
-  string GetMesh_Out_FileName(void) const { return Mesh_Out_FileName; }
+  string GetMesh_Out_FileName(void) const {
+
+    /*--- we keep the original Mesh_Out_FileName  ---*/
+    string meshFilename = Mesh_Out_FileName;
+
+    /*--- strip the extension, only if it is .su2 or .cgns ---*/
+    auto extIndex = meshFilename.rfind(".su2");
+    if (extIndex != std::string::npos) meshFilename.resize(extIndex);
+    extIndex = meshFilename.rfind(".cgns");
+    if (extIndex != std::string::npos) meshFilename.resize(extIndex);
+
+    // switch (Mesh_FileFormat) {
+    //   case SU2:
+    //     meshFilename += ".su2";
+    //   case CGNS_GRID:
+    //     meshFilename += ".cgns";
+    //   default:
+    //     SU2_MPI::Error("Unrecognized mesh format specified!", CURRENT_FUNCTION);
+    //   break;
+    // }
+
+    return meshFilename;
+  }
 
   /*!
    * \brief Get the name of the file with the solution of the flow problem.
    * \return Name of the file with the solution of the flow problem.
    */
-  string GetSolution_FileName(void) const { return Solution_FileName; }
+  string GetSolution_FileName(void) const {
+
+    /*--- we keep the original Solution_FileName  ---*/
+    string solutionFilename = Solution_FileName;
+
+    /*--- strip the extension, only if it is .dat or .csv ---*/
+    auto extIndex = solutionFilename.rfind(".dat");
+    if (extIndex != std::string::npos) solutionFilename.resize(extIndex);
+    extIndex = solutionFilename.rfind(".csv");
+    if (extIndex != std::string::npos) solutionFilename.resize(extIndex);
+
+    /*--- return the stripped filename base, without extension. ---*/
+    return solutionFilename;
+    }
 
   /*!
    * \brief Get the name of the file with the solution of the adjoint flow problem
@@ -5505,7 +5564,7 @@ class CConfig {
    * \brief Get the name of the file with the convergence history of the problem.
    * \return Name of the file with convergence history of the problem.
    */
-  string GetConv_FileName(void) const {
+  string GetHistory_FileName(void) const {
 
     /*--- we keep the original Conv_FileName  ---*/
     string historyFilename = Conv_FileName;
@@ -5516,8 +5575,9 @@ class CConfig {
     extIndex = historyFilename.rfind(".csv");
     if (extIndex != std::string::npos) historyFilename.resize(extIndex);
 
-    /*--- Append the zone ID ---*/
-    historyFilename = GetMultizone_FileName(historyFilename, GetiZone(), "");
+    /*--- Multizone problems require the number of the zone to be appended. ---*/
+    if (GetMultizone_Problem())
+      historyFilename = GetMultizone_FileName(historyFilename, GetiZone(), "");
 
     /*--- Append the restart iteration ---*/
     if (GetTime_Domain() && GetRestart()) {
@@ -5534,6 +5594,39 @@ class CConfig {
     return historyFilename;
   }
 
+  /*!
+   * \brief Get name of the input file for the specified inlet profile.
+   * \return Name of the input file for the specified inlet profile.
+   */
+  string GetInlet_FileName(void) const {
+
+    /*--- we keep the original inlet profile filename  ---*/
+    string inletProfileFilename = Inlet_Filename;
+
+    /*--- strip the extension, only if it is .dat or .csv ---*/
+    auto extIndex = inletProfileFilename.rfind(".dat");
+    if (extIndex != std::string::npos) inletProfileFilename.resize(extIndex);
+    extIndex = inletProfileFilename.rfind(".csv");
+    if (extIndex != std::string::npos) inletProfileFilename.resize(extIndex);
+
+    /*--- Multizone problems require the number of the zone to be appended. ---*/
+    if (GetMultizone_Problem())
+      inletProfileFilename = GetMultizone_FileName(inletProfileFilename, GetiZone(), "");
+
+    /*--- Modify file name for an unsteady restart ---*/
+    if (GetTime_Domain() && GetRestart()) {
+      inletProfileFilename = GetUnsteady_FileName(inletProfileFilename, GetRestart_Iter(), "");
+    }
+    /*--- Add the correct file extension depending on the file format ---*/
+    string ext = ".dat";
+
+    inletProfileFilename += ext;
+
+
+    return inletProfileFilename;
+  }
+
+
   /*!
    * \brief Get the Starting Iteration for the windowing approach
    *        in Sensitivity Analysis for period-averaged outputs, which oscillate.

Common/src/CConfig.cpp

@@ -170,7 +170,7 @@ CConfig::CConfig(CConfig* config, char case_filename[MAX_STRING_SIZE], SU2_COMPO
 
   /*--- Get the dimension --- */
 
-  val_nDim = GetnDim(Mesh_FileName, Mesh_FileFormat);
+  val_nDim = GetnDim(GetMesh_FileName(), Mesh_FileFormat);
 
   /*--- Configuration file postprocessing ---*/
 
@@ -2127,7 +2127,7 @@ void CConfig::SetConfig_Options() {
   /*!\brief MESH_FORMAT \n DESCRIPTION: Mesh input file format \n OPTIONS: see \link Input_Map \endlink \n DEFAULT: SU2 \ingroup Config*/
   addEnumOption("MESH_FORMAT", Mesh_FileFormat, Input_Map, SU2);
   /* DESCRIPTION:  Mesh input file */
-  addStringOption("MESH_FILENAME", Mesh_FileName, string("mesh.su2"));
+  addStringOption("MESH_FILENAME", Mesh_FileName, string("mesh"));
   /*!\brief MESH_OUT_FILENAME \n DESCRIPTION: Mesh output file name. Used when converting, scaling, or deforming a mesh. \n DEFAULT: mesh_out \ingroup Config*/
   addStringOption("MESH_OUT_FILENAME", Mesh_Out_FileName, string("mesh_out"));
 
@@ -3341,7 +3341,7 @@ void CConfig::SetnZone(){
 
       /*--- Get the number of zones from the mesh file --- */
 
-      nZone = GetnZone(Mesh_FileName, Mesh_FileFormat);
+      nZone = GetnZone(GetMesh_FileName(), Mesh_FileFormat);
 
       /*--- If config list is set, make sure number matches number of zones in mesh file --- */
 
@@ -6588,7 +6588,7 @@ void CConfig::SetOutput(SU2_COMPONENT val_software, unsigned short val_izone) {
     }
   }
 
-  cout << "Input mesh file name: " << Mesh_FileName << endl;
+  cout << "Input mesh file name: " << GetMesh_FileName() << endl;
 
   if (val_software == SU2_COMPONENT::SU2_DOT) {
     if (DiscreteAdjoint) {
@@ -8362,29 +8362,24 @@ CConfig::~CConfig() {
   delete [] FreeStreamTurboNormal;
 }
 
+/*--- Input is the filename base, output is the completed filename. ---*/
 string CConfig::GetFilename(string filename, const string& ext, int timeIter) const {
 
-
-
   /*--- Append the zone number if multizone problems ---*/
-  if (Multizone_Problem)
-    //filename = GetMultizone_FileName(filename, GetiZone(), ext);
+  if (GetMultizone_Problem())
     filename = GetMultizone_FileName(filename, GetiZone(), "");
 
   /*--- Append the zone number if multiple instance problems ---*/
   if (GetnTimeInstances() > 1)
-    //filename = GetMultiInstance_FileName(filename, GetiInst(), ext);
     filename = GetMultiInstance_FileName(filename, GetiInst(), "");
 
   /*--- Append the iteration number for unsteady problems ---*/
   if (GetTime_Domain())
-    //filename = GetUnsteady_FileName(filename, timeIter, ext);
     filename = GetUnsteady_FileName(filename, timeIter, "");
 
-
   /*--- Add the extension --- */
-  filename = filename + string(ext);
 
+  filename = filename + string(ext);
 
   return filename;
 }

Common/src/grid_movement/CSurfaceMovement.cpp

@@ -4060,7 +4060,7 @@ void CSurfaceMovement::ReadFFDInfo(CGeometry* geometry, CConfig* config, CFreeFo
 
   mesh_file.open(val_mesh_filename);
   if (mesh_file.fail()) {
-    SU2_MPI::Error("There is no geometry file (ReadFFDInfo)!!", CURRENT_FUNCTION);
+    SU2_MPI::Error("ReadFFDInfo:: There is no geometry file called " + val_mesh_filename, CURRENT_FUNCTION);
   }
 
   while (getline(mesh_file, text_line)) {
@@ -4919,7 +4919,7 @@ void CSurfaceMovement::WriteFFDInfo(CSurfaceMovement** surface_movement, CGeomet
 
     auto str = config[ZONE_0]->GetMesh_Out_FileName();
     // unsigned short lastindex = str.find_last_of('.');
-    str += ".su2";
+    //str += ".su2";
 
     output_file.precision(15);
     output_file.open(str, ios::out | ios::app);

SU2_CFD/include/solvers/CFVMFlowSolverBase.inl

@@ -824,7 +824,7 @@ void CFVMFlowSolverBase<V, R>::LoadRestart_impl(CGeometry **geometry, CSolver **
                                                 unsigned short nVar_Restart) {
   /*--- Restart the solution from file information ---*/
 
-  const string restart_filename = config->GetFilename(config->GetSolution_FileName(), "", iter);
+  string restart_filename = config->GetSolution_FileName();
   const bool static_fsi = ((config->GetTime_Marching() == TIME_MARCHING::STEADY) && config->GetFSI_Simulation());
 
   /*--- To make this routine safe to call in parallel most of it can only be executed by one thread. ---*/
@@ -837,10 +837,12 @@ void CFVMFlowSolverBase<V, R>::LoadRestart_impl(CGeometry **geometry, CSolver **
     unsigned short skipVars = nDim;
 
     /*--- Read the restart data from either an ASCII or binary SU2 file. ---*/
-
+cout << "nijso:cfvmflowsolverbase.inl" << endl;
     if (config->GetRead_Binary_Restart()) {
+      restart_filename = config->GetFilename(restart_filename, ".dat", iter);
       Read_SU2_Restart_Binary(geometry[MESH_0], config, restart_filename);
     } else {
+      restart_filename = config->GetFilename(restart_filename, ".csv", iter);
       Read_SU2_Restart_ASCII(geometry[MESH_0], config, restart_filename);
     }
 

SU2_CFD/src/output/CMeshOutput.cpp

@@ -38,7 +38,7 @@ CMeshOutput::CMeshOutput(CConfig *config, unsigned short nDim) : COutput(config,
 
   /*--- Set the volume filename --- */
 
-  volumeFilename = config->GetMesh_Out_FileName() + ".su2";
+  volumeFilename = config->GetMesh_Out_FileName();
 
   /*--- Set the surface filename ---*/
 

SU2_CFD/src/output/COutput.cpp

@@ -84,7 +84,7 @@ COutput::COutput(const CConfig *config, unsigned short ndim, bool fem_output):
 
   /*--- Retrieve the history filename, including extension ---*/
 
-  historyFilename = config->GetConv_FileName();
+  historyFilename = config->GetHistory_FileName();
 
   historySep = ",";
 

SU2_CFD/src/output/filewriter/CSU2MeshFileWriter.cpp

@@ -39,8 +39,8 @@ void CSU2MeshFileWriter::WriteData(string val_filename) {
   ofstream output_file;
 
   /*--- strip the extension from the original filename and add the .su2 extension ---*/
-  unsigned short lastindex = val_filename.find_last_of('.');
-  val_filename = val_filename.substr(0, lastindex);
+  //unsigned short lastindex = val_filename.find_last_of('.');
+  //val_filename = val_filename.substr(0, lastindex);
 
   /*--- We append the pre-defined suffix (extension) to the filename (prefix) ---*/
   val_filename.append(fileExt);

SU2_CFD/src/solvers/CAdjEulerSolver.cpp

@@ -3814,7 +3814,9 @@ void CAdjEulerSolver::LoadRestart(CGeometry **geometry, CSolver ***solver, CConf
 
   filename         = config->GetSolution_AdjFileName();
   restart_filename = config->GetObjFunc_Extension(filename);
-  restart_filename = config->GetFilename(restart_filename, "", val_iter);
+
+  cout << "adj-euler: restart filename = " << restart_filename << endl;
+
 
   Coord = new su2double [nDim];
   for (iDim = 0; iDim < nDim; iDim++)
@@ -3827,8 +3829,10 @@ void CAdjEulerSolver::LoadRestart(CGeometry **geometry, CSolver ***solver, CConf
   /*--- Read the restart data from either an ASCII or binary SU2 file. ---*/
 
   if (config->GetRead_Binary_Restart()) {
+    restart_filename = config->GetFilename(restart_filename, ".dat", val_iter);
     Read_SU2_Restart_Binary(geometry[MESH_0], config, restart_filename);
   } else {
+    restart_filename = config->GetFilename(restart_filename, ".csv", val_iter);
     Read_SU2_Restart_ASCII(geometry[MESH_0], config, restart_filename);
   }