Merge branch 'develop' into feature_conductivity

Author: Cristopher-Morales

Common/include/CConfig.hpp

@@ -45,6 +45,7 @@
 
 #include "option_structure.hpp"
 #include "containers/container_decorators.hpp"
+#include "toolboxes/printing_toolbox.hpp"
 
 #ifdef HAVE_CGNS
 #include "cgnslib.h"
@@ -358,7 +359,6 @@ class CConfig {
   su2double BEM_blade_angle;                 /*!< \brief Propeller blade angle.*/
   string    BEM_prop_filename;               /*!< \brief Propeller filename.*/
   unsigned short ActDiskBem_Frequency;       /*!< \brief Frequency of updating actuator disk with BEM. */
-  bool      History_File_Append_Flag;        /*!< \brief Flag to append history file.*/
   su2double *ActDisk_DeltaPress;             /*!< \brief Specified pressure delta for actuator disk. */
   su2double *ActDisk_DeltaTemp;              /*!< \brief Specified temperature delta for actuator disk. */
   su2double *ActDisk_TotalPressRatio;        /*!< \brief Specified tot. pres. ratio for actuator disk. */
@@ -2304,7 +2304,22 @@ class CConfig {
    * \brief Get the name of the file with the element properties for structural problems.
    * \return Name of the file with the element properties of the structural problem.
    */
-  string GetFEA_FileName(void) const { return FEA_FileName; }
+  string GetFEA_FileName(void) const {
+    string FEAFilename = FEA_FileName;
+
+    /*--- strip the extension if it is present, only if it is .dat ---*/
+    PrintingToolbox::TrimExtension(".dat", FEAFilename);
+
+    /*--- If multizone, append zone name ---*/
+    if (Multizone_Problem)
+      FEAFilename = GetMultizone_FileName(FEAFilename, GetiZone(), "");
+
+    /*--- Add the extension again ---*/
+    FEAFilename += ".dat";
+
+    /*--- return the stripped filename base, without extension. ---*/
+    return FEAFilename;
+  }
 
   /*!
    * \brief Determine if advanced features are used from the element-based FEA analysis (experimental feature).
@@ -5073,12 +5088,6 @@ 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.
    * \return Name of the input file for the specified actuator disk.
@@ -5601,20 +5610,70 @@ 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);
+
+    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);
+
+    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
@@ -5652,7 +5711,68 @@ 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 { return Conv_FileName; }
+  string GetHistory_FileName(void) const {
+
+    /*--- we keep the original Conv_FileName  ---*/
+    string historyFilename = Conv_FileName;
+
+    /*--- strip the extension, only if it is .dat or .csv ---*/
+    auto extIndex = historyFilename.rfind(".dat");
+    if (extIndex != std::string::npos) historyFilename.resize(extIndex);
+    extIndex = historyFilename.rfind(".csv");
+    if (extIndex != std::string::npos) historyFilename.resize(extIndex);
+
+    /*--- 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()) {
+      historyFilename = GetUnsteady_FileName(historyFilename, GetRestart_Iter(), "");
+    }
+
+    /*--- Add the correct file extension depending on the file format ---*/
+    string hist_ext = ".csv";
+    if (GetTabular_FileFormat() == TAB_OUTPUT::TAB_TECPLOT) hist_ext = ".dat";
+
+    /*--- Append the extension ---*/
+    historyFilename += hist_ext;
+
+    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
@@ -5703,15 +5823,6 @@ class CConfig {
    */
   string GetMultizone_FileName(string val_filename, int val_iZone, const string& ext) const;
 
-  /*!
-   * \brief Append the zone index to the restart or the solution files.
-   * \param[in] val_filename - the base filename.
-   * \param[in] val_iZone - the zone ID.
-   * \param[in] ext - the filename extension.
-   * \return Name of the restart file for the flow variables.
-   */
-  string GetMultizone_HistoryFileName(string val_filename, int val_iZone, const string& ext) const;
-
   /*!
    * \brief Append the instance index to the restart or the solution files.
    * \param[in] val_filename - the base filename.

Common/include/toolboxes/printing_toolbox.hpp

@@ -25,6 +25,8 @@
  * License along with SU2. If not, see <http://www.gnu.org/licenses/>.
  */
 
+#pragma once
+
 #include <iostream>
 #include <iomanip>
 #include <cstdint>
@@ -287,4 +289,16 @@ inline std::string StringToUpperCase(const std::string& str) {
   return upp_str;
 }
 
+/*!
+ * \brief Trim an extension from a name.
+ * \param[in] - extension we want to remove.
+ * \param[in,out] - string we want to trim.
+ */
+inline void TrimExtension(const std::string& ext, std::string& name) {
+  const auto extIndex = name.rfind(ext);
+  if (extIndex != std::string::npos && extIndex + ext.size() == name.size()) {
+    name.resize(extIndex);
+  }
+}
+
 }  // namespace PrintingToolbox