remove suffix from mesh_out

Author: bigfooted

Common/src/CConfig.cpp

@@ -2130,8 +2130,8 @@ void CConfig::SetConfig_Options() {
   addEnumOption("MESH_FORMAT", Mesh_FileFormat, Input_Map, SU2);
   /* DESCRIPTION:  Mesh input file */
   addStringOption("MESH_FILENAME", Mesh_FileName, string("mesh.su2"));
-  /*!\brief MESH_OUT_FILENAME \n DESCRIPTION: Mesh output file name. Used when converting, scaling, or deforming a mesh. \n DEFAULT: mesh_out.su2 \ingroup Config*/
-  addStringOption("MESH_OUT_FILENAME", Mesh_Out_FileName, string("mesh_out.su2"));
+  /*!\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"));
 
   /* DESCRIPTION: List of the number of grid points in the RECTANGLE or BOX grid in the x,y,z directions. (default: (33,33,33) ). */
   addShortListOption("MESH_BOX_SIZE", nMesh_Box_Size, Mesh_Box_Size);
@@ -7400,7 +7400,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 << ". " << 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;

Common/src/grid_movement/CSurfaceMovement.cpp

@@ -4918,8 +4918,8 @@ void CSurfaceMovement::WriteFFDInfo(CSurfaceMovement** surface_movement, CGeomet
     /*--- Read the name of the output file ---*/
 
     auto str = config[ZONE_0]->GetMesh_Out_FileName();
-    unsigned short lastindex = str.find_last_of('.');
-    str = str.substr(0, lastindex) + ".su2";
+    //unsigned short lastindex = str.find_last_of('.');
+    str += ".su2";
 
     output_file.precision(15);
     output_file.open(str, ios::out | ios::app);

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();
+  volumeFilename = config->GetMesh_Out_FileName() + ".su2";
 
   /*--- Set the surface filename ---*/
 

SU2_DEF/src/drivers/CDeformationDriver.cpp

@@ -498,7 +498,7 @@ void CDeformationDriver::OutputFiles() {
     output_container[iZone]->LoadData(geometry_container[iZone][INST_0][MESH_0], config_container[iZone], nullptr);
 
     output_container[iZone]->WriteToFile(config_container[iZone], geometry_container[iZone][INST_0][MESH_0],
-                                         OUTPUT_TYPE::MESH, driver_config->GetMesh_Out_FileName());
+                                         OUTPUT_TYPE::MESH, driver_config->GetMesh_Out_FileName()+ ".su2");
 
     /*--- Set the file names for the visualization files. ---*/
 

SU2_PY/SU2/run/deform.py

@@ -90,17 +90,20 @@ def deform(config, dv_new=None, dv_old=None):
 
     # setup mesh name
     suffix = "deform"
+
     mesh_name = konfig["MESH_FILENAME"]
     meshname_suffixed = su2io.add_suffix(mesh_name, suffix)
+
     konfig["MESH_OUT_FILENAME"] = meshname_suffixed
+    meshname_suffixed = su2io.add_suffix(mesh_name, suffix)
 
     # Run Deformation
     SU2_DEF(konfig)
 
     # update super config
     config.update(
         {
-            "MESH_FILENAME": konfig["MESH_OUT_FILENAME"],
+            "MESH_FILENAME": konfig["MESH_OUT_FILENAME"] + ".su2",
             "DV_KIND": konfig["DV_KIND"],
             "DV_MARKER": konfig["DV_MARKER"],
             "DV_PARAM": konfig["DV_PARAM"],

TestCases/cont_adj_euler/naca0012/inv_NACA0012.cfg

@@ -112,7 +112,7 @@ CONV_CAUCHY_EPS= 1E-6
 %
 MESH_FILENAME= mesh_NACA0012_inv.su2
 MESH_FORMAT= SU2
-MESH_OUT_FILENAME= mesh_out.su2
+MESH_OUT_FILENAME= mesh_out
 SOLUTION_FILENAME= solution_flow
 SOLUTION_ADJ_FILENAME= solution_adj
 TABULAR_FORMAT= TECPLOT

TestCases/cont_adj_euler/naca0012/inv_NACA0012_FD.cfg

@@ -112,7 +112,7 @@ CONV_CAUCHY_EPS= 1E-6
 %
 MESH_FILENAME= mesh_NACA0012_inv.su2
 MESH_FORMAT= SU2
-MESH_OUT_FILENAME= mesh_out.su2
+MESH_OUT_FILENAME= mesh_out
 SOLUTION_FILENAME= solution_flow
 SOLUTION_ADJ_FILENAME= solution_adj
 TABULAR_FORMAT= TECPLOT

TestCases/cont_adj_euler/naca0012/inv_NACA0012_discadj.cfg

@@ -86,7 +86,7 @@ CONV_CAUCHY_EPS= 1E-6
 %
 MESH_FILENAME= mesh_NACA0012_inv.su2
 MESH_FORMAT= SU2
-MESH_OUT_FILENAME= mesh_out.su2
+MESH_OUT_FILENAME= mesh_out
 SOLUTION_FILENAME= solution_flow
 SOLUTION_ADJ_FILENAME= solution_adj
 TABULAR_FORMAT= TECPLOT

TestCases/cont_adj_euler/oneram6/inv_ONERAM6.cfg

@@ -99,7 +99,7 @@ CONV_CAUCHY_EPS= 1E-10
 % ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
 %
 MESH_FILENAME= mesh_ONERAM6_inv_ffd.su2
-MESH_OUT_FILENAME= mesh_out.su2
+MESH_OUT_FILENAME= mesh_out
 SOLUTION_FILENAME= solution_flow
 SOLUTION_ADJ_FILENAME= solution_adj
 MESH_FORMAT= SU2

TestCases/cont_adj_euler/wedge/inv_wedge_ROE.cfg

@@ -94,7 +94,7 @@ CONV_STARTITER= 10
 %
 MESH_FILENAME= mesh_wedge_inv_FFD.su2
 MESH_FORMAT= SU2
-MESH_OUT_FILENAME= mesh_out.su2
+MESH_OUT_FILENAME= mesh_out
 SOLUTION_FILENAME= solution_flow
 SOLUTION_ADJ_FILENAME= solution_adj
 TABULAR_FORMAT= TECPLOT