update FEA_Filename

Author: bigfooted

Common/include/CConfig.hpp

@@ -2260,7 +2260,23 @@ 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 ---*/
+    auto extIndex = FEAFilename.rfind(".dat");
+    if (extIndex != std::string::npos) FEAFilename.resize(extIndex);
+
+    /*--- 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).
@@ -5484,8 +5500,6 @@ class CConfig {
     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:

Common/src/CConfig.cpp

@@ -7419,7 +7419,7 @@ void CConfig::SetOutput(SU2_COMPONENT val_software, unsigned short val_izone) {
   }
 
   if (val_software == SU2_COMPONENT::SU2_DEF) {
-    cout << "Output mesh file name: " << Mesh_Out_FileName  << ".su2 . " << endl;
+    cout << "Output mesh file name: " << Mesh_Out_FileName << ".su2 . " << endl;
     switch (GetDeform_Stiffness_Type()) {
       case INVERSE_VOLUME:
         cout << "Cell stiffness scaled by inverse of the cell volume." << endl;
@@ -8428,14 +8428,7 @@ string CConfig::GetUnsteady_FileName(string val_filename, int val_iter, const st
   if (Time_Domain) {
     /*--- Determine dynamic number of zeroes, note that we always add 5 digits. ---*/
     int zeroes = 6 - to_string(val_iter).length();
-    cout << "zeroes = " << zeroes << " , val = " << val_iter <<endl;
     SPRINTF (buffer, "_%0*ld", 5,val_iter);
-    //if ((val_iter >= 0)    && (val_iter < 10))    SPRINTF (buffer, "_0000%d", val_iter);
-    //if ((val_iter >= 10)   && (val_iter < 100))   SPRINTF (buffer, "_000%d",  val_iter);
-    //if ((val_iter >= 100)  && (val_iter < 1000))  SPRINTF (buffer, "_00%d",   val_iter);
-    //if ((val_iter >= 1000) && (val_iter < 10000)) SPRINTF (buffer, "_0%d",    val_iter);
-    //if (val_iter >= 10000) SPRINTF (buffer, "_%d", val_iter);
-
 
     UnstExt = string(buffer);
   }
@@ -8535,9 +8528,6 @@ string CConfig::GetObjFunc_Extension(string val_filename) const {
     }
     Filename.append(AdjExt);
 
-    /*--- Lastly, add the .dat extension ---*/
-    //Filename.append(".dat");
-
   }
 
   return Filename;

SU2_CFD/src/drivers/CDriver.cpp

