final fix and cleanup

Author: bigfooted

Common/include/CConfig.hpp

@@ -355,7 +355,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. */

Common/src/CConfig.cpp

@@ -2433,8 +2433,8 @@ void CConfig::SetConfig_Options() {
   /*!\par CONFIG_CATEGORY: FEA solver \ingroup Config*/
   /*--- Options related to the FEA solver ---*/
 
-  /*!\brief FEA_FILENAME \n DESCRIPTION: Filename to input for element-based properties \n Default: default_element_properties.dat \ingroup Config */
-  addStringOption("FEA_FILENAME", FEA_FileName, string("default_element_properties.dat"));
+  /*!\brief FEA_FILENAME \n DESCRIPTION: Filename to input for element-based properties \n Default: default_element_properties \ingroup Config */
+  addStringOption("FEA_FILENAME", FEA_FileName, string("default_element_properties"));
   /* DESCRIPTION: Determine if advanced features are used from the element-based FEA analysis (NO, YES = experimental) */
   addBoolOption("FEA_ADVANCED_MODE", FEAAdvancedMode, false);
 
@@ -8403,11 +8403,6 @@ string CConfig::GetUnsteady_FileName(string val_filename, int val_iter, const st
   string UnstExt, UnstFilename = std::move(val_filename);
   char buffer[50];
 
-  /*--- Note that we always call this routine with the extension already attached, so
-        we remove it. ---*/
-  //unsigned short lastindex = UnstFilename.find_last_of('.');
-  //UnstFilename = UnstFilename.substr(0, lastindex);
-
   /*--- Check that a positive value iteration is requested (for now). ---*/
 
   if (val_iter < 0) {
@@ -8436,11 +8431,6 @@ string CConfig::GetMultizone_FileName(string val_filename, int val_iZone, const
     string multizone_filename = std::move(val_filename);
     char buffer[50];
 
-    /*--- Note that we always call this routine wit the extension already attached, so
-          we remove it. ---*/
-    //unsigned short lastindex = multizone_filename.find_last_of('.');
-    //multizone_filename = multizone_filename.substr(0, lastindex);
-
     if (Multizone_Problem) {
         SPRINTF (buffer, "_%d", SU2_TYPE::Int(val_iZone));
         multizone_filename.append(string(buffer));

Common/src/geometry/meshreader/CSU2ASCIIMeshReaderBase.cpp

@@ -44,9 +44,8 @@ bool CSU2ASCIIMeshReaderBase::ReadMetadata(const bool single_pass, CConfig* conf
   /*--- Open grid file ---*/
   mesh_file.open(meshFilename);
   if (mesh_file.fail()) {
-    cout << "Trying to open mesh filename " << meshFilename << endl;
     SU2_MPI::Error(
-        "Error opening SU2 ASCII grid. \n"
+        "Error opening SU2 ASCII grid.\n"
         "Check that the file exists.",
         CURRENT_FUNCTION);
   }

SU2_CFD/src/output/CFlowOutput.cpp

@@ -2434,14 +2434,6 @@ void CFlowOutput::WriteForcesBreakdown(const CConfig* config, const CSolver* flo
 
   auto fileName = config->GetBreakdown_FileName();
 
-
-  //if (unsteady) {
-    //const auto lastindex = fileName.find_last_of('.');
-    //const auto ext = fileName.substr(lastindex, fileName.size());
-    //fileName = fileName.substr(0, lastindex);
-    //fileName = config->GetFilename(fileName, ext, curTimeIter);
-  //}
-
   /*--- Output the mean flow solution using only the master node ---*/
 
   cout << "\nWriting the forces breakdown file (" << fileName << ")." << endl;

SU2_CFD/src/output/COutput.cpp

@@ -482,6 +482,7 @@ void COutput::WriteToFile(CConfig *config, CGeometry *geometry, OUTPUT_TYPE form
       /*--- Load and sort the output data and connectivity. ---*/
 
       volumeDataSorter->SortConnectivity(config, geometry, true);
+
       LogOutputFiles("SU2 mesh");
       fileWriter = new CSU2MeshFileWriter(volumeDataSorter, config->GetiZone(), config->GetnZone());
 

SU2_CFD/src/output/filewriter/CSU2MeshFileWriter.cpp

@@ -38,16 +38,12 @@ void CSU2MeshFileWriter::WriteData(string val_filename) {
 
   ofstream output_file;
 
-
-  cout <<"mesh file writer : file=" << val_filename << endl;
   /*--- 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);
-  cout <<"mesh file writer : file=" << val_filename << endl;
 
   /*--- We append the pre-defined suffix (extension) to the filename (prefix) ---*/
   val_filename.append(fileExt);
-  cout <<"mesh file writer : file=" << val_filename << endl;
 
   /*--- Only the FIRST node writes the header (it does not matter if that is the master). ---*/
 

SU2_CFD/src/solvers/CBaselineSolver.cpp

@@ -91,17 +91,13 @@ void CBaselineSolver::SetOutputVariables(CGeometry *geometry, CConfig *config) {
   } else {
     filename = config->GetSolution_FileName();
   }
-  //nijso
-  cout << "filename = "<<filename << endl;
   /*--- Read only the number of variables in the restart file. ---*/
 
   if (config->GetRead_Binary_Restart()) {
 
     /*--- Multizone problems require the number of the zone to be appended. ---*/
 
-    
     filename = config->GetFilename(filename, ".dat", config->GetTimeIter());
-  cout << "filename = "<<filename << endl;
 
     char fname[100];
     strcpy(fname, filename.c_str());

SU2_CFD/src/solvers/CFEASolver.cpp

@@ -487,7 +487,6 @@ void CFEASolver::Set_ReferenceGeometry(CGeometry *geometry, CConfig *config) {
   /*--- In case there is no file ---*/
 
   if (reference_file.fail()) {
-    cout << "reference_file" << endl;
     SU2_MPI::Error( "There is no FEM reference geometry file!!", CURRENT_FUNCTION);
   }
 

SU2_PY/SU2/io/state.py

@@ -259,7 +259,6 @@ def find_files(self, config):
         files = self.FILES
 
         mesh_name = config.MESH_FILENAME
-        print("state:: find_files: binary restart = ", config.READ_BINARY_RESTART)
         if config.get("READ_BINARY_RESTART", "YES") == "NO":
             if not "RESTART_ASCII" in config.get("OUTPUT_FILES", ["RESTART"]):
                 print(
@@ -270,16 +269,10 @@ def find_files(self, config):
         direct_name = config.SOLUTION_FILENAME
         adjoint_name = config.SOLUTION_ADJ_FILENAME
 
-        print("direct name=", direct_name)
-
         if "RESTART_ASCII" in config.get("OUTPUT_FILES", ["RESTART"]):
-            # direct_name = direct_name.split(".")[0] + ".csv"
-            # adjoint_name = adjoint_name.split(".")[0] + ".csv"
             direct_name = direct_name + ".csv"
             adjoint_name = adjoint_name + ".csv"
         else:
-            # direct_name = direct_name.split(".")[0] + ".dat"
-            # adjoint_name = adjoint_name.split(".")[0] + ".dat"
             direct_name = direct_name + ".dat"
             adjoint_name = adjoint_name + ".dat"
 

SU2_PY/SU2/io/tools.py

@@ -1178,9 +1178,6 @@ def restart2solution(config, state={}):
     if config.MATH_PROBLEM == "DIRECT":
         restart = config.RESTART_FILENAME
         solution = config.SOLUTION_FILENAME
-        # restart = restart.split(".")[0]
-        # solution = solution.split(".")[0]
-
         pass
 
         if "RESTART_ASCII" in config.get("OUTPUT_FILES", ["RESTART_BINARY"]):
@@ -1197,7 +1194,6 @@ def restart2solution(config, state={}):
         restarts = expand_time(restarts, config)
         solutions = expand_time(solutions, config)
 
-        print("copy restart to solution:", restarts, " ", solutions)
         # move
         for res, sol in zip(restarts, solutions):
             if os.path.exists(res):