@@ -2313,18 +2313,8 @@ void CDriver::InitializeNumerics(CConfig *config, CGeometry **geometry, CSolver
 
       ifstream properties_file;
 
-
       string filename = config->GetFEA_FileName();
 
-      unsigned short lastindex = filename.find_last_of('.');
-      filename = filename.substr(0, lastindex);
-
-      if (nZone > 1)
-        filename = config->GetMultizone_FileName(filename, iZone, "");
-
-      /*--- At the moment we stay consistent with the default extension .dat for all input files. ---*/
-      filename += ".dat";
-
       properties_file.open(filename.data(), ios::in);
 
       /*--- In case there is a properties file, containers are allocated for a number of material models. ---*/

SU2_CFD/src/solvers/CFEASolver.cpp

@@ -295,11 +295,7 @@ void CFEASolver::Set_ElementProperties(CGeometry *geometry, CConfig *config) {
 
   auto filename = config->GetFEA_FileName();
 
-  /*--- If multizone, append zone name ---*/
-  if (nZone > 1)
-    filename = config->GetMultizone_FileName(filename, iZone, "");
 
-  filename += ".dat";
   if (rank == MASTER_NODE) cout << "Filename: " << filename << "." << endl;
 
   ifstream properties_file;

SU2_CFD/src/solvers/CIncEulerSolver.cpp

@@ -72,8 +72,8 @@ CIncEulerSolver::CIncEulerSolver(CGeometry *geometry, CConfig *config, unsigned
     /*--- Multizone problems require the number of the zone to be appended. ---*/
 
     auto filename_ = config->GetSolution_FileName();
-    // nijso: check this!
-    if (nZone > 1) filename_ = config->GetMultizone_FileName(filename_, iZone, ".dat");
+  //   // nijso: this is inconsistent with line 70, nZone<= 1!
+    if (nZone > 1) filename_ = config->GetMultizone_FileName(filename_, iZone, "");
 
     /*--- Modify file name for a dual-time unsteady restart ---*/
 
@@ -82,24 +82,27 @@ CIncEulerSolver::CIncEulerSolver(CGeometry *geometry, CConfig *config, unsigned
       else if (config->GetTime_Marching() == TIME_MARCHING::DT_STEPPING_1ST)
         Unst_RestartIter = SU2_TYPE::Int(config->GetRestart_Iter())-1;
       else Unst_RestartIter = SU2_TYPE::Int(config->GetRestart_Iter())-2;
-      filename_ = config->GetUnsteady_FileName(filename_, Unst_RestartIter, ".dat");
+      filename_ = config->GetUnsteady_FileName(filename_, Unst_RestartIter, "");
     }
 
     /*--- Modify file name for a time stepping unsteady restart ---*/
 
     if (time_stepping) {
       if (adjoint) Unst_RestartIter = SU2_TYPE::Int(config->GetUnst_AdjointIter())-1;
       else Unst_RestartIter = SU2_TYPE::Int(config->GetRestart_Iter())-1;
-      filename_ = config->GetUnsteady_FileName(filename_, Unst_RestartIter, ".dat");
+      filename_ = config->GetUnsteady_FileName(filename_, Unst_RestartIter, "");
     }
 
-    /*--- Read and store the restart metadata. ---*/
+   filename_ += ".dat";
 
+    /*--- Read and store the restart metadata. ---*/
+    // nijso: We now overwrite all previous modifications of filename ?!?
     filename_ = "flow";
     filename_ = config->GetFilename(filename_, ".meta", Unst_RestartIter);
     Read_SU2_Restart_Metadata(geometry, config, adjoint, filename_);
 
   }
+
   if (restart && (config->GetKind_Streamwise_Periodic() == ENUM_STREAMWISE_PERIODIC::MASSFLOW)) {
     string filename_ = "flow";
     filename_ = config->GetFilename(filename_, ".meta", Unst_RestartIter);

TestCases/disc_adj_fsi/dyn_fsi/configFEA.cfg

@@ -8,7 +8,7 @@ NEWMARK_GAMMA=0.52
 
 % Optimization --------------------------------------------------------- %
 FEA_ADVANCED_MODE= YES
-FEA_FILENAME= element_properties
+FEA_FILENAME= element_properties.dat
 GRAD_OBJFUNC_FILENAME= of_grad
 REFERENCE_NODE= 234
 REFERENCE_NODE_DISPLACEMENT= (0.0, 0.0)

TestCases/fea_topology/config.cfg

@@ -13,7 +13,7 @@ TOPOLOGY_OPTIMIZATION= YES
 % this file, those are the variables the optimizer should manipulate.
 % Values below 0 or above 1 will result in density of 0 or 1 respectively,
 % i.e. the value after filtering is ignored.
-FEA_FILENAME= element_properties
+FEA_FILENAME= element_properties.dat
 % Filtering is required to avoid numerical issues, see [Sigmund, 2007]
 % (DOI 10.1007/s00158-006-0087-x). Currently available options:
 % CONSTANT;  CONICAL (default);  GAUSSIAN;  DILATE;  ERODE.

TestCases/fea_topology/quick_start/settings.cfg

@@ -6,7 +6,7 @@ ITER= 1
 %
 % Optimization
 TOPOLOGY_OPTIMIZATION= YES
-FEA_FILENAME= element_properties
+FEA_FILENAME= element_properties.dat
 TOPOL_OPTIM_FILTER_RADIUS= 0.013
 TOPOL_OPTIM_FILTER_KERNEL= ( DILATE,ERODE )
 TOPOL_OPTIM_KERNEL_PARAM= 0.01

TestCases/fea_topology/quick_start/settings_compliance.cfg

@@ -6,7 +6,7 @@ ITER= 1
 %
 % Optimization
 TOPOLOGY_OPTIMIZATION= YES
-FEA_FILENAME= element_properties
+FEA_FILENAME= element_properties.dat
 TOPOL_OPTIM_FILTER_RADIUS= 0.013
 TOPOL_OPTIM_FILTER_KERNEL= ( DILATE,ERODE )
 TOPOL_OPTIM_KERNEL_PARAM= 0.01

TestCases/fea_topology/quick_start/settings_volfrac.cfg

@@ -6,7 +6,7 @@ ITER= 1
 %
 % Optimization
 TOPOLOGY_OPTIMIZATION= YES
-FEA_FILENAME= element_properties
+FEA_FILENAME= element_properties.dat
 TOPOL_OPTIM_FILTER_RADIUS= 0.013
 TOPOL_OPTIM_FILTER_KERNEL= ( DILATE,ERODE )
 TOPOL_OPTIM_KERNEL_PARAM= 0.01