diff --git a/Common/include/CConfig.hpp b/Common/include/CConfig.hpp
index 45c4618fa485..0d0c2a90bfa4 100644
--- a/Common/include/CConfig.hpp
+++ b/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. */
@@ -2276,7 +2276,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).
@@ -5021,12 +5036,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.
@@ -5549,20 +5558,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
@@ -5600,7 +5659,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
@@ -5651,15 +5771,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.
diff --git a/Common/include/toolboxes/printing_toolbox.hpp b/Common/include/toolboxes/printing_toolbox.hpp
index 079ad4c93ca6..790b8f5871ae 100644
--- a/Common/include/toolboxes/printing_toolbox.hpp
+++ b/Common/include/toolboxes/printing_toolbox.hpp
@@ -25,6 +25,8 @@
* License along with SU2. If not, see .
*/
+#pragma once
+
#include
#include
#include
@@ -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
diff --git a/Common/src/CConfig.cpp b/Common/src/CConfig.cpp
index 7c7eb20e1009..a6fbeb2d16fa 100644
--- a/Common/src/CConfig.cpp
+++ b/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 ---*/
@@ -1710,8 +1710,6 @@ void CConfig::SetConfig_Options() {
/* DESCRIPTION: Actuator disk double surface */
addBoolOption("ACTDISK_DOUBLE_SURFACE", ActDisk_DoubleSurface, false);
- /* DESCRIPTION: Actuator disk BEM switch for history file appending.*/
- addBoolOption("HISTORY_FILE_APPEND", History_File_Append_Flag, false);
/* DESCRIPTION: Propeller blade angle for actuator disk BEM.*/
addDoubleOption("BEM_PROP_BLADE_ANGLE", BEM_blade_angle, 23.9);
/* DESCRIPTION: Propeller file name for actuator disk BEM.*/
@@ -2155,9 +2153,9 @@ 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"));
- /*!\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"));
+ 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"));
/* 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);
@@ -2201,13 +2199,13 @@ void CConfig::SetConfig_Options() {
/*!\brief BREAKDOWN_FILENAME \n DESCRIPTION: Output file forces breakdown \ingroup Config*/
addStringOption("BREAKDOWN_FILENAME", Breakdown_FileName, string("forces_breakdown.dat"));
/*!\brief SOLUTION_FLOW_FILENAME \n DESCRIPTION: Restart flow input file (the file output under the filename set by RESTART_FLOW_FILENAME) \n DEFAULT: solution_flow.dat \ingroup Config */
- addStringOption("SOLUTION_FILENAME", Solution_FileName, string("solution.dat"));
+ addStringOption("SOLUTION_FILENAME", Solution_FileName, string("solution"));
/*!\brief SOLUTION_ADJ_FILENAME\n DESCRIPTION: Restart adjoint input file. Objective function abbreviation is expected. \ingroup Config*/
- addStringOption("SOLUTION_ADJ_FILENAME", Solution_AdjFileName, string("solution_adj.dat"));
+ addStringOption("SOLUTION_ADJ_FILENAME", Solution_AdjFileName, string("solution_adj"));
/*!\brief RESTART_FLOW_FILENAME \n DESCRIPTION: Output file restart flow \ingroup Config*/
- addStringOption("RESTART_FILENAME", Restart_FileName, string("restart.dat"));
+ addStringOption("RESTART_FILENAME", Restart_FileName, string("restart"));
/*!\brief RESTART_ADJ_FILENAME \n DESCRIPTION: Output file restart adjoint. Objective function abbreviation will be appended. \ingroup Config*/
- addStringOption("RESTART_ADJ_FILENAME", Restart_AdjFileName, string("restart_adj.dat"));
+ addStringOption("RESTART_ADJ_FILENAME", Restart_AdjFileName, string("restart_adj"));
/*!\brief VOLUME_FLOW_FILENAME \n DESCRIPTION: Output file flow (w/o extension) variables \ingroup Config */
addStringOption("VOLUME_FILENAME", Volume_FileName, string("vol_solution"));
/*!\brief VOLUME_ADJ_FILENAME
@@ -2215,10 +2213,10 @@ void CConfig::SetConfig_Options() {
addStringOption("VOLUME_ADJ_FILENAME", Adj_FileName, string("adj_vol_solution"));
/*!\brief GRAD_OBJFUNC_FILENAME
* \n DESCRIPTION: Output objective function gradient \ingroup Config*/
- addStringOption("GRAD_OBJFUNC_FILENAME", ObjFunc_Grad_FileName, string("of_grad.dat"));
+ addStringOption("GRAD_OBJFUNC_FILENAME", ObjFunc_Grad_FileName, string("of_grad"));
/*!\brief VALUE_OBJFUNC_FILENAME
* \n DESCRIPTION: Output objective function \ingroup Config*/
- addStringOption("VALUE_OBJFUNC_FILENAME", ObjFunc_Value_FileName, string("of_func.dat"));
+ addStringOption("VALUE_OBJFUNC_FILENAME", ObjFunc_Value_FileName, string("of_func"));
/*!\brief SURFACE_FLOW_FILENAME
* \n DESCRIPTION: Output file surface flow coefficient (w/o extension) \ingroup Config*/
addStringOption("SURFACE_FILENAME", SurfCoeff_FileName, string("surface"));
@@ -2466,8 +2464,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);
@@ -2504,8 +2502,8 @@ void CConfig::SetConfig_Options() {
addBoolOption("REFERENCE_GEOMETRY", RefGeom, false);
/*!\brief REFERENCE_GEOMETRY_PENALTY\n DESCRIPTION: Penalty weight value for the objective function \ingroup Config*/
addDoubleOption("REFERENCE_GEOMETRY_PENALTY", RefGeom_Penalty, 1E6);
- /*!\brief REFERENCE_GEOMETRY_FILENAME \n DESCRIPTION: Reference geometry filename \n Default: reference_geometry.dat \ingroup Config */
- addStringOption("REFERENCE_GEOMETRY_FILENAME", RefGeom_FEMFileName, string("reference_geometry.dat"));
+ /*!\brief REFERENCE_GEOMETRY_FILENAME \n DESCRIPTION: Reference geometry filename \n Default: reference_geometry \ingroup Config */
+ addStringOption("REFERENCE_GEOMETRY_FILENAME", RefGeom_FEMFileName, string("reference_geometry"));
/*!\brief REFERENCE_GEOMETRY_FORMAT \n DESCRIPTION: Format of the reference geometry file \n OPTIONS: see \link Input_Ref_Map \endlink \n DEFAULT: SU2 \ingroup Config*/
addEnumOption("REFERENCE_GEOMETRY_FORMAT", RefGeom_FileFormat, Input_Ref_Map, SU2_REF);
/*!\brief REFERENCE_GEOMETRY_SURFACE\n DESCRIPTION: If true consider only the surfaces where loads are applied. \ingroup Config*/
@@ -2535,7 +2533,7 @@ void CConfig::SetConfig_Options() {
* Options: NO, YES \ingroup Config */
addBoolOption("PRESTRETCH", Prestretch, false);
/*!\brief PRESTRETCH_FILENAME \n DESCRIPTION: Filename to input for prestretching membranes \n Default: prestretch_file.dat \ingroup Config */
- addStringOption("PRESTRETCH_FILENAME", Prestretch_FEMFileName, string("prestretch_file.dat"));
+ addStringOption("PRESTRETCH_FILENAME", Prestretch_FEMFileName, string("prestretch_file"));
/* DESCRIPTION: Iterative method for non-linear structural analysis */
addEnumOption("NONLINEAR_FEM_SOLUTION_METHOD", Kind_SpaceIteScheme_FEA, Space_Ite_Map_FEA, STRUCT_SPACE_ITE::NEWTON);
@@ -3382,7 +3380,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 --- */
@@ -6643,7 +6641,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) {
@@ -7467,7 +7465,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: " << GetMesh_Out_FileName() << ".su2. " << endl;
switch (GetDeform_Stiffness_Type()) {
case INVERSE_VOLUME:
cout << "Cell stiffness scaled by inverse of the cell volume." << endl;
@@ -8450,29 +8448,28 @@ 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 {
- /*--- Remove any extension --- */
-
- unsigned short lastindex = filename.find_last_of('.');
- filename = filename.substr(0, lastindex);
-
- /*--- Add the extension --- */
-
- filename = filename + string(ext);
+ /*--- strip the extension in case it is still there ---*/
+ auto extIndex = filename.rfind(ext);
+ if (extIndex != std::string::npos) filename.resize(extIndex);
/*--- Append the zone number if multizone problems ---*/
if (Multizone_Problem && Multizone_Adapt_FileName)
- filename = GetMultizone_FileName(filename, GetiZone(), ext);
+ 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);
- }
+ if (GetTime_Domain())
+ filename = GetUnsteady_FileName(filename, timeIter, "");
+
+ /*--- Add the extension --- */
+
+ filename += ext;
return filename;
}
@@ -8495,18 +8492,13 @@ string CConfig::GetUnsteady_FileName(string val_filename, int val_iter, const st
SU2_MPI::Error("Requesting a negative iteration number for the restart file!!", CURRENT_FUNCTION);
}
- unsigned short lastindex = UnstFilename.find_last_of('.');
- UnstFilename = UnstFilename.substr(0, lastindex);
-
/*--- Append iteration number for unsteady cases ---*/
if (Time_Domain) {
+ /*--- Determine dynamic number of zeroes, note that we always add 5 digits. ---*/
+ const int number_digits = 5;
+ SPRINTF (buffer, "_%0*ld", number_digits, 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);
}
UnstExt += ext;
@@ -8520,9 +8512,6 @@ string CConfig::GetMultizone_FileName(string val_filename, int val_iZone, const
string multizone_filename = std::move(val_filename);
char buffer[50];
- 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));
@@ -8532,27 +8521,11 @@ string CConfig::GetMultizone_FileName(string val_filename, int val_iZone, const
return multizone_filename;
}
-string CConfig::GetMultizone_HistoryFileName(string val_filename, int val_iZone, const string& ext) const {
-
- string multizone_filename = std::move(val_filename);
- char buffer[50];
- 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));
- }
- multizone_filename += ext;
- return multizone_filename;
-}
-
string CConfig::GetMultiInstance_FileName(string val_filename, int val_iInst, const string& ext) const {
string multizone_filename = std::move(val_filename);
char buffer[50];
- unsigned short lastindex = multizone_filename.find_last_of('.');
- multizone_filename = multizone_filename.substr(0, lastindex);
SPRINTF (buffer, "_%d", SU2_TYPE::Int(val_iInst));
multizone_filename.append(string(buffer));
multizone_filename += ext;
@@ -8564,11 +8537,8 @@ string CConfig::GetMultiInstance_HistoryFileName(string val_filename, int val_iI
string multizone_filename = std::move(val_filename);
char buffer[50];
- unsigned short lastindex = multizone_filename.find_last_of('.');
- multizone_filename = multizone_filename.substr(0, lastindex);
SPRINTF (buffer, "_%d", SU2_TYPE::Int(val_iInst));
multizone_filename.append(string(buffer));
-
return multizone_filename;
}
@@ -8578,11 +8548,6 @@ string CConfig::GetObjFunc_Extension(string val_filename) const {
if (ContinuousAdjoint || DiscreteAdjoint) {
- /*--- Remove filename extension (.dat) ---*/
-
- unsigned short lastindex = Filename.find_last_of('.');
- Filename = Filename.substr(0, lastindex);
-
if (nObj==1) {
switch (Kind_ObjFunc[0]) {
case DRAG_COEFFICIENT: AdjExt = "_cd"; break;
@@ -8632,9 +8597,6 @@ string CConfig::GetObjFunc_Extension(string val_filename) const {
}
Filename.append(AdjExt);
- /*--- Lastly, add the .dat extension ---*/
- Filename.append(".dat");
-
}
return Filename;
diff --git a/Common/src/geometry/CPhysicalGeometry.cpp b/Common/src/geometry/CPhysicalGeometry.cpp
index 0647a2bafb19..7162e5ded8d3 100644
--- a/Common/src/geometry/CPhysicalGeometry.cpp
+++ b/Common/src/geometry/CPhysicalGeometry.cpp
@@ -111,7 +111,7 @@ CPhysicalGeometry::CPhysicalGeometry(CConfig* config, unsigned short val_iZone,
/*--- If SU2_DEF then write a file with the boundary information ---*/
if ((config->GetKind_SU2() == SU2_COMPONENT::SU2_DEF) && (rank == MASTER_NODE)) {
- string str = "boundary.dat";
+ string str = "boundary";
str = config->GetMultizone_FileName(str, val_iZone, ".dat");
@@ -5691,8 +5691,6 @@ void CPhysicalGeometry::SetTurboVertex(CConfig* config, unsigned short val_iZone
char buffer[50];
if (GetnZone() > 1) {
- unsigned short lastindex = multizone_filename.find_last_of('.');
- multizone_filename = multizone_filename.substr(0, lastindex);
SPRINTF(buffer, "_%d.dat", SU2_TYPE::Int(val_iZone));
multizone_filename.append(string(buffer));
}
diff --git a/Common/src/grid_movement/CSurfaceMovement.cpp b/Common/src/grid_movement/CSurfaceMovement.cpp
index d7b6d394c485..f47cd37cce10 100644
--- a/Common/src/grid_movement/CSurfaceMovement.cpp
+++ b/Common/src/grid_movement/CSurfaceMovement.cpp
@@ -3519,8 +3519,6 @@ void CSurfaceMovement::SetExternal_Deformation(CGeometry* geometry, CConfig* con
physical time, so perform mesh motion in reverse. ---*/
unsigned long nFlowIter = config->GetnTime_Iter() - 1;
flowIter = nFlowIter - iter;
- unsigned short lastindex = DV_Filename.find_last_of('.');
- DV_Filename = DV_Filename.substr(0, lastindex);
if ((SU2_TYPE::Int(flowIter) >= 0) && (SU2_TYPE::Int(flowIter) < 10))
SPRINTF(buffer, "_0000%d.dat", SU2_TYPE::Int(flowIter));
if ((SU2_TYPE::Int(flowIter) >= 10) && (SU2_TYPE::Int(flowIter) < 100))
@@ -3535,8 +3533,6 @@ void CSurfaceMovement::SetExternal_Deformation(CGeometry* geometry, CConfig* con
} else {
/*--- Forward time for the direct problem ---*/
flowIter = iter;
- unsigned short lastindex = DV_Filename.find_last_of('.');
- DV_Filename = DV_Filename.substr(0, lastindex);
if ((SU2_TYPE::Int(flowIter) >= 0) && (SU2_TYPE::Int(flowIter) < 10))
SPRINTF(buffer, "_0000%d.dat", SU2_TYPE::Int(flowIter));
if ((SU2_TYPE::Int(flowIter) >= 10) && (SU2_TYPE::Int(flowIter) < 100))
@@ -4193,7 +4189,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)) {
@@ -5051,8 +5047,6 @@ 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";
output_file.precision(15);
output_file.open(str, ios::out | ios::app);
diff --git a/QuickStart/inv_NACA0012.cfg b/QuickStart/inv_NACA0012.cfg
index cfa27105b95c..d1e78608c69c 100644
--- a/QuickStart/inv_NACA0012.cfg
+++ b/QuickStart/inv_NACA0012.cfg
@@ -247,13 +247,13 @@ MESH_FILENAME= mesh_NACA0012_inv.su2
MESH_FORMAT= SU2
%
% Mesh output file
-MESH_OUT_FILENAME= mesh_out.su2
+MESH_OUT_FILENAME= mesh_out
%
% Restart flow input file
-SOLUTION_FILENAME= solution_flow.dat
+SOLUTION_FILENAME= solution_flow
%
% Restart adjoint input file
-SOLUTION_ADJ_FILENAME= solution_adj.dat
+SOLUTION_ADJ_FILENAME= solution_adj
%
% Output file format (TECPLOT, CSV)
TABULAR_FORMAT= CSV
@@ -262,10 +262,10 @@ TABULAR_FORMAT= CSV
CONV_FILENAME= history
%
% Output file restart flow
-RESTART_FILENAME= restart_flow.dat
+RESTART_FILENAME= restart_flow
%
% Output file restart adjoint
-RESTART_ADJ_FILENAME= restart_adj.dat
+RESTART_ADJ_FILENAME= restart_adj
%
% Output file flow (w/o extension) variables
VOLUME_FILENAME= flow
@@ -274,7 +274,7 @@ VOLUME_FILENAME= flow
VOLUME_ADJ_FILENAME= adjoint
%
% Output Objective function gradient (using continuous adjoint)
-GRAD_OBJFUNC_FILENAME= of_grad.dat
+GRAD_OBJFUNC_FILENAME= of_grad
%
% Output file surface flow coefficient (w/o extension)
SURFACE_FILENAME= surface_flow
diff --git a/SU2_CFD/include/solvers/CFVMFlowSolverBase.inl b/SU2_CFD/include/solvers/CFVMFlowSolverBase.inl
index a0b6e6a30129..3c36ad835ec6 100644
--- a/SU2_CFD/include/solvers/CFVMFlowSolverBase.inl
+++ b/SU2_CFD/include/solvers/CFVMFlowSolverBase.inl
@@ -825,7 +825,7 @@ void CFVMFlowSolverBase::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. ---*/
@@ -838,10 +838,11 @@ void CFVMFlowSolverBase::LoadRestart_impl(CGeometry **geometry, CSolver **
unsigned short skipVars = nDim;
/*--- Read the restart data from either an ASCII or binary SU2 file. ---*/
-
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);
}
diff --git a/SU2_CFD/src/drivers/CDriver.cpp b/SU2_CFD/src/drivers/CDriver.cpp
index d418313f74d0..9df834e28561 100644
--- a/SU2_CFD/src/drivers/CDriver.cpp
+++ b/SU2_CFD/src/drivers/CDriver.cpp
@@ -2316,8 +2316,6 @@ void CDriver::InitializeNumerics(CConfig *config, CGeometry **geometry, CSolver
ifstream properties_file;
string filename = config->GetFEA_FileName();
- if (nZone > 1)
- filename = config->GetMultizone_FileName(filename, iZone, ".dat");
properties_file.open(filename.data(), ios::in);
diff --git a/SU2_CFD/src/output/CFlowOutput.cpp b/SU2_CFD/src/output/CFlowOutput.cpp
index aae57d7fb0d0..d874146a4935 100644
--- a/SU2_CFD/src/output/CFlowOutput.cpp
+++ b/SU2_CFD/src/output/CFlowOutput.cpp
@@ -2442,13 +2442,9 @@ void CFlowOutput::WriteForcesBreakdown(const CConfig* config, const CSolver* flo
const auto Ref_NonDim = config->GetRef_NonDim();
const auto nMonitoring = config->GetnMarker_Monitoring();
- 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);
- }
+ string fileName = config->GetBreakdown_FileName();
+ fileName = config->GetFilename(fileName, ".dat", config->GetTimeIter());
+
/*--- Output the mean flow solution using only the master node ---*/
diff --git a/SU2_CFD/src/output/COutput.cpp b/SU2_CFD/src/output/COutput.cpp
index 90d39de199c5..fe90afd98882 100644
--- a/SU2_CFD/src/output/COutput.cpp
+++ b/SU2_CFD/src/output/COutput.cpp
@@ -82,24 +82,9 @@ COutput::COutput(const CConfig *config, unsigned short ndim, bool fem_output):
volumeFilename = "volume";
restartFilename = "restart";
- /*--- Retrieve the history filename ---*/
+ /*--- Retrieve the history filename, including extension ---*/
- historyFilename = config->GetConv_FileName();
-
- /*--- Add the correct file extension depending on the file format ---*/
-
- string hist_ext = ".csv";
- if (config->GetTabular_FileFormat() == TAB_OUTPUT::TAB_TECPLOT) hist_ext = ".dat";
-
- /*--- Append the zone ID ---*/
-
- historyFilename = config->GetMultizone_HistoryFileName(historyFilename, config->GetiZone(), hist_ext);
-
- /*--- Append the restart iteration ---*/
-
- if (config->GetTime_Domain() && config->GetRestart()) {
- historyFilename = config->GetUnsteady_FileName(historyFilename, config->GetRestart_Iter(), hist_ext);
- }
+ historyFilename = config->GetHistory_FileName();
historySep = ",";
@@ -383,7 +368,7 @@ void COutput::LoadData(CGeometry *geometry, CConfig *config, CSolver** solver_co
}
-void COutput::WriteToFile(CConfig *config, CGeometry *geometry, OUTPUT_TYPE format, string fileName){
+void COutput::WriteToFile(CConfig *config, CGeometry *geometry, OUTPUT_TYPE format, string fileName) {
/*--- File writer that will later be used to write the file to disk. Created below in the "switch" ---*/
CFileWriter *fileWriter = nullptr;
@@ -391,10 +376,6 @@ void COutput::WriteToFile(CConfig *config, CGeometry *geometry, OUTPUT_TYPE form
/*--- Set current time iter even if history file is not written ---*/
curTimeIter = config->GetTimeIter();
- /*--- If it is still present, strip the extension (suffix) from the filename ---*/
- const auto lastindex = fileName.find_last_of('.');
- fileName = fileName.substr(0, lastindex);
-
/*--- If the filename with appended iteration is set (depending on the WRT_*_OVERWRITE options)
* two files are writen, the normal one and a copy to avoid overwriting previous outputs. ---*/
string filename_iter, extension;
diff --git a/SU2_CFD/src/solvers/CAdjEulerSolver.cpp b/SU2_CFD/src/solvers/CAdjEulerSolver.cpp
index 0b40f3edf134..dfc823f0e14d 100644
--- a/SU2_CFD/src/solvers/CAdjEulerSolver.cpp
+++ b/SU2_CFD/src/solvers/CAdjEulerSolver.cpp
@@ -3814,7 +3814,6 @@ 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);
Coord = new su2double [nDim];
for (iDim = 0; iDim < nDim; iDim++)
@@ -3827,8 +3826,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);
}
diff --git a/SU2_CFD/src/solvers/CBaselineSolver.cpp b/SU2_CFD/src/solvers/CBaselineSolver.cpp
index ff093d957b08..431dd85ebc87 100644
--- a/SU2_CFD/src/solvers/CBaselineSolver.cpp
+++ b/SU2_CFD/src/solvers/CBaselineSolver.cpp
@@ -97,7 +97,7 @@ void CBaselineSolver::SetOutputVariables(CGeometry *geometry, CConfig *config) {
if (config->GetRead_Binary_Restart()) {
- /*--- Multizone problems require the number of the zone to be appended. ---*/
+ /*--- Unsteady problems require the number of the iteration to be appended. ---*/
filename = config->GetFilename(filename, ".dat", config->GetTimeIter());
@@ -353,7 +353,7 @@ void CBaselineSolver::LoadRestart(CGeometry **geometry, CSolver ***solver, CConf
/*--- Restart the solution from file information ---*/
- string filename;
+ string restart_filename;
unsigned long index;
unsigned short iDim, iVar;
bool adjoint = ( config->GetContinuous_Adjoint() || config->GetDiscrete_Adjoint() );
@@ -372,26 +372,26 @@ void CBaselineSolver::LoadRestart(CGeometry **geometry, CSolver ***solver, CConf
/*--- Retrieve filename from config ---*/
if (adjoint) {
- filename = config->GetSolution_AdjFileName();
- filename = config->GetObjFunc_Extension(filename);
+ restart_filename = config->GetSolution_AdjFileName();
+ restart_filename = config->GetObjFunc_Extension(restart_filename);
} else {
- filename = config->GetSolution_FileName();
+ restart_filename = config->GetSolution_FileName();
}
- filename = config->GetFilename(filename, "", val_iter);
-
/*--- Output the file name to the console. ---*/
if (rank == MASTER_NODE)
- cout << "Reading and storing the solution from " << filename
+ cout << "Reading and storing the solution from " << restart_filename
<< "." << endl;
/*--- Read the restart data from either an ASCII or binary SU2 file. ---*/
if (config->GetRead_Binary_Restart()) {
- Read_SU2_Restart_Binary(geometry[iInst], config, filename);
+ restart_filename = config->GetFilename(restart_filename, ".dat", val_iter);
+ Read_SU2_Restart_Binary(geometry[iInst], config, restart_filename);
} else {
- Read_SU2_Restart_ASCII(geometry[iInst], config, filename);
+ restart_filename = config->GetFilename(restart_filename, ".csv", val_iter);
+ Read_SU2_Restart_ASCII(geometry[iInst], config, restart_filename);
}
int counter = 0;
@@ -500,10 +500,6 @@ void CBaselineSolver::LoadRestart_FSI(CGeometry *geometry, CConfig *config, int
filename = config->GetSolution_FileName();
}
- /*--- Multizone problems require the number of the zone to be appended. ---*/
-
- filename = config->GetFilename(filename, "", val_iter);
-
/*--- Output the file name to the console. ---*/
if (rank == MASTER_NODE)
@@ -513,8 +509,10 @@ void CBaselineSolver::LoadRestart_FSI(CGeometry *geometry, CConfig *config, int
/*--- Read the restart data from either an ASCII or binary SU2 file. ---*/
if (config->GetRead_Binary_Restart()) {
+ filename = config->GetFilename(filename, ".dat", val_iter);
Read_SU2_Restart_Binary(geometry, config, filename);
} else {
+ filename = config->GetFilename(filename, ".csv", val_iter);
Read_SU2_Restart_ASCII(geometry, config, filename);
}
diff --git a/SU2_CFD/src/solvers/CBaselineSolver_FEM.cpp b/SU2_CFD/src/solvers/CBaselineSolver_FEM.cpp
index d6e08e4d3ad2..1505d7f795bc 100644
--- a/SU2_CFD/src/solvers/CBaselineSolver_FEM.cpp
+++ b/SU2_CFD/src/solvers/CBaselineSolver_FEM.cpp
@@ -318,10 +318,6 @@ void CBaselineSolver_FEM::LoadRestart(CGeometry **geometry, CSolver ***solver, C
string restart_filename = config->GetSolution_FileName();
- if (config->GetTime_Domain()) {
- restart_filename = config->GetUnsteady_FileName(restart_filename, SU2_TYPE::Int(val_iter), "");
- }
-
int counter = 0;
long iPoint_Local = 0; unsigned long iPoint_Global = 0;
unsigned short rbuf_NotMatching = 0;
@@ -330,8 +326,10 @@ void CBaselineSolver_FEM::LoadRestart(CGeometry **geometry, CSolver ***solver, C
/*--- 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);
}
diff --git a/SU2_CFD/src/solvers/CDiscAdjFEASolver.cpp b/SU2_CFD/src/solvers/CDiscAdjFEASolver.cpp
index a5a874735224..50d1493f57c4 100644
--- a/SU2_CFD/src/solvers/CDiscAdjFEASolver.cpp
+++ b/SU2_CFD/src/solvers/CDiscAdjFEASolver.cpp
@@ -463,7 +463,14 @@ void CDiscAdjFEASolver::LoadRestart(CGeometry **geometry, CSolver ***solver, CCo
auto filename = config->GetSolution_AdjFileName();
auto restart_filename = config->GetObjFunc_Extension(filename);
- restart_filename = config->GetFilename(restart_filename, "", val_iter);
+
+ if (config->GetRead_Binary_Restart()) {
+ restart_filename = config->GetFilename(restart_filename, ".dat", val_iter);
+ Read_SU2_Restart_Binary(geometry[MESH_0], config, filename);
+ } else {
+ restart_filename = config->GetFilename(restart_filename, ".csv", val_iter);
+ Read_SU2_Restart_ASCII(geometry[MESH_0], config, filename);
+ }
BasicLoadRestart(geometry[MESH_0], config, restart_filename, geometry[MESH_0]->GetnDim());
diff --git a/SU2_CFD/src/solvers/CDiscAdjSolver.cpp b/SU2_CFD/src/solvers/CDiscAdjSolver.cpp
index 07caefe91c3c..c9b010738e05 100644
--- a/SU2_CFD/src/solvers/CDiscAdjSolver.cpp
+++ b/SU2_CFD/src/solvers/CDiscAdjSolver.cpp
@@ -624,7 +624,6 @@ void CDiscAdjSolver::LoadRestart(CGeometry **geometry, CSolver ***solver, CConfi
auto filename = config->GetSolution_AdjFileName();
auto restart_filename = config->GetObjFunc_Extension(filename);
- restart_filename = config->GetFilename(restart_filename, "", val_iter);
const bool rans = (config->GetKind_Turb_Model() != TURB_MODEL::NONE);
@@ -648,6 +647,14 @@ void CDiscAdjSolver::LoadRestart(CGeometry **geometry, CSolver ***solver, CConfi
if (rans) skipVars += solver[MESH_0][TURB_SOL]->GetnVar();
}
+ 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);
+ }
+
BasicLoadRestart(geometry[MESH_0], config, restart_filename, skipVars);
/*--- Interpolate solution on coarse grids ---*/
diff --git a/SU2_CFD/src/solvers/CFEASolver.cpp b/SU2_CFD/src/solvers/CFEASolver.cpp
index acdea74b9e41..db7447391c4c 100644
--- a/SU2_CFD/src/solvers/CFEASolver.cpp
+++ b/SU2_CFD/src/solvers/CFEASolver.cpp
@@ -284,9 +284,6 @@ void CFEASolver::HybridParallelInitialization(CGeometry* geometry) {
void CFEASolver::Set_ElementProperties(CGeometry *geometry, CConfig *config) {
- const auto iZone = config->GetiZone();
- const auto nZone = geometry->GetnZone();
-
const bool topology_mode = config->GetTopology_Optimization();
element_properties = new CProperty*[nElement];
@@ -295,9 +292,6 @@ 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, ".dat");
if (rank == MASTER_NODE) cout << "Filename: " << filename << "." << endl;
@@ -3115,11 +3109,13 @@ void CFEASolver::LoadRestart(CGeometry **geometry, CSolver ***solver, CConfig *c
/*--- Read the restart data from either an ASCII or binary SU2 file. ---*/
- string filename = config->GetFilename(config->GetSolution_FileName(), "", val_iter);
+ string filename = config->GetSolution_FileName();
if (config->GetRead_Binary_Restart()) {
+ filename = config->GetFilename(filename, ".dat", val_iter);
Read_SU2_Restart_Binary(geometry[MESH_0], config, filename);
} else {
+ filename = config->GetFilename(filename, ".csv", val_iter);
Read_SU2_Restart_ASCII(geometry[MESH_0], config, filename);
}
diff --git a/SU2_CFD/src/solvers/CFEM_DG_EulerSolver.cpp b/SU2_CFD/src/solvers/CFEM_DG_EulerSolver.cpp
index 723a363fc1b0..c18d892757fa 100644
--- a/SU2_CFD/src/solvers/CFEM_DG_EulerSolver.cpp
+++ b/SU2_CFD/src/solvers/CFEM_DG_EulerSolver.cpp
@@ -9474,13 +9474,14 @@ void CFEM_DG_EulerSolver::LoadRestart(CGeometry **geometry, CSolver ***solver, C
unsigned short skipVars = geometry[MESH_0]->GetnDim();
- restart_filename = config->GetFilename(restart_filename, "", val_iter);
/*--- 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);
}
diff --git a/SU2_CFD/src/solvers/CHeatSolver.cpp b/SU2_CFD/src/solvers/CHeatSolver.cpp
index 217baf8f8d4e..cd48c0ea8e3a 100644
--- a/SU2_CFD/src/solvers/CHeatSolver.cpp
+++ b/SU2_CFD/src/solvers/CHeatSolver.cpp
@@ -190,7 +190,7 @@ void CHeatSolver::Preprocessing(CGeometry *geometry, CSolver **solver_container,
void CHeatSolver::LoadRestart(CGeometry **geometry, CSolver ***solver, CConfig *config, int val_iter,
bool val_update_geo) {
- const string restart_filename = config->GetFilename(config->GetSolution_FileName(), "", val_iter);
+ string restart_filename = config->GetSolution_FileName();
BEGIN_SU2_OMP_SAFE_GLOBAL_ACCESS {
/*--- Skip coordinates ---*/
@@ -205,8 +205,10 @@ void CHeatSolver::LoadRestart(CGeometry **geometry, CSolver ***solver, CConfig *
/*--- 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);
}
diff --git a/SU2_CFD/src/solvers/CIncEulerSolver.cpp b/SU2_CFD/src/solvers/CIncEulerSolver.cpp
index b9bed47adab4..dd16bbe60460 100644
--- a/SU2_CFD/src/solvers/CIncEulerSolver.cpp
+++ b/SU2_CFD/src/solvers/CIncEulerSolver.cpp
@@ -48,10 +48,8 @@ CIncEulerSolver::CIncEulerSolver(CGeometry *geometry, CConfig *config, unsigned
unsigned short iMarker;
ifstream restart_file;
- unsigned short nZone = geometry->GetnZone();
bool restart = (config->GetRestart() || config->GetRestart_Flow());
int Unst_RestartIter = 0;
- unsigned short iZone = config->GetiZone();
bool dual_time = ((config->GetTime_Marching() == TIME_MARCHING::DT_STEPPING_1ST) ||
(config->GetTime_Marching() == TIME_MARCHING::DT_STEPPING_2ND));
bool time_stepping = config->GetTime_Marching() == TIME_MARCHING::TIME_STEPPING;
@@ -67,46 +65,37 @@ CIncEulerSolver::CIncEulerSolver(CGeometry *geometry, CConfig *config, unsigned
/*--- Check for a restart file to evaluate if there is a change in the angle of attack
before computing all the non-dimesional quantities. ---*/
- if (restart && (iMesh == MESH_0) && nZone <= 1) {
+ if (restart) {
- /*--- Multizone problems require the number of the zone to be appended. ---*/
+ if (iMesh == MESH_0) {
- auto filename_ = config->GetSolution_FileName();
+ /*--- Modify file name for a dual-time unsteady restart ---*/
- if (nZone > 1) filename_ = config->GetMultizone_FileName(filename_, iZone, ".dat");
-
- /*--- Modify file name for a dual-time unsteady restart ---*/
+ if (dual_time) {
+ if (adjoint) Unst_RestartIter = SU2_TYPE::Int(config->GetUnst_AdjointIter())-1;
+ 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;
+ }
- if (dual_time) {
- if (adjoint) Unst_RestartIter = SU2_TYPE::Int(config->GetUnst_AdjointIter())-1;
- 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");
- }
+ /*--- Modify file name for a time stepping unsteady restart ---*/
- /*--- 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;
+ }
- 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");
}
- /*--- Read and store the restart metadata. ---*/
-
- filename_ = "flow";
- filename_ = config->GetFilename(filename_, ".meta", Unst_RestartIter);
- Read_SU2_Restart_Metadata(geometry, config, adjoint, filename_);
+ if (config->GetKind_Streamwise_Periodic() == ENUM_STREAMWISE_PERIODIC::MASSFLOW) {
+ if (rank==MASTER_NODE) cout << "Setting streamwise periodic pressure drop from restart metadata file." << endl;
+ }
- }
- if (restart && (config->GetKind_Streamwise_Periodic() == ENUM_STREAMWISE_PERIODIC::MASSFLOW)) {
- string filename_ = "flow";
- filename_ = config->GetFilename(filename_, ".meta", Unst_RestartIter);
+ auto filename_ = config->GetFilename("flow", ".meta", Unst_RestartIter);
Read_SU2_Restart_Metadata(geometry, config, adjoint, filename_);
- if (rank==MASTER_NODE) cout << "Setting streamwise periodic pressure drop from restart metadata file." << endl;
}
+
/*--- Set the gamma value ---*/
Gamma = config->GetGamma();
diff --git a/SU2_CFD/src/solvers/CMeshSolver.cpp b/SU2_CFD/src/solvers/CMeshSolver.cpp
index a9a661ba89e3..992b63d05bee 100644
--- a/SU2_CFD/src/solvers/CMeshSolver.cpp
+++ b/SU2_CFD/src/solvers/CMeshSolver.cpp
@@ -765,11 +765,13 @@ void CMeshSolver::LoadRestart(CGeometry **geometry, CSolver ***solver, CConfig *
/*--- Read the restart data from either an ASCII or binary SU2 file. ---*/
- string filename = config->GetFilename(config->GetSolution_FileName(), "", val_iter);
+ string filename = config->GetSolution_FileName();
if (config->GetRead_Binary_Restart()) {
+ filename = config->GetFilename(filename, ".dat", val_iter);
Read_SU2_Restart_Binary(geometry[MESH_0], config, filename);
} else {
+ filename = config->GetFilename(filename, ".csv", val_iter);
Read_SU2_Restart_ASCII(geometry[MESH_0], config, filename);
}
@@ -865,15 +867,6 @@ void CMeshSolver::RestartOldGeometry(CGeometry *geometry, const CConfig *config)
/*--- This function is intended for dual time simulations ---*/
- unsigned short iZone = config->GetiZone();
- unsigned short nZone = geometry->GetnZone();
- string filename = config->GetSolution_FileName();
-
- /*--- Multizone problems require the number of the zone to be appended. ---*/
-
- if (nZone > 1)
- filename = config->GetMultizone_FileName(filename, iZone, "");
-
/*--- Determine how many files need to be read. ---*/
unsigned short nSteps = (config->GetTime_Marching() == TIME_MARCHING::DT_STEPPING_2ND) ? 2 : 1;
@@ -901,14 +894,16 @@ void CMeshSolver::RestartOldGeometry(CGeometry *geometry, const CConfig *config)
}
}
else {
- string filename_n = config->GetUnsteady_FileName(filename, Unst_RestartIter, "");
/*--- Read the restart data from either an ASCII or binary SU2 file. ---*/
+ string restart_filename = config->GetSolution_FileName();
if (config->GetRead_Binary_Restart()) {
- Read_SU2_Restart_Binary(geometry, config, filename_n);
+ restart_filename = config->GetFilename(restart_filename, ".dat", Unst_RestartIter);
+ Read_SU2_Restart_Binary(geometry, config, restart_filename);
} else {
- Read_SU2_Restart_ASCII(geometry, config, filename_n);
+ restart_filename = config->GetFilename(restart_filename, ".csv", Unst_RestartIter);
+ Read_SU2_Restart_ASCII(geometry, config, restart_filename);
}
/*--- Load data from the restart into correct containers. ---*/
@@ -948,7 +943,7 @@ void CMeshSolver::RestartOldGeometry(CGeometry *geometry, const CConfig *config)
/*--- Detect a wrong solution file. ---*/
if (counter != nPointDomain) {
- SU2_MPI::Error(string("The solution file ") + filename_n + string(" doesn't match with the mesh file!\n") +
+ SU2_MPI::Error(string("The solution file ") + restart_filename + string(" doesn't match with the mesh file!\n") +
string("It could be empty lines at the end of the file."), CURRENT_FUNCTION);
}
}
diff --git a/SU2_CFD/src/solvers/CRadSolver.cpp b/SU2_CFD/src/solvers/CRadSolver.cpp
index 454fc8df9864..a588cf3fa852 100644
--- a/SU2_CFD/src/solvers/CRadSolver.cpp
+++ b/SU2_CFD/src/solvers/CRadSolver.cpp
@@ -84,12 +84,14 @@ void CRadSolver::LoadRestart(CGeometry **geometry, CSolver ***solver, CConfig *c
string UnstExt, text_line;
ifstream restart_file;
- string restart_filename = config->GetFilename(config->GetSolution_FileName(), "", val_iter);
+ string restart_filename = config->GetSolution_FileName();
/*--- 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);
}
diff --git a/SU2_CFD/src/solvers/CSolver.cpp b/SU2_CFD/src/solvers/CSolver.cpp
index 796e009f181b..4aad8892ae0e 100644
--- a/SU2_CFD/src/solvers/CSolver.cpp
+++ b/SU2_CFD/src/solvers/CSolver.cpp
@@ -2762,7 +2762,6 @@ void CSolver::Read_SU2_Restart_ASCII(CGeometry *geometry, const CConfig *config,
/*--- First, check that this is not a binary restart file. ---*/
char fname[100];
- val_filename += ".csv";
strcpy(fname, val_filename.c_str());
int magic_number;
@@ -2911,7 +2910,6 @@ void CSolver::Read_SU2_Restart_ASCII(CGeometry *geometry, const CConfig *config,
void CSolver::Read_SU2_Restart_Binary(CGeometry *geometry, const CConfig *config, string val_filename) {
char str_buf[CGNS_STRING_SIZE], fname[100];
- val_filename += ".dat";
strcpy(fname, val_filename.c_str());
const int nRestart_Vars = 5;
Restart_Vars.resize(nRestart_Vars);
@@ -3562,12 +3560,6 @@ void CSolver::LoadInletProfile(CGeometry **geometry,
const auto KIND_SOLVER = val_kind_solver;
const auto KIND_MARKER = val_kind_marker;
- const bool time_stepping = (config->GetTime_Marching() == TIME_MARCHING::DT_STEPPING_1ST) ||
- (config->GetTime_Marching() == TIME_MARCHING::DT_STEPPING_2ND) ||
- (config->GetTime_Marching() == TIME_MARCHING::TIME_STEPPING);
-
- const auto iZone = config->GetiZone();
- const auto nZone = config->GetnZone();
auto profile_filename = config->GetInlet_FileName();
@@ -3596,17 +3588,6 @@ void CSolver::LoadInletProfile(CGeometry **geometry,
//if (config->GetEnergy_Equation() ==false)
//nCol_InletFile = nCol_InletFile -1;
- /*--- Multizone problems require the number of the zone to be appended. ---*/
-
- if (nZone > 1)
- profile_filename = config->GetMultizone_FileName(profile_filename, iZone, ".dat");
-
- /*--- Modify file name for an unsteady restart ---*/
-
- if (time_stepping)
- profile_filename = config->GetUnsteady_FileName(profile_filename, val_iter, ".dat");
-
-
// create vector of column names
for (unsigned short iMarker = 0; iMarker < config->GetnMarker_All(); iMarker++) {
@@ -4230,14 +4211,6 @@ void CSolver::BasicLoadRestart(CGeometry *geometry, const CConfig *config, const
// Read_SU2_Restart_Metadata(geometry[MESH_0], config, true, filename);
- /*--- Read the restart data from either an ASCII or binary SU2 file. ---*/
-
- if (config->GetRead_Binary_Restart()) {
- Read_SU2_Restart_Binary(geometry, config, filename);
- } else {
- Read_SU2_Restart_ASCII(geometry, config, filename);
- }
-
/*--- Load data from the restart into correct containers. ---*/
unsigned long iPoint_Global_Local = 0;
diff --git a/SU2_CFD/src/solvers/CSpeciesSolver.cpp b/SU2_CFD/src/solvers/CSpeciesSolver.cpp
index 97420e0119ab..763cd6c8891e 100644
--- a/SU2_CFD/src/solvers/CSpeciesSolver.cpp
+++ b/SU2_CFD/src/solvers/CSpeciesSolver.cpp
@@ -180,15 +180,18 @@ void CSpeciesSolver::Initialize(CGeometry* geometry, CConfig* config, unsigned s
void CSpeciesSolver::LoadRestart(CGeometry** geometry, CSolver*** solver, CConfig* config, int val_iter,
bool val_update_geo) {
/*--- Restart the solution from file information ---*/
- const string restart_filename = config->GetFilename(config->GetSolution_FileName(), "", val_iter);
+
+ string restart_filename = config->GetSolution_FileName();
/*--- To make this routine safe to call in parallel most of it can only be executed by one thread. ---*/
BEGIN_SU2_OMP_SAFE_GLOBAL_ACCESS {
/*--- 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);
}
diff --git a/SU2_CFD/src/solvers/CTransLMSolver.cpp b/SU2_CFD/src/solvers/CTransLMSolver.cpp
index 0228a28cb669..4713754781d8 100644
--- a/SU2_CFD/src/solvers/CTransLMSolver.cpp
+++ b/SU2_CFD/src/solvers/CTransLMSolver.cpp
@@ -502,15 +502,17 @@ void CTransLMSolver::BC_Outlet(CGeometry *geometry, CSolver **solver_container,
void CTransLMSolver::LoadRestart(CGeometry** geometry, CSolver*** solver, CConfig* config, int val_iter,
bool val_update_geo) {
- const string restart_filename = config->GetFilename(config->GetSolution_FileName(), "", val_iter);
+ string restart_filename = config->GetSolution_FileName();
/*--- To make this routine safe to call in parallel most of it can only be executed by one thread. ---*/
BEGIN_SU2_OMP_SAFE_GLOBAL_ACCESS {
/*--- 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);
}
diff --git a/SU2_CFD/src/solvers/CTurbSolver.cpp b/SU2_CFD/src/solvers/CTurbSolver.cpp
index fc645b132bc1..64f5a4bcce37 100644
--- a/SU2_CFD/src/solvers/CTurbSolver.cpp
+++ b/SU2_CFD/src/solvers/CTurbSolver.cpp
@@ -104,15 +104,17 @@ void CTurbSolver::LoadRestart(CGeometry** geometry, CSolver*** solver, CConfig*
bool val_update_geo) {
/*--- Restart the solution from file information ---*/
- const string restart_filename = config->GetFilename(config->GetSolution_FileName(), "", val_iter);
+ string restart_filename = config->GetSolution_FileName();
/*--- To make this routine safe to call in parallel most of it can only be executed by one thread. ---*/
BEGIN_SU2_OMP_SAFE_GLOBAL_ACCESS {
/*--- 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);
}
diff --git a/SU2_GEO/src/SU2_GEO.cpp b/SU2_GEO/src/SU2_GEO.cpp
index 0f6b521e7e7a..8bfd810f47bb 100644
--- a/SU2_GEO/src/SU2_GEO.cpp
+++ b/SU2_GEO/src/SU2_GEO.cpp
@@ -612,8 +612,6 @@ int main(int argc, char* argv[]) {
/*--- Write the objective function in a external file ---*/
string filename = config_container[ZONE_0]->GetObjFunc_Value_FileName();
- unsigned short lastindex = filename.find_last_of('.');
- filename = filename.substr(0, lastindex);
if (tabTecplot)
filename += ".dat";
else
@@ -730,8 +728,6 @@ int main(int argc, char* argv[]) {
/*--- Write the gradient in a external file ---*/
if (rank == MASTER_NODE) {
string filename = config_container[ZONE_0]->GetObjFunc_Grad_FileName();
- unsigned short lastindex = filename.find_last_of('.');
- filename = filename.substr(0, lastindex);
if (tabTecplot)
filename += ".dat";
else
diff --git a/SU2_PY/SU2/io/config.py b/SU2_PY/SU2/io/config.py
index 3db56b9ecd22..91f54fc5fc29 100755
--- a/SU2_PY/SU2/io/config.py
+++ b/SU2_PY/SU2/io/config.py
@@ -752,9 +752,9 @@ def read_config(filename):
"EQUALITY": OrderedDict(),
}
if "VALUE_OBJFUNC_FILENAME" not in data_dict:
- data_dict["VALUE_OBJFUNC_FILENAME"] = "of_eval.dat"
+ data_dict["VALUE_OBJFUNC_FILENAME"] = "of_eval"
if "GRAD_OBJFUNC_FILENAME" not in data_dict:
- data_dict["GRAD_OBJFUNC_FILENAME"] = "of_grad.dat"
+ data_dict["GRAD_OBJFUNC_FILENAME"] = "of_grad"
if "AOA" not in data_dict:
data_dict["AOA"] = 0.0
if "SIDESLIP_ANGLE" not in data_dict:
@@ -905,9 +905,9 @@ def read_config(filename):
"SIZE": [1],
}
if "VALUE_OBJFUNC_FILENAME" not in data_dict:
- data_dict["VALUE_OBJFUNC_FILENAME"] = "of_eval.dat"
+ data_dict["VALUE_OBJFUNC_FILENAME"] = "of_eval"
if "GRAD_OBJFUNC_FILENAME" not in data_dict:
- data_dict["GRAD_OBJFUNC_FILENAME"] = "of_grad.dat"
+ data_dict["GRAD_OBJFUNC_FILENAME"] = "of_grad"
return data_dict
diff --git a/SU2_PY/SU2/io/state.py b/SU2_PY/SU2/io/state.py
index b55df00ad6ca..385f0765439c 100644
--- a/SU2_PY/SU2/io/state.py
+++ b/SU2_PY/SU2/io/state.py
@@ -270,11 +270,11 @@ def find_files(self, config):
adjoint_name = config.SOLUTION_ADJ_FILENAME
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"
targetea_name = "TargetEA.dat"
targetcp_name = "TargetCp.dat"
diff --git a/SU2_PY/SU2/io/tools.py b/SU2_PY/SU2/io/tools.py
index ed3b0f2d8f98..f8658872472f 100755
--- a/SU2_PY/SU2/io/tools.py
+++ b/SU2_PY/SU2/io/tools.py
@@ -1182,8 +1182,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]
if "RESTART_ASCII" in config.get("OUTPUT_FILES", ["RESTART_BINARY"]):
restart += ".csv"
diff --git a/SU2_PY/SU2/run/deform.py b/SU2_PY/SU2/run/deform.py
index 6622fdcfac83..ffdc06146a2a 100644
--- a/SU2_PY/SU2/run/deform.py
+++ b/SU2_PY/SU2/run/deform.py
@@ -90,9 +90,12 @@ 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)
diff --git a/SU2_PY/SU2/run/geometry.py b/SU2_PY/SU2/run/geometry.py
index 9036b18c74e5..5bd75349207e 100644
--- a/SU2_PY/SU2/run/geometry.py
+++ b/SU2_PY/SU2/run/geometry.py
@@ -75,11 +75,11 @@ def geometry(config, step=1e-3):
grad_filename = konfig["GRAD_OBJFUNC_FILENAME"]
if tabular_format == "CSV":
- func_filename = func_filename.split(".")[0] + ".csv"
- grad_filename = grad_filename.split(".")[0] + ".csv"
+ func_filename = func_filename + ".csv"
+ grad_filename = grad_filename + ".csv"
else:
- func_filename = func_filename.split(".")[0] + ".dat"
- grad_filename = grad_filename.split(".")[0] + ".dat"
+ func_filename = func_filename + ".dat"
+ grad_filename = grad_filename + ".dat"
# choose dv values
Definition_DV = konfig["DEFINITION_DV"]
diff --git a/SU2_PY/SU2/run/interface.py b/SU2_PY/SU2/run/interface.py
index 2aa0ba3674b9..d40f62f53023 100644
--- a/SU2_PY/SU2/run/interface.py
+++ b/SU2_PY/SU2/run/interface.py
@@ -261,7 +261,6 @@ def run_command(Command):
"""runs os command with subprocess
checks for errors from command
"""
-
sys.stdout.flush()
proc = subprocess.Popen(
diff --git a/SU2_PY/compute_polar.py b/SU2_PY/compute_polar.py
index 13f3ae699013..889ecf90a44e 100755
--- a/SU2_PY/compute_polar.py
+++ b/SU2_PY/compute_polar.py
@@ -482,10 +482,28 @@ def main():
# if caseName exists copy the restart file from it for run continuation
# Continue from previous sweep point if this is not he first
if os.path.isdir(caseName):
- command = "cp " + caseName + "/" + config.SOLUTION_FILENAME + " ."
+
+ print(
+ "config option READ_BINARY_RESTART=", config.READ_BINARY_RESTART
+ )
+ if config.READ_BINARY_RESTART == "YES":
+ file_ext = ".dat"
+ else:
+ file_ext = ".csv"
+ command = (
+ "cp "
+ + caseName
+ + "/"
+ + config.SOLUTION_FILENAME
+ + file_ext
+ + " ."
+ )
if options.verbose:
print(command)
- shutil.copy2(caseName + "/" + config.SOLUTION_FILENAME, os.getcwd())
+ shutil.copy2(
+ caseName + "/" + config.SOLUTION_FILENAME + file_ext,
+ os.getcwd(),
+ )
konfig.RESTART_SOL = "YES"
else:
konfig.RESTART_SOL = "NO"
@@ -557,7 +575,12 @@ def main():
# save data
SU2.io.save_data("results.pkl", results)
shutil.copy2("results.pkl", "DIRECT")
- shutil.copy2(config.SOLUTION_FILENAME, "DIRECT")
+
+ if config.READ_BINARY_RESTART == "YES":
+ file_ext = ".dat"
+ else:
+ file_ext = ".csv"
+ shutil.copy2(config.SOLUTION_FILENAME + file_ext, "DIRECT")
if os.path.isdir(caseName):
command = (
@@ -580,8 +603,12 @@ def main():
f.close()
if os.path.isdir("DIRECT"):
shutil.rmtree("DIRECT")
- if os.path.isfile(config.SOLUTION_FILENAME):
- os.remove(config.SOLUTION_FILENAME)
+ if config.READ_BINARY_RESTART == "YES":
+ file_ext = ".dat"
+ else:
+ file_ext = ".csv"
+ if os.path.isfile(config.SOLUTION_FILENAME + file_ext):
+ os.remove(config.SOLUTION_FILENAME + file_ext)
if os.path.isfile("results.pkl"):
os.remove("results.pkl")
print("Post sweep cleanup completed")
diff --git a/SU2_PY/shape_optimization.py b/SU2_PY/shape_optimization.py
index ad9bfa164c8c..699ae8fd38ba 100755
--- a/SU2_PY/shape_optimization.py
+++ b/SU2_PY/shape_optimization.py
@@ -245,7 +245,14 @@ def shape_optimization(
and config.get("RESTART_SOL", "NO") == "YES"
and gradient != "CONTINUOUS_ADJOINT"
):
- restart_name = config["RESTART_FILENAME"].split(".")[0]
+ # needs to be handled...
+ filename = config["RESTART_FILENAME"].split(".")
+ # join everything except the last extension
+ if filename[-1] == ".dat":
+ restart_name = ".".join(filename[:-1])
+ else:
+ restart_name = config["RESTART_FILENAME"]
+
restart_filename = (
restart_name + "_" + str(int(config["RESTART_ITER"]) - 1).zfill(5) + ".dat"
)
diff --git a/SU2_PY/topology_optimization.py b/SU2_PY/topology_optimization.py
index e3bfcc32761b..52f12af19c38 100755
--- a/SU2_PY/topology_optimization.py
+++ b/SU2_PY/topology_optimization.py
@@ -70,7 +70,7 @@
commands = ["SU2_CFD ", "SU2_CFD_AD "]
# file through which SU2 gets the design densities
-inputFile = "element_properties.dat"
+inputFile = "element_properties"
# names of the output files [objective value, objective gradient, constraint value, ...]
outputFiles = ["grad_compliance.dat", "grad_vol_frac.dat"]
diff --git a/TestCases/aeroelastic/aeroelastic_NACA64A010.cfg b/TestCases/aeroelastic/aeroelastic_NACA64A010.cfg
index f87da351fb26..6bdc11f94c4c 100644
--- a/TestCases/aeroelastic/aeroelastic_NACA64A010.cfg
+++ b/TestCases/aeroelastic/aeroelastic_NACA64A010.cfg
@@ -148,10 +148,10 @@ CONV_CAUCHY_EPS= 1E-10
%
MESH_FILENAME= mesh_NACA64A010_hybrid_inv.su2
MESH_FORMAT= SU2
-SOLUTION_FILENAME= solution_flow.dat
+SOLUTION_FILENAME= solution_flow
TABULAR_FORMAT= CSV
CONV_FILENAME= history
-RESTART_FILENAME= restart_flow.dat
+RESTART_FILENAME= restart_flow
VOLUME_FILENAME= flow
SURFACE_FILENAME= surface_flow
OUTPUT_WRT_FREQ= 1000
diff --git a/TestCases/axisymmetric_rans/air_nozzle/air_nozzle_restart.cfg b/TestCases/axisymmetric_rans/air_nozzle/air_nozzle_restart.cfg
index 9c9711fda934..5d0699e93285 100644
--- a/TestCases/axisymmetric_rans/air_nozzle/air_nozzle_restart.cfg
+++ b/TestCases/axisymmetric_rans/air_nozzle/air_nozzle_restart.cfg
@@ -89,8 +89,8 @@ CONV_STARTITER= 10
% ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
%
MESH_FILENAME= nozzle.su2
-SOLUTION_FILENAME= solution_flow.dat
-RESTART_FILENAME= restart_flow.dat
+SOLUTION_FILENAME= solution_flow
+RESTART_FILENAME= restart_flow
OUTPUT_WRT_FREQ= 1000
SCREEN_OUTPUT= (INNER_ITER, RMS_DENSITY, RMS_ENERGY, RMS_TKE, RMS_DISSIPATION, TOTAL_HEATFLUX, \
RMS_ADJ_DENSITY, RMS_ADJ_ENERGY, RMS_ADJ_TKE, RMS_ADJ_DISSIPATION)
diff --git a/TestCases/cont_adj_euler/naca0012/inv_NACA0012.cfg b/TestCases/cont_adj_euler/naca0012/inv_NACA0012.cfg
index 2f4c7c86b5b8..60b772594cff 100644
--- a/TestCases/cont_adj_euler/naca0012/inv_NACA0012.cfg
+++ b/TestCases/cont_adj_euler/naca0012/inv_NACA0012.cfg
@@ -112,16 +112,16 @@ CONV_CAUCHY_EPS= 1E-6
%
MESH_FILENAME= mesh_NACA0012_inv.su2
MESH_FORMAT= SU2
-MESH_OUT_FILENAME= mesh_out.su2
-SOLUTION_FILENAME= solution_flow.dat
-SOLUTION_ADJ_FILENAME= solution_adj.dat
+MESH_OUT_FILENAME= mesh_out
+SOLUTION_FILENAME= solution_flow
+SOLUTION_ADJ_FILENAME= solution_adj
TABULAR_FORMAT= TECPLOT
CONV_FILENAME= history
-RESTART_FILENAME= restart_flow.dat
-RESTART_ADJ_FILENAME= restart_adj.dat
+RESTART_FILENAME= restart_flow
+RESTART_ADJ_FILENAME= restart_adj
VOLUME_FILENAME= flow
VOLUME_ADJ_FILENAME= adjoint
-GRAD_OBJFUNC_FILENAME= of_grad.dat
+GRAD_OBJFUNC_FILENAME= of_grad
SURFACE_FILENAME= surface_flow
SURFACE_ADJ_FILENAME= surface_adjoint
OUTPUT_WRT_FREQ= 250
diff --git a/TestCases/cont_adj_euler/naca0012/inv_NACA0012_FD.cfg b/TestCases/cont_adj_euler/naca0012/inv_NACA0012_FD.cfg
index 5561884d4424..c73e81b34173 100644
--- a/TestCases/cont_adj_euler/naca0012/inv_NACA0012_FD.cfg
+++ b/TestCases/cont_adj_euler/naca0012/inv_NACA0012_FD.cfg
@@ -112,16 +112,16 @@ CONV_CAUCHY_EPS= 1E-6
%
MESH_FILENAME= mesh_NACA0012_inv.su2
MESH_FORMAT= SU2
-MESH_OUT_FILENAME= mesh_out.su2
-SOLUTION_FILENAME= solution_flow.dat
-SOLUTION_ADJ_FILENAME= solution_adj.dat
+MESH_OUT_FILENAME= mesh_out
+SOLUTION_FILENAME= solution_flow
+SOLUTION_ADJ_FILENAME= solution_adj
TABULAR_FORMAT= TECPLOT
CONV_FILENAME= history
-RESTART_FILENAME= restart_flow.dat
-RESTART_ADJ_FILENAME= restart_adj.dat
+RESTART_FILENAME= restart_flow
+RESTART_ADJ_FILENAME= restart_adj
VOLUME_FILENAME= flow
VOLUME_ADJ_FILENAME= adjoint
-GRAD_OBJFUNC_FILENAME= of_grad.dat
+GRAD_OBJFUNC_FILENAME= of_grad
SURFACE_FILENAME= surface_flow
SURFACE_ADJ_FILENAME= surface_adjoint
OUTPUT_WRT_FREQ= 250
diff --git a/TestCases/cont_adj_euler/naca0012/inv_NACA0012_discadj.cfg b/TestCases/cont_adj_euler/naca0012/inv_NACA0012_discadj.cfg
index b4d7d3ba4edb..ab7f125e078e 100644
--- a/TestCases/cont_adj_euler/naca0012/inv_NACA0012_discadj.cfg
+++ b/TestCases/cont_adj_euler/naca0012/inv_NACA0012_discadj.cfg
@@ -86,16 +86,16 @@ CONV_CAUCHY_EPS= 1E-6
%
MESH_FILENAME= mesh_NACA0012_inv.su2
MESH_FORMAT= SU2
-MESH_OUT_FILENAME= mesh_out.su2
-SOLUTION_FILENAME= solution_flow.dat
-SOLUTION_ADJ_FILENAME= solution_adj.dat
+MESH_OUT_FILENAME= mesh_out
+SOLUTION_FILENAME= solution_flow
+SOLUTION_ADJ_FILENAME= solution_adj
TABULAR_FORMAT= TECPLOT
CONV_FILENAME= history
-RESTART_FILENAME= restart_flow.dat
-RESTART_ADJ_FILENAME= restart_adj.dat
+RESTART_FILENAME= restart_flow
+RESTART_ADJ_FILENAME= restart_adj
VOLUME_FILENAME= flow
VOLUME_ADJ_FILENAME= adjoint
-GRAD_OBJFUNC_FILENAME= of_grad.dat
+GRAD_OBJFUNC_FILENAME= of_grad
SURFACE_FILENAME= surface_flow
SURFACE_ADJ_FILENAME= surface_adjoint
OUTPUT_WRT_FREQ= 250
diff --git a/TestCases/cont_adj_euler/oneram6/inv_ONERAM6.cfg b/TestCases/cont_adj_euler/oneram6/inv_ONERAM6.cfg
index f0cbba1c8cdd..a4b84db8bcd3 100644
--- a/TestCases/cont_adj_euler/oneram6/inv_ONERAM6.cfg
+++ b/TestCases/cont_adj_euler/oneram6/inv_ONERAM6.cfg
@@ -99,17 +99,17 @@ CONV_CAUCHY_EPS= 1E-10
% ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
%
MESH_FILENAME= mesh_ONERAM6_inv_ffd.su2
-MESH_OUT_FILENAME= mesh_out.su2
-SOLUTION_FILENAME= solution_flow.dat
-SOLUTION_ADJ_FILENAME= solution_adj.dat
+MESH_OUT_FILENAME= mesh_out
+SOLUTION_FILENAME= solution_flow
+SOLUTION_ADJ_FILENAME= solution_adj
MESH_FORMAT= SU2
TABULAR_FORMAT= CSV
CONV_FILENAME= history
-RESTART_FILENAME= restart_flow.dat
-RESTART_ADJ_FILENAME= restart_adj.dat
+RESTART_FILENAME= restart_flow
+RESTART_ADJ_FILENAME= restart_adj
VOLUME_FILENAME= flow
VOLUME_ADJ_FILENAME= adjoint
-GRAD_OBJFUNC_FILENAME= of_grad.dat
+GRAD_OBJFUNC_FILENAME= of_grad
SURFACE_FILENAME= surface_flow
SURFACE_ADJ_FILENAME= surface_adjoint
OUTPUT_WRT_FREQ= 100
diff --git a/TestCases/cont_adj_euler/wedge/inv_wedge_ROE.cfg b/TestCases/cont_adj_euler/wedge/inv_wedge_ROE.cfg
index 0f757dd93a09..601352299b74 100644
--- a/TestCases/cont_adj_euler/wedge/inv_wedge_ROE.cfg
+++ b/TestCases/cont_adj_euler/wedge/inv_wedge_ROE.cfg
@@ -94,16 +94,16 @@ CONV_STARTITER= 10
%
MESH_FILENAME= mesh_wedge_inv_FFD.su2
MESH_FORMAT= SU2
-MESH_OUT_FILENAME= mesh_out.su2
-SOLUTION_FILENAME= solution_flow.dat
-SOLUTION_ADJ_FILENAME= solution_adj.dat
+MESH_OUT_FILENAME= mesh_out
+SOLUTION_FILENAME= solution_flow
+SOLUTION_ADJ_FILENAME= solution_adj
TABULAR_FORMAT= TECPLOT
CONV_FILENAME= history
-RESTART_FILENAME= restart_flow.dat
-RESTART_ADJ_FILENAME= restart_adj.dat
+RESTART_FILENAME= restart_flow
+RESTART_ADJ_FILENAME= restart_adj
VOLUME_FILENAME= flow
VOLUME_ADJ_FILENAME= adjoint
-GRAD_OBJFUNC_FILENAME= of_grad.dat
+GRAD_OBJFUNC_FILENAME= of_grad
SURFACE_FILENAME= surface_flow
SURFACE_ADJ_FILENAME= surface_adjoint
OUTPUT_WRT_FREQ= 250
diff --git a/TestCases/cont_adj_euler/wedge/inv_wedge_ROE_multiobj.cfg b/TestCases/cont_adj_euler/wedge/inv_wedge_ROE_multiobj.cfg
index 4076d89bb867..5adfc6b5e9a3 100644
--- a/TestCases/cont_adj_euler/wedge/inv_wedge_ROE_multiobj.cfg
+++ b/TestCases/cont_adj_euler/wedge/inv_wedge_ROE_multiobj.cfg
@@ -100,16 +100,16 @@ CONV_STARTITER= 10
%
MESH_FILENAME= mesh_wedge_inv_FFD.su2
MESH_FORMAT= SU2
-MESH_OUT_FILENAME= mesh_out.su2
-SOLUTION_FILENAME= solution_flow.dat
-SOLUTION_ADJ_FILENAME= solution_adj.dat
+MESH_OUT_FILENAME= mesh_out
+SOLUTION_FILENAME= solution_flow
+SOLUTION_ADJ_FILENAME= solution_adj
TABULAR_FORMAT= TECPLOT
CONV_FILENAME= history
-RESTART_FILENAME= restart_flow.dat
-RESTART_ADJ_FILENAME= restart_adj.dat
+RESTART_FILENAME= restart_flow
+RESTART_ADJ_FILENAME= restart_adj
VOLUME_FILENAME= flow
VOLUME_ADJ_FILENAME= adjoint
-GRAD_OBJFUNC_FILENAME= of_grad.dat
+GRAD_OBJFUNC_FILENAME= of_grad
SURFACE_FILENAME= surface_flow
SURFACE_ADJ_FILENAME= surface_adjoint
OUTPUT_WRT_FREQ= 250
diff --git a/TestCases/cont_adj_navierstokes/cylinder/lam_cylinder.cfg b/TestCases/cont_adj_navierstokes/cylinder/lam_cylinder.cfg
index 8429fe40c5fd..a0789cc17432 100644
--- a/TestCases/cont_adj_navierstokes/cylinder/lam_cylinder.cfg
+++ b/TestCases/cont_adj_navierstokes/cylinder/lam_cylinder.cfg
@@ -99,16 +99,16 @@ CONV_CAUCHY_EPS= 1E-6
%
MESH_FILENAME= mesh_cylinder_lam.su2
MESH_FORMAT= SU2
-MESH_OUT_FILENAME= mesh_out.su2
-SOLUTION_FILENAME= solution_flow.dat
-SOLUTION_ADJ_FILENAME= solution_adj.dat
+MESH_OUT_FILENAME= mesh_out
+SOLUTION_FILENAME= solution_flow
+SOLUTION_ADJ_FILENAME= solution_adj
TABULAR_FORMAT= CSV
CONV_FILENAME= history
-RESTART_FILENAME= restart_flow.dat
-RESTART_ADJ_FILENAME= restart_adj.dat
+RESTART_FILENAME= restart_flow
+RESTART_ADJ_FILENAME= restart_adj
VOLUME_FILENAME= flow
VOLUME_ADJ_FILENAME= adjoint
-GRAD_OBJFUNC_FILENAME= of_grad.dat
+GRAD_OBJFUNC_FILENAME= of_grad
SURFACE_FILENAME= surface_flow
SURFACE_ADJ_FILENAME= surface_adjoint
OUTPUT_WRT_FREQ= 1000
diff --git a/TestCases/cont_adj_navierstokes/naca0012_sub/lam_NACA0012.cfg b/TestCases/cont_adj_navierstokes/naca0012_sub/lam_NACA0012.cfg
index eec08f2291c9..07f9340e87d8 100644
--- a/TestCases/cont_adj_navierstokes/naca0012_sub/lam_NACA0012.cfg
+++ b/TestCases/cont_adj_navierstokes/naca0012_sub/lam_NACA0012.cfg
@@ -87,16 +87,16 @@ CONV_CAUCHY_EPS= 1E-10
%
MESH_FILENAME= mesh_NACA0012_lam_hybrid_v2.su2
MESH_FORMAT= SU2
-MESH_OUT_FILENAME= mesh_out.su2
-SOLUTION_FILENAME= solution_flow.dat
-SOLUTION_ADJ_FILENAME= solution_adj.dat
+MESH_OUT_FILENAME= mesh_out
+SOLUTION_FILENAME= solution_flow
+SOLUTION_ADJ_FILENAME= solution_adj
TABULAR_FORMAT= CSV
CONV_FILENAME= history
-RESTART_FILENAME= restart_flow.dat
-RESTART_ADJ_FILENAME= restart_adj.dat
+RESTART_FILENAME= restart_flow
+RESTART_ADJ_FILENAME= restart_adj
VOLUME_FILENAME= flow
VOLUME_ADJ_FILENAME= adjoint
-GRAD_OBJFUNC_FILENAME= of_grad.dat
+GRAD_OBJFUNC_FILENAME= of_grad
SURFACE_FILENAME= surface_flow
SURFACE_ADJ_FILENAME= surface_adjoint
OUTPUT_WRT_FREQ= 5000
diff --git a/TestCases/cont_adj_navierstokes/naca0012_trans/lam_NACA0012.cfg b/TestCases/cont_adj_navierstokes/naca0012_trans/lam_NACA0012.cfg
index dc40f7e6ae87..78da5b47f347 100644
--- a/TestCases/cont_adj_navierstokes/naca0012_trans/lam_NACA0012.cfg
+++ b/TestCases/cont_adj_navierstokes/naca0012_trans/lam_NACA0012.cfg
@@ -90,16 +90,16 @@ CONV_CAUCHY_EPS= 1E-10
%
MESH_FILENAME= mesh_NACA0012_lam_hybrid_v2.su2
MESH_FORMAT= SU2
-MESH_OUT_FILENAME= mesh_out.su2
-SOLUTION_FILENAME= solution_flow.dat
-SOLUTION_ADJ_FILENAME= solution_adj.dat
+MESH_OUT_FILENAME= mesh_out
+SOLUTION_FILENAME= solution_flow
+SOLUTION_ADJ_FILENAME= solution_adj
TABULAR_FORMAT= CSV
CONV_FILENAME= history
-RESTART_FILENAME= restart_flow.dat
-RESTART_ADJ_FILENAME= restart_adj.dat
+RESTART_FILENAME= restart_flow
+RESTART_ADJ_FILENAME= restart_adj
VOLUME_FILENAME= flow
VOLUME_ADJ_FILENAME= adjoint
-GRAD_OBJFUNC_FILENAME= of_grad.dat
+GRAD_OBJFUNC_FILENAME= of_grad
SURFACE_FILENAME= surface_flow
SURFACE_ADJ_FILENAME= surface_adjoint
OUTPUT_WRT_FREQ= 10000
diff --git a/TestCases/cont_adj_rans/naca0012/turb_nasa.cfg b/TestCases/cont_adj_rans/naca0012/turb_nasa.cfg
index 7d6b419aa06c..b36c2b0d3744 100644
--- a/TestCases/cont_adj_rans/naca0012/turb_nasa.cfg
+++ b/TestCases/cont_adj_rans/naca0012/turb_nasa.cfg
@@ -98,16 +98,16 @@ CONV_CAUCHY_EPS= 1E-6
%
MESH_FILENAME= naca0012rans_ff10.su2
MESH_FORMAT= SU2
-MESH_OUT_FILENAME= mesh_out.su2
-SOLUTION_FILENAME= solution_flow.dat
-SOLUTION_ADJ_FILENAME= solution_adj.dat
+MESH_OUT_FILENAME= mesh_out
+SOLUTION_FILENAME= solution_flow
+SOLUTION_ADJ_FILENAME= solution_adj
TABULAR_FORMAT= CSV
CONV_FILENAME= history
-RESTART_FILENAME= restart_flow.dat
-RESTART_ADJ_FILENAME= restart_adj.dat
+RESTART_FILENAME= restart_flow
+RESTART_ADJ_FILENAME= restart_adj
VOLUME_FILENAME= flow
VOLUME_ADJ_FILENAME= adjoint
-GRAD_OBJFUNC_FILENAME= of_grad.dat
+GRAD_OBJFUNC_FILENAME= of_grad
SURFACE_FILENAME= surface_flow
SURFACE_ADJ_FILENAME= surface_adjoint
OUTPUT_WRT_FREQ= 1000
diff --git a/TestCases/cont_adj_rans/naca0012/turb_nasa_binary.cfg b/TestCases/cont_adj_rans/naca0012/turb_nasa_binary.cfg
index 07400144d0e0..0227051a0e16 100644
--- a/TestCases/cont_adj_rans/naca0012/turb_nasa_binary.cfg
+++ b/TestCases/cont_adj_rans/naca0012/turb_nasa_binary.cfg
@@ -99,16 +99,16 @@ CONV_CAUCHY_EPS= 1E-6
%
MESH_FILENAME= naca0012rans_ff10.su2
MESH_FORMAT= SU2
-MESH_OUT_FILENAME= mesh_out.su2
-SOLUTION_FILENAME= bin_solution_flow.dat
-SOLUTION_ADJ_FILENAME= bin_solution_adj.dat
+MESH_OUT_FILENAME= mesh_out
+SOLUTION_FILENAME= bin_solution_flow
+SOLUTION_ADJ_FILENAME= bin_solution_adj
TABULAR_FORMAT= CSV
CONV_FILENAME= history
-RESTART_FILENAME= restart_flow.dat
-RESTART_ADJ_FILENAME= restart_adj.dat
+RESTART_FILENAME= restart_flow
+RESTART_ADJ_FILENAME= restart_adj
VOLUME_FILENAME= flow
VOLUME_ADJ_FILENAME= adjoint
-GRAD_OBJFUNC_FILENAME= of_grad.dat
+GRAD_OBJFUNC_FILENAME= of_grad
SURFACE_FILENAME= surface_flow
SURFACE_ADJ_FILENAME= surface_adjoint
OUTPUT_WRT_FREQ= 1000
diff --git a/TestCases/cont_adj_rans/oneram6/turb_ONERAM6.cfg b/TestCases/cont_adj_rans/oneram6/turb_ONERAM6.cfg
index 0b87db01ee2c..87869285293f 100644
--- a/TestCases/cont_adj_rans/oneram6/turb_ONERAM6.cfg
+++ b/TestCases/cont_adj_rans/oneram6/turb_ONERAM6.cfg
@@ -120,16 +120,16 @@ CONV_CAUCHY_EPS= 1E-5
%
MESH_FILENAME= mesh_ONERAM6_turb.su2
MESH_FORMAT= SU2
-MESH_OUT_FILENAME= mesh_out.su2
-SOLUTION_FILENAME= solution_flow.dat
-SOLUTION_ADJ_FILENAME= solution_adj.dat
+MESH_OUT_FILENAME= mesh_out
+SOLUTION_FILENAME= solution_flow
+SOLUTION_ADJ_FILENAME= solution_adj
TABULAR_FORMAT= CSV
CONV_FILENAME= history
-RESTART_FILENAME= restart_flow.dat
-RESTART_ADJ_FILENAME= restart_adj.dat
+RESTART_FILENAME= restart_flow
+RESTART_ADJ_FILENAME= restart_adj
VOLUME_FILENAME= flow
VOLUME_ADJ_FILENAME= adjoint
-GRAD_OBJFUNC_FILENAME= of_grad.dat
+GRAD_OBJFUNC_FILENAME= of_grad
SURFACE_FILENAME= surface_flow
SURFACE_ADJ_FILENAME= surface_adjoint
OUTPUT_WRT_FREQ= 1000
diff --git a/TestCases/cont_adj_rans/rae2822/turb_SA_RAE2822.cfg b/TestCases/cont_adj_rans/rae2822/turb_SA_RAE2822.cfg
index 21c3cf827ac2..b7219cdae4af 100644
--- a/TestCases/cont_adj_rans/rae2822/turb_SA_RAE2822.cfg
+++ b/TestCases/cont_adj_rans/rae2822/turb_SA_RAE2822.cfg
@@ -95,16 +95,16 @@ CONV_CAUCHY_EPS= 1E-6
%
MESH_FILENAME= mesh_RAE2822_turb.su2
MESH_FORMAT= SU2
-MESH_OUT_FILENAME= mesh_out.su2
-SOLUTION_FILENAME= solution_flow.dat
-SOLUTION_ADJ_FILENAME= solution_adj.dat
+MESH_OUT_FILENAME= mesh_out
+SOLUTION_FILENAME= solution_flow
+SOLUTION_ADJ_FILENAME= solution_adj
TABULAR_FORMAT= CSV
CONV_FILENAME= history
-RESTART_FILENAME= restart_flow.dat
-RESTART_ADJ_FILENAME= restart_adj.dat
+RESTART_FILENAME= restart_flow
+RESTART_ADJ_FILENAME= restart_adj
VOLUME_FILENAME= flow
VOLUME_ADJ_FILENAME= adjoint
-GRAD_OBJFUNC_FILENAME= of_grad.dat
+GRAD_OBJFUNC_FILENAME= of_grad
SURFACE_FILENAME= surface_flow
SURFACE_ADJ_FILENAME= surface_adjoint
OUTPUT_WRT_FREQ= 1000
diff --git a/TestCases/control_surface/inv_ONERAM6_moving.cfg b/TestCases/control_surface/inv_ONERAM6_moving.cfg
index 7d97f6d04b39..214760ec2bc7 100644
--- a/TestCases/control_surface/inv_ONERAM6_moving.cfg
+++ b/TestCases/control_surface/inv_ONERAM6_moving.cfg
@@ -92,17 +92,17 @@ CONV_CAUCHY_EPS= 1E-10
% ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
%
MESH_FILENAME= mesh_ONERAM6_inv_FFD.su2
-MESH_OUT_FILENAME= mesh_out.su2
-SOLUTION_FILENAME= solution_flow.dat
-SOLUTION_ADJ_FILENAME= solution_adj.dat
+MESH_OUT_FILENAME= mesh_out
+SOLUTION_FILENAME= solution_flow
+SOLUTION_ADJ_FILENAME= solution_adj
MESH_FORMAT= SU2
TABULAR_FORMAT= CSV
CONV_FILENAME= history
-RESTART_FILENAME= restart_flow.dat
-RESTART_ADJ_FILENAME= restart_adj.dat
+RESTART_FILENAME= restart_flow
+RESTART_ADJ_FILENAME= restart_adj
VOLUME_FILENAME= flow
VOLUME_ADJ_FILENAME= adjoint
-GRAD_OBJFUNC_FILENAME= of_grad.dat
+GRAD_OBJFUNC_FILENAME= of_grad
SURFACE_FILENAME= surface_flow
SURFACE_ADJ_FILENAME= surface_adjoint
OUTPUT_WRT_FREQ= 50
diff --git a/TestCases/control_surface/inv_ONERAM6_setting.cfg b/TestCases/control_surface/inv_ONERAM6_setting.cfg
index ec7fd40c1709..b050cd14d6b2 100644
--- a/TestCases/control_surface/inv_ONERAM6_setting.cfg
+++ b/TestCases/control_surface/inv_ONERAM6_setting.cfg
@@ -93,16 +93,16 @@ CONV_CAUCHY_EPS= 1E-10
%
MESH_FILENAME= mesh_ONERAM6_inv.su2
MESH_OUT_FILENAME= mesh_ONERAM6_inv_FFD.su2
-SOLUTION_FILENAME= solution_flow.dat
-SOLUTION_ADJ_FILENAME= solution_adj.dat
+SOLUTION_FILENAME= solution_flow
+SOLUTION_ADJ_FILENAME= solution_adj
MESH_FORMAT= SU2
TABULAR_FORMAT= CSV
CONV_FILENAME= history
-RESTART_FILENAME= restart_flow.dat
-RESTART_ADJ_FILENAME= restart_adj.dat
+RESTART_FILENAME= restart_flow
+RESTART_ADJ_FILENAME= restart_adj
VOLUME_FILENAME= flow
VOLUME_ADJ_FILENAME= adjoint
-GRAD_OBJFUNC_FILENAME= of_grad.dat
+GRAD_OBJFUNC_FILENAME= of_grad
SURFACE_FILENAME= surface_flow
SURFACE_ADJ_FILENAME= surface_adjoint
OUTPUT_WRT_FREQ= 50
diff --git a/TestCases/coupled_cht/comp_2d/flow_cylinder.cfg b/TestCases/coupled_cht/comp_2d/flow_cylinder.cfg
index 218cc7fa4703..75605d314f03 100644
--- a/TestCases/coupled_cht/comp_2d/flow_cylinder.cfg
+++ b/TestCases/coupled_cht/comp_2d/flow_cylinder.cfg
@@ -60,17 +60,17 @@ CONV_CAUCHY_EPS= 1E-6
% ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
%
-SOLUTION_FILENAME= solution_flow.dat
-SOLUTION_ADJ_FILENAME= solution_adj.dat
+SOLUTION_FILENAME= solution_flow
+SOLUTION_ADJ_FILENAME= solution_adj
TABULAR_FORMAT= TECPLOT
CONV_FILENAME= history
BREAKDOWN_FILENAME= forces_breakdown.dat
-RESTART_FILENAME= restart_flow.dat
-RESTART_ADJ_FILENAME= restart_adj.dat
+RESTART_FILENAME= restart_flow
+RESTART_ADJ_FILENAME= restart_adj
VOLUME_FILENAME= flow
VOLUME_ADJ_FILENAME= adjoint
-VALUE_OBJFUNC_FILENAME= of_eval.dat
-GRAD_OBJFUNC_FILENAME= of_grad.dat
+VALUE_OBJFUNC_FILENAME= of_eval
+GRAD_OBJFUNC_FILENAME= of_grad
SURFACE_FILENAME= surface_flow
SURFACE_ADJ_FILENAME= surface_adjoint
diff --git a/TestCases/coupled_cht/comp_2d/solid_cylinder1.cfg b/TestCases/coupled_cht/comp_2d/solid_cylinder1.cfg
index a68eec8fb9c6..7ea477b6e42e 100644
--- a/TestCases/coupled_cht/comp_2d/solid_cylinder1.cfg
+++ b/TestCases/coupled_cht/comp_2d/solid_cylinder1.cfg
@@ -59,17 +59,17 @@ CONV_CAUCHY_EPS= 1E-6
% ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
%
-SOLUTION_FILENAME= solution_flow.dat
-SOLUTION_ADJ_FILENAME= solution_adj.dat
+SOLUTION_FILENAME= solution_flow
+SOLUTION_ADJ_FILENAME= solution_adj
TABULAR_FORMAT= TECPLOT
CONV_FILENAME= history
BREAKDOWN_FILENAME= forces_breakdown.dat
-RESTART_FILENAME= restart_flow.dat
-RESTART_ADJ_FILENAME= restart_adj.dat
+RESTART_FILENAME= restart_flow
+RESTART_ADJ_FILENAME= restart_adj
VOLUME_FILENAME= flow
VOLUME_ADJ_FILENAME= adjoint
-VALUE_OBJFUNC_FILENAME= of_eval.dat
-GRAD_OBJFUNC_FILENAME= of_grad.dat
+VALUE_OBJFUNC_FILENAME= of_eval
+GRAD_OBJFUNC_FILENAME= of_grad
SURFACE_FILENAME= surface_flow
SURFACE_ADJ_FILENAME= surface_adjoint
diff --git a/TestCases/coupled_cht/comp_2d/solid_cylinder2.cfg b/TestCases/coupled_cht/comp_2d/solid_cylinder2.cfg
index 18c185881581..67ae42eb633e 100644
--- a/TestCases/coupled_cht/comp_2d/solid_cylinder2.cfg
+++ b/TestCases/coupled_cht/comp_2d/solid_cylinder2.cfg
@@ -59,17 +59,17 @@ CONV_CAUCHY_EPS= 1E-6
% ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
%
-SOLUTION_FILENAME= solution_flow.dat
-SOLUTION_ADJ_FILENAME= solution_adj.dat
+SOLUTION_FILENAME= solution_flow
+SOLUTION_ADJ_FILENAME= solution_adj
TABULAR_FORMAT= TECPLOT
CONV_FILENAME= history
BREAKDOWN_FILENAME= forces_breakdown.dat
-RESTART_FILENAME= restart_flow.dat
-RESTART_ADJ_FILENAME= restart_adj.dat
+RESTART_FILENAME= restart_flow
+RESTART_ADJ_FILENAME= restart_adj
VOLUME_FILENAME= flow
VOLUME_ADJ_FILENAME= adjoint
-VALUE_OBJFUNC_FILENAME= of_eval.dat
-GRAD_OBJFUNC_FILENAME= of_grad.dat
+VALUE_OBJFUNC_FILENAME= of_eval
+GRAD_OBJFUNC_FILENAME= of_grad
SURFACE_FILENAME= surface_flow
SURFACE_ADJ_FILENAME= surface_adjoint
diff --git a/TestCases/coupled_cht/comp_2d/solid_cylinder3.cfg b/TestCases/coupled_cht/comp_2d/solid_cylinder3.cfg
index d3784d904cac..81efe7e7c024 100644
--- a/TestCases/coupled_cht/comp_2d/solid_cylinder3.cfg
+++ b/TestCases/coupled_cht/comp_2d/solid_cylinder3.cfg
@@ -58,17 +58,17 @@ CONV_CAUCHY_EPS= 1E-6
% ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
%
-SOLUTION_FILENAME= solution_flow.dat
-SOLUTION_ADJ_FILENAME= solution_adj.dat
+SOLUTION_FILENAME= solution_flow
+SOLUTION_ADJ_FILENAME= solution_adj
TABULAR_FORMAT= TECPLOT
CONV_FILENAME= history
BREAKDOWN_FILENAME= forces_breakdown.dat
-RESTART_FILENAME= restart_flow.dat
-RESTART_ADJ_FILENAME= restart_adj.dat
+RESTART_FILENAME= restart_flow
+RESTART_ADJ_FILENAME= restart_adj
VOLUME_FILENAME= flow
VOLUME_ADJ_FILENAME= adjoint
-VALUE_OBJFUNC_FILENAME= of_eval.dat
-GRAD_OBJFUNC_FILENAME= of_grad.dat
+VALUE_OBJFUNC_FILENAME= of_eval
+GRAD_OBJFUNC_FILENAME= of_grad
SURFACE_FILENAME= surface_flow
SURFACE_ADJ_FILENAME= surface_adjoint
diff --git a/TestCases/coupled_cht/disc_adj_incomp_2d/flow_cylinder.cfg b/TestCases/coupled_cht/disc_adj_incomp_2d/flow_cylinder.cfg
index 500d5db42f1c..3e25a2a68bbe 100644
--- a/TestCases/coupled_cht/disc_adj_incomp_2d/flow_cylinder.cfg
+++ b/TestCases/coupled_cht/disc_adj_incomp_2d/flow_cylinder.cfg
@@ -85,17 +85,17 @@ CONV_CAUCHY_EPS= 1E-6
% ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
%
-SOLUTION_FILENAME= solution_flow.dat
-SOLUTION_ADJ_FILENAME= solution_adj.dat
+SOLUTION_FILENAME= solution_flow
+SOLUTION_ADJ_FILENAME= solution_adj
TABULAR_FORMAT= TECPLOT
CONV_FILENAME= history
BREAKDOWN_FILENAME= forces_breakdown.dat
-RESTART_FILENAME= restart_flow.dat
-RESTART_ADJ_FILENAME= restart_adj.dat
+RESTART_FILENAME= restart_flow
+RESTART_ADJ_FILENAME= restart_adj
VOLUME_FILENAME= flow
VOLUME_ADJ_FILENAME= adjoint
-VALUE_OBJFUNC_FILENAME= of_eval.dat
-GRAD_OBJFUNC_FILENAME= of_grad.dat
+VALUE_OBJFUNC_FILENAME= of_eval
+GRAD_OBJFUNC_FILENAME= of_grad
SURFACE_FILENAME= surface_flow
SURFACE_ADJ_FILENAME= surface_adjoint
diff --git a/TestCases/coupled_cht/disc_adj_incomp_2d/solid_cylinder1.cfg b/TestCases/coupled_cht/disc_adj_incomp_2d/solid_cylinder1.cfg
index 99b61f65992d..218dda045643 100644
--- a/TestCases/coupled_cht/disc_adj_incomp_2d/solid_cylinder1.cfg
+++ b/TestCases/coupled_cht/disc_adj_incomp_2d/solid_cylinder1.cfg
@@ -59,17 +59,17 @@ CONV_CAUCHY_EPS= 1E-6
% ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
%
-SOLUTION_FILENAME= solution_flow.dat
-SOLUTION_ADJ_FILENAME= solution_adj.dat
+SOLUTION_FILENAME= solution_flow
+SOLUTION_ADJ_FILENAME= solution_adj
TABULAR_FORMAT= TECPLOT
CONV_FILENAME= history
BREAKDOWN_FILENAME= forces_breakdown.dat
-RESTART_FILENAME= restart_flow.dat
-RESTART_ADJ_FILENAME= restart_adj.dat
+RESTART_FILENAME= restart_flow
+RESTART_ADJ_FILENAME= restart_adj
VOLUME_FILENAME= flow
VOLUME_ADJ_FILENAME= adjoint
-VALUE_OBJFUNC_FILENAME= of_eval.dat
-GRAD_OBJFUNC_FILENAME= of_grad.dat
+VALUE_OBJFUNC_FILENAME= of_eval
+GRAD_OBJFUNC_FILENAME= of_grad
SURFACE_FILENAME= surface_flow
SURFACE_ADJ_FILENAME= surface_adjoint
diff --git a/TestCases/coupled_cht/disc_adj_incomp_2d/solid_cylinder2.cfg b/TestCases/coupled_cht/disc_adj_incomp_2d/solid_cylinder2.cfg
index bb8267047bb4..5316c64c178e 100644
--- a/TestCases/coupled_cht/disc_adj_incomp_2d/solid_cylinder2.cfg
+++ b/TestCases/coupled_cht/disc_adj_incomp_2d/solid_cylinder2.cfg
@@ -59,17 +59,17 @@ CONV_CAUCHY_EPS= 1E-6
% ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
%
-SOLUTION_FILENAME= solution_flow.dat
-SOLUTION_ADJ_FILENAME= solution_adj.dat
+SOLUTION_FILENAME= solution_flow
+SOLUTION_ADJ_FILENAME= solution_adj
TABULAR_FORMAT= TECPLOT
CONV_FILENAME= history
BREAKDOWN_FILENAME= forces_breakdown.dat
-RESTART_FILENAME= restart_flow.dat
-RESTART_ADJ_FILENAME= restart_adj.dat
+RESTART_FILENAME= restart_flow
+RESTART_ADJ_FILENAME= restart_adj
VOLUME_FILENAME= flow
VOLUME_ADJ_FILENAME= adjoint
-VALUE_OBJFUNC_FILENAME= of_eval.dat
-GRAD_OBJFUNC_FILENAME= of_grad.dat
+VALUE_OBJFUNC_FILENAME= of_eval
+GRAD_OBJFUNC_FILENAME= of_grad
SURFACE_FILENAME= surface_flow
SURFACE_ADJ_FILENAME= surface_adjoint
diff --git a/TestCases/coupled_cht/disc_adj_incomp_2d/solid_cylinder3.cfg b/TestCases/coupled_cht/disc_adj_incomp_2d/solid_cylinder3.cfg
index 5670dc79ea00..b4943ccecf50 100644
--- a/TestCases/coupled_cht/disc_adj_incomp_2d/solid_cylinder3.cfg
+++ b/TestCases/coupled_cht/disc_adj_incomp_2d/solid_cylinder3.cfg
@@ -59,17 +59,17 @@ CONV_CAUCHY_EPS= 1E-6
% ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
%
-SOLUTION_FILENAME= solution_flow.dat
-SOLUTION_ADJ_FILENAME= solution_adj.dat
+SOLUTION_FILENAME= solution_flow
+SOLUTION_ADJ_FILENAME= solution_adj
TABULAR_FORMAT= TECPLOT
CONV_FILENAME= history
BREAKDOWN_FILENAME= forces_breakdown.dat
-RESTART_FILENAME= restart_flow.dat
-RESTART_ADJ_FILENAME= restart_adj.dat
+RESTART_FILENAME= restart_flow
+RESTART_ADJ_FILENAME= restart_adj
VOLUME_FILENAME= flow
VOLUME_ADJ_FILENAME= adjoint
-VALUE_OBJFUNC_FILENAME= of_eval.dat
-GRAD_OBJFUNC_FILENAME= of_grad.dat
+VALUE_OBJFUNC_FILENAME= of_eval
+GRAD_OBJFUNC_FILENAME= of_grad
SURFACE_FILENAME= surface_flow
SURFACE_ADJ_FILENAME= surface_adjoint
diff --git a/TestCases/coupled_cht/incomp_2d/flow_cylinder.cfg b/TestCases/coupled_cht/incomp_2d/flow_cylinder.cfg
index 360d8a94e50f..83f125e57ea3 100644
--- a/TestCases/coupled_cht/incomp_2d/flow_cylinder.cfg
+++ b/TestCases/coupled_cht/incomp_2d/flow_cylinder.cfg
@@ -83,17 +83,17 @@ CONV_CAUCHY_EPS= 1E-6
% ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
%
-SOLUTION_FILENAME= solution_flow.dat
-SOLUTION_ADJ_FILENAME= solution_adj.dat
+SOLUTION_FILENAME= solution_flow
+SOLUTION_ADJ_FILENAME= solution_adj
TABULAR_FORMAT= TECPLOT
CONV_FILENAME= history
BREAKDOWN_FILENAME= forces_breakdown.dat
-RESTART_FILENAME= restart_flow.dat
-RESTART_ADJ_FILENAME= restart_adj.dat
+RESTART_FILENAME= restart_flow
+RESTART_ADJ_FILENAME= restart_adj
VOLUME_FILENAME= flow
VOLUME_ADJ_FILENAME= adjoint
-VALUE_OBJFUNC_FILENAME= of_eval.dat
-GRAD_OBJFUNC_FILENAME= of_grad.dat
+VALUE_OBJFUNC_FILENAME= of_eval
+GRAD_OBJFUNC_FILENAME= of_grad
SURFACE_FILENAME= surface_flow
SURFACE_ADJ_FILENAME= surface_adjoint
diff --git a/TestCases/coupled_cht/incomp_2d/solid_cylinder1.cfg b/TestCases/coupled_cht/incomp_2d/solid_cylinder1.cfg
index 63a00c08dea6..ce5b9bca737e 100644
--- a/TestCases/coupled_cht/incomp_2d/solid_cylinder1.cfg
+++ b/TestCases/coupled_cht/incomp_2d/solid_cylinder1.cfg
@@ -60,17 +60,17 @@ CONV_CAUCHY_EPS= 1E-6
% ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
%
-SOLUTION_FILENAME= solution_flow.dat
-SOLUTION_ADJ_FILENAME= solution_adj.dat
+SOLUTION_FILENAME= solution_flow
+SOLUTION_ADJ_FILENAME= solution_adj
TABULAR_FORMAT= TECPLOT
CONV_FILENAME= history
BREAKDOWN_FILENAME= forces_breakdown.dat
-RESTART_FILENAME= restart_flow.dat
-RESTART_ADJ_FILENAME= restart_adj.dat
+RESTART_FILENAME= restart_flow
+RESTART_ADJ_FILENAME= restart_adj
VOLUME_FILENAME= flow
VOLUME_ADJ_FILENAME= adjoint
-VALUE_OBJFUNC_FILENAME= of_eval.dat
-GRAD_OBJFUNC_FILENAME= of_grad.dat
+VALUE_OBJFUNC_FILENAME= of_eval
+GRAD_OBJFUNC_FILENAME= of_grad
SURFACE_FILENAME= surface_flow
SURFACE_ADJ_FILENAME= surface_adjoint
diff --git a/TestCases/coupled_cht/incomp_2d/solid_cylinder2.cfg b/TestCases/coupled_cht/incomp_2d/solid_cylinder2.cfg
index ab8221cce5cb..ea0c8f19cdb1 100644
--- a/TestCases/coupled_cht/incomp_2d/solid_cylinder2.cfg
+++ b/TestCases/coupled_cht/incomp_2d/solid_cylinder2.cfg
@@ -60,17 +60,17 @@ CONV_CAUCHY_EPS= 1E-6
% ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
%
-SOLUTION_FILENAME= solution_flow.dat
-SOLUTION_ADJ_FILENAME= solution_adj.dat
+SOLUTION_FILENAME= solution_flow
+SOLUTION_ADJ_FILENAME= solution_adj
TABULAR_FORMAT= TECPLOT
CONV_FILENAME= history
BREAKDOWN_FILENAME= forces_breakdown.dat
-RESTART_FILENAME= restart_flow.dat
-RESTART_ADJ_FILENAME= restart_adj.dat
+RESTART_FILENAME= restart_flow
+RESTART_ADJ_FILENAME= restart_adj
VOLUME_FILENAME= flow
VOLUME_ADJ_FILENAME= adjoint
-VALUE_OBJFUNC_FILENAME= of_eval.dat
-GRAD_OBJFUNC_FILENAME= of_grad.dat
+VALUE_OBJFUNC_FILENAME= of_eval
+GRAD_OBJFUNC_FILENAME= of_grad
SURFACE_FILENAME= surface_flow
SURFACE_ADJ_FILENAME= surface_adjoint
diff --git a/TestCases/coupled_cht/incomp_2d/solid_cylinder3.cfg b/TestCases/coupled_cht/incomp_2d/solid_cylinder3.cfg
index 7db6b4b6c757..868e19c8f789 100644
--- a/TestCases/coupled_cht/incomp_2d/solid_cylinder3.cfg
+++ b/TestCases/coupled_cht/incomp_2d/solid_cylinder3.cfg
@@ -60,17 +60,17 @@ CONV_CAUCHY_EPS= 1E-6
% ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
%
-SOLUTION_FILENAME= solution_flow.dat
-SOLUTION_ADJ_FILENAME= solution_adj.dat
+SOLUTION_FILENAME= solution_flow
+SOLUTION_ADJ_FILENAME= solution_adj
TABULAR_FORMAT= TECPLOT
CONV_FILENAME= history
BREAKDOWN_FILENAME= forces_breakdown.dat
-RESTART_FILENAME= restart_flow.dat
-RESTART_ADJ_FILENAME= restart_adj.dat
+RESTART_FILENAME= restart_flow
+RESTART_ADJ_FILENAME= restart_adj
VOLUME_FILENAME= flow
VOLUME_ADJ_FILENAME= adjoint
-VALUE_OBJFUNC_FILENAME= of_eval.dat
-GRAD_OBJFUNC_FILENAME= of_grad.dat
+VALUE_OBJFUNC_FILENAME= of_eval
+GRAD_OBJFUNC_FILENAME= of_grad
SURFACE_FILENAME= surface_flow
SURFACE_ADJ_FILENAME= surface_adjoint
diff --git a/TestCases/coupled_cht/incomp_2d_unsteady/flow_cylinder.cfg b/TestCases/coupled_cht/incomp_2d_unsteady/flow_cylinder.cfg
index c99794377c8c..4c9cee39ce98 100644
--- a/TestCases/coupled_cht/incomp_2d_unsteady/flow_cylinder.cfg
+++ b/TestCases/coupled_cht/incomp_2d_unsteady/flow_cylinder.cfg
@@ -79,17 +79,17 @@ CONV_CAUCHY_EPS= 1E-6
% ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
%
-SOLUTION_FILENAME= solution_flow.dat
-SOLUTION_ADJ_FILENAME= solution_adj.dat
+SOLUTION_FILENAME= solution_flow
+SOLUTION_ADJ_FILENAME= solution_adj
TABULAR_FORMAT= TECPLOT
CONV_FILENAME= history
BREAKDOWN_FILENAME= forces_breakdown.dat
-RESTART_FILENAME= restart_flow.dat
-RESTART_ADJ_FILENAME= restart_adj.dat
+RESTART_FILENAME= restart_flow
+RESTART_ADJ_FILENAME= restart_adj
VOLUME_FILENAME= flow
VOLUME_ADJ_FILENAME= adjoint
-VALUE_OBJFUNC_FILENAME= of_eval.dat
-GRAD_OBJFUNC_FILENAME= of_grad.dat
+VALUE_OBJFUNC_FILENAME= of_eval
+GRAD_OBJFUNC_FILENAME= of_grad
SURFACE_FILENAME= surface_flow
SURFACE_ADJ_FILENAME= surface_adjoint
diff --git a/TestCases/coupled_cht/incomp_2d_unsteady/solid_cylinder1.cfg b/TestCases/coupled_cht/incomp_2d_unsteady/solid_cylinder1.cfg
index a0d29c2fce9e..dd28f8963c13 100644
--- a/TestCases/coupled_cht/incomp_2d_unsteady/solid_cylinder1.cfg
+++ b/TestCases/coupled_cht/incomp_2d_unsteady/solid_cylinder1.cfg
@@ -55,17 +55,17 @@ CONV_CAUCHY_EPS= 1E-6
% ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
%
-SOLUTION_FILENAME= solution_flow.dat
-SOLUTION_ADJ_FILENAME= solution_adj.dat
+SOLUTION_FILENAME= solution_flow
+SOLUTION_ADJ_FILENAME= solution_adj
TABULAR_FORMAT= TECPLOT
CONV_FILENAME= history
BREAKDOWN_FILENAME= forces_breakdown.dat
-RESTART_FILENAME= restart_flow.dat
-RESTART_ADJ_FILENAME= restart_adj.dat
+RESTART_FILENAME= restart_flow
+RESTART_ADJ_FILENAME= restart_adj
VOLUME_FILENAME= flow
VOLUME_ADJ_FILENAME= adjoint
-VALUE_OBJFUNC_FILENAME= of_eval.dat
-GRAD_OBJFUNC_FILENAME= of_grad.dat
+VALUE_OBJFUNC_FILENAME= of_eval
+GRAD_OBJFUNC_FILENAME= of_grad
SURFACE_FILENAME= surface_flow
SURFACE_ADJ_FILENAME= surface_adjoint
diff --git a/TestCases/coupled_cht/incomp_2d_unsteady/solid_cylinder2.cfg b/TestCases/coupled_cht/incomp_2d_unsteady/solid_cylinder2.cfg
index 5aee001767df..c537d8d79e01 100644
--- a/TestCases/coupled_cht/incomp_2d_unsteady/solid_cylinder2.cfg
+++ b/TestCases/coupled_cht/incomp_2d_unsteady/solid_cylinder2.cfg
@@ -55,17 +55,17 @@ CONV_CAUCHY_EPS= 1E-6
% ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
%
-SOLUTION_FILENAME= solution_flow.dat
-SOLUTION_ADJ_FILENAME= solution_adj.dat
+SOLUTION_FILENAME= solution_flow
+SOLUTION_ADJ_FILENAME= solution_adj
TABULAR_FORMAT= TECPLOT
CONV_FILENAME= history
BREAKDOWN_FILENAME= forces_breakdown.dat
-RESTART_FILENAME= restart_flow.dat
-RESTART_ADJ_FILENAME= restart_adj.dat
+RESTART_FILENAME= restart_flow
+RESTART_ADJ_FILENAME= restart_adj
VOLUME_FILENAME= flow
VOLUME_ADJ_FILENAME= adjoint
-VALUE_OBJFUNC_FILENAME= of_eval.dat
-GRAD_OBJFUNC_FILENAME= of_grad.dat
+VALUE_OBJFUNC_FILENAME= of_eval
+GRAD_OBJFUNC_FILENAME= of_grad
SURFACE_FILENAME= surface_flow
SURFACE_ADJ_FILENAME= surface_adjoint
diff --git a/TestCases/coupled_cht/incomp_2d_unsteady/solid_cylinder3.cfg b/TestCases/coupled_cht/incomp_2d_unsteady/solid_cylinder3.cfg
index 31dd81035091..27860fc7020b 100644
--- a/TestCases/coupled_cht/incomp_2d_unsteady/solid_cylinder3.cfg
+++ b/TestCases/coupled_cht/incomp_2d_unsteady/solid_cylinder3.cfg
@@ -55,17 +55,17 @@ CONV_CAUCHY_EPS= 1E-6
% ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
%
-SOLUTION_FILENAME= solution_flow.dat
-SOLUTION_ADJ_FILENAME= solution_adj.dat
+SOLUTION_FILENAME= solution_flow
+SOLUTION_ADJ_FILENAME= solution_adj
TABULAR_FORMAT= TECPLOT
CONV_FILENAME= history
BREAKDOWN_FILENAME= forces_breakdown.dat
-RESTART_FILENAME= restart_flow.dat
-RESTART_ADJ_FILENAME= restart_adj.dat
+RESTART_FILENAME= restart_flow
+RESTART_ADJ_FILENAME= restart_adj
VOLUME_FILENAME= flow
VOLUME_ADJ_FILENAME= adjoint
-VALUE_OBJFUNC_FILENAME= of_eval.dat
-GRAD_OBJFUNC_FILENAME= of_grad.dat
+VALUE_OBJFUNC_FILENAME= of_eval
+GRAD_OBJFUNC_FILENAME= of_grad
SURFACE_FILENAME= surface_flow
SURFACE_ADJ_FILENAME= surface_adjoint
diff --git a/TestCases/ddes/flatplate/ddes_flatplate.cfg b/TestCases/ddes/flatplate/ddes_flatplate.cfg
index ad36cdffe7f2..080877832361 100644
--- a/TestCases/ddes/flatplate/ddes_flatplate.cfg
+++ b/TestCases/ddes/flatplate/ddes_flatplate.cfg
@@ -91,16 +91,16 @@ CONV_CAUCHY_EPS= 1E-6
%
MESH_FILENAME= mesh_flatplate_turb_137x97.su2
MESH_FORMAT= SU2
-MESH_OUT_FILENAME= mesh_out.su2
-SOLUTION_FILENAME= solution_flow.dat
-SOLUTION_ADJ_FILENAME= solution_adj.dat
+MESH_OUT_FILENAME= mesh_out
+SOLUTION_FILENAME= solution_flow
+SOLUTION_ADJ_FILENAME= solution_adj
TABULAR_FORMAT= CSV
CONV_FILENAME= history
-RESTART_FILENAME= restart_flow.dat
-RESTART_ADJ_FILENAME= restart_adj.dat
+RESTART_FILENAME= restart_flow
+RESTART_ADJ_FILENAME= restart_adj
VOLUME_FILENAME= flow
VOLUME_ADJ_FILENAME= adjoint
-GRAD_OBJFUNC_FILENAME= of_grad.dat
+GRAD_OBJFUNC_FILENAME= of_grad
SURFACE_FILENAME= surface_flow
SURFACE_ADJ_FILENAME= surface_adjoint
OUTPUT_WRT_FREQ= 1000
diff --git a/TestCases/deformation/brick_hex/def_brick_hex.cfg b/TestCases/deformation/brick_hex/def_brick_hex.cfg
index a669a5348387..f0c5f5417128 100755
--- a/TestCases/deformation/brick_hex/def_brick_hex.cfg
+++ b/TestCases/deformation/brick_hex/def_brick_hex.cfg
@@ -95,15 +95,15 @@ CONV_CAUCHY_EPS= 1E-6
%
MESH_FILENAME= mesh_brick_hex_ffd.su2
MESH_FORMAT= SU2
-MESH_OUT_FILENAME= mesh_out.su2
-SOLUTION_FILENAME= solution_flow.dat
-SOLUTION_ADJ_FILENAME= solution_adj.dat
+MESH_OUT_FILENAME= mesh_out
+SOLUTION_FILENAME= solution_flow
+SOLUTION_ADJ_FILENAME= solution_adj
TABULAR_FORMAT= CSV
CONV_FILENAME= history
-RESTART_FILENAME= restart_flow.dat
-RESTART_ADJ_FILENAME= restart_adj.dat
+RESTART_FILENAME= restart_flow
+RESTART_ADJ_FILENAME= restart_adj
VOLUME_FILENAME= flow
VOLUME_ADJ_FILENAME= adjoint
-GRAD_OBJFUNC_FILENAME= of_grad.dat
+GRAD_OBJFUNC_FILENAME= of_grad
SURFACE_FILENAME= surface_flow
SURFACE_ADJ_FILENAME= surface_adjoint
diff --git a/TestCases/deformation/brick_hex_rans/def_brick_hex_rans.cfg b/TestCases/deformation/brick_hex_rans/def_brick_hex_rans.cfg
index c53cc5aab997..ee0e2b0485bf 100755
--- a/TestCases/deformation/brick_hex_rans/def_brick_hex_rans.cfg
+++ b/TestCases/deformation/brick_hex_rans/def_brick_hex_rans.cfg
@@ -95,16 +95,16 @@ CONV_CAUCHY_EPS= 1E-6
%
MESH_FILENAME= mesh_brick_hex_rans_ffd.su2
MESH_FORMAT= SU2
-MESH_OUT_FILENAME= mesh_out.su2
-SOLUTION_FILENAME= solution_flow.dat
-SOLUTION_ADJ_FILENAME= solution_adj.dat
+MESH_OUT_FILENAME= mesh_out
+SOLUTION_FILENAME= solution_flow
+SOLUTION_ADJ_FILENAME= solution_adj
TABULAR_FORMAT= CSV
CONV_FILENAME= history
-RESTART_FILENAME= restart_flow.dat
-RESTART_ADJ_FILENAME= restart_adj.dat
+RESTART_FILENAME= restart_flow
+RESTART_ADJ_FILENAME= restart_adj
VOLUME_FILENAME= flow
VOLUME_ADJ_FILENAME= adjoint
-GRAD_OBJFUNC_FILENAME= of_grad.dat
+GRAD_OBJFUNC_FILENAME= of_grad
SURFACE_FILENAME= surface_flow
SURFACE_ADJ_FILENAME= surface_adjoint
OUTPUT_WRT_FREQ= 250
diff --git a/TestCases/deformation/brick_prism/def_brick_prism.cfg b/TestCases/deformation/brick_prism/def_brick_prism.cfg
index 418412c76726..28e22b92fc2a 100755
--- a/TestCases/deformation/brick_prism/def_brick_prism.cfg
+++ b/TestCases/deformation/brick_prism/def_brick_prism.cfg
@@ -95,15 +95,15 @@ CONV_CAUCHY_EPS= 1E-6
%
MESH_FILENAME= mesh_brick_prism_ffd.su2
MESH_FORMAT= SU2
-MESH_OUT_FILENAME= mesh_out.su2
-SOLUTION_FILENAME= solution_flow.dat
-SOLUTION_ADJ_FILENAME= solution_adj.dat
+MESH_OUT_FILENAME= mesh_out
+SOLUTION_FILENAME= solution_flow
+SOLUTION_ADJ_FILENAME= solution_adj
TABULAR_FORMAT= CSV
CONV_FILENAME= history
-RESTART_FILENAME= restart_flow.dat
-RESTART_ADJ_FILENAME= restart_adj.dat
+RESTART_FILENAME= restart_flow
+RESTART_ADJ_FILENAME= restart_adj
VOLUME_FILENAME= flow
VOLUME_ADJ_FILENAME= adjoint
-GRAD_OBJFUNC_FILENAME= of_grad.dat
+GRAD_OBJFUNC_FILENAME= of_grad
SURFACE_FILENAME= surface_flow
SURFACE_ADJ_FILENAME= surface_adjoint
diff --git a/TestCases/deformation/brick_prism_rans/def_brick_prism_rans.cfg b/TestCases/deformation/brick_prism_rans/def_brick_prism_rans.cfg
index 801fef712e37..96c888bb7e8b 100755
--- a/TestCases/deformation/brick_prism_rans/def_brick_prism_rans.cfg
+++ b/TestCases/deformation/brick_prism_rans/def_brick_prism_rans.cfg
@@ -95,15 +95,15 @@ CONV_CAUCHY_EPS= 1E-6
%
MESH_FILENAME= mesh_brick_prism_rans_ffd.su2
MESH_FORMAT= SU2
-MESH_OUT_FILENAME= mesh_out.su2
-SOLUTION_FILENAME= solution_flow.dat
-SOLUTION_ADJ_FILENAME= solution_adj.dat
+MESH_OUT_FILENAME= mesh_out
+SOLUTION_FILENAME= solution_flow
+SOLUTION_ADJ_FILENAME= solution_adj
TABULAR_FORMAT= CSV
CONV_FILENAME= history
-RESTART_FILENAME= restart_flow.dat
-RESTART_ADJ_FILENAME= restart_adj.dat
+RESTART_FILENAME= restart_flow
+RESTART_ADJ_FILENAME= restart_adj
VOLUME_FILENAME= flow
VOLUME_ADJ_FILENAME= adjoint
-GRAD_OBJFUNC_FILENAME= of_grad.dat
+GRAD_OBJFUNC_FILENAME= of_grad
SURFACE_FILENAME= surface_flow
SURFACE_ADJ_FILENAME= surface_adjoint
diff --git a/TestCases/deformation/brick_pyra/def_brick_pyra.cfg b/TestCases/deformation/brick_pyra/def_brick_pyra.cfg
index 1168e7a86317..980329c47add 100755
--- a/TestCases/deformation/brick_pyra/def_brick_pyra.cfg
+++ b/TestCases/deformation/brick_pyra/def_brick_pyra.cfg
@@ -95,16 +95,16 @@ CONV_CAUCHY_EPS= 1E-6
%
MESH_FILENAME= mesh_brick_pyra_ffd.su2
MESH_FORMAT= SU2
-MESH_OUT_FILENAME= mesh_out.su2
-SOLUTION_FILENAME= solution_flow.dat
-SOLUTION_ADJ_FILENAME= solution_adj.dat
+MESH_OUT_FILENAME= mesh_out
+SOLUTION_FILENAME= solution_flow
+SOLUTION_ADJ_FILENAME= solution_adj
TABULAR_FORMAT= CSV
CONV_FILENAME= history
-RESTART_FILENAME= restart_flow.dat
-RESTART_ADJ_FILENAME= restart_adj.dat
+RESTART_FILENAME= restart_flow
+RESTART_ADJ_FILENAME= restart_adj
VOLUME_FILENAME= flow
VOLUME_ADJ_FILENAME= adjoint
-GRAD_OBJFUNC_FILENAME= of_grad.dat
+GRAD_OBJFUNC_FILENAME= of_grad
SURFACE_FILENAME= surface_flow
SURFACE_ADJ_FILENAME= surface_adjoint
OUTPUT_WRT_FREQ= 250
diff --git a/TestCases/deformation/brick_tets/def_brick_tets.cfg b/TestCases/deformation/brick_tets/def_brick_tets.cfg
index 957f30a99a67..88fb76785601 100755
--- a/TestCases/deformation/brick_tets/def_brick_tets.cfg
+++ b/TestCases/deformation/brick_tets/def_brick_tets.cfg
@@ -95,16 +95,16 @@ CONV_CAUCHY_EPS= 1E-6
%
MESH_FILENAME= mesh_brick_tets_ffd.su2
MESH_FORMAT= SU2
-MESH_OUT_FILENAME= mesh_out.su2
-SOLUTION_FILENAME= solution_flow.dat
-SOLUTION_ADJ_FILENAME= solution_adj.dat
+MESH_OUT_FILENAME= mesh_out
+SOLUTION_FILENAME= solution_flow
+SOLUTION_ADJ_FILENAME= solution_adj
TABULAR_FORMAT= CSV
CONV_FILENAME= history
-RESTART_FILENAME= restart_flow.dat
-RESTART_ADJ_FILENAME= restart_adj.dat
+RESTART_FILENAME= restart_flow
+RESTART_ADJ_FILENAME= restart_adj
VOLUME_FILENAME= flow
VOLUME_ADJ_FILENAME= adjoint
-GRAD_OBJFUNC_FILENAME= of_grad.dat
+GRAD_OBJFUNC_FILENAME= of_grad
SURFACE_FILENAME= surface_flow
SURFACE_ADJ_FILENAME= surface_adjoint
OUTPUT_WRT_FREQ= 250
diff --git a/TestCases/deformation/cst/naca0012.cfg b/TestCases/deformation/cst/naca0012.cfg
index fa5bf0d35c30..0db411b6ded3 100644
--- a/TestCases/deformation/cst/naca0012.cfg
+++ b/TestCases/deformation/cst/naca0012.cfg
@@ -79,13 +79,13 @@ MESH_FILENAME= ../naca0012/mesh_NACA0012_inv.su2
MESH_FORMAT= SU2
%
% Mesh output file
-MESH_OUT_FILENAME= mesh_out.su2
+MESH_OUT_FILENAME= mesh_out
%
% Restart flow input file
-SOLUTION_FILENAME= solution_flow.dat
+SOLUTION_FILENAME= solution_flow
%
% Restart adjoint input file
-SOLUTION_ADJ_FILENAME= solution_adj.dat
+SOLUTION_ADJ_FILENAME= solution_adj
%
% Output tabular file format (TECPLOT, CSV)
TABULAR_FORMAT= CSV
@@ -104,10 +104,10 @@ CONV_FILENAME= history
BREAKDOWN_FILENAME= forces_breakdown.dat
%
% Output file restart flow
-RESTART_FILENAME= restart_flow.dat
+RESTART_FILENAME= restart_flow
%
% Output file restart adjoint
-RESTART_ADJ_FILENAME= restart_adj.dat
+RESTART_ADJ_FILENAME= restart_adj
%
% Output file flow (w/o extension) variables
VOLUME_FILENAME= flow
@@ -116,10 +116,10 @@ VOLUME_FILENAME= flow
VOLUME_ADJ_FILENAME= adjoint
%
% Output Objective function
-VALUE_OBJFUNC_FILENAME= of_eval.dat
+VALUE_OBJFUNC_FILENAME= of_eval
%
% Output objective function gradient (using continuous adjoint)
-GRAD_OBJFUNC_FILENAME= of_grad.dat
+GRAD_OBJFUNC_FILENAME= of_grad
%
% Output file surface flow coefficient (w/o extension)
SURFACE_FILENAME= surface_flow
diff --git a/TestCases/deformation/cylindrical_ffd/def_cylindrical.cfg b/TestCases/deformation/cylindrical_ffd/def_cylindrical.cfg
index 983070fb6cc6..9f46ca70c1db 100644
--- a/TestCases/deformation/cylindrical_ffd/def_cylindrical.cfg
+++ b/TestCases/deformation/cylindrical_ffd/def_cylindrical.cfg
@@ -125,18 +125,18 @@ CONV_STARTITER= 10
%
MESH_FILENAME= cylindrical.su2
MESH_FORMAT= SU2
-MESH_OUT_FILENAME= mesh_out.su2
-SOLUTION_FILENAME= solution_flow.dat
-SOLUTION_ADJ_FILENAME= solution_adj.dat
+MESH_OUT_FILENAME= mesh_out
+SOLUTION_FILENAME= solution_flow
+SOLUTION_ADJ_FILENAME= solution_adj
TABULAR_FORMAT= CSV
CONV_FILENAME= history
BREAKDOWN_FILENAME= forces_breakdown.dat
-RESTART_FILENAME= restart_flow.dat
-RESTART_ADJ_FILENAME= restart_adj.dat
+RESTART_FILENAME= restart_flow
+RESTART_ADJ_FILENAME= restart_adj
VOLUME_FILENAME= flow
VOLUME_ADJ_FILENAME= adjoint
-VALUE_OBJFUNC_FILENAME= of_eval.dat
-GRAD_OBJFUNC_FILENAME= of_grad.dat
+VALUE_OBJFUNC_FILENAME= of_eval
+GRAD_OBJFUNC_FILENAME= of_grad
SURFACE_FILENAME= surface_flow
SURFACE_ADJ_FILENAME= surface_adjoint
OUTPUT_WRT_FREQ= 1
diff --git a/TestCases/deformation/intersection_prevention/def_intersect.cfg b/TestCases/deformation/intersection_prevention/def_intersect.cfg
index ee2e4b66a774..c128be02a661 100644
--- a/TestCases/deformation/intersection_prevention/def_intersect.cfg
+++ b/TestCases/deformation/intersection_prevention/def_intersect.cfg
@@ -118,16 +118,16 @@ CONV_FIELD = (RMS_PRESSURE, RMS_ADJ_PRESSURE)
% ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
%
MESH_FORMAT= SU2
-SOLUTION_FILENAME= solution_flow.dat
-SOLUTION_ADJ_FILENAME= solution_adj.dat
+SOLUTION_FILENAME= solution_flow
+SOLUTION_ADJ_FILENAME= solution_adj
OUTPUT_FILES = (RESTART, PARAVIEW_ASCII, SURFACE_CSV)
TABULAR_FORMAT = CSV
CONV_FILENAME= history
-RESTART_FILENAME= restart_flow.dat
-RESTART_ADJ_FILENAME= restart_adj.dat
+RESTART_FILENAME= restart_flow
+RESTART_ADJ_FILENAME= restart_adj
VOLUME_FILENAME= flow
VOLUME_ADJ_FILENAME= adjoint
-GRAD_OBJFUNC_FILENAME= of_grad.dat
+GRAD_OBJFUNC_FILENAME= of_grad
SURFACE_FILENAME= surface_flow
SURFACE_ADJ_FILENAME= surface_adjoint
VOLUME_OUTPUT= RESIDUAL PRIMITIVE SOURCE SENSITIVITY COEFFICIENT
diff --git a/TestCases/deformation/naca0012/def_NACA0012.cfg b/TestCases/deformation/naca0012/def_NACA0012.cfg
index d026fa0873cd..08817336f912 100644
--- a/TestCases/deformation/naca0012/def_NACA0012.cfg
+++ b/TestCases/deformation/naca0012/def_NACA0012.cfg
@@ -113,16 +113,16 @@ CONV_CAUCHY_EPS= 1E-6
%
MESH_FILENAME= mesh_NACA0012_inv.su2
MESH_FORMAT= SU2
-MESH_OUT_FILENAME= mesh_out.su2
-SOLUTION_FILENAME= solution_flow.dat
-SOLUTION_ADJ_FILENAME= solution_adj.dat
+MESH_OUT_FILENAME= mesh_out
+SOLUTION_FILENAME= solution_flow
+SOLUTION_ADJ_FILENAME= solution_adj
TABULAR_FORMAT= CSV
CONV_FILENAME= history
-RESTART_FILENAME= restart_flow.dat
-RESTART_ADJ_FILENAME= restart_adj.dat
+RESTART_FILENAME= restart_flow
+RESTART_ADJ_FILENAME= restart_adj
VOLUME_FILENAME= flow
VOLUME_ADJ_FILENAME= adjoint
-GRAD_OBJFUNC_FILENAME= of_grad.dat
+GRAD_OBJFUNC_FILENAME= of_grad
SURFACE_FILENAME= surface_flow
SURFACE_ADJ_FILENAME= surface_adjoint
OUTPUT_WRT_FREQ= 250
diff --git a/TestCases/deformation/naca0012/surface_file_NACA0012.cfg b/TestCases/deformation/naca0012/surface_file_NACA0012.cfg
index 485ca26b65ea..12a8286a4b88 100644
--- a/TestCases/deformation/naca0012/surface_file_NACA0012.cfg
+++ b/TestCases/deformation/naca0012/surface_file_NACA0012.cfg
@@ -114,16 +114,16 @@ CONV_CAUCHY_EPS= 1E-6
%
MESH_FILENAME= mesh_NACA0012_inv.su2
MESH_FORMAT= SU2
-MESH_OUT_FILENAME= mesh_out.su2
-SOLUTION_FILENAME= solution_flow.dat
-SOLUTION_ADJ_FILENAME= solution_adj.dat
+MESH_OUT_FILENAME= mesh_out
+SOLUTION_FILENAME= solution_flow
+SOLUTION_ADJ_FILENAME= solution_adj
TABULAR_FORMAT= CSV
CONV_FILENAME= history
-RESTART_FILENAME= restart_flow.dat
-RESTART_ADJ_FILENAME= restart_adj.dat
+RESTART_FILENAME= restart_flow
+RESTART_ADJ_FILENAME= restart_adj
VOLUME_FILENAME= flow
VOLUME_ADJ_FILENAME= adjoint
-GRAD_OBJFUNC_FILENAME= of_grad.dat
+GRAD_OBJFUNC_FILENAME= of_grad
SURFACE_FILENAME= surface_flow
SURFACE_ADJ_FILENAME= surface_adjoint
diff --git a/TestCases/deformation/naca4412/def_NACA4412.cfg b/TestCases/deformation/naca4412/def_NACA4412.cfg
index 3ec9561fa101..2097acc4d672 100644
--- a/TestCases/deformation/naca4412/def_NACA4412.cfg
+++ b/TestCases/deformation/naca4412/def_NACA4412.cfg
@@ -101,16 +101,16 @@ CONV_CAUCHY_EPS= 1E0
%
MESH_FILENAME= mesh_NACA4412_turb.su2
MESH_FORMAT= SU2
-MESH_OUT_FILENAME= mesh_out.su2
-SOLUTION_FILENAME= solution_flow.dat
-SOLUTION_ADJ_FILENAME= solution_adj.dat
+MESH_OUT_FILENAME= mesh_out
+SOLUTION_FILENAME= solution_flow
+SOLUTION_ADJ_FILENAME= solution_adj
TABULAR_FORMAT= CSV
CONV_FILENAME= history
-RESTART_FILENAME= restart_flow.dat
-RESTART_ADJ_FILENAME= restart_adj.dat
+RESTART_FILENAME= restart_flow
+RESTART_ADJ_FILENAME= restart_adj
VOLUME_FILENAME= flow
VOLUME_ADJ_FILENAME= adjoint
-GRAD_OBJFUNC_FILENAME= of_grad.dat
+GRAD_OBJFUNC_FILENAME= of_grad
SURFACE_FILENAME= surface_flow
SURFACE_ADJ_FILENAME= surface_adjoint
OUTPUT_WRT_FREQ= 1000
diff --git a/TestCases/deformation/rae2822/def_RAE2822.cfg b/TestCases/deformation/rae2822/def_RAE2822.cfg
index 900760cc96b2..91c1f5d6213b 100644
--- a/TestCases/deformation/rae2822/def_RAE2822.cfg
+++ b/TestCases/deformation/rae2822/def_RAE2822.cfg
@@ -99,16 +99,16 @@ CONV_CAUCHY_EPS= 1E-6
%
MESH_FILENAME= mesh_RAE2822_turb_ffd.su2
MESH_FORMAT= SU2
-MESH_OUT_FILENAME= mesh_out.su2
-SOLUTION_FILENAME= solution_flow.dat
-SOLUTION_ADJ_FILENAME= solution_adj.dat
+MESH_OUT_FILENAME= mesh_out
+SOLUTION_FILENAME= solution_flow
+SOLUTION_ADJ_FILENAME= solution_adj
TABULAR_FORMAT= CSV
CONV_FILENAME= history
-RESTART_FILENAME= restart_flow.dat
-RESTART_ADJ_FILENAME= restart_adj.dat
+RESTART_FILENAME= restart_flow
+RESTART_ADJ_FILENAME= restart_adj
VOLUME_FILENAME= flow
VOLUME_ADJ_FILENAME= adjoint
-GRAD_OBJFUNC_FILENAME= of_grad.dat
+GRAD_OBJFUNC_FILENAME= of_grad
SURFACE_FILENAME= surface_flow
SURFACE_ADJ_FILENAME= surface_adjoint
OUTPUT_WRT_FREQ= 250
diff --git a/TestCases/deformation/spherical_ffd/def_spherical.cfg b/TestCases/deformation/spherical_ffd/def_spherical.cfg
index 19d44fee875d..9cb8432943ee 100644
--- a/TestCases/deformation/spherical_ffd/def_spherical.cfg
+++ b/TestCases/deformation/spherical_ffd/def_spherical.cfg
@@ -109,18 +109,18 @@ CONV_STARTITER= 10
%
MESH_FILENAME= spherical.su2
MESH_FORMAT= SU2
-MESH_OUT_FILENAME= mesh_out.su2
-SOLUTION_FILENAME= solution_flow.dat
-SOLUTION_ADJ_FILENAME= solution_adj.dat
+MESH_OUT_FILENAME= mesh_out
+SOLUTION_FILENAME= solution_flow
+SOLUTION_ADJ_FILENAME= solution_adj
TABULAR_FORMAT= CSV
CONV_FILENAME= history
BREAKDOWN_FILENAME= forces_breakdown.dat
-RESTART_FILENAME= restart_flow.dat
-RESTART_ADJ_FILENAME= restart_adj.dat
+RESTART_FILENAME= restart_flow
+RESTART_ADJ_FILENAME= restart_adj
VOLUME_FILENAME= flow
VOLUME_ADJ_FILENAME= adjoint
-VALUE_OBJFUNC_FILENAME= of_eval.dat
-GRAD_OBJFUNC_FILENAME= of_grad.dat
+VALUE_OBJFUNC_FILENAME= of_eval
+GRAD_OBJFUNC_FILENAME= of_grad
SURFACE_FILENAME= surface_flow
SURFACE_ADJ_FILENAME= surface_adjoint
OUTPUT_WRT_FREQ= 1500
diff --git a/TestCases/deformation/spherical_ffd/def_spherical_bspline.cfg b/TestCases/deformation/spherical_ffd/def_spherical_bspline.cfg
index ffdd21b6a911..738e576e6344 100644
--- a/TestCases/deformation/spherical_ffd/def_spherical_bspline.cfg
+++ b/TestCases/deformation/spherical_ffd/def_spherical_bspline.cfg
@@ -111,18 +111,18 @@ CONV_STARTITER= 10
%
MESH_FILENAME= spherical_bspline.su2
MESH_FORMAT= SU2
-MESH_OUT_FILENAME= mesh_out.su2
-SOLUTION_FILENAME= solution_flow.dat
-SOLUTION_ADJ_FILENAME= solution_adj.dat
+MESH_OUT_FILENAME= mesh_out
+SOLUTION_FILENAME= solution_flow
+SOLUTION_ADJ_FILENAME= solution_adj
TABULAR_FORMAT= CSV
CONV_FILENAME= history
BREAKDOWN_FILENAME= forces_breakdown.dat
-RESTART_FILENAME= restart_flow.dat
-RESTART_ADJ_FILENAME= restart_adj.dat
+RESTART_FILENAME= restart_flow
+RESTART_ADJ_FILENAME= restart_adj
VOLUME_FILENAME= flow
VOLUME_ADJ_FILENAME= adjoint
-VALUE_OBJFUNC_FILENAME= of_eval.dat
-GRAD_OBJFUNC_FILENAME= of_grad.dat
+VALUE_OBJFUNC_FILENAME= of_eval
+GRAD_OBJFUNC_FILENAME= of_grad
SURFACE_FILENAME= surface_flow
SURFACE_ADJ_FILENAME= surface_adjoint
OUTPUT_WRT_FREQ= 1500
diff --git a/TestCases/disc_adj_euler/arina2k/Arina2KRS.cfg b/TestCases/disc_adj_euler/arina2k/Arina2KRS.cfg
index 28e9a76ac3c1..1a5a9e6c8c3e 100644
--- a/TestCases/disc_adj_euler/arina2k/Arina2KRS.cfg
+++ b/TestCases/disc_adj_euler/arina2k/Arina2KRS.cfg
@@ -170,18 +170,18 @@ CONV_CAUCHY_EPS= 1E-10
%
MESH_FILENAME= Arina2Kmesh.su2
MESH_FORMAT= SU2
-MESH_OUT_FILENAME= MESHOUT_Arina2Kmesh.su2
-SOLUTION_FILENAME= solution_flow.dat
-SOLUTION_ADJ_FILENAME= solution_adj.dat
+MESH_OUT_FILENAME= mesh_out
+SOLUTION_FILENAME= solution_flow
+SOLUTION_ADJ_FILENAME= solution_adj
TABULAR_FORMAT= CSV
CONV_FILENAME= history
BREAKDOWN_FILENAME= forces_breakdown.dat
-RESTART_FILENAME= restart_flow.dat
-RESTART_ADJ_FILENAME= restart_adj.dat
+RESTART_FILENAME= restart_flow
+RESTART_ADJ_FILENAME= restart_adj
VOLUME_FILENAME= flow
VOLUME_ADJ_FILENAME= adjoint
-VALUE_OBJFUNC_FILENAME= of_eval.dat
-GRAD_OBJFUNC_FILENAME= of_grad.dat
+VALUE_OBJFUNC_FILENAME= of_eval
+GRAD_OBJFUNC_FILENAME= of_grad
SURFACE_FILENAME= surface_flow
SURFACE_ADJ_FILENAME= surface_adjoint
OUTPUT_WRT_FREQ= 1000
diff --git a/TestCases/disc_adj_euler/cylinder3D/inv_cylinder3D.cfg b/TestCases/disc_adj_euler/cylinder3D/inv_cylinder3D.cfg
index 5634e22ca37b..95c51a171efd 100644
--- a/TestCases/disc_adj_euler/cylinder3D/inv_cylinder3D.cfg
+++ b/TestCases/disc_adj_euler/cylinder3D/inv_cylinder3D.cfg
@@ -99,18 +99,18 @@ CONV_CAUCHY_EPS= 1E-10
%
MESH_FILENAME= cylinder3D.cgns
MESH_FORMAT= CGNS
-MESH_OUT_FILENAME= mesh_out.su2
-SOLUTION_FILENAME= solution_flow.dat
-SOLUTION_ADJ_FILENAME= solution_adj.dat
+MESH_OUT_FILENAME= mesh_out
+SOLUTION_FILENAME= solution_flow
+SOLUTION_ADJ_FILENAME= solution_adj
TABULAR_FORMAT= CSV
CONV_FILENAME= history
BREAKDOWN_FILENAME= forces_breakdown.dat
-RESTART_FILENAME= restart_flow.dat
-RESTART_ADJ_FILENAME= restart_adj.dat
+RESTART_FILENAME= restart_flow
+RESTART_ADJ_FILENAME= restart_adj
VOLUME_FILENAME= flow
VOLUME_ADJ_FILENAME= adjoint
-VALUE_OBJFUNC_FILENAME= of_eval.dat
-GRAD_OBJFUNC_FILENAME= of_grad.dat
+VALUE_OBJFUNC_FILENAME= of_eval
+GRAD_OBJFUNC_FILENAME= of_grad
SURFACE_FILENAME= surface_flow
SURFACE_ADJ_FILENAME= surface_adjoint
OUTPUT_WRT_FREQ= 2525
diff --git a/TestCases/disc_adj_euler/naca0012_pitching/inv_NACA0012_pitching.cfg b/TestCases/disc_adj_euler/naca0012_pitching/inv_NACA0012_pitching.cfg
index ae54063eeeb8..df699f723019 100644
--- a/TestCases/disc_adj_euler/naca0012_pitching/inv_NACA0012_pitching.cfg
+++ b/TestCases/disc_adj_euler/naca0012_pitching/inv_NACA0012_pitching.cfg
@@ -132,16 +132,16 @@ CONV_CAUCHY_EPS= 1E-6
%
MESH_FILENAME= mesh_NACA0012_inv_FFD.su2
MESH_FORMAT= SU2
-MESH_OUT_FILENAME= mesh_out.su2
-SOLUTION_FILENAME= solution_flow.dat
-SOLUTION_ADJ_FILENAME= solution_adj.dat
+MESH_OUT_FILENAME= mesh_out
+SOLUTION_FILENAME= solution_flow
+SOLUTION_ADJ_FILENAME= solution_adj
TABULAR_FORMAT= CSV
CONV_FILENAME= history
-RESTART_FILENAME= restart_flow.dat
-RESTART_ADJ_FILENAME= restart_adj.dat
+RESTART_FILENAME= restart_flow
+RESTART_ADJ_FILENAME= restart_adj
VOLUME_FILENAME= flow
VOLUME_ADJ_FILENAME= adjoint
-GRAD_OBJFUNC_FILENAME= of_grad.dat
+GRAD_OBJFUNC_FILENAME= of_grad
SURFACE_FILENAME= surface_flow
SURFACE_ADJ_FILENAME= surface_adjoint
OUTPUT_WRT_FREQ= 1
diff --git a/TestCases/disc_adj_euler/naca0012_pitching_def/inv_NACA0012_pitching_deform.cfg b/TestCases/disc_adj_euler/naca0012_pitching_def/inv_NACA0012_pitching_deform.cfg
index 38c4f885636c..02e9e6fd0199 100644
--- a/TestCases/disc_adj_euler/naca0012_pitching_def/inv_NACA0012_pitching_deform.cfg
+++ b/TestCases/disc_adj_euler/naca0012_pitching_def/inv_NACA0012_pitching_deform.cfg
@@ -108,18 +108,18 @@ CONV_CAUCHY_EPS= 1E-6
% ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
MESH_FILENAME= mesh_NACA0012_inv_FFD.su2
MESH_FORMAT= SU2
-MESH_OUT_FILENAME= mesh_out.su2
-SOLUTION_FILENAME= solution_flow.dat
-SOLUTION_ADJ_FILENAME= solution_adj.dat
+MESH_OUT_FILENAME= mesh_out
+SOLUTION_FILENAME= solution_flow
+SOLUTION_ADJ_FILENAME= solution_adj
OUTPUT_FILES= (RESTART_ASCII, RESTART, PARAVIEW)
HISTORY_OUTPUT= ITER, RMS_RES, AERO_COEFF
TABULAR_FORMAT= CSV
CONV_FILENAME= history
-RESTART_FILENAME= solution_flow.dat
-RESTART_ADJ_FILENAME= solution_adj.dat
+RESTART_FILENAME= solution_flow
+RESTART_ADJ_FILENAME= solution_adj
VOLUME_FILENAME= flow
VOLUME_ADJ_FILENAME= adjoint
-GRAD_OBJFUNC_FILENAME= of_grad.dat
+GRAD_OBJFUNC_FILENAME= of_grad
SURFACE_FILENAME= surface_flow
SURFACE_ADJ_FILENAME= surface_adjoint
OUTPUT_WRT_FREQ= 1
diff --git a/TestCases/disc_adj_euler/naca0012_pitching_def/inv_NACA0012_pitching_deform_ad.cfg b/TestCases/disc_adj_euler/naca0012_pitching_def/inv_NACA0012_pitching_deform_ad.cfg
index 35fd81abe9a8..775a824e1345 100644
--- a/TestCases/disc_adj_euler/naca0012_pitching_def/inv_NACA0012_pitching_deform_ad.cfg
+++ b/TestCases/disc_adj_euler/naca0012_pitching_def/inv_NACA0012_pitching_deform_ad.cfg
@@ -108,18 +108,18 @@ CONV_CAUCHY_EPS= 1E-6
% ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
MESH_FILENAME= mesh_NACA0012_inv_FFD.su2
MESH_FORMAT= SU2
-MESH_OUT_FILENAME= mesh_out.su2
-SOLUTION_FILENAME= solution_flow.dat
-SOLUTION_ADJ_FILENAME= solution_adj.dat
+MESH_OUT_FILENAME= mesh_out
+SOLUTION_FILENAME= solution_flow
+SOLUTION_ADJ_FILENAME= solution_adj
OUTPUT_FILES= (RESTART_ASCII, RESTART, PARAVIEW)
HISTORY_OUTPUT= ITER, RMS_RES, AERO_COEFF
TABULAR_FORMAT= CSV
CONV_FILENAME= history
-RESTART_FILENAME= solution_flow.dat
-RESTART_ADJ_FILENAME= solution_adj.dat
+RESTART_FILENAME= solution_flow
+RESTART_ADJ_FILENAME= solution_adj
VOLUME_FILENAME= flow
VOLUME_ADJ_FILENAME= adjoint
-GRAD_OBJFUNC_FILENAME= of_grad.dat
+GRAD_OBJFUNC_FILENAME= of_grad
SURFACE_FILENAME= surface_flow
SURFACE_ADJ_FILENAME= surface_adjoint
OUTPUT_WRT_FREQ= 1
diff --git a/TestCases/disc_adj_euler/oneram6/inv_ONERAM6.cfg b/TestCases/disc_adj_euler/oneram6/inv_ONERAM6.cfg
index 9ac61f175834..dbd7ce26557f 100644
--- a/TestCases/disc_adj_euler/oneram6/inv_ONERAM6.cfg
+++ b/TestCases/disc_adj_euler/oneram6/inv_ONERAM6.cfg
@@ -95,17 +95,17 @@ CONV_CAUCHY_EPS= 1E-10
% ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
%
MESH_FILENAME= mesh_ONERAM6_inv.su2
-MESH_OUT_FILENAME= mesh_out.su2
-SOLUTION_FILENAME= solution_flow.dat
-SOLUTION_ADJ_FILENAME= solution_adj.dat
+MESH_OUT_FILENAME= mesh_out
+SOLUTION_FILENAME= solution_flow
+SOLUTION_ADJ_FILENAME= solution_adj
MESH_FORMAT= SU2
TABULAR_FORMAT= CSV
CONV_FILENAME= history
-RESTART_FILENAME= restart_flow.dat
-RESTART_ADJ_FILENAME= restart_adj.dat
+RESTART_FILENAME= restart_flow
+RESTART_ADJ_FILENAME= restart_adj
VOLUME_FILENAME= flow
VOLUME_ADJ_FILENAME= adjoint
-GRAD_OBJFUNC_FILENAME= of_grad.dat
+GRAD_OBJFUNC_FILENAME= of_grad
SURFACE_FILENAME= surface_flow
SURFACE_ADJ_FILENAME= surface_adjoint
OUTPUT_WRT_FREQ= 100
diff --git a/TestCases/disc_adj_fea/configAD_fem.cfg b/TestCases/disc_adj_fea/configAD_fem.cfg
index 07b8656b1ab5..5c7c829a805b 100644
--- a/TestCases/disc_adj_fea/configAD_fem.cfg
+++ b/TestCases/disc_adj_fea/configAD_fem.cfg
@@ -19,7 +19,7 @@ ITER = 10
OBJECTIVE_FUNCTION = REFERENCE_GEOMETRY
REFERENCE_GEOMETRY = YES
-REFERENCE_GEOMETRY_FILENAME = reference_geometry.dat
+REFERENCE_GEOMETRY_FILENAME = reference_geometry
REFERENCE_GEOMETRY_FORMAT = SU2
REFERENCE_GEOMETRY_PENALTY = 1E6
% Consider only the surface
@@ -47,11 +47,11 @@ CONV_FILENAME= history
VOLUME_FILENAME= beam
BREAKDOWN_FILENAME= forces_breakdown.dat
-SOLUTION_FILENAME= solution_beam.dat
-RESTART_FILENAME= restart_beam.dat
+SOLUTION_FILENAME= solution_beam
+RESTART_FILENAME= restart_beam
-SOLUTION_ADJ_FILENAME= solution_adj.dat
-RESTART_ADJ_FILENAME= restart_adj.dat
+SOLUTION_ADJ_FILENAME= solution_adj
+RESTART_ADJ_FILENAME= restart_adj
MESH_FORMAT= SU2
TABULAR_FORMAT= CSV
diff --git a/TestCases/disc_adj_fsi/Airfoil_2d/configFEA.cfg b/TestCases/disc_adj_fsi/Airfoil_2d/configFEA.cfg
index 80502871ff20..d3bdba81310b 100755
--- a/TestCases/disc_adj_fsi/Airfoil_2d/configFEA.cfg
+++ b/TestCases/disc_adj_fsi/Airfoil_2d/configFEA.cfg
@@ -2,7 +2,7 @@
SOLVER= ELASTICITY
% Optimization --------------------------------------------------------- %
-GRAD_OBJFUNC_FILENAME= of_grad.dat
+GRAD_OBJFUNC_FILENAME= of_grad
REFERENCE_NODE= 234
REFERENCE_NODE_DISPLACEMENT= (0.0, 0.0)
REFERENCE_NODE_PENALTY= 1.0
@@ -46,10 +46,10 @@ MESH_FORMAT= SU2
CUSTOM_OUTPUTS= 'sens_e : Function{1e8 * SENS_E_0};\
ref_node : Function{1e3 * REFERENCE_NODE}'
RESTART_SOL= NO
-SOLUTION_FILENAME= solution_solid.dat
-SOLUTION_ADJ_FILENAME= adjoint_solid.dat
-RESTART_FILENAME= solution_solid.dat
-RESTART_ADJ_FILENAME= adjoint_solid.dat
+SOLUTION_FILENAME= solution_solid
+SOLUTION_ADJ_FILENAME= adjoint_solid
+RESTART_FILENAME= solution_solid
+RESTART_ADJ_FILENAME= adjoint_solid
TABULAR_FORMAT= CSV
VOLUME_FILENAME= solid
VOLUME_ADJ_FILENAME= adjoint_solid
diff --git a/TestCases/disc_adj_fsi/Airfoil_2d/configFlow.cfg b/TestCases/disc_adj_fsi/Airfoil_2d/configFlow.cfg
index 23143f1ea39f..1c62889d0b6c 100755
--- a/TestCases/disc_adj_fsi/Airfoil_2d/configFlow.cfg
+++ b/TestCases/disc_adj_fsi/Airfoil_2d/configFlow.cfg
@@ -3,7 +3,7 @@ SOLVER= EULER
KIND_TURB_MODEL= NONE
% Optimization --------------------------------------------------------- %
-GRAD_OBJFUNC_FILENAME= of_grad.dat
+GRAD_OBJFUNC_FILENAME= of_grad
CUSTOM_OBJFUNC= '1e5 * DRAG'
% Compressible free-stream conditions ---------------------------------- %
@@ -80,10 +80,10 @@ MESH_FILENAME= mesh.su2
MESH_FORMAT= SU2
RESTART_SOL= NO
-SOLUTION_FILENAME= solution_fluid.dat
-SOLUTION_ADJ_FILENAME= adjoint_fluid.dat
-RESTART_FILENAME= solution_fluid.dat
-RESTART_ADJ_FILENAME= adjoint_fluid.dat
+SOLUTION_FILENAME= solution_fluid
+SOLUTION_ADJ_FILENAME= adjoint_fluid
+RESTART_FILENAME= solution_fluid
+RESTART_ADJ_FILENAME= adjoint_fluid
TABULAR_FORMAT= CSV
VOLUME_FILENAME= fluid
VOLUME_ADJ_FILENAME= adjoint_fluid
diff --git a/TestCases/disc_adj_fsi/configFEA.cfg b/TestCases/disc_adj_fsi/configFEA.cfg
index 1071d12fc297..0fe8067b15c4 100644
--- a/TestCases/disc_adj_fsi/configFEA.cfg
+++ b/TestCases/disc_adj_fsi/configFEA.cfg
@@ -10,7 +10,7 @@
SOLVER= ELASTICITY
PRESTRETCH = YES
-PRESTRETCH_FILENAME = prestretch.dat
+PRESTRETCH_FILENAME = prestretch
DE_EFFECTS = YES
ELECTRIC_FIELD_CONST = 4.25E-11
@@ -18,7 +18,7 @@ ELECTRIC_FIELD_DIR = (0.0,1.0)
ELECTRIC_FIELD_MOD = 20E5
REFERENCE_GEOMETRY = YES
-REFERENCE_GEOMETRY_FILENAME = reference_geometry.dat
+REFERENCE_GEOMETRY_FILENAME = reference_geometry
REFERENCE_GEOMETRY_FORMAT = SU2
% Consider only the surface
REFERENCE_GEOMETRY_SURFACE = NO
@@ -61,8 +61,8 @@ VOLUME_FILENAME= results_beam
CONV_FILENAME= history
BREAKDOWN_FILENAME= forces_breakdown.dat
-SOLUTION_FILENAME= solution_beam.dat
-RESTART_FILENAME= restart_beam.dat
+SOLUTION_FILENAME= solution_beam
+RESTART_FILENAME= restart_beam
SOLUTION_ADJ_FILENAME= solution_flow_adj.dat
RESTART_ADJ_FILENAME= restart_flow_adj.dat
diff --git a/TestCases/disc_adj_fsi/configFlow.cfg b/TestCases/disc_adj_fsi/configFlow.cfg
index fead895f27f5..ca4a9965deeb 100644
--- a/TestCases/disc_adj_fsi/configFlow.cfg
+++ b/TestCases/disc_adj_fsi/configFlow.cfg
@@ -74,8 +74,8 @@ CONV_CAUCHY_EPS= 1E-5
VOLUME_FILENAME= results_flow
CONV_FILENAME= history
BREAKDOWN_FILENAME= forces_breakdown.dat
-SOLUTION_FILENAME= solution_flow.dat
-RESTART_FILENAME= restart_flow.dat
+SOLUTION_FILENAME= solution_flow
+RESTART_FILENAME= restart_flow
SOLUTION_ADJ_FILENAME= solution_flow_adj.dat
RESTART_ADJ_FILENAME= restart_flow_adj.dat
diff --git a/TestCases/disc_adj_fsi/dyn_fsi/configFEA.cfg b/TestCases/disc_adj_fsi/dyn_fsi/configFEA.cfg
index 0879e03fe446..4a1e1e30f592 100644
--- a/TestCases/disc_adj_fsi/dyn_fsi/configFEA.cfg
+++ b/TestCases/disc_adj_fsi/dyn_fsi/configFEA.cfg
@@ -9,7 +9,7 @@ NEWMARK_GAMMA=0.52
% Optimization --------------------------------------------------------- %
FEA_ADVANCED_MODE= YES
FEA_FILENAME= element_properties.dat
-GRAD_OBJFUNC_FILENAME= of_grad.dat
+GRAD_OBJFUNC_FILENAME= of_grad
REFERENCE_NODE= 234
REFERENCE_NODE_DISPLACEMENT= (0.0, 0.0)
REFERENCE_NODE_PENALTY= 1.0
@@ -48,11 +48,11 @@ INCREMENTAL_LOAD= NO
MESH_FILENAME= mesh.su2
MESH_FORMAT= SU2
-SOLUTION_FILENAME= solution_solid.dat
-SOLUTION_ADJ_FILENAME= adjoint_solid.dat
+SOLUTION_FILENAME= solution_solid
+SOLUTION_ADJ_FILENAME= adjoint_solid
OUTPUT_WRT_FREQ= 1
-RESTART_FILENAME= solution_solid.dat
-RESTART_ADJ_FILENAME= adjoint_solid.dat
+RESTART_FILENAME= solution_solid
+RESTART_ADJ_FILENAME= adjoint_solid
TABULAR_FORMAT= CSV
VOLUME_FILENAME= solid
VOLUME_ADJ_FILENAME= adjoint_solid
diff --git a/TestCases/disc_adj_fsi/dyn_fsi/configFlow.cfg b/TestCases/disc_adj_fsi/dyn_fsi/configFlow.cfg
index 755b4f515cc9..f5c233ec9ccc 100644
--- a/TestCases/disc_adj_fsi/dyn_fsi/configFlow.cfg
+++ b/TestCases/disc_adj_fsi/dyn_fsi/configFlow.cfg
@@ -6,7 +6,7 @@ KIND_TURB_MODEL= NONE
TIME_MARCHING= DUAL_TIME_STEPPING-2ND_ORDER
% Optimization --------------------------------------------------------- %
-GRAD_OBJFUNC_FILENAME= of_grad.dat
+GRAD_OBJFUNC_FILENAME= of_grad
% Compressible free-stream conditions ---------------------------------- %
MACH_NUMBER= 0.8
@@ -85,11 +85,11 @@ CONV_RESIDUAL_MINVAL= -7
MESH_FILENAME= mesh.su2
MESH_FORMAT= SU2
%
-SOLUTION_FILENAME= solution_fluid.dat
-SOLUTION_ADJ_FILENAME= adjoint_fluid.dat
+SOLUTION_FILENAME= solution_fluid
+SOLUTION_ADJ_FILENAME= adjoint_fluid
OUTPUT_WRT_FREQ= 1
-RESTART_FILENAME= solution_fluid.dat
-RESTART_ADJ_FILENAME= adjoint_fluid.dat
+RESTART_FILENAME= solution_fluid
+RESTART_ADJ_FILENAME= adjoint_fluid
TABULAR_FORMAT= CSV
VOLUME_FILENAME= fluid
VOLUME_ADJ_FILENAME= adjoint_fluid
diff --git a/TestCases/disc_adj_heat/disc_adj_heat.cfg b/TestCases/disc_adj_heat/disc_adj_heat.cfg
index 729503ad98bd..907ab17bae93 100644
--- a/TestCases/disc_adj_heat/disc_adj_heat.cfg
+++ b/TestCases/disc_adj_heat/disc_adj_heat.cfg
@@ -180,11 +180,11 @@ MESH_FILENAME= cylinder2d_ffd.su2
MESH_FORMAT= SU2
-MESH_OUT_FILENAME= mesh_out.su2
+MESH_OUT_FILENAME= mesh_out
-SOLUTION_FILENAME= solution_flow.dat
+SOLUTION_FILENAME= solution_flow
-SOLUTION_ADJ_FILENAME= solution_adj.dat
+SOLUTION_ADJ_FILENAME= solution_adj
TABULAR_FORMAT= CSV
@@ -192,17 +192,17 @@ CONV_FILENAME= history
BREAKDOWN_FILENAME= 6rows_forces_breakdown.dat
-RESTART_FILENAME= restart_flow.dat
+RESTART_FILENAME= restart_flow
-RESTART_ADJ_FILENAME= restart_adj.dat
+RESTART_ADJ_FILENAME= restart_adj
VOLUME_FILENAME= flow
VOLUME_ADJ_FILENAME= adjoint
-VALUE_OBJFUNC_FILENAME= of_eval.dat
+VALUE_OBJFUNC_FILENAME= of_eval
-GRAD_OBJFUNC_FILENAME= of_grad.dat
+GRAD_OBJFUNC_FILENAME= of_grad
SURFACE_FILENAME= surface_flow
diff --git a/TestCases/disc_adj_heat/primal.cfg b/TestCases/disc_adj_heat/primal.cfg
index 02b5a32dccde..9217cf7899d3 100644
--- a/TestCases/disc_adj_heat/primal.cfg
+++ b/TestCases/disc_adj_heat/primal.cfg
@@ -124,17 +124,17 @@ FFD_BSPLINE_ORDER= 4,4,2
MESH_FILENAME= cylinder2d_ffd.su2
MESH_FORMAT= SU2
-MESH_OUT_FILENAME= mesh_out.su2
-SOLUTION_FILENAME= solution_flow.dat
-SOLUTION_ADJ_FILENAME= solution_adj.dat
+MESH_OUT_FILENAME= mesh_out
+SOLUTION_FILENAME= solution_flow
+SOLUTION_ADJ_FILENAME= solution_adj
TABULAR_FORMAT= CSV
CONV_FILENAME= history
-RESTART_FILENAME= restart_flow.dat
-RESTART_ADJ_FILENAME= restart_adj.dat
+RESTART_FILENAME= restart_flow
+RESTART_ADJ_FILENAME= restart_adj
VOLUME_FILENAME= flow
VOLUME_ADJ_FILENAME= adjoint
-VALUE_OBJFUNC_FILENAME= of_eval.dat
-GRAD_OBJFUNC_FILENAME= of_grad.dat
+VALUE_OBJFUNC_FILENAME= of_eval
+GRAD_OBJFUNC_FILENAME= of_grad
SURFACE_FILENAME= surface_flow
SURFACE_ADJ_FILENAME= surface_adjoint
OUTPUT_WRT_FREQ= 250
diff --git a/TestCases/disc_adj_incomp_euler/naca0012/incomp_NACA0012_disc.cfg b/TestCases/disc_adj_incomp_euler/naca0012/incomp_NACA0012_disc.cfg
index 88dcc3db1aeb..f8cccc519ff2 100644
--- a/TestCases/disc_adj_incomp_euler/naca0012/incomp_NACA0012_disc.cfg
+++ b/TestCases/disc_adj_incomp_euler/naca0012/incomp_NACA0012_disc.cfg
@@ -82,16 +82,16 @@ CONV_CAUCHY_EPS= 1E-6
%
MESH_FILENAME= mesh_NACA0012_inv.su2
MESH_FORMAT= SU2
-MESH_OUT_FILENAME= mesh_out.su2
-SOLUTION_FILENAME= solution_flow.dat
-SOLUTION_ADJ_FILENAME= solution_adj.dat
+MESH_OUT_FILENAME= mesh_out
+SOLUTION_FILENAME= solution_flow
+SOLUTION_ADJ_FILENAME= solution_adj
TABULAR_FORMAT= CSV
CONV_FILENAME= history
-RESTART_FILENAME= restart_flow.dat
-RESTART_ADJ_FILENAME= restart_adj.dat
+RESTART_FILENAME= restart_flow
+RESTART_ADJ_FILENAME= restart_adj
VOLUME_FILENAME= flow
VOLUME_ADJ_FILENAME= adjoint
-GRAD_OBJFUNC_FILENAME= of_grad.dat
+GRAD_OBJFUNC_FILENAME= of_grad
SURFACE_FILENAME= surface_flow
SURFACE_ADJ_FILENAME= surface_adjoint
OUTPUT_WRT_FREQ= 250
diff --git a/TestCases/disc_adj_incomp_navierstokes/cylinder/heated_cylinder.cfg b/TestCases/disc_adj_incomp_navierstokes/cylinder/heated_cylinder.cfg
index 81f95a746824..1352174613de 100644
--- a/TestCases/disc_adj_incomp_navierstokes/cylinder/heated_cylinder.cfg
+++ b/TestCases/disc_adj_incomp_navierstokes/cylinder/heated_cylinder.cfg
@@ -106,17 +106,17 @@ CONV_CAUCHY_EPS= 1E-6
%
MESH_FILENAME= mesh_cylinder_lam_ffd.su2
MESH_FORMAT= SU2
-SOLUTION_FILENAME= solution_flow.dat
-SOLUTION_ADJ_FILENAME= solution_adj.dat
+SOLUTION_FILENAME= solution_flow
+SOLUTION_ADJ_FILENAME= solution_adj
TABULAR_FORMAT= CSV
CONV_FILENAME= history
BREAKDOWN_FILENAME= forces_breakdown.dat
-RESTART_FILENAME= restart_flow.dat
-RESTART_ADJ_FILENAME= restart_adj.dat
+RESTART_FILENAME= restart_flow
+RESTART_ADJ_FILENAME= restart_adj
VOLUME_FILENAME= flow
VOLUME_ADJ_FILENAME= adjoint
-VALUE_OBJFUNC_FILENAME= of_eval.dat
-GRAD_OBJFUNC_FILENAME= of_grad.dat
+VALUE_OBJFUNC_FILENAME= of_eval
+GRAD_OBJFUNC_FILENAME= of_grad
SURFACE_FILENAME= surface_flow
SURFACE_ADJ_FILENAME= surface_adjoint
OUTPUT_WRT_FREQ= 250
diff --git a/TestCases/disc_adj_incomp_rans/naca0012/turb_naca0012_sa.cfg b/TestCases/disc_adj_incomp_rans/naca0012/turb_naca0012_sa.cfg
index 929ccd00f6f1..3ce31f393c4b 100755
--- a/TestCases/disc_adj_incomp_rans/naca0012/turb_naca0012_sa.cfg
+++ b/TestCases/disc_adj_incomp_rans/naca0012/turb_naca0012_sa.cfg
@@ -102,16 +102,16 @@ CONV_CAUCHY_EPS= 1E-6
%
MESH_FILENAME= n0012_225-65.su2
MESH_FORMAT= SU2
-MESH_OUT_FILENAME= mesh_out.su2
-SOLUTION_FILENAME= solution_flow_sa.dat
-SOLUTION_ADJ_FILENAME= solution_adj.dat
+MESH_OUT_FILENAME= mesh_out
+SOLUTION_FILENAME= solution_flow_sa
+SOLUTION_ADJ_FILENAME= solution_adj
TABULAR_FORMAT= CSV
CONV_FILENAME= history
-RESTART_FILENAME= restart_flow.dat
-RESTART_ADJ_FILENAME= restart_adj.dat
+RESTART_FILENAME= restart_flow
+RESTART_ADJ_FILENAME= restart_adj
VOLUME_FILENAME= flow
VOLUME_ADJ_FILENAME= adjoint
-GRAD_OBJFUNC_FILENAME= of_grad.dat
+GRAD_OBJFUNC_FILENAME= of_grad
SURFACE_FILENAME= surface_flow
SURFACE_ADJ_FILENAME= surface_adjoint
OUTPUT_WRT_FREQ= 250
diff --git a/TestCases/disc_adj_incomp_rans/naca0012/turb_naca0012_sst.cfg b/TestCases/disc_adj_incomp_rans/naca0012/turb_naca0012_sst.cfg
index 4e834ab4a4d4..151d1f5aefdf 100755
--- a/TestCases/disc_adj_incomp_rans/naca0012/turb_naca0012_sst.cfg
+++ b/TestCases/disc_adj_incomp_rans/naca0012/turb_naca0012_sst.cfg
@@ -99,16 +99,16 @@ CONV_CAUCHY_EPS= 1E-6
%
MESH_FILENAME= n0012_225-65.su2
MESH_FORMAT= SU2
-MESH_OUT_FILENAME= mesh_out.su2
-SOLUTION_FILENAME= solution_flow_sst.dat
-SOLUTION_ADJ_FILENAME= solution_adj.dat
+MESH_OUT_FILENAME= mesh_out
+SOLUTION_FILENAME= solution_flow_sst
+SOLUTION_ADJ_FILENAME= solution_adj
TABULAR_FORMAT= CSV
CONV_FILENAME= history
-RESTART_FILENAME= restart_flow.dat
-RESTART_ADJ_FILENAME= restart_adj.dat
+RESTART_FILENAME= restart_flow
+RESTART_ADJ_FILENAME= restart_adj
VOLUME_FILENAME= flow
VOLUME_ADJ_FILENAME= adjoint
-GRAD_OBJFUNC_FILENAME= of_grad.dat
+GRAD_OBJFUNC_FILENAME= of_grad
SURFACE_FILENAME= surface_flow
SURFACE_ADJ_FILENAME= surface_adjoint
OUTPUT_WRT_FREQ= 250
diff --git a/TestCases/disc_adj_rans/cylinder/cylinder.cfg b/TestCases/disc_adj_rans/cylinder/cylinder.cfg
index 8b5ad810978e..33cf658bd85d 100644
--- a/TestCases/disc_adj_rans/cylinder/cylinder.cfg
+++ b/TestCases/disc_adj_rans/cylinder/cylinder.cfg
@@ -98,16 +98,16 @@ CONV_CAUCHY_EPS= 1E-5
%
MESH_FILENAME= mesh_cylinder.su2
MESH_FORMAT= SU2
-MESH_OUT_FILENAME= mesh_out.su2
-SOLUTION_FILENAME= solution_flow.dat
-SOLUTION_ADJ_FILENAME= solution_adj.dat
+MESH_OUT_FILENAME= mesh_out
+SOLUTION_FILENAME= solution_flow
+SOLUTION_ADJ_FILENAME= solution_adj
TABULAR_FORMAT= CSV
CONV_FILENAME= history
-RESTART_FILENAME= restart_flow.dat
-RESTART_ADJ_FILENAME= restart_adj.dat
+RESTART_FILENAME= restart_flow
+RESTART_ADJ_FILENAME= restart_adj
VOLUME_FILENAME= flow
VOLUME_ADJ_FILENAME= adjoint
-GRAD_OBJFUNC_FILENAME= of_grad.dat
+GRAD_OBJFUNC_FILENAME= of_grad
SURFACE_FILENAME= surface_flow
SURFACE_ADJ_FILENAME= surface_adjoint
OUTPUT_WRT_FREQ= 1
diff --git a/TestCases/disc_adj_rans/cylinder/cylinder_Windowing.cfg b/TestCases/disc_adj_rans/cylinder/cylinder_Windowing.cfg
index 35b21a1f5366..49a69147586f 100644
--- a/TestCases/disc_adj_rans/cylinder/cylinder_Windowing.cfg
+++ b/TestCases/disc_adj_rans/cylinder/cylinder_Windowing.cfg
@@ -100,16 +100,16 @@ CONV_WINDOW_CAUCHY_ELEMS = 2
%
MESH_FILENAME= mesh_cylinder.su2
MESH_FORMAT= SU2
-MESH_OUT_FILENAME= mesh_out.su2
-SOLUTION_FILENAME= solution_flow.dat
-SOLUTION_ADJ_FILENAME= solution_adj.dat
+MESH_OUT_FILENAME= mesh_out
+SOLUTION_FILENAME= solution_flow
+SOLUTION_ADJ_FILENAME= solution_adj
TABULAR_FORMAT= CSV
CONV_FILENAME= history
-RESTART_FILENAME= restart_flow.dat
-RESTART_ADJ_FILENAME= restart_adj.dat
+RESTART_FILENAME= restart_flow
+RESTART_ADJ_FILENAME= restart_adj
VOLUME_FILENAME= flow
VOLUME_ADJ_FILENAME= adjoint
-GRAD_OBJFUNC_FILENAME= of_grad.dat
+GRAD_OBJFUNC_FILENAME= of_grad
SURFACE_FILENAME= surface_flow
SURFACE_ADJ_FILENAME= surface_adjoint
SCREEN_OUTPUT= (TIME_ITER, INNER_ITER, DRAG, LIFT, TAVG_DRAG, TAVG_LIFT, CAUCHY_TAVG_DRAG)
diff --git a/TestCases/disc_adj_rans/cylinder/cylinder_Windowing_AD.cfg b/TestCases/disc_adj_rans/cylinder/cylinder_Windowing_AD.cfg
index 829da3dc38f9..b59b3f847f0f 100644
--- a/TestCases/disc_adj_rans/cylinder/cylinder_Windowing_AD.cfg
+++ b/TestCases/disc_adj_rans/cylinder/cylinder_Windowing_AD.cfg
@@ -103,9 +103,9 @@ CONV_WINDOW_CAUCHY_ELEMS = 2
%
MESH_FILENAME= mesh_cylinder.su2
MESH_FORMAT= SU2
-SOLUTION_FILENAME= solution_flow.dat
-RESTART_ADJ_FILENAME= restart_adj.dat
-SOLUTION_ADJ_FILENAME= solution_adj.dat
+SOLUTION_FILENAME= solution_flow
+RESTART_ADJ_FILENAME= restart_adj
+SOLUTION_ADJ_FILENAME= solution_adj
SCREEN_OUTPUT= (TIME_ITER, INNER_ITER, RMS_ADJ_DENSITY)
HISTORY_OUTPUT = (ITER, TAVG_AERO_COEFF, D_TAVG_AERO_COEFF, AERO_COEFF)
OUTPUT_FILES = (RESTART_ASCII)
diff --git a/TestCases/disc_adj_rans/cylinder_DT_1ST/cylinder.cfg b/TestCases/disc_adj_rans/cylinder_DT_1ST/cylinder.cfg
index 821bfbb5e51f..bd6aa7c9d0d2 100644
--- a/TestCases/disc_adj_rans/cylinder_DT_1ST/cylinder.cfg
+++ b/TestCases/disc_adj_rans/cylinder_DT_1ST/cylinder.cfg
@@ -102,16 +102,16 @@ CONV_CAUCHY_EPS= 1E-5
%
MESH_FILENAME= mesh_cylinder.su2
MESH_FORMAT= SU2
-MESH_OUT_FILENAME= mesh_out.su2
-SOLUTION_FILENAME= solution_flow.dat
-SOLUTION_ADJ_FILENAME= solution_adj.dat
+MESH_OUT_FILENAME= mesh_out
+SOLUTION_FILENAME= solution_flow
+SOLUTION_ADJ_FILENAME= solution_adj
TABULAR_FORMAT= CSV
CONV_FILENAME= history
-RESTART_FILENAME= solution_flow.dat
-RESTART_ADJ_FILENAME= solution_adj.dat
+RESTART_FILENAME= solution_flow
+RESTART_ADJ_FILENAME= solution_adj
VOLUME_FILENAME= flow
VOLUME_ADJ_FILENAME= adjoint
-GRAD_OBJFUNC_FILENAME= of_grad.dat
+GRAD_OBJFUNC_FILENAME= of_grad
SURFACE_FILENAME= surface_flow
SURFACE_ADJ_FILENAME= surface_adjoint
OUTPUT_WRT_FREQ= 1
diff --git a/TestCases/disc_adj_rans/naca0012/naca0012.cfg b/TestCases/disc_adj_rans/naca0012/naca0012.cfg
index 7061a73e0e0a..c495d45b66bf 100644
--- a/TestCases/disc_adj_rans/naca0012/naca0012.cfg
+++ b/TestCases/disc_adj_rans/naca0012/naca0012.cfg
@@ -97,13 +97,13 @@ SCREEN_OUTPUT=(INNER_ITER, TIME_ITER, RMS_ADJ_DENSITY, RMS_DENSITY, , REL_RMS_DE
HISTORY_OUTPUT=(ITER, RMS_RES, AERO_COEFF, TAVG_AERO_COEFF, ADJ_AERO_COEFF)
MESH_FILENAME= naca0012_FFD.su2
MESH_FORMAT= SU2
-MESH_OUT_FILENAME= mesh_out.su2
-SOLUTION_FILENAME= restart_flow.dat
-SOLUTION_ADJ_FILENAME= restart_adj.dat
+MESH_OUT_FILENAME= mesh_out
+SOLUTION_FILENAME= restart_flow
+SOLUTION_ADJ_FILENAME= restart_adj
TABULAR_FORMAT= CSV
CONV_FILENAME= 0_history
-RESTART_FILENAME= restart_flow.dat
-RESTART_ADJ_FILENAME= restart_adj.dat
+RESTART_FILENAME= restart_flow
+RESTART_ADJ_FILENAME= restart_adj
VOLUME_FILENAME= flow
SURFACE_FILENAME= surface_flow
OUTPUT_WRT_FREQ= 1
diff --git a/TestCases/disc_adj_rans/naca0012/turb_NACA0012_sa.cfg b/TestCases/disc_adj_rans/naca0012/turb_NACA0012_sa.cfg
index 919a6e48bbd4..d54a4eb3cbdf 100644
--- a/TestCases/disc_adj_rans/naca0012/turb_NACA0012_sa.cfg
+++ b/TestCases/disc_adj_rans/naca0012/turb_NACA0012_sa.cfg
@@ -90,16 +90,16 @@ CONV_CAUCHY_EPS= 1E-6
%
MESH_FILENAME= n0012_225-65.su2
MESH_FORMAT= SU2
-MESH_OUT_FILENAME= mesh_out.su2
-SOLUTION_FILENAME= solution_flow_sa.dat
-SOLUTION_ADJ_FILENAME= solution_adj.dat
+MESH_OUT_FILENAME= mesh_out
+SOLUTION_FILENAME= solution_flow_sa
+SOLUTION_ADJ_FILENAME= solution_adj
TABULAR_FORMAT= CSV
CONV_FILENAME= history
-RESTART_FILENAME= restart_flow.dat
-RESTART_ADJ_FILENAME= restart_adj.dat
+RESTART_FILENAME= restart_flow
+RESTART_ADJ_FILENAME= restart_adj
VOLUME_FILENAME= flow
VOLUME_ADJ_FILENAME= adjoint
-GRAD_OBJFUNC_FILENAME= of_grad.dat
+GRAD_OBJFUNC_FILENAME= of_grad
SURFACE_FILENAME= surface_flow
SURFACE_ADJ_FILENAME= surface_adjoint
OUTPUT_WRT_FREQ= 1000
diff --git a/TestCases/disc_adj_rans/naca0012/turb_NACA0012_sst.cfg b/TestCases/disc_adj_rans/naca0012/turb_NACA0012_sst.cfg
index 066d60c80319..4f2cfcefb692 100644
--- a/TestCases/disc_adj_rans/naca0012/turb_NACA0012_sst.cfg
+++ b/TestCases/disc_adj_rans/naca0012/turb_NACA0012_sst.cfg
@@ -92,16 +92,16 @@ CONV_CAUCHY_EPS= 1E-6
%
MESH_FILENAME= n0012_225-65.su2
MESH_FORMAT= SU2
-MESH_OUT_FILENAME= mesh_out.su2
-SOLUTION_FILENAME= solution_flow_sst.dat
-SOLUTION_ADJ_FILENAME= solution_adj.dat
+MESH_OUT_FILENAME= mesh_out
+SOLUTION_FILENAME= solution_flow_sst
+SOLUTION_ADJ_FILENAME= solution_adj
TABULAR_FORMAT= CSV
CONV_FILENAME= history
-RESTART_FILENAME= restart_flow.dat
-RESTART_ADJ_FILENAME= restart_adj.dat
+RESTART_FILENAME= restart_flow
+RESTART_ADJ_FILENAME= restart_adj
VOLUME_FILENAME= flow
VOLUME_ADJ_FILENAME= adjoint
-GRAD_OBJFUNC_FILENAME= of_grad.dat
+GRAD_OBJFUNC_FILENAME= of_grad
SURFACE_FILENAME= surface_flow
SURFACE_ADJ_FILENAME= surface_adjoint
OUTPUT_WRT_FREQ= 1000
diff --git a/TestCases/disc_adj_turbomachinery/transonic_stator_2D/transonic_stator.cfg b/TestCases/disc_adj_turbomachinery/transonic_stator_2D/transonic_stator.cfg
index 281937376cfa..cf0ee9ff2d80 100644
--- a/TestCases/disc_adj_turbomachinery/transonic_stator_2D/transonic_stator.cfg
+++ b/TestCases/disc_adj_turbomachinery/transonic_stator_2D/transonic_stator.cfg
@@ -192,15 +192,15 @@ MUSCL_ADJTURB= NO
MESH_FILENAME= mesh_stator_turb.su2
MESH_FORMAT= SU2
MESH_OUT_FILENAME= su2mesh_per_optimal.su2
-SOLUTION_FILENAME= solution_flow.dat
-SOLUTION_ADJ_FILENAME= solution_adj.dat
+SOLUTION_FILENAME= solution_flow
+SOLUTION_ADJ_FILENAME= solution_adj
TABULAR_FORMAT= CSV
CONV_FILENAME= history
-RESTART_FILENAME= restart_flow.dat
-RESTART_ADJ_FILENAME= restart_adj.dat
+RESTART_FILENAME= restart_flow
+RESTART_ADJ_FILENAME= restart_adj
VOLUME_FILENAME= flow
VOLUME_ADJ_FILENAME= adjoint
-GRAD_OBJFUNC_FILENAME= of_grad.dat
+GRAD_OBJFUNC_FILENAME= of_grad
SURFACE_FILENAME= surface_flow
SURFACE_ADJ_FILENAME= surface_adjoint
OUTPUT_WRT_FREQ= 500
diff --git a/TestCases/euler/CRM/inv_CRM_JST.cfg b/TestCases/euler/CRM/inv_CRM_JST.cfg
index b55ac94d2850..d5a40e27d94c 100644
--- a/TestCases/euler/CRM/inv_CRM_JST.cfg
+++ b/TestCases/euler/CRM/inv_CRM_JST.cfg
@@ -88,17 +88,17 @@ CONV_CAUCHY_EPS= 1E-10
% ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
%
MESH_FILENAME= grid_crm_dpw4_MB-structured.su2
-MESH_OUT_FILENAME= mesh_out.su2
-SOLUTION_FILENAME= solution_flow.dat
-SOLUTION_ADJ_FILENAME= solution_adj.dat
+MESH_OUT_FILENAME= mesh_out
+SOLUTION_FILENAME= solution_flow
+SOLUTION_ADJ_FILENAME= solution_adj
MESH_FORMAT= SU2
TABULAR_FORMAT= CSV
CONV_FILENAME= history
-RESTART_FILENAME= restart_flow.dat
-RESTART_ADJ_FILENAME= restart_adj.dat
+RESTART_FILENAME= restart_flow
+RESTART_ADJ_FILENAME= restart_adj
VOLUME_FILENAME= flow
VOLUME_ADJ_FILENAME= adjoint
-GRAD_OBJFUNC_FILENAME= of_grad.dat
+GRAD_OBJFUNC_FILENAME= of_grad
SURFACE_FILENAME= surface_flow
SURFACE_ADJ_FILENAME= surface_adjoint
OUTPUT_WRT_FREQ= 50
diff --git a/TestCases/euler/biparabolic/BIPARABOLIC.cfg b/TestCases/euler/biparabolic/BIPARABOLIC.cfg
index 7a31323f836b..04ddad49c73e 100644
--- a/TestCases/euler/biparabolic/BIPARABOLIC.cfg
+++ b/TestCases/euler/biparabolic/BIPARABOLIC.cfg
@@ -98,16 +98,16 @@ CONV_CAUCHY_EPS= 1E-10
%
MESH_FILENAME= mesh_BIPARABOLIC_sup.su2
MESH_FORMAT= SU2
-MESH_OUT_FILENAME= mesh_out.su2
-SOLUTION_FILENAME= solution_flow.dat
-SOLUTION_ADJ_FILENAME= solution_adj.dat
+MESH_OUT_FILENAME= mesh_out
+SOLUTION_FILENAME= solution_flow
+SOLUTION_ADJ_FILENAME= solution_adj
TABULAR_FORMAT= CSV
CONV_FILENAME= history
-RESTART_FILENAME= restart_flow.dat
-RESTART_ADJ_FILENAME= restart_adj.dat
+RESTART_FILENAME= restart_flow
+RESTART_ADJ_FILENAME= restart_adj
VOLUME_FILENAME= volume_flow
VOLUME_ADJ_FILENAME= volume_adjoint
-GRAD_OBJFUNC_FILENAME= of_grad.dat
+GRAD_OBJFUNC_FILENAME= of_grad
SURFACE_FILENAME= surface_flow
SURFACE_ADJ_FILENAME= surface_adjoint
OUTPUT_WRT_FREQ= 100
diff --git a/TestCases/euler/bluntbody/blunt.cfg b/TestCases/euler/bluntbody/blunt.cfg
index efb8af6fbbb9..8738d9442547 100644
--- a/TestCases/euler/bluntbody/blunt.cfg
+++ b/TestCases/euler/bluntbody/blunt.cfg
@@ -73,16 +73,16 @@ CONV_CAUCHY_EPS= 1E-6
%
MESH_FILENAME= blunt_91.su2
MESH_FORMAT= SU2
-MESH_OUT_FILENAME= mesh_out.su2
-SOLUTION_FILENAME= solution_flow.dat
-SOLUTION_ADJ_FILENAME= solution_adj.dat
+MESH_OUT_FILENAME= mesh_out
+SOLUTION_FILENAME= solution_flow
+SOLUTION_ADJ_FILENAME= solution_adj
TABULAR_FORMAT= CSV
CONV_FILENAME= history
-RESTART_FILENAME= restart_flow.dat
-RESTART_ADJ_FILENAME= restart_adj.dat
+RESTART_FILENAME= restart_flow
+RESTART_ADJ_FILENAME= restart_adj
VOLUME_FILENAME= flow
VOLUME_ADJ_FILENAME= adjoint
-GRAD_OBJFUNC_FILENAME= of_grad.dat
+GRAD_OBJFUNC_FILENAME= of_grad
SURFACE_FILENAME= surface_flow
SURFACE_ADJ_FILENAME= surface_adjoint
OUTPUT_WRT_FREQ= 250
diff --git a/TestCases/euler/channel/inv_channel.cfg b/TestCases/euler/channel/inv_channel.cfg
index 001f2cdf6067..db8c00a849a6 100644
--- a/TestCases/euler/channel/inv_channel.cfg
+++ b/TestCases/euler/channel/inv_channel.cfg
@@ -88,16 +88,16 @@ CONV_CAUCHY_EPS= 1E-10
%
MESH_FILENAME= mesh_channel_256x128.su2
MESH_FORMAT= SU2
-MESH_OUT_FILENAME= mesh_out.su2
-SOLUTION_FILENAME= solution_flow.dat
-SOLUTION_ADJ_FILENAME= solution_adj.dat
+MESH_OUT_FILENAME= mesh_out
+SOLUTION_FILENAME= solution_flow
+SOLUTION_ADJ_FILENAME= solution_adj
TABULAR_FORMAT= CSV
CONV_FILENAME= history
-RESTART_FILENAME= restart_flow.dat
-RESTART_ADJ_FILENAME= restart_adj.dat
+RESTART_FILENAME= restart_flow
+RESTART_ADJ_FILENAME= restart_adj
VOLUME_FILENAME= flow
VOLUME_ADJ_FILENAME= adjoint
-GRAD_OBJFUNC_FILENAME= of_grad.dat
+GRAD_OBJFUNC_FILENAME= of_grad
SURFACE_FILENAME= surface_flow
SURFACE_ADJ_FILENAME= surface_adjoint
OUTPUT_WRT_FREQ= 250
diff --git a/TestCases/euler/channel/inv_channel_RK.cfg b/TestCases/euler/channel/inv_channel_RK.cfg
index d5e0642cf984..3e81b3401d13 100644
--- a/TestCases/euler/channel/inv_channel_RK.cfg
+++ b/TestCases/euler/channel/inv_channel_RK.cfg
@@ -81,16 +81,16 @@ CONV_CAUCHY_EPS= 1E-10
%
MESH_FILENAME= mesh_channel_256x128.su2
MESH_FORMAT= SU2
-MESH_OUT_FILENAME= mesh_out.su2
-SOLUTION_FILENAME= solution_flow.dat
-SOLUTION_ADJ_FILENAME= solution_adj.dat
+MESH_OUT_FILENAME= mesh_out
+SOLUTION_FILENAME= solution_flow
+SOLUTION_ADJ_FILENAME= solution_adj
TABULAR_FORMAT= CSV
CONV_FILENAME= history
-RESTART_FILENAME= restart_flow.dat
-RESTART_ADJ_FILENAME= restart_adj.dat
+RESTART_FILENAME= restart_flow
+RESTART_ADJ_FILENAME= restart_adj
VOLUME_FILENAME= flow
VOLUME_ADJ_FILENAME= adjoint
-GRAD_OBJFUNC_FILENAME= of_grad.dat
+GRAD_OBJFUNC_FILENAME= of_grad
SURFACE_FILENAME= surface_flow
SURFACE_ADJ_FILENAME= surface_adjoint
OUTPUT_WRT_FREQ= 250
diff --git a/TestCases/euler/naca0012/inv_NACA0012.cfg b/TestCases/euler/naca0012/inv_NACA0012.cfg
index ea33d6bd843c..dfff6f3ccc9e 100644
--- a/TestCases/euler/naca0012/inv_NACA0012.cfg
+++ b/TestCases/euler/naca0012/inv_NACA0012.cfg
@@ -107,16 +107,16 @@ CONV_CAUCHY_EPS= 1E-6
%
MESH_FILENAME= mesh_NACA0012_inv.su2
MESH_FORMAT= SU2
-MESH_OUT_FILENAME= mesh_out.su2
-SOLUTION_FILENAME= solution_flow.dat
-SOLUTION_ADJ_FILENAME= solution_adj.dat
+MESH_OUT_FILENAME= mesh_out
+SOLUTION_FILENAME= solution_flow
+SOLUTION_ADJ_FILENAME= solution_adj
TABULAR_FORMAT= CSV
CONV_FILENAME= history
-RESTART_FILENAME= restart_flow.dat
-RESTART_ADJ_FILENAME= restart_adj.dat
+RESTART_FILENAME= restart_flow
+RESTART_ADJ_FILENAME= restart_adj
VOLUME_FILENAME= flow
VOLUME_ADJ_FILENAME= adjoint
-GRAD_OBJFUNC_FILENAME= of_grad.dat
+GRAD_OBJFUNC_FILENAME= of_grad
SURFACE_FILENAME= surface_flow
SURFACE_ADJ_FILENAME= surface_adjoint
SCREEN_OUTPUT = (INNER_ITER, RMS_DENSITY, RMS_ENERGY, LIFT, DRAG)
diff --git a/TestCases/euler/naca0012/inv_NACA0012_Roe.cfg b/TestCases/euler/naca0012/inv_NACA0012_Roe.cfg
index 4adc98ffaf53..3115be3af642 100644
--- a/TestCases/euler/naca0012/inv_NACA0012_Roe.cfg
+++ b/TestCases/euler/naca0012/inv_NACA0012_Roe.cfg
@@ -80,16 +80,16 @@ CONV_CAUCHY_EPS= 1E-6
%
MESH_FILENAME= mesh_NACA0012_inv.su2
MESH_FORMAT= SU2
-MESH_OUT_FILENAME= mesh_out.su2
-SOLUTION_FILENAME= solution_flow.dat
-SOLUTION_ADJ_FILENAME= solution_adj.dat
+MESH_OUT_FILENAME= mesh_out
+SOLUTION_FILENAME= solution_flow
+SOLUTION_ADJ_FILENAME= solution_adj
TABULAR_FORMAT= CSV
CONV_FILENAME= history
-RESTART_FILENAME= restart_flow.dat
-RESTART_ADJ_FILENAME= restart_adj.dat
+RESTART_FILENAME= restart_flow
+RESTART_ADJ_FILENAME= restart_adj
VOLUME_FILENAME= flow
VOLUME_ADJ_FILENAME= adjoint
-GRAD_OBJFUNC_FILENAME= of_grad.dat
+GRAD_OBJFUNC_FILENAME= of_grad
SURFACE_FILENAME= surface_flow
SURFACE_ADJ_FILENAME= surface_adjoint
SCREEN_OUTPUT = (INNER_ITER, RMS_DENSITY, RMS_ENERGY, LIFT, DRAG)
diff --git a/TestCases/euler/oneram6/inv_ONERAM6.cfg b/TestCases/euler/oneram6/inv_ONERAM6.cfg
index 133a10d214e5..8369c54449d4 100644
--- a/TestCases/euler/oneram6/inv_ONERAM6.cfg
+++ b/TestCases/euler/oneram6/inv_ONERAM6.cfg
@@ -99,17 +99,17 @@ CONV_CAUCHY_EPS= 1E-10
% ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
%
MESH_FILENAME= mesh_ONERAM6_inv_ffd.su2
-MESH_OUT_FILENAME= mesh_out.su2
-SOLUTION_FILENAME= solution_flow.dat
-SOLUTION_ADJ_FILENAME= solution_adj.dat
+MESH_OUT_FILENAME= mesh_out
+SOLUTION_FILENAME= solution_flow
+SOLUTION_ADJ_FILENAME= solution_adj
MESH_FORMAT= SU2
TABULAR_FORMAT= CSV
CONV_FILENAME= history
-RESTART_FILENAME= restart_flow.dat
-RESTART_ADJ_FILENAME= restart_adj.dat
+RESTART_FILENAME= restart_flow
+RESTART_ADJ_FILENAME= restart_adj
VOLUME_FILENAME= flow
VOLUME_ADJ_FILENAME= adjoint
-GRAD_OBJFUNC_FILENAME= of_grad.dat
+GRAD_OBJFUNC_FILENAME= of_grad
SURFACE_FILENAME= surface_flow
SURFACE_ADJ_FILENAME= surface_adjoint
OUTPUT_WRT_FREQ= 100
diff --git a/TestCases/euler/ramp/inv_ramp.cfg b/TestCases/euler/ramp/inv_ramp.cfg
index fad4c9548acf..4b1374ae5619 100644
--- a/TestCases/euler/ramp/inv_ramp.cfg
+++ b/TestCases/euler/ramp/inv_ramp.cfg
@@ -73,16 +73,16 @@ CONV_CAUCHY_EPS= 1E-10
%
MESH_FILENAME= ramp_unst.su2
MESH_FORMAT= SU2
-MESH_OUT_FILENAME= mesh_out.su2
-SOLUTION_FILENAME= restart_flow.dat
-SOLUTION_ADJ_FILENAME= solution_adj.dat
+MESH_OUT_FILENAME= mesh_out
+SOLUTION_FILENAME= restart_flow
+SOLUTION_ADJ_FILENAME= solution_adj
TABULAR_FORMAT= CSV
CONV_FILENAME= history
-RESTART_FILENAME= restart_flowrun.dat
-RESTART_ADJ_FILENAME= restart_adj.dat
+RESTART_FILENAME= restart_flowrun
+RESTART_ADJ_FILENAME= restart_adj
VOLUME_FILENAME= flow
VOLUME_ADJ_FILENAME= adjoint
-GRAD_OBJFUNC_FILENAME= of_grad.dat
+GRAD_OBJFUNC_FILENAME= of_grad
SURFACE_FILENAME= surface_flow
SURFACE_ADJ_FILENAME= surface_adjoint
OUTPUT_WRT_FREQ= 250
diff --git a/TestCases/euler/wedge/inv_wedge_HLLC.cfg b/TestCases/euler/wedge/inv_wedge_HLLC.cfg
index f54892fdd3bf..4e6f8289d5c8 100644
--- a/TestCases/euler/wedge/inv_wedge_HLLC.cfg
+++ b/TestCases/euler/wedge/inv_wedge_HLLC.cfg
@@ -81,16 +81,16 @@ CONV_CAUCHY_EPS= 1E-10
%
MESH_FILENAME= mesh_wedge_inv.cgns
MESH_FORMAT= CGNS
-MESH_OUT_FILENAME= mesh_out.su2
-SOLUTION_FILENAME= solution_flow.dat
-SOLUTION_ADJ_FILENAME= solution_adj.dat
+MESH_OUT_FILENAME= mesh_out
+SOLUTION_FILENAME= solution_flow
+SOLUTION_ADJ_FILENAME= solution_adj
TABULAR_FORMAT= CSV
CONV_FILENAME= history
-RESTART_FILENAME= restart_flow.dat
-RESTART_ADJ_FILENAME= restart_adj.dat
+RESTART_FILENAME= restart_flow
+RESTART_ADJ_FILENAME= restart_adj
VOLUME_FILENAME= flow
VOLUME_ADJ_FILENAME= adjoint
-GRAD_OBJFUNC_FILENAME= of_grad.dat
+GRAD_OBJFUNC_FILENAME= of_grad
SURFACE_FILENAME= surface_flow
SURFACE_ADJ_FILENAME= surface_adjoint
OUTPUT_WRT_FREQ= 250
diff --git a/TestCases/fea_fsi/Airfoil_RBF/configFEA.cfg b/TestCases/fea_fsi/Airfoil_RBF/configFEA.cfg
index b75242bcc67d..dbeafb4755a2 100644
--- a/TestCases/fea_fsi/Airfoil_RBF/configFEA.cfg
+++ b/TestCases/fea_fsi/Airfoil_RBF/configFEA.cfg
@@ -58,10 +58,10 @@ MESH_FORMAT= SU2
MULTIZONE_MESH= NO
% inputs
RESTART_SOL= YES
-SOLUTION_FILENAME= solution_solid.dat
+SOLUTION_FILENAME= solution_solid
% outputs
OUTPUT_WRT_FREQ= 9999
-RESTART_FILENAME= restart_solid.dat
+RESTART_FILENAME= restart_solid
VOLUME_FILENAME= solid
% history and screen
SCREEN_WRT_FREQ_INNER= 10
diff --git a/TestCases/fea_fsi/Airfoil_RBF/configFlow.cfg b/TestCases/fea_fsi/Airfoil_RBF/configFlow.cfg
index a8231078668f..102c85d5b85c 100644
--- a/TestCases/fea_fsi/Airfoil_RBF/configFlow.cfg
+++ b/TestCases/fea_fsi/Airfoil_RBF/configFlow.cfg
@@ -115,10 +115,10 @@ MESH_FORMAT= SU2
MULTIZONE_MESH= NO
% inputs
RESTART_SOL= YES
-SOLUTION_FILENAME= solution_fluid.dat
+SOLUTION_FILENAME= solution_fluid
% outputs
OUTPUT_WRT_FREQ= 9999
-RESTART_FILENAME= restart_fluid.dat
+RESTART_FILENAME= restart_fluid
VOLUME_FILENAME= fluid
SURFACE_FILENAME= surface_fluid
% history and screen
diff --git a/TestCases/fea_fsi/DynBeam_2d/configBeam_2d.cfg b/TestCases/fea_fsi/DynBeam_2d/configBeam_2d.cfg
index f2728332c676..2037e106d148 100644
--- a/TestCases/fea_fsi/DynBeam_2d/configBeam_2d.cfg
+++ b/TestCases/fea_fsi/DynBeam_2d/configBeam_2d.cfg
@@ -37,7 +37,7 @@ LINEAR_SOLVER_ITER= 100
MESH_FORMAT= SU2
TABULAR_FORMAT= CSV
VOLUME_FILENAME= beam
-RESTART_FILENAME= restart_beam.dat
-SOLUTION_FILENAME= solution_beam.dat
+RESTART_FILENAME= restart_beam
+SOLUTION_FILENAME= solution_beam
OUTPUT_WRT_FREQ= 1
OUTPUT_FILES= RESTART_ASCII, PARAVIEW
diff --git a/TestCases/fea_fsi/MixElemsKnowles/config.cfg b/TestCases/fea_fsi/MixElemsKnowles/config.cfg
index a24034a77dcc..57f1132ba06a 100644
--- a/TestCases/fea_fsi/MixElemsKnowles/config.cfg
+++ b/TestCases/fea_fsi/MixElemsKnowles/config.cfg
@@ -48,7 +48,7 @@ MESH_FILENAME= mesh.su2
MESH_FORMAT= SU2
TABULAR_FORMAT= CSV
RESTART_SOL= YES
-SOLUTION_FILENAME= solution_structure.dat
+SOLUTION_FILENAME= solution_structure
HISTORY_OUTPUT= (ITER, RMS_RES, STRUCT_COEFF)
SCREEN_OUTPUT=(INNER_ITER, RMS_UTOL, RMS_RTOL, RMS_ETOL, REFERENCE_NODE, VMS)
diff --git a/TestCases/fea_fsi/SquareCyl_Beam/config.cfg b/TestCases/fea_fsi/SquareCyl_Beam/config.cfg
index 4f587b580ce0..8e94ff0debb5 100644
--- a/TestCases/fea_fsi/SquareCyl_Beam/config.cfg
+++ b/TestCases/fea_fsi/SquareCyl_Beam/config.cfg
@@ -136,10 +136,10 @@ VOLUME_FILENAME= results_flow
VOLUME_STRUCTURE_FILENAME= results_beam
CONV_FILENAME= history
BREAKDOWN_FILENAME= forces_breakdown.dat
-SOLUTION_FILENAME= solution_flow.dat
-SOLUTION_STRUCTURE_FILENAME= solution_beam.dat
-RESTART_FILENAME= restart_flow.dat
-RESTART_STRUCTURE_FILENAME= restart_beam.dat
+SOLUTION_FILENAME= solution_flow
+SOLUTION_STRUCTURE_FILENAME= solution_beam
+RESTART_FILENAME= restart_flow
+RESTART_STRUCTURE_FILENAME= restart_beam
OUTPUT_WRT_FREQ= 1
% -----------------------------------------------------------------------------%
diff --git a/TestCases/fea_fsi/StatBeam_3d/configBeam_3d.cfg b/TestCases/fea_fsi/StatBeam_3d/configBeam_3d.cfg
index f78228d1842b..4e31421cadfa 100644
--- a/TestCases/fea_fsi/StatBeam_3d/configBeam_3d.cfg
+++ b/TestCases/fea_fsi/StatBeam_3d/configBeam_3d.cfg
@@ -29,7 +29,7 @@ MESH_FORMAT= SU2
TABULAR_FORMAT= CSV
CONV_FILENAME= history_beam
VOLUME_FILENAME= beam
-RESTART_FILENAME= restart_beam.dat
-SOLUTION_FILENAME= restart_beam.dat
+RESTART_FILENAME= restart_beam
+SOLUTION_FILENAME= restart_beam
OUTPUT_WRT_FREQ= 1
INNER_ITER=1
diff --git a/TestCases/fea_fsi/ThermalBeam_3d/configBeam_3d.cfg b/TestCases/fea_fsi/ThermalBeam_3d/configBeam_3d.cfg
index cad1ab20e1c5..aa03caf4fb97 100644
--- a/TestCases/fea_fsi/ThermalBeam_3d/configBeam_3d.cfg
+++ b/TestCases/fea_fsi/ThermalBeam_3d/configBeam_3d.cfg
@@ -25,8 +25,8 @@ MESH_FORMAT= SU2
TABULAR_FORMAT= CSV
CONV_FILENAME= history_beam
VOLUME_FILENAME= beam
-RESTART_FILENAME= restart_beam.dat
-SOLUTION_FILENAME= restart_beam.dat
+RESTART_FILENAME= restart_beam
+SOLUTION_FILENAME= restart_beam
OUTPUT_WRT_FREQ= 1
INNER_ITER=1
diff --git a/TestCases/fea_fsi/WallChannel_2d/configFEA.cfg b/TestCases/fea_fsi/WallChannel_2d/configFEA.cfg
index 7486d208bf3f..2a1fd14267b0 100644
--- a/TestCases/fea_fsi/WallChannel_2d/configFEA.cfg
+++ b/TestCases/fea_fsi/WallChannel_2d/configFEA.cfg
@@ -48,5 +48,5 @@ MESH_FORMAT= SU2
OUTPUT_WRT_FREQ= 1
VOLUME_FILENAME= results_wall
-RESTART_FILENAME= solution_wall.dat
-SOLUTION_FILENAME= solution_wall.dat
+RESTART_FILENAME= solution_wall
+SOLUTION_FILENAME= solution_wall
diff --git a/TestCases/fea_fsi/WallChannel_2d/configFlow.cfg b/TestCases/fea_fsi/WallChannel_2d/configFlow.cfg
index e14c17898bdd..08be457bcdc5 100644
--- a/TestCases/fea_fsi/WallChannel_2d/configFlow.cfg
+++ b/TestCases/fea_fsi/WallChannel_2d/configFlow.cfg
@@ -75,5 +75,5 @@ TABULAR_FORMAT= CSV
OUTPUT_WRT_FREQ= 1
VOLUME_FILENAME= results_flow
-RESTART_FILENAME= solution_flow.dat
-SOLUTION_FILENAME= solution_flow.dat
+RESTART_FILENAME= solution_flow
+SOLUTION_FILENAME= solution_flow
diff --git a/TestCases/fea_fsi/dyn_fsi/configFEA.cfg b/TestCases/fea_fsi/dyn_fsi/configFEA.cfg
index a0487e2f5ac6..aaee3baad3cc 100644
--- a/TestCases/fea_fsi/dyn_fsi/configFEA.cfg
+++ b/TestCases/fea_fsi/dyn_fsi/configFEA.cfg
@@ -50,8 +50,8 @@ SCREEN_WRT_FREQ_INNER= 100
OUTPUT_WRT_FREQ= 100
VOLUME_FILENAME= results_wall
-RESTART_FILENAME= restart_wall.dat
-SOLUTION_FILENAME= solution_wall.dat
+RESTART_FILENAME= restart_wall
+SOLUTION_FILENAME= solution_wall
HISTORY_OUTPUT= ITER, RMS_RES, STRUCT_COEFF, TAVG_STRUCT_COEFF
OBJECTIVE_FUNCTION= REFERENCE_NODE
diff --git a/TestCases/fea_fsi/dyn_fsi/configFlow.cfg b/TestCases/fea_fsi/dyn_fsi/configFlow.cfg
index b2f12dfcf107..5dfd5da3421e 100644
--- a/TestCases/fea_fsi/dyn_fsi/configFlow.cfg
+++ b/TestCases/fea_fsi/dyn_fsi/configFlow.cfg
@@ -72,7 +72,7 @@ SCREEN_WRT_FREQ_INNER= 100
OUTPUT_WRT_FREQ= 100
VOLUME_FILENAME= results_flow
-RESTART_FILENAME= restart_flow.dat
-SOLUTION_FILENAME= solution_flow.dat
+RESTART_FILENAME= restart_flow
+SOLUTION_FILENAME= solution_flow
HISTORY_OUTPUT= ITER, RMS_RES, AERO_COEFF, TAVG_AERO_COEFF
diff --git a/TestCases/fea_fsi/stat_fsi/configFEA.cfg b/TestCases/fea_fsi/stat_fsi/configFEA.cfg
index 0f4e66ad1f7f..07c2a748f956 100755
--- a/TestCases/fea_fsi/stat_fsi/configFEA.cfg
+++ b/TestCases/fea_fsi/stat_fsi/configFEA.cfg
@@ -48,8 +48,8 @@ VOLUME_FILENAME= result_beam
BREAKDOWN_FILENAME= forces_breakdown.dat
-SOLUTION_FILENAME= solution_beam.dat
-RESTART_FILENAME= restart_beam.dat
+SOLUTION_FILENAME= solution_beam
+RESTART_FILENAME= restart_beam
% ------------------------ STRUCTURAL PARAMETERS ------------------------------%
diff --git a/TestCases/fea_fsi/stat_fsi/configFlow.cfg b/TestCases/fea_fsi/stat_fsi/configFlow.cfg
index a20f5947d7f2..2b54ef4d3866 100755
--- a/TestCases/fea_fsi/stat_fsi/configFlow.cfg
+++ b/TestCases/fea_fsi/stat_fsi/configFlow.cfg
@@ -43,8 +43,8 @@ CONV_FILENAME= history
BREAKDOWN_FILENAME= forces_breakdown.dat
-SOLUTION_FILENAME= solution_flow.dat
-RESTART_FILENAME= restart_flow.dat
+SOLUTION_FILENAME= solution_flow
+RESTART_FILENAME= restart_flow
% -------------------- BOUNDARY CONDITION DEFINITION --------------------------%
diff --git a/TestCases/fea_topology/config.cfg b/TestCases/fea_topology/config.cfg
index 8e085f08720e..3a426d5f6735 100644
--- a/TestCases/fea_topology/config.cfg
+++ b/TestCases/fea_topology/config.cfg
@@ -68,7 +68,7 @@ SOLVER= ELASTICITY
MATH_PROBLEM= DISCRETE_ADJOINT
RESTART_SOL= NO
%
-SOLUTION_FILENAME=solution_structure.dat
+SOLUTION_FILENAME=solution_structure
% Numerics
GEOMETRIC_CONDITIONS= SMALL_DEFORMATIONS
FORMULATION_ELASTICITY_2D= PLANE_STRESS
@@ -97,11 +97,11 @@ MESH_FILENAME= mesh.su2
MESH_FORMAT= SU2
TABULAR_FORMAT= CSV
OUTPUT_WRT_FREQ= 9999
-SOLUTION_ADJ_FILENAME= solution_adj.dat
-RESTART_ADJ_FILENAME= restart_adj.dat
+SOLUTION_ADJ_FILENAME= solution_adj
+RESTART_ADJ_FILENAME= restart_adj
% These settings are just to reproduce test results, comment them out
% or delete them to use best practice values.
PARMETIS_TOLERANCE= 0.05
PARMETIS_EDGE_WEIGHT= 0
-PARMETIS_POINT_WEIGHT= 1
\ No newline at end of file
+PARMETIS_POINT_WEIGHT= 1
diff --git a/TestCases/fea_topology/quick_start/settings.cfg b/TestCases/fea_topology/quick_start/settings.cfg
index 8a0edb1041a8..7d495058eeda 100644
--- a/TestCases/fea_topology/quick_start/settings.cfg
+++ b/TestCases/fea_topology/quick_start/settings.cfg
@@ -42,7 +42,7 @@ LINEAR_SOLVER_ITER= 1000
MESH_FILENAME= mesh.su2
MESH_FORMAT= SU2
TABULAR_FORMAT= CSV
-SOLUTION_FILENAME= direct.dat
-RESTART_FILENAME= direct.dat
+SOLUTION_FILENAME= direct
+RESTART_FILENAME= direct
OUTPUT_FILES= RESTART, PARAVIEW
HISTORY_OUTPUT= STRUCT_COEFF
diff --git a/TestCases/fea_topology/quick_start/settings_compliance.cfg b/TestCases/fea_topology/quick_start/settings_compliance.cfg
index 57241e0615f9..f9cc8050f6af 100644
--- a/TestCases/fea_topology/quick_start/settings_compliance.cfg
+++ b/TestCases/fea_topology/quick_start/settings_compliance.cfg
@@ -44,6 +44,6 @@ DISCADJ_LIN_PREC= ILU
MESH_FILENAME= mesh.su2
MESH_FORMAT= SU2
TABULAR_FORMAT= CSV
-SOLUTION_FILENAME= direct.dat
-RESTART_FILENAME= direct.dat
+SOLUTION_FILENAME= direct
+RESTART_FILENAME= direct
OUTPUT_FILES= PARAVIEW
diff --git a/TestCases/fea_topology/quick_start/settings_volfrac.cfg b/TestCases/fea_topology/quick_start/settings_volfrac.cfg
index c7da2fe14f52..f95ee2564f43 100644
--- a/TestCases/fea_topology/quick_start/settings_volfrac.cfg
+++ b/TestCases/fea_topology/quick_start/settings_volfrac.cfg
@@ -44,6 +44,6 @@ DISCADJ_LIN_PREC= JACOBI
MESH_FILENAME= mesh.su2
MESH_FORMAT= SU2
TABULAR_FORMAT= CSV
-SOLUTION_FILENAME= direct.dat
-RESTART_FILENAME= direct.dat
-OUTPUT_FILES= PARAVIEW
\ No newline at end of file
+SOLUTION_FILENAME= direct
+RESTART_FILENAME= direct
+OUTPUT_FILES= PARAVIEW
diff --git a/TestCases/fixed_cl/naca0012/inv_NACA0012.cfg b/TestCases/fixed_cl/naca0012/inv_NACA0012.cfg
index 0bfe73697519..6968b24b4c6f 100644
--- a/TestCases/fixed_cl/naca0012/inv_NACA0012.cfg
+++ b/TestCases/fixed_cl/naca0012/inv_NACA0012.cfg
@@ -114,7 +114,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= CSV
diff --git a/TestCases/fixed_cl/naca0012/inv_NACA0012_ContAdj.cfg b/TestCases/fixed_cl/naca0012/inv_NACA0012_ContAdj.cfg
index 043d410e7e83..0aabad9bd93f 100644
--- a/TestCases/fixed_cl/naca0012/inv_NACA0012_ContAdj.cfg
+++ b/TestCases/fixed_cl/naca0012/inv_NACA0012_ContAdj.cfg
@@ -115,16 +115,16 @@ CONV_CAUCHY_EPS= 1E-6
%
MESH_FILENAME= mesh_NACA0012_inv.su2
MESH_FORMAT= SU2
-MESH_OUT_FILENAME= mesh_out.su2
-SOLUTION_FILENAME= solution_flow.dat
-SOLUTION_ADJ_FILENAME= solution_adj.dat
+MESH_OUT_FILENAME= mesh_out
+SOLUTION_FILENAME= solution_flow
+SOLUTION_ADJ_FILENAME= solution_adj
TABULAR_FORMAT= CSV
CONV_FILENAME= history
-RESTART_FILENAME= restart_flow.dat
-RESTART_ADJ_FILENAME= restart_adj.dat
+RESTART_FILENAME= restart_flow
+RESTART_ADJ_FILENAME= restart_adj
VOLUME_FILENAME= flow
VOLUME_ADJ_FILENAME= adjoint
-GRAD_OBJFUNC_FILENAME= of_grad.dat
+GRAD_OBJFUNC_FILENAME= of_grad
SURFACE_FILENAME= surface_flow
SURFACE_ADJ_FILENAME= surface_adjoint
OUTPUT_WRT_FREQ= 250
diff --git a/TestCases/flamelet/01_laminar_premixed_ch4_flame_cfd/lam_prem_ch4_cfd.cfg b/TestCases/flamelet/01_laminar_premixed_ch4_flame_cfd/lam_prem_ch4_cfd.cfg
index d1a8e6da6fc1..3e0cbe5cfbaf 100644
--- a/TestCases/flamelet/01_laminar_premixed_ch4_flame_cfd/lam_prem_ch4_cfd.cfg
+++ b/TestCases/flamelet/01_laminar_premixed_ch4_flame_cfd/lam_prem_ch4_cfd.cfg
@@ -124,7 +124,7 @@ CONV_FIELD = RMS_PRESSURE
%
MESH_FORMAT= CGNS
MESH_FILENAME = mesh_structured.cgns
-MESH_OUT_FILENAME= mesh_out.su2
+MESH_OUT_FILENAME= mesh_out
SOLUTION_FILENAME= solution
RESTART_FILENAME= restart
OUTPUT_FILES = (RESTART,PARAVIEW,PARAVIEW_MULTIBLOCK)
diff --git a/TestCases/flamelet/03_laminar_premixed_ch4_flame_cht_cfd/lam_prem_ch4_cht_cfd_solid.cfg b/TestCases/flamelet/03_laminar_premixed_ch4_flame_cht_cfd/lam_prem_ch4_cht_cfd_solid.cfg
index 197980c48995..3767a165b1bb 100644
--- a/TestCases/flamelet/03_laminar_premixed_ch4_flame_cht_cfd/lam_prem_ch4_cht_cfd_solid.cfg
+++ b/TestCases/flamelet/03_laminar_premixed_ch4_flame_cht_cfd/lam_prem_ch4_cht_cfd_solid.cfg
@@ -50,7 +50,7 @@ TABULAR_FORMAT= CSV
CONV_FILENAME= history
VOLUME_FILENAME= solid
VOLUME_ADJ_FILENAME= adjoint
-VALUE_OBJFUNC_FILENAME= of_eval.dat
+VALUE_OBJFUNC_FILENAME= of_eval
SURFACE_FILENAME= surface_solid
SURFACE_ADJ_FILENAME= surface_adjoint
diff --git a/TestCases/flamelet/04_laminar_premixed_ch4_flame_cht_ad/lam_prem_ch4_cht_ad_solid.cfg b/TestCases/flamelet/04_laminar_premixed_ch4_flame_cht_ad/lam_prem_ch4_cht_ad_solid.cfg
index 197980c48995..3767a165b1bb 100644
--- a/TestCases/flamelet/04_laminar_premixed_ch4_flame_cht_ad/lam_prem_ch4_cht_ad_solid.cfg
+++ b/TestCases/flamelet/04_laminar_premixed_ch4_flame_cht_ad/lam_prem_ch4_cht_ad_solid.cfg
@@ -50,7 +50,7 @@ TABULAR_FORMAT= CSV
CONV_FILENAME= history
VOLUME_FILENAME= solid
VOLUME_ADJ_FILENAME= adjoint
-VALUE_OBJFUNC_FILENAME= of_eval.dat
+VALUE_OBJFUNC_FILENAME= of_eval
SURFACE_FILENAME= surface_solid
SURFACE_ADJ_FILENAME= surface_adjoint
diff --git a/TestCases/flamelet/05_laminar_premixed_ch4_flame_cfd_axi/lam_prem_ch4_cfd_axi.cfg b/TestCases/flamelet/05_laminar_premixed_ch4_flame_cfd_axi/lam_prem_ch4_cfd_axi.cfg
index 47140e2ddb3c..5b99c18a0116 100644
--- a/TestCases/flamelet/05_laminar_premixed_ch4_flame_cfd_axi/lam_prem_ch4_cfd_axi.cfg
+++ b/TestCases/flamelet/05_laminar_premixed_ch4_flame_cfd_axi/lam_prem_ch4_cfd_axi.cfg
@@ -124,7 +124,7 @@ CONV_FIELD= RMS_PRESSURE
%
MESH_FORMAT= SU2
MESH_FILENAME= mesh_axi.su2
-MESH_OUT_FILENAME= mesh_out.su2
+MESH_OUT_FILENAME= mesh_out
SOLUTION_FILENAME= solution
RESTART_FILENAME= restart
%OUTPUT_FILES= (RESTART,PARAVIEW,PARAVIEW_MULTIBLOCK)
diff --git a/TestCases/flamelet/06_laminar_partial_premixed_ch4_flame_cfd/lam_partial_prem_ch4_cfd.cfg b/TestCases/flamelet/06_laminar_partial_premixed_ch4_flame_cfd/lam_partial_prem_ch4_cfd.cfg
index fe919c81896e..43c1e0d54004 100644
--- a/TestCases/flamelet/06_laminar_partial_premixed_ch4_flame_cfd/lam_partial_prem_ch4_cfd.cfg
+++ b/TestCases/flamelet/06_laminar_partial_premixed_ch4_flame_cfd/lam_partial_prem_ch4_cfd.cfg
@@ -125,7 +125,7 @@ CONV_FIELD = RMS_PRESSURE
OUTPUT_PRECISION= 16
MESH_FORMAT= SU2
MESH_FILENAME= mesh_unstructured.su2
-MESH_OUT_FILENAME= mesh_out.su2
+MESH_OUT_FILENAME= mesh_out
SOLUTION_FILENAME= solution
RESTART_FILENAME= restart
%OUTPUT_FILES = (RESTART,PARAVIEW,PARAVIEW_MULTIBLOCK)
diff --git a/TestCases/grad_smooth/naca0012/inv_NACA0012_gradsmooth.cfg b/TestCases/grad_smooth/naca0012/inv_NACA0012_gradsmooth.cfg
index 85dc08a4991f..f53c7cc31138 100644
--- a/TestCases/grad_smooth/naca0012/inv_NACA0012_gradsmooth.cfg
+++ b/TestCases/grad_smooth/naca0012/inv_NACA0012_gradsmooth.cfg
@@ -148,17 +148,17 @@ DEFORM_STIFFNESS_TYPE= WALL_DISTANCE
OUTPUT_PRECISION=10
MESH_FILENAME= mesh_NACA0012_inv.su2
MESH_FORMAT= SU2
-MESH_OUT_FILENAME= mesh_out.su2
-SOLUTION_FILENAME= solution_flow.dat
-SOLUTION_ADJ_FILENAME= solution_adj.dat
+MESH_OUT_FILENAME= mesh_out
+SOLUTION_FILENAME= solution_flow
+SOLUTION_ADJ_FILENAME= solution_adj
TABULAR_FORMAT= TECPLOT
OUTPUT_FILES= (RESTART, PARAVIEW, SURFACE_PARAVIEW)
CONV_FILENAME= history
-RESTART_FILENAME= restart_flow.dat
-RESTART_ADJ_FILENAME= restart_adj.dat
+RESTART_FILENAME= restart_flow
+RESTART_ADJ_FILENAME= restart_adj
VOLUME_FILENAME= flow
VOLUME_ADJ_FILENAME= adjoint
-GRAD_OBJFUNC_FILENAME= of_grad.dat
+GRAD_OBJFUNC_FILENAME= of_grad
SURFACE_FILENAME= surface_flow
SURFACE_ADJ_FILENAME= surface_adjoint
READ_BINARY_RESTART= YES
\ No newline at end of file
diff --git a/TestCases/grad_smooth/oneram6/ONERAM6_gradsmooth.cfg b/TestCases/grad_smooth/oneram6/ONERAM6_gradsmooth.cfg
index cd7215f3aa72..ce939519b290 100644
--- a/TestCases/grad_smooth/oneram6/ONERAM6_gradsmooth.cfg
+++ b/TestCases/grad_smooth/oneram6/ONERAM6_gradsmooth.cfg
@@ -227,16 +227,16 @@ OUTPUT_PRECISION=10
MESH_FILENAME= mesh_tutorial_ffd.su2
MESH_FORMAT= SU2
-SOLUTION_FILENAME= solution_flow.dat
-SOLUTION_ADJ_FILENAME= solution_adj.dat
+SOLUTION_FILENAME= solution_flow
+SOLUTION_ADJ_FILENAME= solution_adj
TABULAR_FORMAT= TECPLOT
OUTPUT_FILES= (RESTART, PARAVIEW, SURFACE_PARAVIEW)
CONV_FILENAME= history
-RESTART_FILENAME= restart_flow.dat
-RESTART_ADJ_FILENAME= restart_adj.dat
+RESTART_FILENAME= restart_flow
+RESTART_ADJ_FILENAME= restart_adj
VOLUME_FILENAME= flow
VOLUME_ADJ_FILENAME= adjoint
-GRAD_OBJFUNC_FILENAME= of_grad.dat
+GRAD_OBJFUNC_FILENAME= of_grad
SURFACE_FILENAME= surface_flow
SURFACE_ADJ_FILENAME= surface_adjoint
READ_BINARY_RESTART= YES
diff --git a/TestCases/gust/cosine_gust_zdir.cfg b/TestCases/gust/cosine_gust_zdir.cfg
index c058c6e336d1..a95872c44a74 100644
--- a/TestCases/gust/cosine_gust_zdir.cfg
+++ b/TestCases/gust/cosine_gust_zdir.cfg
@@ -101,11 +101,11 @@ HISTORY_OUTPUT= (ITER, RMS_RES, AERO_COEFF, CAUCHY, WALL_TIME)
%
MESH_FILENAME= mesh_rectangular_wing.su2
MESH_FORMAT= SU2
-SOLUTION_FILENAME= restart_gust.dat
-RESTART_FILENAME= restart_gust.dat
+SOLUTION_FILENAME= restart_gust
+RESTART_FILENAME= restart_gust
SURFACE_FILENAME= surface_gust
VOLUME_FILENAME= volume_gust
CONV_FILENAME= history_gust
TABULAR_FORMAT= CSV
OUTPUT_FILES= (RESTART, RESTART_ASCII)
-%
\ No newline at end of file
+%
diff --git a/TestCases/gust/gust_with_mesh_deformation.cfg b/TestCases/gust/gust_with_mesh_deformation.cfg
index 9e8dba31c42a..9ab3f0c0c9c6 100644
--- a/TestCases/gust/gust_with_mesh_deformation.cfg
+++ b/TestCases/gust/gust_with_mesh_deformation.cfg
@@ -112,11 +112,11 @@ HISTORY_OUTPUT= (ITER, RMS_RES, AERO_COEFF, CAUCHY, WALL_TIME)
%
MESH_FILENAME= mesh_NACA0012_inv.su2
MESH_FORMAT= SU2
-SOLUTION_FILENAME= restart_gust.dat
-RESTART_FILENAME= restart_gust.dat
+SOLUTION_FILENAME= restart_gust
+RESTART_FILENAME= restart_gust
SURFACE_FILENAME= surface_gust
VOLUME_FILENAME= volume_gust
CONV_FILENAME= history_gust
TABULAR_FORMAT= CSV
OUTPUT_FILES= (NONE)
-%
\ No newline at end of file
+%
diff --git a/TestCases/gust/inv_gust_NACA0012.cfg b/TestCases/gust/inv_gust_NACA0012.cfg
index c00d51da1bfb..64cc25017c57 100644
--- a/TestCases/gust/inv_gust_NACA0012.cfg
+++ b/TestCases/gust/inv_gust_NACA0012.cfg
@@ -118,11 +118,11 @@ CONV_CAUCHY_EPS= 1E-10
%
MESH_FILENAME= mesh_NACA0012_inv.su2
MESH_FORMAT= SU2
-SOLUTION_FILENAME= solution_flow.dat
+SOLUTION_FILENAME= solution_flow
TABULAR_FORMAT= CSV
CONV_FILENAME= history
BREAKDOWN_FILENAME= forces_breakdown.dat
-RESTART_FILENAME= restart_flow.dat
+RESTART_FILENAME= restart_flow
VOLUME_FILENAME= flow
SURFACE_FILENAME= surface_flow
OUTPUT_WRT_FREQ= 1000
diff --git a/TestCases/harmonic_balance/HB.cfg b/TestCases/harmonic_balance/HB.cfg
index d23aa827dafb..869a8e9984df 100644
--- a/TestCases/harmonic_balance/HB.cfg
+++ b/TestCases/harmonic_balance/HB.cfg
@@ -108,16 +108,16 @@ CONV_CAUCHY_EPS= 1E-6
SCREEN_OUTPUT= INNER_ITER, RMS_RES
MESH_FILENAME= mesh_NACA64A010_inv.su2
MESH_FORMAT= SU2
-MESH_OUT_FILENAME= mesh_out.su2
-SOLUTION_FILENAME= restart_flow.dat
-SOLUTION_ADJ_FILENAME= solution_adj.dat
+MESH_OUT_FILENAME= mesh_out
+SOLUTION_FILENAME= restart_flow
+SOLUTION_ADJ_FILENAME= solution_adj
TABULAR_FORMAT= CSV
CONV_FILENAME= history
-RESTART_FILENAME= restart_flow.dat
-RESTART_ADJ_FILENAME= restart_adj.dat
+RESTART_FILENAME= restart_flow
+RESTART_ADJ_FILENAME= restart_adj
VOLUME_FILENAME= flow
VOLUME_ADJ_FILENAME= adjoint
-GRAD_OBJFUNC_FILENAME= of_grad.dat
+GRAD_OBJFUNC_FILENAME= of_grad
SURFACE_FILENAME= surface_flow
SURFACE_ADJ_FILENAME= surface_adjoint
OUTPUT_WRT_FREQ= 500
diff --git a/TestCases/harmonic_balance/hb_rans_preconditioning/davis.cfg b/TestCases/harmonic_balance/hb_rans_preconditioning/davis.cfg
index 46278af8d161..02609afe604e 100644
--- a/TestCases/harmonic_balance/hb_rans_preconditioning/davis.cfg
+++ b/TestCases/harmonic_balance/hb_rans_preconditioning/davis.cfg
@@ -92,11 +92,11 @@ CONV_CAUCHY_EPS= 1E-6
SCREEN_OUTPUT= INNER_ITER, RMS_RES
MESH_FILENAME= n64a010_turb.su2
MESH_FORMAT= SU2
-MESH_OUT_FILENAME= mesh_out.su2
-SOLUTION_FILENAME= restart_flow.dat
+MESH_OUT_FILENAME= mesh_out
+SOLUTION_FILENAME= restart_flow
TABULAR_FORMAT= CSV
CONV_FILENAME= history
-RESTART_FILENAME= restart_flow.dat
+RESTART_FILENAME= restart_flow
VOLUME_FILENAME= flow
SURFACE_FILENAME= surface_flow
OUTPUT_WRT_FREQ= 500
diff --git a/TestCases/hom_euler/InviscidVortex/2D/Quad32X32_nPoly4/InviscidVortex.cfg b/TestCases/hom_euler/InviscidVortex/2D/Quad32X32_nPoly4/InviscidVortex.cfg
index 36f985e82b6a..4bbbc95acfa6 100644
--- a/TestCases/hom_euler/InviscidVortex/2D/Quad32X32_nPoly4/InviscidVortex.cfg
+++ b/TestCases/hom_euler/InviscidVortex/2D/Quad32X32_nPoly4/InviscidVortex.cfg
@@ -70,16 +70,16 @@ CONV_CAUCHY_EPS= 1E-6
%
MESH_FILENAME= Quad32X32_nPoly4.su2
MESH_FORMAT= SU2
-MESH_OUT_FILENAME= mesh_out.su2
-SOLUTION_FILENAME= SolInterpolFrom3rdOrder.dat
-SOLUTION_ADJ_FILENAME= solution_adj.dat
+MESH_OUT_FILENAME= mesh_out
+SOLUTION_FILENAME= SolInterpolFrom3rdOrder
+SOLUTION_ADJ_FILENAME= solution_adj
TABULAR_FORMAT= CSV
CONV_FILENAME= history
-RESTART_FILENAME= restart_flow.dat
-RESTART_ADJ_FILENAME= restart_adj.dat
+RESTART_FILENAME= restart_flow
+RESTART_ADJ_FILENAME= restart_adj
VOLUME_FILENAME= flow
VOLUME_ADJ_FILENAME= adjoint
-GRAD_OBJFUNC_FILENAME= of_grad.dat
+GRAD_OBJFUNC_FILENAME= of_grad
SURFACE_FILENAME= surface_flow
SURFACE_ADJ_FILENAME= surface_adjoint
OUTPUT_WRT_FREQ= 40
diff --git a/TestCases/hom_euler/InviscidVortex/3D/nPoly2_Tets/InviscidVortex.cfg b/TestCases/hom_euler/InviscidVortex/3D/nPoly2_Tets/InviscidVortex.cfg
index 97ccb4efb2d9..8a30846a8110 100644
--- a/TestCases/hom_euler/InviscidVortex/3D/nPoly2_Tets/InviscidVortex.cfg
+++ b/TestCases/hom_euler/InviscidVortex/3D/nPoly2_Tets/InviscidVortex.cfg
@@ -70,16 +70,16 @@ CONV_CAUCHY_EPS= 1E-6
%
MESH_FILENAME= Tets_nPoly2.su2
MESH_FORMAT= SU2
-MESH_OUT_FILENAME= mesh_out.su2
-SOLUTION_FILENAME= SolInterpolFrom3rdOrder.dat
-SOLUTION_ADJ_FILENAME= solution_adj.dat
+MESH_OUT_FILENAME= mesh_out
+SOLUTION_FILENAME= SolInterpolFrom3rdOrder
+SOLUTION_ADJ_FILENAME= solution_adj
TABULAR_FORMAT= CSV
CONV_FILENAME= history
-RESTART_FILENAME= restart_flow.dat
-RESTART_ADJ_FILENAME= restart_adj.dat
+RESTART_FILENAME= restart_flow
+RESTART_ADJ_FILENAME= restart_adj
VOLUME_FILENAME= flow
VOLUME_ADJ_FILENAME= adjoint
-GRAD_OBJFUNC_FILENAME= of_grad.dat
+GRAD_OBJFUNC_FILENAME= of_grad
SURFACE_FILENAME= surface_flow
SURFACE_ADJ_FILENAME= surface_adjoint
OUTPUT_WRT_FREQ= 100
diff --git a/TestCases/hom_euler/InviscidVortex/3D/nPoly4_Tets/InviscidVortex.cfg b/TestCases/hom_euler/InviscidVortex/3D/nPoly4_Tets/InviscidVortex.cfg
index 725258946066..da78b2d7b365 100644
--- a/TestCases/hom_euler/InviscidVortex/3D/nPoly4_Tets/InviscidVortex.cfg
+++ b/TestCases/hom_euler/InviscidVortex/3D/nPoly4_Tets/InviscidVortex.cfg
@@ -69,16 +69,16 @@ CONV_CAUCHY_EPS= 1E-6
%
MESH_FILENAME= Tets_nPoly4.su2
MESH_FORMAT= SU2
-MESH_OUT_FILENAME= mesh_out.su2
-SOLUTION_FILENAME= SolInterpolFrom3rdOrder.dat
-SOLUTION_ADJ_FILENAME= solution_adj.dat
+MESH_OUT_FILENAME= mesh_out
+SOLUTION_FILENAME= SolInterpolFrom3rdOrder
+SOLUTION_ADJ_FILENAME= solution_adj
TABULAR_FORMAT= CSV
CONV_FILENAME= history
-RESTART_FILENAME= restart_flow.dat
-RESTART_ADJ_FILENAME= restart_adj.dat
+RESTART_FILENAME= restart_flow
+RESTART_ADJ_FILENAME= restart_adj
VOLUME_FILENAME= flow
VOLUME_ADJ_FILENAME= adjoint
-GRAD_OBJFUNC_FILENAME= of_grad.dat
+GRAD_OBJFUNC_FILENAME= of_grad
SURFACE_FILENAME= surface_flow
SURFACE_ADJ_FILENAME= surface_adjoint
OUTPUT_WRT_FREQ= 100
diff --git a/TestCases/hom_euler/NACA0012_3D_Hybrid_4thOrder/fem_NACA0012.cfg b/TestCases/hom_euler/NACA0012_3D_Hybrid_4thOrder/fem_NACA0012.cfg
index 640b6ec8a0cf..fe130fc52e41 100644
--- a/TestCases/hom_euler/NACA0012_3D_Hybrid_4thOrder/fem_NACA0012.cfg
+++ b/TestCases/hom_euler/NACA0012_3D_Hybrid_4thOrder/fem_NACA0012.cfg
@@ -73,16 +73,16 @@ CONV_CAUCHY_EPS= 1E-6
%
MESH_FILENAME= NACA0012_3D_nPoly3.su2
MESH_FORMAT= SU2
-MESH_OUT_FILENAME= mesh_out.su2
-SOLUTION_FILENAME= solution_flow.dat
-SOLUTION_ADJ_FILENAME= solution_adj.dat
+MESH_OUT_FILENAME= mesh_out
+SOLUTION_FILENAME= solution_flow
+SOLUTION_ADJ_FILENAME= solution_adj
TABULAR_FORMAT= CSV
CONV_FILENAME= history
-RESTART_FILENAME= restart_flow.dat
-RESTART_ADJ_FILENAME= restart_adj.dat
+RESTART_FILENAME= restart_flow
+RESTART_ADJ_FILENAME= restart_adj
VOLUME_FILENAME= flow
VOLUME_ADJ_FILENAME= adjoint
-GRAD_OBJFUNC_FILENAME= of_grad.dat
+GRAD_OBJFUNC_FILENAME= of_grad
SURFACE_FILENAME= surface_flow
SURFACE_ADJ_FILENAME= surface_adjoint
OUTPUT_WRT_FREQ= 2500
diff --git a/TestCases/hom_euler/NACA0012_5thOrder/fem_NACA0012.cfg b/TestCases/hom_euler/NACA0012_5thOrder/fem_NACA0012.cfg
index e2c2781819d4..93e9a3ef1e66 100644
--- a/TestCases/hom_euler/NACA0012_5thOrder/fem_NACA0012.cfg
+++ b/TestCases/hom_euler/NACA0012_5thOrder/fem_NACA0012.cfg
@@ -75,16 +75,16 @@ CONV_CAUCHY_EPS= 1E-6
%
MESH_FILENAME= Naca0012_nPoly4.su2
MESH_FORMAT= SU2
-MESH_OUT_FILENAME= mesh_out.su2
-SOLUTION_FILENAME= solution_flow.dat_FullyConverged
-SOLUTION_ADJ_FILENAME= solution_adj.dat
+MESH_OUT_FILENAME= mesh_out
+SOLUTION_FILENAME= solution_flow_FullyConverged
+SOLUTION_ADJ_FILENAME= solution_adj
TABULAR_FORMAT= CSV
CONV_FILENAME= history
-RESTART_FILENAME= restart_flow.dat
-RESTART_ADJ_FILENAME= restart_adj.dat
+RESTART_FILENAME= restart_flow
+RESTART_ADJ_FILENAME= restart_adj
VOLUME_FILENAME= flow
VOLUME_ADJ_FILENAME= adjoint
-GRAD_OBJFUNC_FILENAME= of_grad.dat
+GRAD_OBJFUNC_FILENAME= of_grad
SURFACE_FILENAME= surface_flow
SURFACE_ADJ_FILENAME= surface_adjoint
OUTPUT_WRT_FREQ= 50000
diff --git a/TestCases/hom_euler/NACA0012_5thOrder/fem_NACA0012_reg.cfg b/TestCases/hom_euler/NACA0012_5thOrder/fem_NACA0012_reg.cfg
index 73db0c864d9b..5a479bb73adf 100644
--- a/TestCases/hom_euler/NACA0012_5thOrder/fem_NACA0012_reg.cfg
+++ b/TestCases/hom_euler/NACA0012_5thOrder/fem_NACA0012_reg.cfg
@@ -75,16 +75,16 @@ CONV_CAUCHY_EPS= 1E-6
%
MESH_FILENAME= Naca0012_nPoly4.su2
MESH_FORMAT= SU2
-MESH_OUT_FILENAME= mesh_out.su2
-SOLUTION_FILENAME= solution_flow_naca0012.dat
-SOLUTION_ADJ_FILENAME= solution_adj.dat
+MESH_OUT_FILENAME= mesh_out
+SOLUTION_FILENAME= solution_flow_naca0012
+SOLUTION_ADJ_FILENAME= solution_adj
TABULAR_FORMAT= CSV
CONV_FILENAME= history
-RESTART_FILENAME= restart_flow.dat
-RESTART_ADJ_FILENAME= restart_adj.dat
+RESTART_FILENAME= restart_flow
+RESTART_ADJ_FILENAME= restart_adj
VOLUME_FILENAME= flow
VOLUME_ADJ_FILENAME= adjoint
-GRAD_OBJFUNC_FILENAME= of_grad.dat
+GRAD_OBJFUNC_FILENAME= of_grad
SURFACE_FILENAME= surface_flow
SURFACE_ADJ_FILENAME= surface_adjoint
OUTPUT_WRT_FREQ= 50000
diff --git a/TestCases/hom_euler/Ringleb/Quad100X50_nPoly3/Ringleb.cfg b/TestCases/hom_euler/Ringleb/Quad100X50_nPoly3/Ringleb.cfg
index 5510644aec03..2ede7eb93c1d 100644
--- a/TestCases/hom_euler/Ringleb/Quad100X50_nPoly3/Ringleb.cfg
+++ b/TestCases/hom_euler/Ringleb/Quad100X50_nPoly3/Ringleb.cfg
@@ -65,16 +65,16 @@ CONV_CAUCHY_EPS= 1E-6
%
MESH_FILENAME= Quad100X50_nPoly3.su2
MESH_FORMAT= SU2
-MESH_OUT_FILENAME= mesh_out.su2
-SOLUTION_FILENAME= solution_flow.dat
-SOLUTION_ADJ_FILENAME= solution_adj.dat
+MESH_OUT_FILENAME= mesh_out
+SOLUTION_FILENAME= solution_flow
+SOLUTION_ADJ_FILENAME= solution_adj
TABULAR_FORMAT= CSV
CONV_FILENAME= history
-RESTART_FILENAME= restart_flow.dat
-RESTART_ADJ_FILENAME= restart_adj.dat
+RESTART_FILENAME= restart_flow
+RESTART_ADJ_FILENAME= restart_adj
VOLUME_FILENAME= flow
VOLUME_ADJ_FILENAME= adjoint
-GRAD_OBJFUNC_FILENAME= of_grad.dat
+GRAD_OBJFUNC_FILENAME= of_grad
SURFACE_FILENAME= surface_flow
SURFACE_ADJ_FILENAME= surface_adjoint
OUTPUT_WRT_FREQ= 5000
diff --git a/TestCases/hom_euler/Ringleb/Quad100X50_nPoly3/Ringleb_WallBC.cfg b/TestCases/hom_euler/Ringleb/Quad100X50_nPoly3/Ringleb_WallBC.cfg
index 2777cd8b4e5e..f1b8dd76fcf0 100644
--- a/TestCases/hom_euler/Ringleb/Quad100X50_nPoly3/Ringleb_WallBC.cfg
+++ b/TestCases/hom_euler/Ringleb/Quad100X50_nPoly3/Ringleb_WallBC.cfg
@@ -65,16 +65,16 @@ CONV_CAUCHY_EPS= 1E-6
%
MESH_FILENAME= Quad100X50_nPoly3.su2
MESH_FORMAT= SU2
-MESH_OUT_FILENAME= mesh_out.su2
-SOLUTION_FILENAME= solution_flow.dat
-SOLUTION_ADJ_FILENAME= solution_adj.dat
+MESH_OUT_FILENAME= mesh_out
+SOLUTION_FILENAME= solution_flow
+SOLUTION_ADJ_FILENAME= solution_adj
TABULAR_FORMAT= CSV
CONV_FILENAME= history
-RESTART_FILENAME= restart_flow.dat
-RESTART_ADJ_FILENAME= restart_adj.dat
+RESTART_FILENAME= restart_flow
+RESTART_ADJ_FILENAME= restart_adj
VOLUME_FILENAME= flow
VOLUME_ADJ_FILENAME= adjoint
-GRAD_OBJFUNC_FILENAME= of_grad.dat
+GRAD_OBJFUNC_FILENAME= of_grad
SURFACE_FILENAME= surface_flow
SURFACE_ADJ_FILENAME= surface_adjoint
OUTPUT_WRT_FREQ= 5000
diff --git a/TestCases/hom_euler/Ringleb/Quad100X50_nPoly4/Ringleb.cfg b/TestCases/hom_euler/Ringleb/Quad100X50_nPoly4/Ringleb.cfg
index 7b117f6dbfaf..9ae5d0530d16 100644
--- a/TestCases/hom_euler/Ringleb/Quad100X50_nPoly4/Ringleb.cfg
+++ b/TestCases/hom_euler/Ringleb/Quad100X50_nPoly4/Ringleb.cfg
@@ -64,16 +64,16 @@ CONV_CAUCHY_EPS= 1E-6
%
MESH_FILENAME= Quad100X50_nPoly4.su2
MESH_FORMAT= SU2
-MESH_OUT_FILENAME= mesh_out.su2
-SOLUTION_FILENAME= solution_flow.dat
-SOLUTION_ADJ_FILENAME= solution_adj.dat
+MESH_OUT_FILENAME= mesh_out
+SOLUTION_FILENAME= solution_flow
+SOLUTION_ADJ_FILENAME= solution_adj
TABULAR_FORMAT= CSV
CONV_FILENAME= history
-RESTART_FILENAME= restart_flow.dat
-RESTART_ADJ_FILENAME= restart_adj.dat
+RESTART_FILENAME= restart_flow
+RESTART_ADJ_FILENAME= restart_adj
VOLUME_FILENAME= flow
VOLUME_ADJ_FILENAME= adjoint
-GRAD_OBJFUNC_FILENAME= of_grad.dat
+GRAD_OBJFUNC_FILENAME= of_grad
SURFACE_FILENAME= surface_flow
SURFACE_ADJ_FILENAME= surface_adjoint
OUTPUT_WRT_FREQ= 5000
diff --git a/TestCases/hom_euler/Ringleb/Quad100X50_nPoly4/Ringleb_WallBC.cfg b/TestCases/hom_euler/Ringleb/Quad100X50_nPoly4/Ringleb_WallBC.cfg
index 071154a66e1a..843f843cf51b 100644
--- a/TestCases/hom_euler/Ringleb/Quad100X50_nPoly4/Ringleb_WallBC.cfg
+++ b/TestCases/hom_euler/Ringleb/Quad100X50_nPoly4/Ringleb_WallBC.cfg
@@ -65,16 +65,16 @@ CONV_CAUCHY_EPS= 1E-6
%
MESH_FILENAME= Quad100X50_nPoly4.su2
MESH_FORMAT= SU2
-MESH_OUT_FILENAME= mesh_out.su2
-SOLUTION_FILENAME= solution_flow.dat
-SOLUTION_ADJ_FILENAME= solution_adj.dat
+MESH_OUT_FILENAME= mesh_out
+SOLUTION_FILENAME= solution_flow
+SOLUTION_ADJ_FILENAME= solution_adj
TABULAR_FORMAT= CSV
CONV_FILENAME= history
-RESTART_FILENAME= restart_flow.dat
-RESTART_ADJ_FILENAME= restart_adj.dat
+RESTART_FILENAME= restart_flow
+RESTART_ADJ_FILENAME= restart_adj
VOLUME_FILENAME= flow
VOLUME_ADJ_FILENAME= adjoint
-GRAD_OBJFUNC_FILENAME= of_grad.dat
+GRAD_OBJFUNC_FILENAME= of_grad
SURFACE_FILENAME= surface_flow
SURFACE_ADJ_FILENAME= surface_adjoint
OUTPUT_WRT_FREQ= 5000
diff --git a/TestCases/hom_euler/Ringleb/Quad200X100_nPoly4/Ringleb.cfg b/TestCases/hom_euler/Ringleb/Quad200X100_nPoly4/Ringleb.cfg
index fb8010048998..f3f255166e73 100644
--- a/TestCases/hom_euler/Ringleb/Quad200X100_nPoly4/Ringleb.cfg
+++ b/TestCases/hom_euler/Ringleb/Quad200X100_nPoly4/Ringleb.cfg
@@ -64,16 +64,16 @@ CONV_CAUCHY_EPS= 1E-6
%
MESH_FILENAME= Quad200X100_nPoly4.su2
MESH_FORMAT= SU2
-MESH_OUT_FILENAME= mesh_out.su2
-SOLUTION_FILENAME= solution_flow.dat
-SOLUTION_ADJ_FILENAME= solution_adj.dat
+MESH_OUT_FILENAME= mesh_out
+SOLUTION_FILENAME= solution_flow
+SOLUTION_ADJ_FILENAME= solution_adj
TABULAR_FORMAT= CSV
CONV_FILENAME= history
-RESTART_FILENAME= restart_flow.dat
-RESTART_ADJ_FILENAME= restart_adj.dat
+RESTART_FILENAME= restart_flow
+RESTART_ADJ_FILENAME= restart_adj
VOLUME_FILENAME= flow
VOLUME_ADJ_FILENAME= adjoint
-GRAD_OBJFUNC_FILENAME= of_grad.dat
+GRAD_OBJFUNC_FILENAME= of_grad
SURFACE_FILENAME= surface_flow
SURFACE_ADJ_FILENAME= surface_adjoint
OUTPUT_WRT_FREQ= 5000
diff --git a/TestCases/hom_euler/Ringleb/Quad200X100_nPoly4/Ringleb_WallBC.cfg b/TestCases/hom_euler/Ringleb/Quad200X100_nPoly4/Ringleb_WallBC.cfg
index cb5db14c9f2c..2e9cdd435e16 100644
--- a/TestCases/hom_euler/Ringleb/Quad200X100_nPoly4/Ringleb_WallBC.cfg
+++ b/TestCases/hom_euler/Ringleb/Quad200X100_nPoly4/Ringleb_WallBC.cfg
@@ -65,16 +65,16 @@ CONV_CAUCHY_EPS= 1E-6
%
MESH_FILENAME= Quad200X100_nPoly4.su2
MESH_FORMAT= SU2
-MESH_OUT_FILENAME= mesh_out.su2
-SOLUTION_FILENAME= solution_flow.dat
-SOLUTION_ADJ_FILENAME= solution_adj.dat
+MESH_OUT_FILENAME= mesh_out
+SOLUTION_FILENAME= solution_flow
+SOLUTION_ADJ_FILENAME= solution_adj
TABULAR_FORMAT= CSV
CONV_FILENAME= history
-RESTART_FILENAME= restart_flow.dat
-RESTART_ADJ_FILENAME= restart_adj.dat
+RESTART_FILENAME= restart_flow
+RESTART_ADJ_FILENAME= restart_adj
VOLUME_FILENAME= flow
VOLUME_ADJ_FILENAME= adjoint
-GRAD_OBJFUNC_FILENAME= of_grad.dat
+GRAD_OBJFUNC_FILENAME= of_grad
SURFACE_FILENAME= surface_flow
SURFACE_ADJ_FILENAME= surface_adjoint
OUTPUT_WRT_FREQ= 5000
diff --git a/TestCases/hom_euler/Ringleb/Quad50X50_HalfGeom_nPoly4/Ringleb.cfg b/TestCases/hom_euler/Ringleb/Quad50X50_HalfGeom_nPoly4/Ringleb.cfg
index 885873e4d23d..e96d16647cac 100644
--- a/TestCases/hom_euler/Ringleb/Quad50X50_HalfGeom_nPoly4/Ringleb.cfg
+++ b/TestCases/hom_euler/Ringleb/Quad50X50_HalfGeom_nPoly4/Ringleb.cfg
@@ -64,16 +64,16 @@ CONV_CAUCHY_EPS= 1E-6
%
MESH_FILENAME= Quad50X50_HalfGeom_nPoly4.su2
MESH_FORMAT= SU2
-MESH_OUT_FILENAME= mesh_out.su2
-SOLUTION_FILENAME= solution_flow.dat
-SOLUTION_ADJ_FILENAME= solution_adj.dat
+MESH_OUT_FILENAME= mesh_out
+SOLUTION_FILENAME= solution_flow
+SOLUTION_ADJ_FILENAME= solution_adj
TABULAR_FORMAT= CSV
CONV_FILENAME= history
-RESTART_FILENAME= restart_flow.dat
-RESTART_ADJ_FILENAME= restart_adj.dat
+RESTART_FILENAME= restart_flow
+RESTART_ADJ_FILENAME= restart_adj
VOLUME_FILENAME= flow
VOLUME_ADJ_FILENAME= adjoint
-GRAD_OBJFUNC_FILENAME= of_grad.dat
+GRAD_OBJFUNC_FILENAME= of_grad
SURFACE_FILENAME= surface_flow
SURFACE_ADJ_FILENAME= surface_adjoint
OUTPUT_WRT_FREQ= 5000
diff --git a/TestCases/hom_euler/Ringleb/Quad50X50_HalfGeom_nPoly4/Ringleb_WallBC.cfg b/TestCases/hom_euler/Ringleb/Quad50X50_HalfGeom_nPoly4/Ringleb_WallBC.cfg
index 090d5249bd88..967f78c3e21b 100644
--- a/TestCases/hom_euler/Ringleb/Quad50X50_HalfGeom_nPoly4/Ringleb_WallBC.cfg
+++ b/TestCases/hom_euler/Ringleb/Quad50X50_HalfGeom_nPoly4/Ringleb_WallBC.cfg
@@ -65,16 +65,16 @@ CONV_CAUCHY_EPS= 1E-6
%
MESH_FILENAME= Quad50X50_HalfGeom_nPoly4.su2
MESH_FORMAT= SU2
-MESH_OUT_FILENAME= mesh_out.su2
-SOLUTION_FILENAME= solution_flow.dat
-SOLUTION_ADJ_FILENAME= solution_adj.dat
+MESH_OUT_FILENAME= mesh_out
+SOLUTION_FILENAME= solution_flow
+SOLUTION_ADJ_FILENAME= solution_adj
TABULAR_FORMAT= CSV
CONV_FILENAME= history
-RESTART_FILENAME= restart_flow.dat
-RESTART_ADJ_FILENAME= restart_adj.dat
+RESTART_FILENAME= restart_flow
+RESTART_ADJ_FILENAME= restart_adj
VOLUME_FILENAME= flow
VOLUME_ADJ_FILENAME= adjoint
-GRAD_OBJFUNC_FILENAME= of_grad.dat
+GRAD_OBJFUNC_FILENAME= of_grad
SURFACE_FILENAME= surface_flow
SURFACE_ADJ_FILENAME= surface_adjoint
OUTPUT_WRT_FREQ= 5000
diff --git a/TestCases/hom_euler/Ringleb/QuadDominantUnstr100X100_HalfGeom_nPoly4/Ringleb.cfg b/TestCases/hom_euler/Ringleb/QuadDominantUnstr100X100_HalfGeom_nPoly4/Ringleb.cfg
index c9220619fcaf..79751513c463 100644
--- a/TestCases/hom_euler/Ringleb/QuadDominantUnstr100X100_HalfGeom_nPoly4/Ringleb.cfg
+++ b/TestCases/hom_euler/Ringleb/QuadDominantUnstr100X100_HalfGeom_nPoly4/Ringleb.cfg
@@ -64,16 +64,16 @@ CONV_CAUCHY_EPS= 1E-6
%
MESH_FILENAME= QuadDominantUnstr100X100_HalfGeom_nPoly4.su2
MESH_FORMAT= SU2
-MESH_OUT_FILENAME= mesh_out.su2
-SOLUTION_FILENAME= solution_flow.dat
-SOLUTION_ADJ_FILENAME= solution_adj.dat
+MESH_OUT_FILENAME= mesh_out
+SOLUTION_FILENAME= solution_flow
+SOLUTION_ADJ_FILENAME= solution_adj
TABULAR_FORMAT= CSV
CONV_FILENAME= history
-RESTART_FILENAME= restart_flow.dat
-RESTART_ADJ_FILENAME= restart_adj.dat
+RESTART_FILENAME= restart_flow
+RESTART_ADJ_FILENAME= restart_adj
VOLUME_FILENAME= flow
VOLUME_ADJ_FILENAME= adjoint
-GRAD_OBJFUNC_FILENAME= of_grad.dat
+GRAD_OBJFUNC_FILENAME= of_grad
SURFACE_FILENAME= surface_flow
SURFACE_ADJ_FILENAME= surface_adjoint
OUTPUT_WRT_FREQ= 5000
diff --git a/TestCases/hom_euler/Ringleb/QuadDominantUnstr100X100_HalfGeom_nPoly4/Ringleb_WallBC.cfg b/TestCases/hom_euler/Ringleb/QuadDominantUnstr100X100_HalfGeom_nPoly4/Ringleb_WallBC.cfg
index 392f61998574..4960528c33a6 100644
--- a/TestCases/hom_euler/Ringleb/QuadDominantUnstr100X100_HalfGeom_nPoly4/Ringleb_WallBC.cfg
+++ b/TestCases/hom_euler/Ringleb/QuadDominantUnstr100X100_HalfGeom_nPoly4/Ringleb_WallBC.cfg
@@ -65,16 +65,16 @@ CONV_CAUCHY_EPS= 1E-6
%
MESH_FILENAME= QuadDominantUnstr100X100_HalfGeom_nPoly4.su2
MESH_FORMAT= SU2
-MESH_OUT_FILENAME= mesh_out.su2
-SOLUTION_FILENAME= solution_flow.dat
-SOLUTION_ADJ_FILENAME= solution_adj.dat
+MESH_OUT_FILENAME= mesh_out
+SOLUTION_FILENAME= solution_flow
+SOLUTION_ADJ_FILENAME= solution_adj
TABULAR_FORMAT= CSV
CONV_FILENAME= history
-RESTART_FILENAME= restart_flow.dat
-RESTART_ADJ_FILENAME= restart_adj.dat
+RESTART_FILENAME= restart_flow
+RESTART_ADJ_FILENAME= restart_adj
VOLUME_FILENAME= flow
VOLUME_ADJ_FILENAME= adjoint
-GRAD_OBJFUNC_FILENAME= of_grad.dat
+GRAD_OBJFUNC_FILENAME= of_grad
SURFACE_FILENAME= surface_flow
SURFACE_ADJ_FILENAME= surface_adjoint
OUTPUT_WRT_FREQ= 5000
diff --git a/TestCases/hom_euler/Ringleb/Triangle50X50_HalfGeom_nPoly4/Ringleb.cfg b/TestCases/hom_euler/Ringleb/Triangle50X50_HalfGeom_nPoly4/Ringleb.cfg
index db2e805fab25..13db59b9fcb1 100644
--- a/TestCases/hom_euler/Ringleb/Triangle50X50_HalfGeom_nPoly4/Ringleb.cfg
+++ b/TestCases/hom_euler/Ringleb/Triangle50X50_HalfGeom_nPoly4/Ringleb.cfg
@@ -64,16 +64,16 @@ CONV_CAUCHY_EPS= 1E-6
%
MESH_FILENAME= TriangleUnstr50X50_HalfGeom_nPoly4.su2
MESH_FORMAT= SU2
-MESH_OUT_FILENAME= mesh_out.su2
-SOLUTION_FILENAME= solution_flow.dat
-SOLUTION_ADJ_FILENAME= solution_adj.dat
+MESH_OUT_FILENAME= mesh_out
+SOLUTION_FILENAME= solution_flow
+SOLUTION_ADJ_FILENAME= solution_adj
TABULAR_FORMAT= CSV
CONV_FILENAME= history
-RESTART_FILENAME= restart_flow.dat
-RESTART_ADJ_FILENAME= restart_adj.dat
+RESTART_FILENAME= restart_flow
+RESTART_ADJ_FILENAME= restart_adj
VOLUME_FILENAME= flow
VOLUME_ADJ_FILENAME= adjoint
-GRAD_OBJFUNC_FILENAME= of_grad.dat
+GRAD_OBJFUNC_FILENAME= of_grad
SURFACE_FILENAME= surface_flow
SURFACE_ADJ_FILENAME= surface_adjoint
OUTPUT_WRT_FREQ= 5000
diff --git a/TestCases/hom_euler/Ringleb/Triangle50X50_HalfGeom_nPoly4/Ringleb_WallBC.cfg b/TestCases/hom_euler/Ringleb/Triangle50X50_HalfGeom_nPoly4/Ringleb_WallBC.cfg
index 2178ed57e755..372d58cdf9d6 100644
--- a/TestCases/hom_euler/Ringleb/Triangle50X50_HalfGeom_nPoly4/Ringleb_WallBC.cfg
+++ b/TestCases/hom_euler/Ringleb/Triangle50X50_HalfGeom_nPoly4/Ringleb_WallBC.cfg
@@ -65,16 +65,16 @@ CONV_CAUCHY_EPS= 1E-6
%
MESH_FILENAME= TriangleUnstr50X50_HalfGeom_nPoly4.su2
MESH_FORMAT= SU2
-MESH_OUT_FILENAME= mesh_out.su2
-SOLUTION_FILENAME= solution_flow.dat
-SOLUTION_ADJ_FILENAME= solution_adj.dat
+MESH_OUT_FILENAME= mesh_out
+SOLUTION_FILENAME= solution_flow
+SOLUTION_ADJ_FILENAME= solution_adj
TABULAR_FORMAT= CSV
CONV_FILENAME= history
-RESTART_FILENAME= restart_flow.dat
-RESTART_ADJ_FILENAME= restart_adj.dat
+RESTART_FILENAME= restart_flow
+RESTART_ADJ_FILENAME= restart_adj
VOLUME_FILENAME= flow
VOLUME_ADJ_FILENAME= adjoint
-GRAD_OBJFUNC_FILENAME= of_grad.dat
+GRAD_OBJFUNC_FILENAME= of_grad
SURFACE_FILENAME= surface_flow
SURFACE_ADJ_FILENAME= surface_adjoint
OUTPUT_WRT_FREQ= 5000
diff --git a/TestCases/hom_euler/Sphere_4thOrder_Hexa/fem_Sphere.cfg b/TestCases/hom_euler/Sphere_4thOrder_Hexa/fem_Sphere.cfg
index a6219e6bcc56..a34e8100b377 100644
--- a/TestCases/hom_euler/Sphere_4thOrder_Hexa/fem_Sphere.cfg
+++ b/TestCases/hom_euler/Sphere_4thOrder_Hexa/fem_Sphere.cfg
@@ -73,16 +73,16 @@ CONV_CAUCHY_EPS= 1E-6
%
MESH_FILENAME= SphereCoarse_4thOrder.su2
MESH_FORMAT= SU2
-MESH_OUT_FILENAME= mesh_out.su2
-SOLUTION_FILENAME= solution_flow.dat
-SOLUTION_ADJ_FILENAME= solution_adj.dat
+MESH_OUT_FILENAME= mesh_out
+SOLUTION_FILENAME= solution_flow
+SOLUTION_ADJ_FILENAME= solution_adj
TABULAR_FORMAT= CSV
CONV_FILENAME= history
-RESTART_FILENAME= restart_flow.dat
-RESTART_ADJ_FILENAME= restart_adj.dat
+RESTART_FILENAME= restart_flow
+RESTART_ADJ_FILENAME= restart_adj
VOLUME_FILENAME= flow
VOLUME_ADJ_FILENAME= adjoint
-GRAD_OBJFUNC_FILENAME= of_grad.dat
+GRAD_OBJFUNC_FILENAME= of_grad
SURFACE_FILENAME= surface_flow
SURFACE_ADJ_FILENAME= surface_adjoint
OUTPUT_WRT_FREQ= 250
diff --git a/TestCases/hom_euler/Sphere_4thOrder_Tet/fem_Sphere.cfg b/TestCases/hom_euler/Sphere_4thOrder_Tet/fem_Sphere.cfg
index 6af8e8185ad9..c7883266c011 100644
--- a/TestCases/hom_euler/Sphere_4thOrder_Tet/fem_Sphere.cfg
+++ b/TestCases/hom_euler/Sphere_4thOrder_Tet/fem_Sphere.cfg
@@ -73,16 +73,16 @@ CONV_CAUCHY_EPS= 1E-6
%
MESH_FILENAME= Sphere_4thOrder.su2
MESH_FORMAT= SU2
-MESH_OUT_FILENAME= mesh_out.su2
-SOLUTION_FILENAME= SolInterpolFrom3rdOrder.dat
-SOLUTION_ADJ_FILENAME= solution_adj.dat
+MESH_OUT_FILENAME= mesh_out
+SOLUTION_FILENAME= SolInterpolFrom3rdOrder
+SOLUTION_ADJ_FILENAME= solution_adj
TABULAR_FORMAT= CSV
CONV_FILENAME= history
-RESTART_FILENAME= restart_flow.dat
-RESTART_ADJ_FILENAME= restart_adj.dat
+RESTART_FILENAME= restart_flow
+RESTART_ADJ_FILENAME= restart_adj
VOLUME_FILENAME= flow
VOLUME_ADJ_FILENAME= adjoint
-GRAD_OBJFUNC_FILENAME= of_grad.dat
+GRAD_OBJFUNC_FILENAME= of_grad
SURFACE_FILENAME= surface_flow
SURFACE_ADJ_FILENAME= surface_adjoint
OUTPUT_WRT_FREQ= 500
diff --git a/TestCases/hom_euler/SubsonicChannel/nPoly1/fem_SubsonicChannel.cfg b/TestCases/hom_euler/SubsonicChannel/nPoly1/fem_SubsonicChannel.cfg
index 8b02afb4ac47..424e5615a4e8 100644
--- a/TestCases/hom_euler/SubsonicChannel/nPoly1/fem_SubsonicChannel.cfg
+++ b/TestCases/hom_euler/SubsonicChannel/nPoly1/fem_SubsonicChannel.cfg
@@ -73,16 +73,16 @@ CONV_CAUCHY_EPS= 1E-6
%
MESH_FILENAME= SubsonicChannel_nPoly1.su2
MESH_FORMAT= SU2
-MESH_OUT_FILENAME= mesh_out.su2
-SOLUTION_FILENAME= solution_flow.dat
-SOLUTION_ADJ_FILENAME= solution_adj.dat
+MESH_OUT_FILENAME= mesh_out
+SOLUTION_FILENAME= solution_flow
+SOLUTION_ADJ_FILENAME= solution_adj
TABULAR_FORMAT= CSV
CONV_FILENAME= history
-RESTART_FILENAME= restart_flow.dat
-RESTART_ADJ_FILENAME= restart_adj.dat
+RESTART_FILENAME= restart_flow
+RESTART_ADJ_FILENAME= restart_adj
VOLUME_FILENAME= flow
VOLUME_ADJ_FILENAME= adjoint
-GRAD_OBJFUNC_FILENAME= of_grad.dat
+GRAD_OBJFUNC_FILENAME= of_grad
SURFACE_FILENAME= surface_flow
SURFACE_ADJ_FILENAME= surface_adjoint
OUTPUT_WRT_FREQ= 5000
diff --git a/TestCases/hom_euler/SubsonicChannel/nPoly1/fem_SubsonicChannel_Farfield.cfg b/TestCases/hom_euler/SubsonicChannel/nPoly1/fem_SubsonicChannel_Farfield.cfg
index 124723c6c747..da200e4bad00 100644
--- a/TestCases/hom_euler/SubsonicChannel/nPoly1/fem_SubsonicChannel_Farfield.cfg
+++ b/TestCases/hom_euler/SubsonicChannel/nPoly1/fem_SubsonicChannel_Farfield.cfg
@@ -72,16 +72,16 @@ CONV_CAUCHY_EPS= 1E-6
%
MESH_FILENAME= SubsonicChannel_nPoly1.su2
MESH_FORMAT= SU2
-MESH_OUT_FILENAME= mesh_out.su2
-SOLUTION_FILENAME= solution_flow.dat
-SOLUTION_ADJ_FILENAME= solution_adj.dat
+MESH_OUT_FILENAME= mesh_out
+SOLUTION_FILENAME= solution_flow
+SOLUTION_ADJ_FILENAME= solution_adj
TABULAR_FORMAT= CSV
CONV_FILENAME= history
-RESTART_FILENAME= restart_flow.dat
-RESTART_ADJ_FILENAME= restart_adj.dat
+RESTART_FILENAME= restart_flow
+RESTART_ADJ_FILENAME= restart_adj
VOLUME_FILENAME= flow
VOLUME_ADJ_FILENAME= adjoint
-GRAD_OBJFUNC_FILENAME= of_grad.dat
+GRAD_OBJFUNC_FILENAME= of_grad
SURFACE_FILENAME= surface_flow
SURFACE_ADJ_FILENAME= surface_adjoint
OUTPUT_WRT_FREQ= 5000
diff --git a/TestCases/hom_euler/SubsonicChannel/nPoly2/fem_SubsonicChannel.cfg b/TestCases/hom_euler/SubsonicChannel/nPoly2/fem_SubsonicChannel.cfg
index 9d946ef54693..37018df761e2 100644
--- a/TestCases/hom_euler/SubsonicChannel/nPoly2/fem_SubsonicChannel.cfg
+++ b/TestCases/hom_euler/SubsonicChannel/nPoly2/fem_SubsonicChannel.cfg
@@ -74,16 +74,16 @@ CONV_CAUCHY_EPS= 1E-6
%
MESH_FILENAME= SubsonicChannel_nPoly2.su2
MESH_FORMAT= SU2
-MESH_OUT_FILENAME= mesh_out.su2
-SOLUTION_FILENAME= solution_flow.dat
-SOLUTION_ADJ_FILENAME= solution_adj.dat
+MESH_OUT_FILENAME= mesh_out
+SOLUTION_FILENAME= solution_flow
+SOLUTION_ADJ_FILENAME= solution_adj
TABULAR_FORMAT= CSV
CONV_FILENAME= history
-RESTART_FILENAME= restart_flow.dat
-RESTART_ADJ_FILENAME= restart_adj.dat
+RESTART_FILENAME= restart_flow
+RESTART_ADJ_FILENAME= restart_adj
VOLUME_FILENAME= flow
VOLUME_ADJ_FILENAME= adjoint
-GRAD_OBJFUNC_FILENAME= of_grad.dat
+GRAD_OBJFUNC_FILENAME= of_grad
SURFACE_FILENAME= surface_flow
SURFACE_ADJ_FILENAME= surface_adjoint
OUTPUT_WRT_FREQ= 5000
diff --git a/TestCases/hom_euler/SubsonicChannel/nPoly2/fem_SubsonicChannel_Farfield.cfg b/TestCases/hom_euler/SubsonicChannel/nPoly2/fem_SubsonicChannel_Farfield.cfg
index da554192c50e..bb5473c1c293 100644
--- a/TestCases/hom_euler/SubsonicChannel/nPoly2/fem_SubsonicChannel_Farfield.cfg
+++ b/TestCases/hom_euler/SubsonicChannel/nPoly2/fem_SubsonicChannel_Farfield.cfg
@@ -71,16 +71,16 @@ CONV_CAUCHY_EPS= 1E-6
%
MESH_FILENAME= SubsonicChannel_nPoly2.su2
MESH_FORMAT= SU2
-MESH_OUT_FILENAME= mesh_out.su2
-SOLUTION_FILENAME= solution_flow.dat
-SOLUTION_ADJ_FILENAME= solution_adj.dat
+MESH_OUT_FILENAME= mesh_out
+SOLUTION_FILENAME= solution_flow
+SOLUTION_ADJ_FILENAME= solution_adj
TABULAR_FORMAT= CSV
CONV_FILENAME= history
-RESTART_FILENAME= restart_flow.dat
-RESTART_ADJ_FILENAME= restart_adj.dat
+RESTART_FILENAME= restart_flow
+RESTART_ADJ_FILENAME= restart_adj
VOLUME_FILENAME= flow
VOLUME_ADJ_FILENAME= adjoint
-GRAD_OBJFUNC_FILENAME= of_grad.dat
+GRAD_OBJFUNC_FILENAME= of_grad
SURFACE_FILENAME= surface_flow
SURFACE_ADJ_FILENAME= surface_adjoint
OUTPUT_WRT_FREQ= 5000
diff --git a/TestCases/hom_euler/SubsonicChannel/nPoly4/fem_SubsonicChannel.cfg b/TestCases/hom_euler/SubsonicChannel/nPoly4/fem_SubsonicChannel.cfg
index a5250cc93d09..faf158ec2834 100644
--- a/TestCases/hom_euler/SubsonicChannel/nPoly4/fem_SubsonicChannel.cfg
+++ b/TestCases/hom_euler/SubsonicChannel/nPoly4/fem_SubsonicChannel.cfg
@@ -73,16 +73,16 @@ CONV_CAUCHY_EPS= 1E-6
%
MESH_FILENAME= SubsonicChannel_nPoly4.su2
MESH_FORMAT= SU2
-MESH_OUT_FILENAME= mesh_out.su2
-SOLUTION_FILENAME= solution_flow.dat
-SOLUTION_ADJ_FILENAME= solution_adj.dat
+MESH_OUT_FILENAME= mesh_out
+SOLUTION_FILENAME= solution_flow
+SOLUTION_ADJ_FILENAME= solution_adj
TABULAR_FORMAT= CSV
CONV_FILENAME= history
-RESTART_FILENAME= restart_flow.dat
-RESTART_ADJ_FILENAME= restart_adj.dat
+RESTART_FILENAME= restart_flow
+RESTART_ADJ_FILENAME= restart_adj
VOLUME_FILENAME= flow
VOLUME_ADJ_FILENAME= adjoint
-GRAD_OBJFUNC_FILENAME= of_grad.dat
+GRAD_OBJFUNC_FILENAME= of_grad
SURFACE_FILENAME= surface_flow
SURFACE_ADJ_FILENAME= surface_adjoint
OUTPUT_WRT_FREQ= 5000
diff --git a/TestCases/hom_euler/SubsonicChannel/nPoly4/fem_SubsonicChannel_Farfield.cfg b/TestCases/hom_euler/SubsonicChannel/nPoly4/fem_SubsonicChannel_Farfield.cfg
index 3780981a02a8..566b009f177f 100644
--- a/TestCases/hom_euler/SubsonicChannel/nPoly4/fem_SubsonicChannel_Farfield.cfg
+++ b/TestCases/hom_euler/SubsonicChannel/nPoly4/fem_SubsonicChannel_Farfield.cfg
@@ -70,16 +70,16 @@ CONV_CAUCHY_EPS= 1E-6
%
MESH_FILENAME= SubsonicChannel_nPoly4.su2
MESH_FORMAT= SU2
-MESH_OUT_FILENAME= mesh_out.su2
-SOLUTION_FILENAME= solution_flow.dat
-SOLUTION_ADJ_FILENAME= solution_adj.dat
+MESH_OUT_FILENAME= mesh_out
+SOLUTION_FILENAME= solution_flow
+SOLUTION_ADJ_FILENAME= solution_adj
TABULAR_FORMAT= CSV
CONV_FILENAME= history
-RESTART_FILENAME= restart_flow.dat
-RESTART_ADJ_FILENAME= restart_adj.dat
+RESTART_FILENAME= restart_flow
+RESTART_ADJ_FILENAME= restart_adj
VOLUME_FILENAME= flow
VOLUME_ADJ_FILENAME= adjoint
-GRAD_OBJFUNC_FILENAME= of_grad.dat
+GRAD_OBJFUNC_FILENAME= of_grad
SURFACE_FILENAME= surface_flow
SURFACE_ADJ_FILENAME= surface_adjoint
OUTPUT_WRT_FREQ= 5000
diff --git a/TestCases/hom_navierstokes/CylinderViscous/nPoly3/fem_Cylinder_reg.cfg b/TestCases/hom_navierstokes/CylinderViscous/nPoly3/fem_Cylinder_reg.cfg
index 051f5cb2b003..b6b375349e05 100644
--- a/TestCases/hom_navierstokes/CylinderViscous/nPoly3/fem_Cylinder_reg.cfg
+++ b/TestCases/hom_navierstokes/CylinderViscous/nPoly3/fem_Cylinder_reg.cfg
@@ -74,16 +74,16 @@ CONV_CAUCHY_EPS= 1E-6
%
MESH_FILENAME= CylinderViscous_nPoly3.su2
MESH_FORMAT= SU2
-MESH_OUT_FILENAME= mesh_out.su2
-SOLUTION_FILENAME= solution_flow.dat
-SOLUTION_ADJ_FILENAME= solution_adj.dat
+MESH_OUT_FILENAME= mesh_out
+SOLUTION_FILENAME= solution_flow
+SOLUTION_ADJ_FILENAME= solution_adj
TABULAR_FORMAT= CSV
CONV_FILENAME= history
-RESTART_FILENAME= restart_flow.dat
-RESTART_ADJ_FILENAME= restart_adj.dat
+RESTART_FILENAME= restart_flow
+RESTART_ADJ_FILENAME= restart_adj
VOLUME_FILENAME= flow
VOLUME_ADJ_FILENAME= adjoint
-GRAD_OBJFUNC_FILENAME= of_grad.dat
+GRAD_OBJFUNC_FILENAME= of_grad
SURFACE_FILENAME= surface_flow
SURFACE_ADJ_FILENAME= surface_adjoint
OUTPUT_WRT_FREQ= 250
diff --git a/TestCases/hom_navierstokes/FlatPlate/nPoly4/lam_flatplate_reg.cfg b/TestCases/hom_navierstokes/FlatPlate/nPoly4/lam_flatplate_reg.cfg
index af875e15a92d..1202490611a3 100644
--- a/TestCases/hom_navierstokes/FlatPlate/nPoly4/lam_flatplate_reg.cfg
+++ b/TestCases/hom_navierstokes/FlatPlate/nPoly4/lam_flatplate_reg.cfg
@@ -70,16 +70,16 @@ CONV_CAUCHY_EPS= 1E-6
%
MESH_FILENAME= mesh_flatplate_64x64_p4.su2
MESH_FORMAT= SU2
-MESH_OUT_FILENAME= mesh_out.su2
-SOLUTION_FILENAME= solution_flow.dat
-SOLUTION_ADJ_FILENAME= solution_adj.dat
+MESH_OUT_FILENAME= mesh_out
+SOLUTION_FILENAME= solution_flow
+SOLUTION_ADJ_FILENAME= solution_adj
TABULAR_FORMAT= CSV
CONV_FILENAME= history
-RESTART_FILENAME= restart_flow.dat
-RESTART_ADJ_FILENAME= restart_adj.dat
+RESTART_FILENAME= restart_flow
+RESTART_ADJ_FILENAME= restart_adj
VOLUME_FILENAME= flow
VOLUME_ADJ_FILENAME= adjoint
-GRAD_OBJFUNC_FILENAME= of_grad.dat
+GRAD_OBJFUNC_FILENAME= of_grad
SURFACE_FILENAME= surface_flow
SURFACE_ADJ_FILENAME= surface_adjoint
OUTPUT_WRT_FREQ= 1000
diff --git a/TestCases/hom_navierstokes/SphereViscous/nPoly3_QuadDominant/fem_Sphere_reg.cfg b/TestCases/hom_navierstokes/SphereViscous/nPoly3_QuadDominant/fem_Sphere_reg.cfg
index c1cf1d0d164e..f1af980bdc89 100644
--- a/TestCases/hom_navierstokes/SphereViscous/nPoly3_QuadDominant/fem_Sphere_reg.cfg
+++ b/TestCases/hom_navierstokes/SphereViscous/nPoly3_QuadDominant/fem_Sphere_reg.cfg
@@ -74,16 +74,16 @@ CONV_CAUCHY_EPS= 1E-6
%
MESH_FILENAME= SphereViscous_QuadDominant_Coarse_nPoly3.su2
MESH_FORMAT= SU2
-MESH_OUT_FILENAME= mesh_out.su2
-SOLUTION_FILENAME= restart_flow.dat
-SOLUTION_ADJ_FILENAME= solution_adj.dat
+MESH_OUT_FILENAME= mesh_out
+SOLUTION_FILENAME= restart_flow
+SOLUTION_ADJ_FILENAME= solution_adj
TABULAR_FORMAT= CSV
CONV_FILENAME= history
-RESTART_FILENAME= restart_flow.dat
-RESTART_ADJ_FILENAME= restart_adj.dat
+RESTART_FILENAME= restart_flow
+RESTART_ADJ_FILENAME= restart_adj
VOLUME_FILENAME= flow
VOLUME_ADJ_FILENAME= adjoint
-GRAD_OBJFUNC_FILENAME= of_grad.dat
+GRAD_OBJFUNC_FILENAME= of_grad
SURFACE_FILENAME= surface_flow
SURFACE_ADJ_FILENAME= surface_adjoint
OUTPUT_WRT_FREQ= 2500
diff --git a/TestCases/hom_navierstokes/SphereViscous/nPoly3_QuadDominant/fem_Sphere_reg_ADER.cfg b/TestCases/hom_navierstokes/SphereViscous/nPoly3_QuadDominant/fem_Sphere_reg_ADER.cfg
index bbfb16039a5c..858b8e219e47 100644
--- a/TestCases/hom_navierstokes/SphereViscous/nPoly3_QuadDominant/fem_Sphere_reg_ADER.cfg
+++ b/TestCases/hom_navierstokes/SphereViscous/nPoly3_QuadDominant/fem_Sphere_reg_ADER.cfg
@@ -85,16 +85,16 @@ CONV_CAUCHY_EPS= 1E-6
%
MESH_FILENAME= SphereViscous_QuadDominant_Coarse_nPoly3.su2
MESH_FORMAT= SU2
-MESH_OUT_FILENAME= mesh_out.su2
-SOLUTION_FILENAME= restart_flow.dat
-SOLUTION_ADJ_FILENAME= solution_adj.dat
+MESH_OUT_FILENAME= mesh_out
+SOLUTION_FILENAME= restart_flow
+SOLUTION_ADJ_FILENAME= solution_adj
TABULAR_FORMAT= CSV
CONV_FILENAME= history
-RESTART_FILENAME= restart_flow.dat
-RESTART_ADJ_FILENAME= restart_adj.dat
+RESTART_FILENAME= restart_flow
+RESTART_ADJ_FILENAME= restart_adj
VOLUME_FILENAME= flow
VOLUME_ADJ_FILENAME= adjoint
-GRAD_OBJFUNC_FILENAME= of_grad.dat
+GRAD_OBJFUNC_FILENAME= of_grad
SURFACE_FILENAME= surface_flow
SURFACE_ADJ_FILENAME= surface_adjoint
OUTPUT_WRT_FREQ= 1000
diff --git a/TestCases/hom_navierstokes/UnsteadyCylinder/nPoly4/fem_unst_cylinder.cfg b/TestCases/hom_navierstokes/UnsteadyCylinder/nPoly4/fem_unst_cylinder.cfg
index 02747b3b0536..40f2b3b3b524 100644
--- a/TestCases/hom_navierstokes/UnsteadyCylinder/nPoly4/fem_unst_cylinder.cfg
+++ b/TestCases/hom_navierstokes/UnsteadyCylinder/nPoly4/fem_unst_cylinder.cfg
@@ -83,16 +83,16 @@ CONV_CAUCHY_EPS= 1E-6
%
MESH_FILENAME= CylinderViscous_nPoly4.su2
MESH_FORMAT= SU2
-MESH_OUT_FILENAME= mesh_out.su2
-SOLUTION_FILENAME= restart_flow.dat
-SOLUTION_ADJ_FILENAME= solution_adj.dat
+MESH_OUT_FILENAME= mesh_out
+SOLUTION_FILENAME= restart_flow
+SOLUTION_ADJ_FILENAME= solution_adj
TABULAR_FORMAT= CSV
CONV_FILENAME= history
-RESTART_FILENAME= restart_flow.dat
-RESTART_ADJ_FILENAME= restart_adj.dat
+RESTART_FILENAME= restart_flow
+RESTART_ADJ_FILENAME= restart_adj
VOLUME_FILENAME= flow
VOLUME_ADJ_FILENAME= adjoint
-GRAD_OBJFUNC_FILENAME= of_grad.dat
+GRAD_OBJFUNC_FILENAME= of_grad
SURFACE_FILENAME= surface_flow
SURFACE_ADJ_FILENAME= surface_adjoint
OUTPUT_WRT_FREQ= 10000
diff --git a/TestCases/hom_navierstokes/UnsteadyCylinder/nPoly4/fem_unst_cylinder_ADER.cfg b/TestCases/hom_navierstokes/UnsteadyCylinder/nPoly4/fem_unst_cylinder_ADER.cfg
index b5b646ee5157..6a599a0bb9a3 100644
--- a/TestCases/hom_navierstokes/UnsteadyCylinder/nPoly4/fem_unst_cylinder_ADER.cfg
+++ b/TestCases/hom_navierstokes/UnsteadyCylinder/nPoly4/fem_unst_cylinder_ADER.cfg
@@ -87,16 +87,16 @@ CONV_CAUCHY_EPS= 1E-6
%
MESH_FILENAME= CylinderViscous_nPoly4.su2
MESH_FORMAT= SU2
-MESH_OUT_FILENAME= mesh_out.su2
-SOLUTION_FILENAME= restart_flow.dat
-SOLUTION_ADJ_FILENAME= solution_adj.dat
+MESH_OUT_FILENAME= mesh_out
+SOLUTION_FILENAME= restart_flow
+SOLUTION_ADJ_FILENAME= solution_adj
TABULAR_FORMAT= CSV
CONV_FILENAME= history
-RESTART_FILENAME= restart_flow.dat
-RESTART_ADJ_FILENAME= restart_adj.dat
+RESTART_FILENAME= restart_flow
+RESTART_ADJ_FILENAME= restart_adj
VOLUME_FILENAME= flow
VOLUME_ADJ_FILENAME= adjoint
-GRAD_OBJFUNC_FILENAME= of_grad.dat
+GRAD_OBJFUNC_FILENAME= of_grad
SURFACE_FILENAME= surface_flow
SURFACE_ADJ_FILENAME= surface_adjoint
OUTPUT_WRT_FREQ= 10000
diff --git a/TestCases/incomp_euler/naca0012/incomp_NACA0012.cfg b/TestCases/incomp_euler/naca0012/incomp_NACA0012.cfg
index e2ef6036ea52..112f996da7a3 100644
--- a/TestCases/incomp_euler/naca0012/incomp_NACA0012.cfg
+++ b/TestCases/incomp_euler/naca0012/incomp_NACA0012.cfg
@@ -79,10 +79,10 @@ CONV_CAUCHY_EPS= 1E-6
%
MESH_FILENAME= mesh_NACA0012_5deg_6814.su2
MESH_FORMAT= SU2
-SOLUTION_FILENAME= solution_flow.dat
+SOLUTION_FILENAME= solution_flow
TABULAR_FORMAT= CSV
CONV_FILENAME= history
-RESTART_FILENAME= restart_flow.dat
+RESTART_FILENAME= restart_flow
VOLUME_FILENAME= flow
SURFACE_FILENAME= surface_flow
OUTPUT_WRT_FREQ= 200
diff --git a/TestCases/incomp_euler/nozzle/inv_nozzle.cfg b/TestCases/incomp_euler/nozzle/inv_nozzle.cfg
index 947f4e602409..6355899f8d9c 100644
--- a/TestCases/incomp_euler/nozzle/inv_nozzle.cfg
+++ b/TestCases/incomp_euler/nozzle/inv_nozzle.cfg
@@ -84,12 +84,12 @@ CONV_RESIDUAL_MINVAL= -12
%
MESH_FILENAME= mesh_nozzle_inv.su2
MESH_FORMAT= SU2
-MESH_OUT_FILENAME= mesh_out.su2
-SOLUTION_FILENAME= solution_flow.dat
+MESH_OUT_FILENAME= mesh_out
+SOLUTION_FILENAME= solution_flow
TABULAR_FORMAT= CSV
CONV_FILENAME= history
BREAKDOWN_FILENAME= forces_breakdown.dat
-RESTART_FILENAME= restart_flow.dat
+RESTART_FILENAME= restart_flow
VOLUME_FILENAME= flow
SURFACE_FILENAME= surface_flow
OUTPUT_WRT_FREQ= 50
diff --git a/TestCases/incomp_navierstokes/bend/lam_bend.cfg b/TestCases/incomp_navierstokes/bend/lam_bend.cfg
index 02226a594277..580006319b17 100755
--- a/TestCases/incomp_navierstokes/bend/lam_bend.cfg
+++ b/TestCases/incomp_navierstokes/bend/lam_bend.cfg
@@ -86,17 +86,17 @@ CONV_CAUCHY_EPS= 1E-10
%
MESH_FILENAME= mesh_bend_coarse.cgns
MESH_FORMAT= CGNS
-MESH_OUT_FILENAME= mesh_out.su2
-SOLUTION_FILENAME= solution_flow.dat
-SOLUTION_ADJ_FILENAME= solution_adj.dat
+MESH_OUT_FILENAME= mesh_out
+SOLUTION_FILENAME= solution_flow
+SOLUTION_ADJ_FILENAME= solution_adj
TABULAR_FORMAT= CSV
CONV_FILENAME= history
-RESTART_FILENAME= restart_flow.dat
-RESTART_ADJ_FILENAME= restart_adj.dat
+RESTART_FILENAME= restart_flow
+RESTART_ADJ_FILENAME= restart_adj
VOLUME_FILENAME= flow
VOLUME_ADJ_FILENAME= adjoint
-VALUE_OBJFUNC_FILENAME= of_eval.dat
-GRAD_OBJFUNC_FILENAME= of_grad.dat
+VALUE_OBJFUNC_FILENAME= of_eval
+GRAD_OBJFUNC_FILENAME= of_grad
SURFACE_FILENAME= surface_flow
SURFACE_ADJ_FILENAME= surface_adjoint
OUTPUT_WRT_FREQ= 1000
diff --git a/TestCases/incomp_navierstokes/buoyancy_cavity/lam_buoyancy_cavity.cfg b/TestCases/incomp_navierstokes/buoyancy_cavity/lam_buoyancy_cavity.cfg
index cd9ed6c3c8fb..a86c48c2a228 100644
--- a/TestCases/incomp_navierstokes/buoyancy_cavity/lam_buoyancy_cavity.cfg
+++ b/TestCases/incomp_navierstokes/buoyancy_cavity/lam_buoyancy_cavity.cfg
@@ -101,16 +101,16 @@ CONV_CAUCHY_EPS= 1E-6
%
MESH_FILENAME= mesh_cavity_65x65.su2
MESH_FORMAT= SU2
-MESH_OUT_FILENAME= mesh_out.su2
-SOLUTION_FILENAME= solution_flow.dat
-SOLUTION_ADJ_FILENAME= solution_adj.dat
+MESH_OUT_FILENAME= mesh_out
+SOLUTION_FILENAME= solution_flow
+SOLUTION_ADJ_FILENAME= solution_adj
TABULAR_FORMAT= CSV
CONV_FILENAME= history
-RESTART_FILENAME= restart_flow.dat
-RESTART_ADJ_FILENAME= restart_adj.dat
+RESTART_FILENAME= restart_flow
+RESTART_ADJ_FILENAME= restart_adj
VOLUME_FILENAME= flow
VOLUME_ADJ_FILENAME= adjoint
-GRAD_OBJFUNC_FILENAME= of_grad.dat
+GRAD_OBJFUNC_FILENAME= of_grad
SURFACE_FILENAME= surface_flow
SURFACE_ADJ_FILENAME= surface_adjoint
OUTPUT_WRT_FREQ= 100
diff --git a/TestCases/incomp_navierstokes/cylinder/incomp_cylinder.cfg b/TestCases/incomp_navierstokes/cylinder/incomp_cylinder.cfg
index 451e01383a1b..92c0634d8f92 100644
--- a/TestCases/incomp_navierstokes/cylinder/incomp_cylinder.cfg
+++ b/TestCases/incomp_navierstokes/cylinder/incomp_cylinder.cfg
@@ -80,10 +80,10 @@ CONV_CAUCHY_EPS= 1E-6
%
MESH_FILENAME= mesh_cylinder_lam.su2
MESH_FORMAT= SU2
-SOLUTION_FILENAME= solution_flow.dat
+SOLUTION_FILENAME= solution_flow
TABULAR_FORMAT= CSV
CONV_FILENAME= history
-RESTART_FILENAME= restart_flow.dat
+RESTART_FILENAME= restart_flow
VOLUME_FILENAME= flow
SURFACE_FILENAME= surface_flow
OUTPUT_WRT_FREQ= 100
diff --git a/TestCases/incomp_navierstokes/cylinder/poly_cylinder.cfg b/TestCases/incomp_navierstokes/cylinder/poly_cylinder.cfg
index 45bf7b81e6f5..fdabf26ddaf1 100644
--- a/TestCases/incomp_navierstokes/cylinder/poly_cylinder.cfg
+++ b/TestCases/incomp_navierstokes/cylinder/poly_cylinder.cfg
@@ -104,17 +104,17 @@ CONV_CAUCHY_EPS= 1E-6
%
MESH_FILENAME= mesh_cylinder_lam.su2
MESH_FORMAT= SU2
-SOLUTION_FILENAME= solution_flow.dat
-SOLUTION_ADJ_FILENAME= solution_adj.dat
+SOLUTION_FILENAME= solution_flow
+SOLUTION_ADJ_FILENAME= solution_adj
TABULAR_FORMAT= CSV
CONV_FILENAME= history
BREAKDOWN_FILENAME= forces_breakdown.dat
-RESTART_FILENAME= restart_flow.dat
-RESTART_ADJ_FILENAME= restart_adj.dat
+RESTART_FILENAME= restart_flow
+RESTART_ADJ_FILENAME= restart_adj
VOLUME_FILENAME= flow
VOLUME_ADJ_FILENAME= adjoint
-VALUE_OBJFUNC_FILENAME= of_eval.dat
-GRAD_OBJFUNC_FILENAME= of_grad.dat
+VALUE_OBJFUNC_FILENAME= of_eval
+GRAD_OBJFUNC_FILENAME= of_grad
SURFACE_FILENAME= surface_flow
SURFACE_ADJ_FILENAME= surface_adjoint
OUTPUT_WRT_FREQ= 250
diff --git a/TestCases/incomp_navierstokes/cylinder_split/cylinder_split.cfg b/TestCases/incomp_navierstokes/cylinder_split/cylinder_split.cfg
index 892f135f21a6..786763199b97 100644
--- a/TestCases/incomp_navierstokes/cylinder_split/cylinder_split.cfg
+++ b/TestCases/incomp_navierstokes/cylinder_split/cylinder_split.cfg
@@ -86,10 +86,10 @@ CONV_CAUCHY_EPS= 1E-6
OUTPUT_FILES= RESTART, PARAVIEW_MULTIBLOCK
MESH_FILENAME= cylinder_split.cgns
MESH_FORMAT= CGNS
-SOLUTION_FILENAME= solution_flow.dat
+SOLUTION_FILENAME= solution_flow
TABULAR_FORMAT= CSV
CONV_FILENAME= history
-RESTART_FILENAME= restart_flow.dat
+RESTART_FILENAME= restart_flow
VOLUME_FILENAME= flow
SURFACE_FILENAME= surface_flow
OUTPUT_WRT_FREQ= 100
diff --git a/TestCases/incomp_navierstokes/sphere/sphere.cfg b/TestCases/incomp_navierstokes/sphere/sphere.cfg
index f2cf7ab9fb1a..bb1a822c64cf 100644
--- a/TestCases/incomp_navierstokes/sphere/sphere.cfg
+++ b/TestCases/incomp_navierstokes/sphere/sphere.cfg
@@ -92,10 +92,10 @@ CONV_CAUCHY_EPS= 1E-6
%
MESH_FILENAME= slice_2syms.su2
MESH_FORMAT= SU2
-SOLUTION_FILENAME= solution_flow.dat
+SOLUTION_FILENAME= solution_flow
TABULAR_FORMAT= CSV
CONV_FILENAME= history
-RESTART_FILENAME= restart_flow.dat
+RESTART_FILENAME= restart_flow
VOLUME_FILENAME= flow
SURFACE_FILENAME= surface_flow
OUTPUT_WRT_FREQ= 100
diff --git a/TestCases/incomp_navierstokes/streamwise_periodic/chtPinArray_2d/FD_configMaster.cfg b/TestCases/incomp_navierstokes/streamwise_periodic/chtPinArray_2d/FD_configMaster.cfg
index 9c98e7ff6503..0a1346417c5a 100644
--- a/TestCases/incomp_navierstokes/streamwise_periodic/chtPinArray_2d/FD_configMaster.cfg
+++ b/TestCases/incomp_navierstokes/streamwise_periodic/chtPinArray_2d/FD_configMaster.cfg
@@ -29,6 +29,7 @@ SCREEN_WRT_FREQ_OUTER= 100
HISTORY_OUTPUT= ( ITER, BGS_RES[0], BGS_RES[1], RMS_RES[0], RMS_RES[1], STREAMWISE_PERIODIC[0], FLOW_COEFF[0], AERO_COEFF[0], HEAT[1] )
%
OUTPUT_FILES= ( RESTART, PARAVIEW_MULTIBLOCK )
+READ_BINARY_RESTART= YES
OUTPUT_WRT_FREQ= 10000
%
MESH_FILENAME= 2D-PinArray_FFD.su2
diff --git a/TestCases/incomp_rans/AhmedBody/turb_ahmed.cfg b/TestCases/incomp_rans/AhmedBody/turb_ahmed.cfg
index b8046ad1c99b..d678a1d4efc1 100644
--- a/TestCases/incomp_rans/AhmedBody/turb_ahmed.cfg
+++ b/TestCases/incomp_rans/AhmedBody/turb_ahmed.cfg
@@ -125,17 +125,17 @@ CONV_CAUCHY_EPS= 1E-10
%
MESH_FILENAME= AhmedBodyMesh_FFD.su2
MESH_FORMAT= SU2
-MESH_OUT_FILENAME= mesh_out.su2
-SOLUTION_FILENAME= solution_flow.dat
-SOLUTION_ADJ_FILENAME= solution_adj.dat
+MESH_OUT_FILENAME= mesh_out
+SOLUTION_FILENAME= solution_flow
+SOLUTION_ADJ_FILENAME= solution_adj
TABULAR_FORMAT= CSV
CONV_FILENAME= history
-RESTART_FILENAME= restart_flow.dat
-RESTART_ADJ_FILENAME= restart_adj.dat
+RESTART_FILENAME= restart_flow
+RESTART_ADJ_FILENAME= restart_adj
VOLUME_FILENAME= flow
VOLUME_ADJ_FILENAME= adjoint
-VALUE_OBJFUNC_FILENAME= of_eval.dat
-GRAD_OBJFUNC_FILENAME= of_grad.dat
+VALUE_OBJFUNC_FILENAME= of_eval
+GRAD_OBJFUNC_FILENAME= of_grad
SURFACE_FILENAME= surface_flow
SURFACE_ADJ_FILENAME= surface_adjoint
OUTPUT_WRT_FREQ= 250
diff --git a/TestCases/incomp_rans/naca0012/naca0012.cfg b/TestCases/incomp_rans/naca0012/naca0012.cfg
index cf7b24669c63..76b393d32cb7 100644
--- a/TestCases/incomp_rans/naca0012/naca0012.cfg
+++ b/TestCases/incomp_rans/naca0012/naca0012.cfg
@@ -94,16 +94,16 @@ CONV_CAUCHY_EPS= 1E-6
%
MESH_FILENAME= mesh_NACA0012_turb_897x257.su2
MESH_FORMAT= SU2
-MESH_OUT_FILENAME= mesh_out.su2
-SOLUTION_FILENAME= solution_flow.dat
-SOLUTION_ADJ_FILENAME= solution_adj.dat
+MESH_OUT_FILENAME= mesh_out
+SOLUTION_FILENAME= solution_flow
+SOLUTION_ADJ_FILENAME= solution_adj
TABULAR_FORMAT= CSV
CONV_FILENAME= history
-RESTART_FILENAME= restart_flow.dat
-RESTART_ADJ_FILENAME= restart_adj.dat
+RESTART_FILENAME= restart_flow
+RESTART_ADJ_FILENAME= restart_adj
VOLUME_FILENAME= flow
VOLUME_ADJ_FILENAME= adjoint
-GRAD_OBJFUNC_FILENAME= of_grad.dat
+GRAD_OBJFUNC_FILENAME= of_grad
SURFACE_FILENAME= surface_flow
SURFACE_ADJ_FILENAME= surface_adjoint
OUTPUT_WRT_FREQ= 100
diff --git a/TestCases/incomp_rans/naca0012/naca0012_SST_SUST.cfg b/TestCases/incomp_rans/naca0012/naca0012_SST_SUST.cfg
index 9a313cd42884..61791d1d047a 100644
--- a/TestCases/incomp_rans/naca0012/naca0012_SST_SUST.cfg
+++ b/TestCases/incomp_rans/naca0012/naca0012_SST_SUST.cfg
@@ -95,16 +95,16 @@ CONV_CAUCHY_EPS= 1E-6
%
MESH_FILENAME= mesh_NACA0012_turb_897x257.su2
MESH_FORMAT= SU2
-MESH_OUT_FILENAME= mesh_out.su2
-SOLUTION_FILENAME= solution_flow.dat
-SOLUTION_ADJ_FILENAME= solution_adj.dat
+MESH_OUT_FILENAME= mesh_out
+SOLUTION_FILENAME= solution_flow
+SOLUTION_ADJ_FILENAME= solution_adj
TABULAR_FORMAT= CSV
CONV_FILENAME= history
-RESTART_FILENAME= restart_flow.dat
-RESTART_ADJ_FILENAME= restart_adj.dat
+RESTART_FILENAME= restart_flow
+RESTART_ADJ_FILENAME= restart_adj
VOLUME_FILENAME= flow
VOLUME_ADJ_FILENAME= adjoint
-GRAD_OBJFUNC_FILENAME= of_grad.dat
+GRAD_OBJFUNC_FILENAME= of_grad
SURFACE_FILENAME= surface_flow
SURFACE_ADJ_FILENAME= surface_adjoint
OUTPUT_WRT_FREQ= 100
diff --git a/TestCases/incomp_rans/rough_flatplate/rough_flatplate_incomp.cfg b/TestCases/incomp_rans/rough_flatplate/rough_flatplate_incomp.cfg
index af410edd5abd..4c9aab2cfc41 100644
--- a/TestCases/incomp_rans/rough_flatplate/rough_flatplate_incomp.cfg
+++ b/TestCases/incomp_rans/rough_flatplate/rough_flatplate_incomp.cfg
@@ -105,7 +105,7 @@ CONV_STARTITER= 10
%
MESH_FILENAME= mesh_flatplate_turb_137x97.su2
MESH_FORMAT= SU2
-MESH_OUT_FILENAME= mesh_out.su2
+MESH_OUT_FILENAME= mesh_out
SOLUTION_FILENAME= restart_flow
TABULAR_FORMAT= CSV
OUTPUT_FILES= RESTART, PARAVIEW, SURFACE_PARAVIEW
diff --git a/TestCases/mms/dg_navierstokes/lam_mms_dg.cfg b/TestCases/mms/dg_navierstokes/lam_mms_dg.cfg
index 64bb9fdddafe..1dd70590386a 100644
--- a/TestCases/mms/dg_navierstokes/lam_mms_dg.cfg
+++ b/TestCases/mms/dg_navierstokes/lam_mms_dg.cfg
@@ -68,16 +68,16 @@ CONV_CAUCHY_EPS= 1E-6
%
MESH_FILENAME= UnitQuadStructured_8X8_nPoly3.su2
MESH_FORMAT= SU2
-MESH_OUT_FILENAME= mesh_out.su2
-SOLUTION_FILENAME= restart_flow.dat
-SOLUTION_ADJ_FILENAME= solution_adj.dat
+MESH_OUT_FILENAME= mesh_out
+SOLUTION_FILENAME= restart_flow
+SOLUTION_ADJ_FILENAME= solution_adj
TABULAR_FORMAT= CSV
CONV_FILENAME= history
-RESTART_FILENAME= restart_flow.dat
-RESTART_ADJ_FILENAME= restart_adj.dat
+RESTART_FILENAME= restart_flow
+RESTART_ADJ_FILENAME= restart_adj
VOLUME_FILENAME= flow
VOLUME_ADJ_FILENAME= adjoint
-GRAD_OBJFUNC_FILENAME= of_grad.dat
+GRAD_OBJFUNC_FILENAME= of_grad
SURFACE_FILENAME= surface_flow
SURFACE_ADJ_FILENAME= surface_adjoint
OUTPUT_WRT_FREQ= 25000
diff --git a/TestCases/mms/dg_navierstokes_3d/lam_mms_dg_3d.cfg b/TestCases/mms/dg_navierstokes_3d/lam_mms_dg_3d.cfg
index 39521a77686c..b09da2992b9a 100644
--- a/TestCases/mms/dg_navierstokes_3d/lam_mms_dg_3d.cfg
+++ b/TestCases/mms/dg_navierstokes_3d/lam_mms_dg_3d.cfg
@@ -72,16 +72,16 @@ CONV_CAUCHY_EPS= 1E-6
%
MESH_FILENAME= SphereInSphereStructured_nPoly3.su2
MESH_FORMAT= SU2
-MESH_OUT_FILENAME= mesh_out.su2
-SOLUTION_FILENAME= restart_flow.dat
-SOLUTION_ADJ_FILENAME= solution_adj.dat
+MESH_OUT_FILENAME= mesh_out
+SOLUTION_FILENAME= restart_flow
+SOLUTION_ADJ_FILENAME= solution_adj
TABULAR_FORMAT= CSV
CONV_FILENAME= history
-RESTART_FILENAME= restart_flow.dat
-RESTART_ADJ_FILENAME= restart_adj.dat
+RESTART_FILENAME= restart_flow
+RESTART_ADJ_FILENAME= restart_adj
VOLUME_FILENAME= flow
VOLUME_ADJ_FILENAME= adjoint
-GRAD_OBJFUNC_FILENAME= of_grad.dat
+GRAD_OBJFUNC_FILENAME= of_grad
SURFACE_FILENAME= surface_flow
SURFACE_ADJ_FILENAME= surface_adjoint
OUTPUT_WRT_FREQ= 25000
diff --git a/TestCases/mms/dg_ringleb/ringleb_dg.cfg b/TestCases/mms/dg_ringleb/ringleb_dg.cfg
index 3e37534e1036..34c136b0df96 100644
--- a/TestCases/mms/dg_ringleb/ringleb_dg.cfg
+++ b/TestCases/mms/dg_ringleb/ringleb_dg.cfg
@@ -76,16 +76,16 @@ CONV_CAUCHY_EPS= 1E-6
%
MESH_FILENAME= QuadDominant25X25_nPoly3.su2
MESH_FORMAT= SU2
-MESH_OUT_FILENAME= mesh_out.su2
-SOLUTION_FILENAME= solution_flow.dat
-SOLUTION_ADJ_FILENAME= solution_adj.dat
+MESH_OUT_FILENAME= mesh_out
+SOLUTION_FILENAME= solution_flow
+SOLUTION_ADJ_FILENAME= solution_adj
TABULAR_FORMAT= CSV
CONV_FILENAME= history
-RESTART_FILENAME= restart_flow.dat
-RESTART_ADJ_FILENAME= restart_adj.dat
+RESTART_FILENAME= restart_flow
+RESTART_ADJ_FILENAME= restart_adj
VOLUME_FILENAME= flow
VOLUME_ADJ_FILENAME= adjoint
-GRAD_OBJFUNC_FILENAME= of_grad.dat
+GRAD_OBJFUNC_FILENAME= of_grad
SURFACE_FILENAME= surface_flow
SURFACE_ADJ_FILENAME= surface_adjoint
OUTPUT_WRT_FREQ= 5000
diff --git a/TestCases/mms/fvm_incomp_euler/inv_mms_jst.cfg b/TestCases/mms/fvm_incomp_euler/inv_mms_jst.cfg
index 2bbc80402f83..4afaa85c7fd6 100755
--- a/TestCases/mms/fvm_incomp_euler/inv_mms_jst.cfg
+++ b/TestCases/mms/fvm_incomp_euler/inv_mms_jst.cfg
@@ -77,16 +77,16 @@ CONV_CAUCHY_EPS= 1E-6
%
MESH_FILENAME= square.su2
MESH_FORMAT= SU2
-MESH_OUT_FILENAME= mesh_out.su2
-SOLUTION_FILENAME= solution_flow.dat
-SOLUTION_ADJ_FILENAME= solution_adj.dat
+MESH_OUT_FILENAME= mesh_out
+SOLUTION_FILENAME= solution_flow
+SOLUTION_ADJ_FILENAME= solution_adj
TABULAR_FORMAT= CSV
CONV_FILENAME= history
-RESTART_FILENAME= restart_flow.dat
-RESTART_ADJ_FILENAME= restart_adj.dat
+RESTART_FILENAME= restart_flow
+RESTART_ADJ_FILENAME= restart_adj
VOLUME_FILENAME= flow
VOLUME_ADJ_FILENAME= adjoint
-GRAD_OBJFUNC_FILENAME= of_grad.dat
+GRAD_OBJFUNC_FILENAME= of_grad
SURFACE_FILENAME= surface_flow
SURFACE_ADJ_FILENAME= surface_adjoint
OUTPUT_WRT_FREQ= 50
diff --git a/TestCases/mms/fvm_incomp_navierstokes/lam_mms_fds.cfg b/TestCases/mms/fvm_incomp_navierstokes/lam_mms_fds.cfg
index b97722275686..4f83de4b03da 100755
--- a/TestCases/mms/fvm_incomp_navierstokes/lam_mms_fds.cfg
+++ b/TestCases/mms/fvm_incomp_navierstokes/lam_mms_fds.cfg
@@ -88,16 +88,16 @@ CONV_CAUCHY_EPS= 1E-6
%
MESH_FILENAME= square.su2
MESH_FORMAT= SU2
-MESH_OUT_FILENAME= mesh_out.su2
-SOLUTION_FILENAME= solution_flow.dat
-SOLUTION_ADJ_FILENAME= solution_adj.dat
+MESH_OUT_FILENAME= mesh_out
+SOLUTION_FILENAME= solution_flow
+SOLUTION_ADJ_FILENAME= solution_adj
TABULAR_FORMAT= CSV
CONV_FILENAME= history
-RESTART_FILENAME= restart_flow.dat
-RESTART_ADJ_FILENAME= restart_adj.dat
+RESTART_FILENAME= restart_flow
+RESTART_ADJ_FILENAME= restart_adj
VOLUME_FILENAME= flow
VOLUME_ADJ_FILENAME= adjoint
-GRAD_OBJFUNC_FILENAME= of_grad.dat
+GRAD_OBJFUNC_FILENAME= of_grad
SURFACE_FILENAME= surface_flow
SURFACE_ADJ_FILENAME= surface_adjoint
OUTPUT_WRT_FREQ= 50
diff --git a/TestCases/mms/fvm_navierstokes/lam_mms_roe.cfg b/TestCases/mms/fvm_navierstokes/lam_mms_roe.cfg
index ab4ece6cac41..2de322bbf617 100755
--- a/TestCases/mms/fvm_navierstokes/lam_mms_roe.cfg
+++ b/TestCases/mms/fvm_navierstokes/lam_mms_roe.cfg
@@ -94,16 +94,16 @@ CONV_CAUCHY_EPS= 1E-6
%
MESH_FILENAME= square.su2
MESH_FORMAT= SU2
-MESH_OUT_FILENAME= mesh_out.su2
-SOLUTION_FILENAME= solution_flow.dat
-SOLUTION_ADJ_FILENAME= solution_adj.dat
+MESH_OUT_FILENAME= mesh_out
+SOLUTION_FILENAME= solution_flow
+SOLUTION_ADJ_FILENAME= solution_adj
TABULAR_FORMAT= CSV
CONV_FILENAME= history
-RESTART_FILENAME= restart_flow.dat
-RESTART_ADJ_FILENAME= restart_adj.dat
+RESTART_FILENAME= restart_flow
+RESTART_ADJ_FILENAME= restart_adj
VOLUME_FILENAME= flow
VOLUME_ADJ_FILENAME= adjoint
-GRAD_OBJFUNC_FILENAME= of_grad.dat
+GRAD_OBJFUNC_FILENAME= of_grad
SURFACE_FILENAME= surface_flow
SURFACE_ADJ_FILENAME= surface_adjoint
OUTPUT_WRT_FREQ= 50
diff --git a/TestCases/moving_wall/cavity/lam_cavity.cfg b/TestCases/moving_wall/cavity/lam_cavity.cfg
index 2da508ef2b40..75e270139f4c 100644
--- a/TestCases/moving_wall/cavity/lam_cavity.cfg
+++ b/TestCases/moving_wall/cavity/lam_cavity.cfg
@@ -90,16 +90,16 @@ CONV_CAUCHY_EPS= 1E-6
%
MESH_FILENAME= mesh_cavity_stretch.su2
MESH_FORMAT= SU2
-MESH_OUT_FILENAME= mesh_out.su2
-SOLUTION_FILENAME= solution_flow.dat
-SOLUTION_ADJ_FILENAME= solution_adj.dat
+MESH_OUT_FILENAME= mesh_out
+SOLUTION_FILENAME= solution_flow
+SOLUTION_ADJ_FILENAME= solution_adj
TABULAR_FORMAT= CSV
CONV_FILENAME= history
-RESTART_FILENAME= restart_flow.dat
-RESTART_ADJ_FILENAME= restart_adj.dat
+RESTART_FILENAME= restart_flow
+RESTART_ADJ_FILENAME= restart_adj
VOLUME_FILENAME= flow
VOLUME_ADJ_FILENAME= adjoint
-GRAD_OBJFUNC_FILENAME= of_grad.dat
+GRAD_OBJFUNC_FILENAME= of_grad
SURFACE_FILENAME= surface_flow
SURFACE_ADJ_FILENAME= surface_adjoint
OUTPUT_WRT_FREQ= 250
diff --git a/TestCases/moving_wall/spinning_cylinder/spinning_cylinder.cfg b/TestCases/moving_wall/spinning_cylinder/spinning_cylinder.cfg
index e4d905d186a5..c5f30b486392 100644
--- a/TestCases/moving_wall/spinning_cylinder/spinning_cylinder.cfg
+++ b/TestCases/moving_wall/spinning_cylinder/spinning_cylinder.cfg
@@ -99,16 +99,16 @@ CONV_CAUCHY_EPS= 1E-7
%
MESH_FILENAME= mesh_cylinder_lam.su2
MESH_FORMAT= SU2
-MESH_OUT_FILENAME= mesh_out.su2
-SOLUTION_FILENAME= solution_flow.dat
-SOLUTION_ADJ_FILENAME= solution_adj.dat
+MESH_OUT_FILENAME= mesh_out
+SOLUTION_FILENAME= solution_flow
+SOLUTION_ADJ_FILENAME= solution_adj
TABULAR_FORMAT= CSV
CONV_FILENAME= history
-RESTART_FILENAME= restart_flow.dat
-RESTART_ADJ_FILENAME= restart_adj.dat
+RESTART_FILENAME= restart_flow
+RESTART_ADJ_FILENAME= restart_adj
VOLUME_FILENAME= flow
VOLUME_ADJ_FILENAME= adjoint
-GRAD_OBJFUNC_FILENAME= of_grad.dat
+GRAD_OBJFUNC_FILENAME= of_grad
SURFACE_FILENAME= surface_flow
SURFACE_ADJ_FILENAME= surface_adjoint
OUTPUT_WRT_FREQ= 100
diff --git a/TestCases/multiple_ffd/naca0012/inv_NACA0012_ffd.cfg b/TestCases/multiple_ffd/naca0012/inv_NACA0012_ffd.cfg
index 74eb10bea61c..d20897b37a4c 100644
--- a/TestCases/multiple_ffd/naca0012/inv_NACA0012_ffd.cfg
+++ b/TestCases/multiple_ffd/naca0012/inv_NACA0012_ffd.cfg
@@ -127,16 +127,16 @@ CONV_CAUCHY_EPS= 1E-6
%
MESH_FILENAME= mesh_NACA0012_multiFFD.su2
MESH_FORMAT= SU2
-MESH_OUT_FILENAME= mesh_out.su2
-SOLUTION_FILENAME= solution_flow.dat
-SOLUTION_ADJ_FILENAME= solution_adj.dat
+MESH_OUT_FILENAME= mesh_out
+SOLUTION_FILENAME= solution_flow
+SOLUTION_ADJ_FILENAME= solution_adj
TABULAR_FORMAT= TECPLOT
CONV_FILENAME= history
-RESTART_FILENAME= restart_flow.dat
-RESTART_ADJ_FILENAME= restart_adj.dat
+RESTART_FILENAME= restart_flow
+RESTART_ADJ_FILENAME= restart_adj
VOLUME_FILENAME= flow
VOLUME_ADJ_FILENAME= adjoint
-GRAD_OBJFUNC_FILENAME= of_grad.dat
+GRAD_OBJFUNC_FILENAME= of_grad
SURFACE_FILENAME= surface_flow
SURFACE_ADJ_FILENAME= surface_adjoint
OUTPUT_WRT_FREQ= 50
diff --git a/TestCases/navierstokes/cylinder/cylinder_lowmach.cfg b/TestCases/navierstokes/cylinder/cylinder_lowmach.cfg
index 32d412358e76..e18884044402 100644
--- a/TestCases/navierstokes/cylinder/cylinder_lowmach.cfg
+++ b/TestCases/navierstokes/cylinder/cylinder_lowmach.cfg
@@ -86,16 +86,16 @@ CONV_CAUCHY_EPS= 1E-6
%
MESH_FILENAME= mesh_cylinder_lam.su2
MESH_FORMAT= SU2
-MESH_OUT_FILENAME= mesh_out.su2
-SOLUTION_FILENAME= solution_flow.dat
-SOLUTION_ADJ_FILENAME= solution_adj.dat
+MESH_OUT_FILENAME= mesh_out
+SOLUTION_FILENAME= solution_flow
+SOLUTION_ADJ_FILENAME= solution_adj
TABULAR_FORMAT= CSV
CONV_FILENAME= history
-RESTART_FILENAME= restart_flow.dat
-RESTART_ADJ_FILENAME= restart_adj.dat
+RESTART_FILENAME= restart_flow
+RESTART_ADJ_FILENAME= restart_adj
VOLUME_FILENAME= flow
VOLUME_ADJ_FILENAME= adjoint
-GRAD_OBJFUNC_FILENAME= of_grad.dat
+GRAD_OBJFUNC_FILENAME= of_grad
SURFACE_FILENAME= surface_flow
SURFACE_ADJ_FILENAME= surface_adjoint
OUTPUT_WRT_FREQ= 250
diff --git a/TestCases/navierstokes/cylinder/lam_cylinder.cfg b/TestCases/navierstokes/cylinder/lam_cylinder.cfg
index a8ffe599981b..7424dc452879 100644
--- a/TestCases/navierstokes/cylinder/lam_cylinder.cfg
+++ b/TestCases/navierstokes/cylinder/lam_cylinder.cfg
@@ -85,16 +85,16 @@ CONV_CAUCHY_EPS= 1E-6
%
MESH_FILENAME= mesh_cylinder_lam.su2
MESH_FORMAT= SU2
-MESH_OUT_FILENAME= mesh_out.su2
-SOLUTION_FILENAME= solution_flow.dat
-SOLUTION_ADJ_FILENAME= solution_adj.dat
+MESH_OUT_FILENAME= mesh_out
+SOLUTION_FILENAME= solution_flow
+SOLUTION_ADJ_FILENAME= solution_adj
TABULAR_FORMAT= CSV
CONV_FILENAME= history
-RESTART_FILENAME= restart_flow.dat
-RESTART_ADJ_FILENAME= restart_adj.dat
+RESTART_FILENAME= restart_flow
+RESTART_ADJ_FILENAME= restart_adj
VOLUME_FILENAME= flow
VOLUME_ADJ_FILENAME= adjoint
-GRAD_OBJFUNC_FILENAME= of_grad.dat
+GRAD_OBJFUNC_FILENAME= of_grad
SURFACE_FILENAME= surface_flow
SURFACE_ADJ_FILENAME= surface_adjoint
OUTPUT_WRT_FREQ= 250
diff --git a/TestCases/navierstokes/flatplate/lam_flatplate.cfg b/TestCases/navierstokes/flatplate/lam_flatplate.cfg
index 31b745a7570d..e23d047b2e17 100644
--- a/TestCases/navierstokes/flatplate/lam_flatplate.cfg
+++ b/TestCases/navierstokes/flatplate/lam_flatplate.cfg
@@ -84,11 +84,11 @@ ITER= 5000
%
MESH_FILENAME= mesh_flatplate_65x65.su2
MESH_FORMAT= SU2
-SOLUTION_FILENAME= solution_flow.dat
-SOLUTION_ADJ_FILENAME= solution_adj.dat
+SOLUTION_FILENAME= solution_flow
+SOLUTION_ADJ_FILENAME= solution_adj
TABULAR_FORMAT= CSV
-RESTART_FILENAME= restart_flow.dat
-RESTART_ADJ_FILENAME= restart_adj.dat
-GRAD_OBJFUNC_FILENAME= of_grad.dat
+RESTART_FILENAME= restart_flow
+RESTART_ADJ_FILENAME= restart_adj
+GRAD_OBJFUNC_FILENAME= of_grad
OUTPUT_WRT_FREQ= 250
SCREEN_OUTPUT= (INNER_ITER, RMS_DENSITY, RMS_ENERGY, DRAG, SURFACE_MASSFLOW, TOTAL_HEATFLUX, TOTAL_HEATFLUX_ON_SURFACE)
diff --git a/TestCases/navierstokes/naca0012/lam_NACA0012.cfg b/TestCases/navierstokes/naca0012/lam_NACA0012.cfg
index 0d0517017782..8a7d70e5558f 100644
--- a/TestCases/navierstokes/naca0012/lam_NACA0012.cfg
+++ b/TestCases/navierstokes/naca0012/lam_NACA0012.cfg
@@ -81,16 +81,16 @@ CONV_CAUCHY_EPS= 1E-10
%
MESH_FILENAME= mesh_NACA0012_lam_hybrid_v1.su2
MESH_FORMAT= SU2
-MESH_OUT_FILENAME= mesh_out.su2
-SOLUTION_FILENAME= solution_flow.dat
-SOLUTION_ADJ_FILENAME= solution_adj.dat
+MESH_OUT_FILENAME= mesh_out
+SOLUTION_FILENAME= solution_flow
+SOLUTION_ADJ_FILENAME= solution_adj
TABULAR_FORMAT= CSV
CONV_FILENAME= history
-RESTART_FILENAME= restart_flow.dat
-RESTART_ADJ_FILENAME= restart_adj.dat
+RESTART_FILENAME= restart_flow
+RESTART_ADJ_FILENAME= restart_adj
VOLUME_FILENAME= flow
VOLUME_ADJ_FILENAME= adjoint
-GRAD_OBJFUNC_FILENAME= of_grad.dat
+GRAD_OBJFUNC_FILENAME= of_grad
SURFACE_FILENAME= surface_flow
SURFACE_ADJ_FILENAME= surface_adjoint
OUTPUT_WRT_FREQ= 250
diff --git a/TestCases/navierstokes/poiseuille/lam_poiseuille.cfg b/TestCases/navierstokes/poiseuille/lam_poiseuille.cfg
index 86484983ba44..d11d4012beff 100644
--- a/TestCases/navierstokes/poiseuille/lam_poiseuille.cfg
+++ b/TestCases/navierstokes/poiseuille/lam_poiseuille.cfg
@@ -101,16 +101,16 @@ CONV_CAUCHY_EPS= 1E-6
%
MESH_FILENAME= mesh_poiseuille_51x51.su2
MESH_FORMAT= SU2
-MESH_OUT_FILENAME= mesh_out.su2
-SOLUTION_FILENAME= solution_flow.dat
-SOLUTION_ADJ_FILENAME= solution_adj.dat
+MESH_OUT_FILENAME= mesh_out
+SOLUTION_FILENAME= solution_flow
+SOLUTION_ADJ_FILENAME= solution_adj
TABULAR_FORMAT= CSV
CONV_FILENAME= history
-RESTART_FILENAME= restart_flow.dat
-RESTART_ADJ_FILENAME= restart_adj.dat
+RESTART_FILENAME= restart_flow
+RESTART_ADJ_FILENAME= restart_adj
VOLUME_FILENAME= flow
VOLUME_ADJ_FILENAME= adjoint
-GRAD_OBJFUNC_FILENAME= of_grad.dat
+GRAD_OBJFUNC_FILENAME= of_grad
SURFACE_FILENAME= surface_flow
SURFACE_ADJ_FILENAME= surface_adjoint
OUTPUT_WRT_FREQ= 500
diff --git a/TestCases/navierstokes/poiseuille/profile_poiseuille.cfg b/TestCases/navierstokes/poiseuille/profile_poiseuille.cfg
index d57b5d5147fd..0c18dda62dae 100644
--- a/TestCases/navierstokes/poiseuille/profile_poiseuille.cfg
+++ b/TestCases/navierstokes/poiseuille/profile_poiseuille.cfg
@@ -111,16 +111,16 @@ CONV_CAUCHY_EPS= 1E-6
%
MESH_FILENAME= mesh_poiseuille_51x51.su2
MESH_FORMAT= SU2
-MESH_OUT_FILENAME= mesh_out.su2
-SOLUTION_FILENAME= solution_flow_profile.dat
-SOLUTION_ADJ_FILENAME= solution_adj.dat
+MESH_OUT_FILENAME= mesh_out
+SOLUTION_FILENAME= solution_flow_profile
+SOLUTION_ADJ_FILENAME= solution_adj
TABULAR_FORMAT= CSV
CONV_FILENAME= history
-RESTART_FILENAME= restart_flow.dat
-RESTART_ADJ_FILENAME= restart_adj.dat
+RESTART_FILENAME= restart_flow
+RESTART_ADJ_FILENAME= restart_adj
VOLUME_FILENAME= flow
VOLUME_ADJ_FILENAME= adjoint
-GRAD_OBJFUNC_FILENAME= of_grad.dat
+GRAD_OBJFUNC_FILENAME= of_grad
SURFACE_FILENAME= surface_flow
SURFACE_ADJ_FILENAME= surface_adjoint
OUTPUT_WRT_FREQ= 25
diff --git a/TestCases/nicf/LS89/turb_SA_PR.cfg b/TestCases/nicf/LS89/turb_SA_PR.cfg
index 1d28e05fab4d..58d992d6da11 100644
--- a/TestCases/nicf/LS89/turb_SA_PR.cfg
+++ b/TestCases/nicf/LS89/turb_SA_PR.cfg
@@ -118,16 +118,16 @@ CONV_CAUCHY_EPS= 1E-6
%
MESH_FILENAME= mesh_vki_turbine_prepbc.su2
MESH_FORMAT= SU2
-MESH_OUT_FILENAME= mesh_out.su2
-SOLUTION_FILENAME= restart_flow.dat
-SOLUTION_ADJ_FILENAME= solution_adj.dat
+MESH_OUT_FILENAME= mesh_out
+SOLUTION_FILENAME= restart_flow
+SOLUTION_ADJ_FILENAME= solution_adj
TABULAR_FORMAT= CSV
CONV_FILENAME= history
-RESTART_FILENAME= restart_flow.dat
-RESTART_ADJ_FILENAME= restart_adj.dat
+RESTART_FILENAME= restart_flow
+RESTART_ADJ_FILENAME= restart_adj
VOLUME_FILENAME= flow
VOLUME_ADJ_FILENAME= adjoint
-GRAD_OBJFUNC_FILENAME= of_grad.dat
+GRAD_OBJFUNC_FILENAME= of_grad
SURFACE_FILENAME= surface_flow
SURFACE_ADJ_FILENAME= surface_adjoint
OUTPUT_WRT_FREQ= 500
diff --git a/TestCases/nicf/LS89/turb_SST_PR.cfg b/TestCases/nicf/LS89/turb_SST_PR.cfg
index f8fb8c2ff915..03b749ddab11 100644
--- a/TestCases/nicf/LS89/turb_SST_PR.cfg
+++ b/TestCases/nicf/LS89/turb_SST_PR.cfg
@@ -119,16 +119,16 @@ CONV_CAUCHY_EPS= 1E-6
%
MESH_FILENAME= mesh_vki_turbine_prepbc.su2
MESH_FORMAT= SU2
-MESH_OUT_FILENAME= mesh_out.su2
-SOLUTION_FILENAME= restart_flow.dat
-SOLUTION_ADJ_FILENAME= solution_adj.dat
+MESH_OUT_FILENAME= mesh_out
+SOLUTION_FILENAME= restart_flow
+SOLUTION_ADJ_FILENAME= solution_adj
TABULAR_FORMAT= CSV
CONV_FILENAME= history
-RESTART_FILENAME= restart_flow.dat
-RESTART_ADJ_FILENAME= restart_adj.dat
+RESTART_FILENAME= restart_flow
+RESTART_ADJ_FILENAME= restart_adj
VOLUME_FILENAME= flow
VOLUME_ADJ_FILENAME= adjoint
-GRAD_OBJFUNC_FILENAME= of_grad.dat
+GRAD_OBJFUNC_FILENAME= of_grad
SURFACE_FILENAME= surface_flow
SURFACE_ADJ_FILENAME= surface_adjoint
OUTPUT_WRT_FREQ= 500
diff --git a/TestCases/nicf/coolprop/fluidModel.cfg b/TestCases/nicf/coolprop/fluidModel.cfg
index 47e6622636d9..896dba67ad8e 100644
--- a/TestCases/nicf/coolprop/fluidModel.cfg
+++ b/TestCases/nicf/coolprop/fluidModel.cfg
@@ -84,11 +84,11 @@ CONV_STARTITER= 10
%
MESH_FILENAME= coolprop_nozzle.su2
MESH_FORMAT= SU2
-MESH_OUT_FILENAME= mesh_out.su2
-SOLUTION_FILENAME= solution_flow.dat
+MESH_OUT_FILENAME= mesh_out
+SOLUTION_FILENAME= solution_flow
TABULAR_FORMAT= CSV
CONV_FILENAME= history
-RESTART_FILENAME= restart_flow.dat
+RESTART_FILENAME= restart_flow
VOLUME_FILENAME= flow
SURFACE_FILENAME= surface_flow
OUTPUT_WRT_FREQ= 50
diff --git a/TestCases/nicf/coolprop/transportModel.cfg b/TestCases/nicf/coolprop/transportModel.cfg
index 8d82a9e5b833..f54878180cb5 100644
--- a/TestCases/nicf/coolprop/transportModel.cfg
+++ b/TestCases/nicf/coolprop/transportModel.cfg
@@ -75,11 +75,11 @@ CONV_STARTITER= 10
% ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
MESH_FILENAME= coolprop_nozzle.su2
MESH_FORMAT= SU2
-MESH_OUT_FILENAME= mesh_out.su2
-SOLUTION_FILENAME= solution_flow.dat
+MESH_OUT_FILENAME= mesh_out
+SOLUTION_FILENAME= solution_flow
TABULAR_FORMAT= CSV
CONV_FILENAME= history
-RESTART_FILENAME= restart_flow.dat
+RESTART_FILENAME= restart_flow
VOLUME_FILENAME= flow
SURFACE_FILENAME= surface_flow
OUTPUT_WRT_FREQ= 50
diff --git a/TestCases/nicf/datadriven/datadriven_nozzle.cfg b/TestCases/nicf/datadriven/datadriven_nozzle.cfg
index eeb30165261c..849802f83018 100644
--- a/TestCases/nicf/datadriven/datadriven_nozzle.cfg
+++ b/TestCases/nicf/datadriven/datadriven_nozzle.cfg
@@ -103,16 +103,16 @@ MESH_FILENAME= ../coolprop/coolprop_nozzle.su2
MESH_FORMAT= SU2
%
% Mesh output file
-MESH_OUT_FILENAME= mesh_out.su2
+MESH_OUT_FILENAME= mesh_out
%
% Restart flow input file
-SOLUTION_FILENAME= solution_flow.dat
+SOLUTION_FILENAME= solution_flow
TABULAR_FORMAT= CSV
%
% Output file convergence history (w/o extension)
%
% Output file restart flow
-RESTART_FILENAME= restart_flow.dat
+RESTART_FILENAME= restart_flow
%
% Output file flow (w/o extension) variables
VOLUME_OUTPUT=(SOLUTION)
diff --git a/TestCases/nicf/edge/edge_PPR.cfg b/TestCases/nicf/edge/edge_PPR.cfg
index 1e115c6d57a8..3e83d3d1f9eb 100644
--- a/TestCases/nicf/edge/edge_PPR.cfg
+++ b/TestCases/nicf/edge/edge_PPR.cfg
@@ -94,15 +94,15 @@ CONV_CAUCHY_EPS= 1E-10
MESH_FILENAME= mesh.su2
MESH_FORMAT= SU2
MESH_OUT_FILENAME= mesh.su2
-SOLUTION_FILENAME= restart_flow.dat
-SOLUTION_ADJ_FILENAME= solution_adj.dat
+SOLUTION_FILENAME= restart_flow
+SOLUTION_ADJ_FILENAME= solution_adj
TABULAR_FORMAT= CSV
CONV_FILENAME= history
-RESTART_FILENAME= restart_flow.dat
-RESTART_ADJ_FILENAME= restart_adj.dat
+RESTART_FILENAME= restart_flow
+RESTART_ADJ_FILENAME= restart_adj
VOLUME_FILENAME= flow
VOLUME_ADJ_FILENAME= adjoint
-GRAD_OBJFUNC_FILENAME= of_grad.dat
+GRAD_OBJFUNC_FILENAME= of_grad
SURFACE_FILENAME= surface_flow
SURFACE_ADJ_FILENAME= surface_adjoint
OUTPUT_WRT_FREQ= 250
diff --git a/TestCases/nicf/edge/edge_VW.cfg b/TestCases/nicf/edge/edge_VW.cfg
index 06a722f78784..22ebaf597c9a 100644
--- a/TestCases/nicf/edge/edge_VW.cfg
+++ b/TestCases/nicf/edge/edge_VW.cfg
@@ -95,15 +95,15 @@ CONV_CAUCHY_EPS= 1E-10
MESH_FILENAME= mesh.su2
MESH_FORMAT= SU2
MESH_OUT_FILENAME= mesh.su2
-SOLUTION_FILENAME= restart_flow.dat
-SOLUTION_ADJ_FILENAME= solution_adj.dat
+SOLUTION_FILENAME= restart_flow
+SOLUTION_ADJ_FILENAME= solution_adj
TABULAR_FORMAT= CSV
CONV_FILENAME= history
-RESTART_FILENAME= restart_flow.dat
-RESTART_ADJ_FILENAME= restart_adj.dat
+RESTART_FILENAME= restart_flow
+RESTART_ADJ_FILENAME= restart_adj
VOLUME_FILENAME= flow
VOLUME_ADJ_FILENAME= adjoint
-GRAD_OBJFUNC_FILENAME= of_grad.dat
+GRAD_OBJFUNC_FILENAME= of_grad
SURFACE_FILENAME= surface_flow
SURFACE_ADJ_FILENAME= surface_adjoint
OUTPUT_WRT_FREQ= 250
diff --git a/TestCases/nonequilibrium/invwedge/invwedge_am.cfg b/TestCases/nonequilibrium/invwedge/invwedge_am.cfg
index e5071518c165..3797ca9fece3 100644
--- a/TestCases/nonequilibrium/invwedge/invwedge_am.cfg
+++ b/TestCases/nonequilibrium/invwedge/invwedge_am.cfg
@@ -62,10 +62,10 @@ CONV_CAUCHY_EPS= 1E-10
%
MESH_FILENAME= invwedge.su2
MESH_FORMAT= SU2
-SOLUTION_FILENAME= restart_flow.dat
+SOLUTION_FILENAME= restart_flow
TABULAR_FORMAT= TECPLOT
CONV_FILENAME= convergence
-RESTART_FILENAME= restart_flow.dat
+RESTART_FILENAME= restart_flow
VOLUME_FILENAME= soln_volume
SURFACE_FILENAME= soln_surface
OUTPUT_WRT_FREQ= 100
diff --git a/TestCases/nonequilibrium/invwedge/invwedge_ausm.cfg b/TestCases/nonequilibrium/invwedge/invwedge_ausm.cfg
index 2dd0084ff89b..1aeb72f0645d 100644
--- a/TestCases/nonequilibrium/invwedge/invwedge_ausm.cfg
+++ b/TestCases/nonequilibrium/invwedge/invwedge_ausm.cfg
@@ -66,10 +66,10 @@ CONV_CAUCHY_EPS= 1E-10
%
MESH_FILENAME= invwedge.su2
MESH_FORMAT= SU2
-SOLUTION_FILENAME= restart_flow.dat
+SOLUTION_FILENAME= restart_flow
TABULAR_FORMAT= TECPLOT
CONV_FILENAME= convergence
-RESTART_FILENAME= restart_flow.dat
+RESTART_FILENAME= restart_flow
VOLUME_FILENAME= soln_volume
SURFACE_FILENAME= soln_surface
OUTPUT_WRT_FREQ= 100
diff --git a/TestCases/nonequilibrium/invwedge/invwedge_ausmplusup2.cfg b/TestCases/nonequilibrium/invwedge/invwedge_ausmplusup2.cfg
index 80d14b4e1f98..eb7aa8008b40 100644
--- a/TestCases/nonequilibrium/invwedge/invwedge_ausmplusup2.cfg
+++ b/TestCases/nonequilibrium/invwedge/invwedge_ausmplusup2.cfg
@@ -63,10 +63,10 @@ CONV_CAUCHY_EPS= 1E-10
%
MESH_FILENAME= invwedge.su2
MESH_FORMAT= SU2
-SOLUTION_FILENAME= restart_flow.dat
+SOLUTION_FILENAME= restart_flow
TABULAR_FORMAT= TECPLOT
CONV_FILENAME= convergence
-RESTART_FILENAME= restart_flow.dat
+RESTART_FILENAME= restart_flow
VOLUME_FILENAME= soln_volume
SURFACE_FILENAME= soln_surface
OUTPUT_WRT_FREQ= 100
diff --git a/TestCases/nonequilibrium/invwedge/invwedge_lax.cfg b/TestCases/nonequilibrium/invwedge/invwedge_lax.cfg
index 6fdc7f0ec048..68a0c127b449 100644
--- a/TestCases/nonequilibrium/invwedge/invwedge_lax.cfg
+++ b/TestCases/nonequilibrium/invwedge/invwedge_lax.cfg
@@ -60,10 +60,10 @@ CONV_CAUCHY_EPS= 1E-10
%
MESH_FILENAME= invwedge.su2
MESH_FORMAT= SU2
-SOLUTION_FILENAME= restart_flow.dat
+SOLUTION_FILENAME= restart_flow
TABULAR_FORMAT= TECPLOT
CONV_FILENAME= convergence
-RESTART_FILENAME= restart_flow.dat
+RESTART_FILENAME= restart_flow
VOLUME_FILENAME= soln_volume
SURFACE_FILENAME= soln_surface
OUTPUT_WRT_FREQ= 100
diff --git a/TestCases/nonequilibrium/invwedge/invwedge_msw.cfg b/TestCases/nonequilibrium/invwedge/invwedge_msw.cfg
index 5155a8b47023..ad87c70e9e2b 100644
--- a/TestCases/nonequilibrium/invwedge/invwedge_msw.cfg
+++ b/TestCases/nonequilibrium/invwedge/invwedge_msw.cfg
@@ -63,10 +63,10 @@ CONV_CAUCHY_EPS= 1E-10
%
MESH_FILENAME= invwedge.su2
MESH_FORMAT= SU2
-SOLUTION_FILENAME= restart_flow.dat
+SOLUTION_FILENAME= restart_flow
TABULAR_FORMAT= TECPLOT
CONV_FILENAME= convergence
-RESTART_FILENAME= restart_flow.dat
+RESTART_FILENAME= restart_flow
VOLUME_FILENAME= soln_volume
SURFACE_FILENAME= soln_surface
OUTPUT_WRT_FREQ= 100
diff --git a/TestCases/nonequilibrium/invwedge/invwedge_roe.cfg b/TestCases/nonequilibrium/invwedge/invwedge_roe.cfg
index 39c4bbc3830e..cad19b0db9bf 100644
--- a/TestCases/nonequilibrium/invwedge/invwedge_roe.cfg
+++ b/TestCases/nonequilibrium/invwedge/invwedge_roe.cfg
@@ -63,10 +63,10 @@ CONV_CAUCHY_EPS= 1E-10
%
MESH_FILENAME= invwedge.su2
MESH_FORMAT= SU2
-SOLUTION_FILENAME= restart_flow.dat
+SOLUTION_FILENAME= restart_flow
TABULAR_FORMAT= TECPLOT
CONV_FILENAME= convergence
-RESTART_FILENAME= restart_flow.dat
+RESTART_FILENAME= restart_flow
VOLUME_FILENAME= soln_volume
SURFACE_FILENAME= soln_surface
OUTPUT_WRT_FREQ= 100
diff --git a/TestCases/nonequilibrium/invwedge/invwedge_ss_inlet.cfg b/TestCases/nonequilibrium/invwedge/invwedge_ss_inlet.cfg
index abbf8f42fa71..327ab2b1ade3 100644
--- a/TestCases/nonequilibrium/invwedge/invwedge_ss_inlet.cfg
+++ b/TestCases/nonequilibrium/invwedge/invwedge_ss_inlet.cfg
@@ -69,10 +69,10 @@ CONV_CAUCHY_EPS= 1E-10
%
MESH_FILENAME= invwedge.su2
MESH_FORMAT= SU2
-SOLUTION_FILENAME= restart_flow.dat
+SOLUTION_FILENAME= restart_flow
TABULAR_FORMAT= TECPLOT
CONV_FILENAME= convergence
-RESTART_FILENAME= restart_flow.dat
+RESTART_FILENAME= restart_flow
VOLUME_FILENAME= soln_volume
SURFACE_FILENAME= soln_surface
OUTPUT_WRT_FREQ= 100
diff --git a/TestCases/nonequilibrium/thermalbath/finitechemistry/thermalbath.cfg b/TestCases/nonequilibrium/thermalbath/finitechemistry/thermalbath.cfg
index 6130f1cf4de4..7e8c158bfde6 100644
--- a/TestCases/nonequilibrium/thermalbath/finitechemistry/thermalbath.cfg
+++ b/TestCases/nonequilibrium/thermalbath/finitechemistry/thermalbath.cfg
@@ -70,17 +70,17 @@ CONV_CAUCHY_EPS= 1E-6
%
MESH_FILENAME= 5x5Mesh.su2
MESH_FORMAT= SU2
-MESH_OUT_FILENAME= mesh_out.su2
-SOLUTION_FILENAME= restart_flow.dat
-SOLUTION_ADJ_FILENAME= solution_adj.dat
+MESH_OUT_FILENAME= mesh_out
+SOLUTION_FILENAME= restart_flow
+SOLUTION_ADJ_FILENAME= solution_adj
TABULAR_FORMAT= TECPLOT
OUTPUT_FILES= (RESTART_ASCII)
CONV_FILENAME= history
-RESTART_FILENAME= restart_flow.dat
-RESTART_ADJ_FILENAME= restart_adj.dat
+RESTART_FILENAME= restart_flow
+RESTART_ADJ_FILENAME= restart_adj
VOLUME_FILENAME= test_flow
VOLUME_ADJ_FILENAME= adjoint
-GRAD_OBJFUNC_FILENAME= of_grad.dat
+GRAD_OBJFUNC_FILENAME= of_grad
SURFACE_FILENAME= surface_flow
SURFACE_ADJ_FILENAME= surface_adjoint
SCREEN_WRT_FREQ_INNER= 10
diff --git a/TestCases/nonequilibrium/thermalbath/finitechemistry/weakly_ionized.cfg b/TestCases/nonequilibrium/thermalbath/finitechemistry/weakly_ionized.cfg
index 22d7907f7a53..cc658839b8f7 100644
--- a/TestCases/nonequilibrium/thermalbath/finitechemistry/weakly_ionized.cfg
+++ b/TestCases/nonequilibrium/thermalbath/finitechemistry/weakly_ionized.cfg
@@ -70,17 +70,17 @@ OBJECTIVE_FUNCTION= DRAG
%
MESH_FILENAME= 5x5Mesh.su2
MESH_FORMAT= SU2
-MESH_OUT_FILENAME= mesh_out.su2
-SOLUTION_FILENAME= restart_flow.dat
-SOLUTION_ADJ_FILENAME= solution_adj.dat
+MESH_OUT_FILENAME= mesh_out
+SOLUTION_FILENAME= restart_flow
+SOLUTION_ADJ_FILENAME= solution_adj
TABULAR_FORMAT= TECPLOT
OUTPUT_FILES= (RESTART_ASCII)
CONV_FILENAME= history
-RESTART_FILENAME= restart_flow.dat
-RESTART_ADJ_FILENAME= restart_adj.dat
+RESTART_FILENAME= restart_flow
+RESTART_ADJ_FILENAME= restart_adj
VOLUME_FILENAME= test_flow
VOLUME_ADJ_FILENAME= adjoint
-GRAD_OBJFUNC_FILENAME= of_grad.dat
+GRAD_OBJFUNC_FILENAME= of_grad
SURFACE_FILENAME= surface_flow
SURFACE_ADJ_FILENAME= surface_adjoint
SCREEN_WRT_FREQ_INNER= 10
diff --git a/TestCases/nonequilibrium/thermalbath/frozen/thermalbath_frozen.cfg b/TestCases/nonequilibrium/thermalbath/frozen/thermalbath_frozen.cfg
index b108d12204e9..67c43e66d57e 100644
--- a/TestCases/nonequilibrium/thermalbath/frozen/thermalbath_frozen.cfg
+++ b/TestCases/nonequilibrium/thermalbath/frozen/thermalbath_frozen.cfg
@@ -70,17 +70,17 @@ CONV_CAUCHY_EPS= 1E-6
%
MESH_FILENAME= 5x5Mesh.su2
MESH_FORMAT= SU2
-MESH_OUT_FILENAME= mesh_out.su2
-SOLUTION_FILENAME= restart_flow.dat
-SOLUTION_ADJ_FILENAME= solution_adj.dat
+MESH_OUT_FILENAME= mesh_out
+SOLUTION_FILENAME= restart_flow
+SOLUTION_ADJ_FILENAME= solution_adj
TABULAR_FORMAT= TECPLOT
OUTPUT_FILES= (RESTART_ASCII, TECPLOT_ASCII)
CONV_FILENAME= history
-RESTART_FILENAME= restart_flow.dat
-RESTART_ADJ_FILENAME= restart_adj.dat
+RESTART_FILENAME= restart_flow
+RESTART_ADJ_FILENAME= restart_adj
VOLUME_FILENAME= test_flow
VOLUME_ADJ_FILENAME= adjoint
-GRAD_OBJFUNC_FILENAME= of_grad.dat
+GRAD_OBJFUNC_FILENAME= of_grad
SURFACE_FILENAME= surface_flow
SURFACE_ADJ_FILENAME= surface_adjoint
SCREEN_WRT_FREQ_INNER= 10
diff --git a/TestCases/nonequilibrium/visc_cylinder/cyl_ion_gy.cfg b/TestCases/nonequilibrium/visc_cylinder/cyl_ion_gy.cfg
index 80adfcc79412..2f51ad7f73fc 100644
--- a/TestCases/nonequilibrium/visc_cylinder/cyl_ion_gy.cfg
+++ b/TestCases/nonequilibrium/visc_cylinder/cyl_ion_gy.cfg
@@ -64,11 +64,11 @@ CONV_STARTITER= 10
%
MESH_FILENAME= visc_cyl.su2
MESH_FORMAT= SU2
-SOLUTION_FILENAME= restart_flow_gy.dat
-RESTART_FILENAME= restart_flow_gy.dat
+SOLUTION_FILENAME= restart_flow_gy
+RESTART_FILENAME= restart_flow_gy
TABULAR_FORMAT= TECPLOT
CONV_FILENAME= convergence
VOLUME_FILENAME= soln_volume
SURFACE_FILENAME= soln_surface
OUTPUT_WRT_FREQ= 2500
-SCREEN_OUTPUT= (INNER_ITER, RMS_DENSITY_0, RMS_DENSITY_1, RMS_DENSITY_2, RMS_DENSITY_3, RMS_DENSITY_4, RMS_DENSITY_5, RMS_DENSITY_6, RMS_ENERGY, RMS_ENERGY_VE, LIFT, DRAG, TOTAL_HEATFLUX
\ No newline at end of file
+SCREEN_OUTPUT= (INNER_ITER, RMS_DENSITY_0, RMS_DENSITY_1, RMS_DENSITY_2, RMS_DENSITY_3, RMS_DENSITY_4, RMS_DENSITY_5, RMS_DENSITY_6, RMS_ENERGY, RMS_ENERGY_VE, LIFT, DRAG, TOTAL_HEATFLUX
diff --git a/TestCases/nonequilibrium/visc_wedge/axi_visccone.cfg b/TestCases/nonequilibrium/visc_wedge/axi_visccone.cfg
index 2702fec63ae4..02449d478683 100644
--- a/TestCases/nonequilibrium/visc_wedge/axi_visccone.cfg
+++ b/TestCases/nonequilibrium/visc_wedge/axi_visccone.cfg
@@ -68,10 +68,10 @@ CONV_STARTITER= 10
%
MESH_FILENAME= viscwedge.su2
MESH_FORMAT= SU2
-SOLUTION_FILENAME= restart_flow.dat
+SOLUTION_FILENAME= restart_flow
TABULAR_FORMAT= TECPLOT
CONV_FILENAME= convergence
-RESTART_FILENAME= restart_flow.dat
+RESTART_FILENAME= restart_flow
VOLUME_FILENAME= soln_volume
SURFACE_FILENAME= soln_surface
OUTPUT_WRT_FREQ= 100
diff --git a/TestCases/nonequilibrium/visc_wedge/partial_cat.cfg b/TestCases/nonequilibrium/visc_wedge/partial_cat.cfg
index 21e1abc11457..1ea38264a0c1 100644
--- a/TestCases/nonequilibrium/visc_wedge/partial_cat.cfg
+++ b/TestCases/nonequilibrium/visc_wedge/partial_cat.cfg
@@ -72,10 +72,10 @@ CONV_STARTITER= 10
%
MESH_FILENAME= viscwedge.su2
MESH_FORMAT= SU2
-SOLUTION_FILENAME= restart_flow.dat
+SOLUTION_FILENAME= restart_flow
TABULAR_FORMAT= TECPLOT
CONV_FILENAME= convergence
-RESTART_FILENAME= restart_flow.dat
+RESTART_FILENAME= restart_flow
VOLUME_FILENAME= soln_volume
SURFACE_FILENAME= soln_surface
OUTPUT_WRT_FREQ= 100
diff --git a/TestCases/nonequilibrium/visc_wedge/super_cat.cfg b/TestCases/nonequilibrium/visc_wedge/super_cat.cfg
index 31098bd1e4b1..51c5d991a8b8 100644
--- a/TestCases/nonequilibrium/visc_wedge/super_cat.cfg
+++ b/TestCases/nonequilibrium/visc_wedge/super_cat.cfg
@@ -72,10 +72,10 @@ CONV_STARTITER= 10
%
MESH_FILENAME= viscwedge.su2
MESH_FORMAT= SU2
-SOLUTION_FILENAME= restart_flow.dat
+SOLUTION_FILENAME= restart_flow
TABULAR_FORMAT= TECPLOT
CONV_FILENAME= convergence
-RESTART_FILENAME= restart_flow.dat
+RESTART_FILENAME= restart_flow
VOLUME_FILENAME= soln_volume
SURFACE_FILENAME= soln_surface
OUTPUT_WRT_FREQ= 100
diff --git a/TestCases/nonequilibrium/viscwedge_mpp/viscwedge_mpp.cfg b/TestCases/nonequilibrium/viscwedge_mpp/viscwedge_mpp.cfg
index ee58bb65a793..5aa736855add 100644
--- a/TestCases/nonequilibrium/viscwedge_mpp/viscwedge_mpp.cfg
+++ b/TestCases/nonequilibrium/viscwedge_mpp/viscwedge_mpp.cfg
@@ -68,10 +68,10 @@ CONV_STARTITER= 10
%
MESH_FILENAME= viscwedge.su2
MESH_FORMAT= SU2
-SOLUTION_FILENAME= restart_flow.dat
+SOLUTION_FILENAME= restart_flow
TABULAR_FORMAT= TECPLOT
CONV_FILENAME= convergence
-RESTART_FILENAME= restart_flow.dat
+RESTART_FILENAME= restart_flow
VOLUME_FILENAME= soln_volume
SURFACE_FILENAME= soln_surface
OUTPUT_WRT_FREQ= 100
diff --git a/TestCases/optimization_euler/equivalentarea_naca64206/NACA64206.cfg b/TestCases/optimization_euler/equivalentarea_naca64206/NACA64206.cfg
index 5c274d526394..743e381c8b1b 100644
--- a/TestCases/optimization_euler/equivalentarea_naca64206/NACA64206.cfg
+++ b/TestCases/optimization_euler/equivalentarea_naca64206/NACA64206.cfg
@@ -106,18 +106,18 @@ CONV_CAUCHY_EPS= 1E-10
% ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
%
MESH_FILENAME= NACA64206_FFD.su2
-MESH_OUT_FILENAME= mesh_out.su2
-SOLUTION_FILENAME= solution_flow.dat
-SOLUTION_ADJ_FILENAME= solution_adj.dat
+MESH_OUT_FILENAME= mesh_out
+SOLUTION_FILENAME= solution_flow
+SOLUTION_ADJ_FILENAME= solution_adj
TABULAR_FORMAT= CSV
MESH_FORMAT= SU2
OUTPUT_FILES= (RESTART_ASCII)
CONV_FILENAME= history
-RESTART_FILENAME= restart_flow.dat
-RESTART_ADJ_FILENAME= restart_adj.dat
+RESTART_FILENAME= restart_flow
+RESTART_ADJ_FILENAME= restart_adj
VOLUME_FILENAME= flow
VOLUME_ADJ_FILENAME= adjoint
-GRAD_OBJFUNC_FILENAME= of_grad.dat
+GRAD_OBJFUNC_FILENAME= of_grad
SURFACE_FILENAME= surface_flow
SURFACE_ADJ_FILENAME= surface_adjoint
HISTORY_WRT_FREQ_INNER= 30
diff --git a/TestCases/optimization_euler/multiobjective_wedge/inv_wedge_ROE_2surf_1obj.cfg b/TestCases/optimization_euler/multiobjective_wedge/inv_wedge_ROE_2surf_1obj.cfg
index 53b5d89d7806..e01f07ec103b 100644
--- a/TestCases/optimization_euler/multiobjective_wedge/inv_wedge_ROE_2surf_1obj.cfg
+++ b/TestCases/optimization_euler/multiobjective_wedge/inv_wedge_ROE_2surf_1obj.cfg
@@ -100,16 +100,16 @@ CONV_STARTITER= 10
%
MESH_FILENAME= mesh_wedge_inv_FFD.su2
MESH_FORMAT= SU2
-MESH_OUT_FILENAME= mesh_out.su2
-SOLUTION_FILENAME= solution_flow.dat
-SOLUTION_ADJ_FILENAME= solution_adj.dat
+MESH_OUT_FILENAME= mesh_out
+SOLUTION_FILENAME= solution_flow
+SOLUTION_ADJ_FILENAME= solution_adj
TABULAR_FORMAT= CSV
CONV_FILENAME= history
-RESTART_FILENAME= restart_flow.dat
-RESTART_ADJ_FILENAME= restart_adj.dat
+RESTART_FILENAME= restart_flow
+RESTART_ADJ_FILENAME= restart_adj
VOLUME_FILENAME= flow
VOLUME_ADJ_FILENAME= adjoint
-GRAD_OBJFUNC_FILENAME= of_grad.dat
+GRAD_OBJFUNC_FILENAME= of_grad
SURFACE_FILENAME= surface_flow
SURFACE_ADJ_FILENAME= surface_adjoint
OUTPUT_WRT_FREQ= 250
diff --git a/TestCases/optimization_euler/multiobjective_wedge/inv_wedge_ROE_multiobj.cfg b/TestCases/optimization_euler/multiobjective_wedge/inv_wedge_ROE_multiobj.cfg
index 544a057cf33d..6e0724a2822f 100644
--- a/TestCases/optimization_euler/multiobjective_wedge/inv_wedge_ROE_multiobj.cfg
+++ b/TestCases/optimization_euler/multiobjective_wedge/inv_wedge_ROE_multiobj.cfg
@@ -102,16 +102,16 @@ CONV_STARTITER= 10
%
MESH_FILENAME= mesh_wedge_inv_FFD.su2
MESH_FORMAT= SU2
-MESH_OUT_FILENAME= mesh_out.su2
-SOLUTION_FILENAME= solution_flow.dat
-SOLUTION_ADJ_FILENAME= solution_adj.dat
+MESH_OUT_FILENAME= mesh_out
+SOLUTION_FILENAME= solution_flow
+SOLUTION_ADJ_FILENAME= solution_adj
TABULAR_FORMAT= TECPLOT
CONV_FILENAME= history
-RESTART_FILENAME= restart_flow.dat
-RESTART_ADJ_FILENAME= restart_adj.dat
+RESTART_FILENAME= restart_flow
+RESTART_ADJ_FILENAME= restart_adj
VOLUME_FILENAME= flow
VOLUME_ADJ_FILENAME= adjoint
-GRAD_OBJFUNC_FILENAME= of_grad.dat
+GRAD_OBJFUNC_FILENAME= of_grad
SURFACE_FILENAME= surface_flow
SURFACE_ADJ_FILENAME= surface_adjoint
OUTPUT_WRT_FREQ= 250
diff --git a/TestCases/optimization_euler/multiobjective_wedge/inv_wedge_ROE_multiobj_1surf.cfg b/TestCases/optimization_euler/multiobjective_wedge/inv_wedge_ROE_multiobj_1surf.cfg
index 8823543345e9..e87aa78e50fb 100644
--- a/TestCases/optimization_euler/multiobjective_wedge/inv_wedge_ROE_multiobj_1surf.cfg
+++ b/TestCases/optimization_euler/multiobjective_wedge/inv_wedge_ROE_multiobj_1surf.cfg
@@ -101,16 +101,16 @@ CONV_STARTITER= 10
%
MESH_FILENAME= mesh_wedge_inv_FFD.su2
MESH_FORMAT= SU2
-MESH_OUT_FILENAME= mesh_out.su2
-SOLUTION_FILENAME= solution_flow.dat
-SOLUTION_ADJ_FILENAME= solution_adj.dat
+MESH_OUT_FILENAME= mesh_out
+SOLUTION_FILENAME= solution_flow
+SOLUTION_ADJ_FILENAME= solution_adj
TABULAR_FORMAT= CSV
CONV_FILENAME= history
-RESTART_FILENAME= restart_flow.dat
-RESTART_ADJ_FILENAME= restart_adj.dat
+RESTART_FILENAME= restart_flow
+RESTART_ADJ_FILENAME= restart_adj
VOLUME_FILENAME= flow
VOLUME_ADJ_FILENAME= adjoint
-GRAD_OBJFUNC_FILENAME= of_grad.dat
+GRAD_OBJFUNC_FILENAME= of_grad
SURFACE_FILENAME= surface_flow
SURFACE_ADJ_FILENAME= surface_adjoint
OUTPUT_WRT_FREQ= 250
diff --git a/TestCases/optimization_euler/multiobjective_wedge/inv_wedge_ROE_multiobj_combo.cfg b/TestCases/optimization_euler/multiobjective_wedge/inv_wedge_ROE_multiobj_combo.cfg
index c7089d8d53d7..5017a42fd459 100644
--- a/TestCases/optimization_euler/multiobjective_wedge/inv_wedge_ROE_multiobj_combo.cfg
+++ b/TestCases/optimization_euler/multiobjective_wedge/inv_wedge_ROE_multiobj_combo.cfg
@@ -103,16 +103,16 @@ CONV_STARTITER= 10
%
MESH_FILENAME= mesh_wedge_inv_FFD.su2
MESH_FORMAT= SU2
-MESH_OUT_FILENAME= mesh_out.su2
-SOLUTION_FILENAME= solution_flow.dat
-SOLUTION_ADJ_FILENAME= solution_adj.dat
+MESH_OUT_FILENAME= mesh_out
+SOLUTION_FILENAME= solution_flow
+SOLUTION_ADJ_FILENAME= solution_adj
TABULAR_FORMAT= CSV
CONV_FILENAME= history
-RESTART_FILENAME= restart_flow.dat
-RESTART_ADJ_FILENAME= restart_adj.dat
+RESTART_FILENAME= restart_flow
+RESTART_ADJ_FILENAME= restart_adj
VOLUME_FILENAME= flow
VOLUME_ADJ_FILENAME= adjoint
-GRAD_OBJFUNC_FILENAME= of_grad.dat
+GRAD_OBJFUNC_FILENAME= of_grad
SURFACE_FILENAME= surface_flow
SURFACE_ADJ_FILENAME= surface_adjoint
OUTPUT_WRT_FREQ= 250
diff --git a/TestCases/optimization_euler/multipoint_naca0012/inv_NACA0012_multipoint.cfg b/TestCases/optimization_euler/multipoint_naca0012/inv_NACA0012_multipoint.cfg
index 3008787ad42a..bedef766dfae 100644
--- a/TestCases/optimization_euler/multipoint_naca0012/inv_NACA0012_multipoint.cfg
+++ b/TestCases/optimization_euler/multipoint_naca0012/inv_NACA0012_multipoint.cfg
@@ -104,16 +104,16 @@ CONV_CAUCHY_EPS= 1E-6
%
MESH_FILENAME= mesh_NACA0012_inv.su2
MESH_FORMAT= SU2
-MESH_OUT_FILENAME= mesh_out.su2
-SOLUTION_FILENAME= solution_flow.dat
-SOLUTION_ADJ_FILENAME= solution_adj.dat
+MESH_OUT_FILENAME= mesh_out
+SOLUTION_FILENAME= solution_flow
+SOLUTION_ADJ_FILENAME= solution_adj
TABULAR_FORMAT= CSV
CONV_FILENAME= history
-RESTART_FILENAME= restart_flow.dat
-RESTART_ADJ_FILENAME= restart_adj.dat
+RESTART_FILENAME= restart_flow
+RESTART_ADJ_FILENAME= restart_adj
VOLUME_FILENAME= flow
VOLUME_ADJ_FILENAME= adjoint
-GRAD_OBJFUNC_FILENAME= of_grad.dat
+GRAD_OBJFUNC_FILENAME= of_grad
SURFACE_FILENAME= surface_flow
SURFACE_ADJ_FILENAME= surface_adjoint
OUTPUT_WRT_FREQ= 250
diff --git a/TestCases/optimization_euler/pitching_naca64a010/pitching_NACA64A010.cfg b/TestCases/optimization_euler/pitching_naca64a010/pitching_NACA64A010.cfg
index 79188f4c1465..1a58e83ee088 100644
--- a/TestCases/optimization_euler/pitching_naca64a010/pitching_NACA64A010.cfg
+++ b/TestCases/optimization_euler/pitching_naca64a010/pitching_NACA64A010.cfg
@@ -135,16 +135,16 @@ CONV_CAUCHY_EPS= 1E-6
%
MESH_FILENAME= mesh_NACA64A010_inv.su2
MESH_FORMAT= SU2
-MESH_OUT_FILENAME= mesh_out.su2
-SOLUTION_FILENAME= restart_flow.dat
-SOLUTION_ADJ_FILENAME= solution_adj.dat
+MESH_OUT_FILENAME= mesh_out
+SOLUTION_FILENAME= restart_flow
+SOLUTION_ADJ_FILENAME= solution_adj
TABULAR_FORMAT= CSV
CONV_FILENAME= history
-RESTART_FILENAME= restart_flow.dat
-RESTART_ADJ_FILENAME= restart_adj.dat
+RESTART_FILENAME= restart_flow
+RESTART_ADJ_FILENAME= restart_adj
VOLUME_FILENAME= flow
VOLUME_ADJ_FILENAME= adjoint
-GRAD_OBJFUNC_FILENAME= of_grad.dat
+GRAD_OBJFUNC_FILENAME= of_grad
SURFACE_FILENAME= surface_flow
SURFACE_ADJ_FILENAME= surface_adjoint
OUTPUT_WRT_FREQ= 1
diff --git a/TestCases/optimization_euler/pitching_oneram6/pitching_ONERAM6.cfg b/TestCases/optimization_euler/pitching_oneram6/pitching_ONERAM6.cfg
index bd5232b4acc5..b114f58f4512 100644
--- a/TestCases/optimization_euler/pitching_oneram6/pitching_ONERAM6.cfg
+++ b/TestCases/optimization_euler/pitching_oneram6/pitching_ONERAM6.cfg
@@ -123,17 +123,17 @@ CONV_CAUCHY_EPS= 1E-10
% ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
%
MESH_FILENAME= mesh_ONERAM6_inv.su2
-MESH_OUT_FILENAME= mesh_out.su2
-SOLUTION_FILENAME= solution_flow.dat
-SOLUTION_ADJ_FILENAME= solution_adj.dat
+MESH_OUT_FILENAME= mesh_out
+SOLUTION_FILENAME= solution_flow
+SOLUTION_ADJ_FILENAME= solution_adj
MESH_FORMAT= SU2
TABULAR_FORMAT= CSV
CONV_FILENAME= history
-RESTART_FILENAME= restart_flow.dat
-RESTART_ADJ_FILENAME= restart_adj.dat
+RESTART_FILENAME= restart_flow
+RESTART_ADJ_FILENAME= restart_adj
VOLUME_FILENAME= flow
VOLUME_ADJ_FILENAME= adjoint
-GRAD_OBJFUNC_FILENAME= of_grad.dat
+GRAD_OBJFUNC_FILENAME= of_grad
SURFACE_FILENAME= surface_flow
SURFACE_ADJ_FILENAME= surface_adjoint
OUTPUT_WRT_FREQ= 1
diff --git a/TestCases/optimization_euler/rotating_naca0012/rotating_NACA0012.cfg b/TestCases/optimization_euler/rotating_naca0012/rotating_NACA0012.cfg
index 30fd366e1820..d81df85f3822 100644
--- a/TestCases/optimization_euler/rotating_naca0012/rotating_NACA0012.cfg
+++ b/TestCases/optimization_euler/rotating_naca0012/rotating_NACA0012.cfg
@@ -121,16 +121,16 @@ CONV_CAUCHY_EPS= 1E-6
%
MESH_FILENAME= mesh_NACA0012_rot.su2
MESH_FORMAT= SU2
-MESH_OUT_FILENAME= mesh_out.su2
-SOLUTION_FILENAME= solution_flow.dat
-SOLUTION_ADJ_FILENAME= solution_adj.dat
+MESH_OUT_FILENAME= mesh_out
+SOLUTION_FILENAME= solution_flow
+SOLUTION_ADJ_FILENAME= solution_adj
TABULAR_FORMAT= CSV
CONV_FILENAME= history
-RESTART_FILENAME= restart_flow.dat
-RESTART_ADJ_FILENAME= restart_adj.dat
+RESTART_FILENAME= restart_flow
+RESTART_ADJ_FILENAME= restart_adj
VOLUME_FILENAME= flow
VOLUME_ADJ_FILENAME= adjoint
-GRAD_OBJFUNC_FILENAME= of_grad.dat
+GRAD_OBJFUNC_FILENAME= of_grad
SURFACE_FILENAME= surface_flow
SURFACE_ADJ_FILENAME= surface_adjoint
OUTPUT_WRT_FREQ= 250
diff --git a/TestCases/optimization_euler/steady_inverse_design/inv_NACA0012.cfg b/TestCases/optimization_euler/steady_inverse_design/inv_NACA0012.cfg
index 91e94aaf382e..99ce4f4a6ac7 100644
--- a/TestCases/optimization_euler/steady_inverse_design/inv_NACA0012.cfg
+++ b/TestCases/optimization_euler/steady_inverse_design/inv_NACA0012.cfg
@@ -110,16 +110,16 @@ CONV_CAUCHY_EPS= 1E-6
%
MESH_FILENAME= mesh_NACA0012_inv_FFD.su2
MESH_FORMAT= SU2
-MESH_OUT_FILENAME= mesh_out.su2
-SOLUTION_FILENAME= solution_flow.dat
-SOLUTION_ADJ_FILENAME= solution_adj.dat
+MESH_OUT_FILENAME= mesh_out
+SOLUTION_FILENAME= solution_flow
+SOLUTION_ADJ_FILENAME= solution_adj
TABULAR_FORMAT= CSV
CONV_FILENAME= history
-RESTART_FILENAME= restart_flow.dat
-RESTART_ADJ_FILENAME= restart_adj.dat
+RESTART_FILENAME= restart_flow
+RESTART_ADJ_FILENAME= restart_adj
VOLUME_FILENAME= flow
VOLUME_ADJ_FILENAME= adjoint
-GRAD_OBJFUNC_FILENAME= of_grad.dat
+GRAD_OBJFUNC_FILENAME= of_grad
SURFACE_FILENAME= surface_flow
SURFACE_ADJ_FILENAME= surface_adjoint
OUTPUT_WRT_FREQ= 250
diff --git a/TestCases/optimization_euler/steady_naca0012/inv_NACA0012_adv.cfg b/TestCases/optimization_euler/steady_naca0012/inv_NACA0012_adv.cfg
index aab55df81b0e..939d6b10cd11 100644
--- a/TestCases/optimization_euler/steady_naca0012/inv_NACA0012_adv.cfg
+++ b/TestCases/optimization_euler/steady_naca0012/inv_NACA0012_adv.cfg
@@ -120,16 +120,16 @@ CONV_CAUCHY_EPS= 1E-6
%
MESH_FILENAME= mesh_NACA0012_inv.su2
MESH_FORMAT= SU2
-MESH_OUT_FILENAME= mesh_out.su2
-SOLUTION_FILENAME= solution_flow.dat
-SOLUTION_ADJ_FILENAME= solution_adj.dat
+MESH_OUT_FILENAME= mesh_out
+SOLUTION_FILENAME= solution_flow
+SOLUTION_ADJ_FILENAME= solution_adj
TABULAR_FORMAT= CSV
CONV_FILENAME= history
-RESTART_FILENAME= restart_flow.dat
-RESTART_ADJ_FILENAME= restart_adj.dat
+RESTART_FILENAME= restart_flow
+RESTART_ADJ_FILENAME= restart_adj
VOLUME_FILENAME= flow
VOLUME_ADJ_FILENAME= adjoint
-GRAD_OBJFUNC_FILENAME= of_grad.dat
+GRAD_OBJFUNC_FILENAME= of_grad
SURFACE_FILENAME= surface_flow
SURFACE_ADJ_FILENAME= surface_adjoint
OUTPUT_WRT_FREQ= 50
diff --git a/TestCases/optimization_euler/steady_naca0012/inv_NACA0012_basic.cfg b/TestCases/optimization_euler/steady_naca0012/inv_NACA0012_basic.cfg
index 3c6643892f88..de41c381c2cf 100644
--- a/TestCases/optimization_euler/steady_naca0012/inv_NACA0012_basic.cfg
+++ b/TestCases/optimization_euler/steady_naca0012/inv_NACA0012_basic.cfg
@@ -114,16 +114,16 @@ CONV_CAUCHY_EPS= 1E-6
%
MESH_FILENAME= mesh_NACA0012_inv.su2
MESH_FORMAT= SU2
-MESH_OUT_FILENAME= mesh_out.su2
-SOLUTION_FILENAME= solution_flow.dat
-SOLUTION_ADJ_FILENAME= solution_adj.dat
+MESH_OUT_FILENAME= mesh_out
+SOLUTION_FILENAME= solution_flow
+SOLUTION_ADJ_FILENAME= solution_adj
TABULAR_FORMAT= CSV
CONV_FILENAME= history
-RESTART_FILENAME= restart_flow.dat
-RESTART_ADJ_FILENAME= restart_adj.dat
+RESTART_FILENAME= restart_flow
+RESTART_ADJ_FILENAME= restart_adj
VOLUME_FILENAME= flow
VOLUME_ADJ_FILENAME= adjoint
-GRAD_OBJFUNC_FILENAME= of_grad.dat
+GRAD_OBJFUNC_FILENAME= of_grad
SURFACE_FILENAME= surface_flow
SURFACE_ADJ_FILENAME= surface_adjoint
OUTPUT_WRT_FREQ= 250
diff --git a/TestCases/optimization_euler/steady_oneram6/inv_ONERAM6_adv.cfg b/TestCases/optimization_euler/steady_oneram6/inv_ONERAM6_adv.cfg
index ca0bb1ccd21f..d3db0f71b773 100644
--- a/TestCases/optimization_euler/steady_oneram6/inv_ONERAM6_adv.cfg
+++ b/TestCases/optimization_euler/steady_oneram6/inv_ONERAM6_adv.cfg
@@ -107,17 +107,17 @@ CONV_CAUCHY_EPS= 1E-10
% ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
%
MESH_FILENAME= mesh_ONERAM6_inv_FFD.su2
-MESH_OUT_FILENAME= mesh_out.su2
-SOLUTION_FILENAME= solution_flow.dat
-SOLUTION_ADJ_FILENAME= solution_adj.dat
+MESH_OUT_FILENAME= mesh_out
+SOLUTION_FILENAME= solution_flow
+SOLUTION_ADJ_FILENAME= solution_adj
MESH_FORMAT= SU2
TABULAR_FORMAT= CSV
CONV_FILENAME= history
-RESTART_FILENAME= restart_flow.dat
-RESTART_ADJ_FILENAME= restart_adj.dat
+RESTART_FILENAME= restart_flow
+RESTART_ADJ_FILENAME= restart_adj
VOLUME_FILENAME= flow
VOLUME_ADJ_FILENAME= adjoint
-GRAD_OBJFUNC_FILENAME= of_grad.dat
+GRAD_OBJFUNC_FILENAME= of_grad
SURFACE_FILENAME= surface_flow
SURFACE_ADJ_FILENAME= surface_adjoint
OUTPUT_WRT_FREQ= 1
diff --git a/TestCases/optimization_euler/steady_oneram6/inv_ONERAM6_basic.cfg b/TestCases/optimization_euler/steady_oneram6/inv_ONERAM6_basic.cfg
index 59500661a1db..7afc438d6228 100644
--- a/TestCases/optimization_euler/steady_oneram6/inv_ONERAM6_basic.cfg
+++ b/TestCases/optimization_euler/steady_oneram6/inv_ONERAM6_basic.cfg
@@ -105,17 +105,17 @@ CONV_CAUCHY_EPS= 1E-10
% ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
%
MESH_FILENAME= mesh_ONERAM6_inv_FFD.su2
-MESH_OUT_FILENAME= mesh_out.su2
-SOLUTION_FILENAME= solution_flow.dat
-SOLUTION_ADJ_FILENAME= solution_adj.dat
+MESH_OUT_FILENAME= mesh_out
+SOLUTION_FILENAME= solution_flow
+SOLUTION_ADJ_FILENAME= solution_adj
MESH_FORMAT= SU2
TABULAR_FORMAT= CSV
CONV_FILENAME= history
-RESTART_FILENAME= restart_flow.dat
-RESTART_ADJ_FILENAME= restart_adj.dat
+RESTART_FILENAME= restart_flow
+RESTART_ADJ_FILENAME= restart_adj
VOLUME_FILENAME= flow
VOLUME_ADJ_FILENAME= adjoint
-GRAD_OBJFUNC_FILENAME= of_grad.dat
+GRAD_OBJFUNC_FILENAME= of_grad
SURFACE_FILENAME= surface_flow
SURFACE_ADJ_FILENAME= surface_adjoint
OUTPUT_WRT_FREQ= 1
diff --git a/TestCases/optimization_rans/naca0012/naca0012.cfg b/TestCases/optimization_rans/naca0012/naca0012.cfg
index 61550e343b6d..466c8609eecd 100644
--- a/TestCases/optimization_rans/naca0012/naca0012.cfg
+++ b/TestCases/optimization_rans/naca0012/naca0012.cfg
@@ -97,13 +97,14 @@ SCREEN_OUTPUT=(INNER_ITER, TIME_ITER, RMS_ADJ_DENSITY, RMS_DENSITY, , REL_RMS_DE
HISTORY_OUTPUT=(ITER, RMS_RES, AERO_COEFF, TAVG_AERO_COEFF, ADJ_AERO_COEFF)
MESH_FILENAME= naca0012_FFD.su2
MESH_FORMAT= SU2
-MESH_OUT_FILENAME= mesh_out.su2
-SOLUTION_FILENAME= restart_flow.dat
-SOLUTION_ADJ_FILENAME= restart_adj.dat
+MESH_OUT_FILENAME= mesh_out
+SOLUTION_FILENAME= restart_flow
+SOLUTION_ADJ_FILENAME= restart_adj
TABULAR_FORMAT= CSV
CONV_FILENAME= 0_history
-RESTART_FILENAME= restart_flow.dat
-RESTART_ADJ_FILENAME= restart_adj.dat
+RESTART_FILENAME= restart_flow
+READ_BINARY_RESTART= YES
+RESTART_ADJ_FILENAME= restart_adj
VOLUME_FILENAME= flow
SURFACE_FILENAME= surface_flow
OUTPUT_WRT_FREQ= 1
diff --git a/TestCases/optimization_rans/pitching_naca64a010/turb_NACA64A010.cfg b/TestCases/optimization_rans/pitching_naca64a010/turb_NACA64A010.cfg
index 8f66986bf538..178b53a74869 100644
--- a/TestCases/optimization_rans/pitching_naca64a010/turb_NACA64A010.cfg
+++ b/TestCases/optimization_rans/pitching_naca64a010/turb_NACA64A010.cfg
@@ -136,16 +136,16 @@ CONV_CAUCHY_EPS= 1E-5
%
MESH_FILENAME= mesh_NACA64A010_turb.su2
MESH_FORMAT= SU2
-MESH_OUT_FILENAME= mesh_out.su2
-SOLUTION_FILENAME= restart_flow.dat
-SOLUTION_ADJ_FILENAME= restart_adj.dat
+MESH_OUT_FILENAME= mesh_out
+SOLUTION_FILENAME= restart_flow
+SOLUTION_ADJ_FILENAME= restart_adj
TABULAR_FORMAT= CSV
CONV_FILENAME= history
-RESTART_FILENAME= restart_flow.dat
-RESTART_ADJ_FILENAME= restart_adj.dat
+RESTART_FILENAME= restart_flow
+RESTART_ADJ_FILENAME= restart_adj
VOLUME_FILENAME= flow
VOLUME_ADJ_FILENAME= adjoint
-GRAD_OBJFUNC_FILENAME= of_grad.dat
+GRAD_OBJFUNC_FILENAME= of_grad
SURFACE_FILENAME= surface_flow
SURFACE_ADJ_FILENAME= surface_adjoint
OUTPUT_WRT_FREQ= 1
diff --git a/TestCases/optimization_rans/pitching_oneram6/turb_ONERAM6.cfg b/TestCases/optimization_rans/pitching_oneram6/turb_ONERAM6.cfg
index d9c7467c22fb..9eac8a26c8f8 100644
--- a/TestCases/optimization_rans/pitching_oneram6/turb_ONERAM6.cfg
+++ b/TestCases/optimization_rans/pitching_oneram6/turb_ONERAM6.cfg
@@ -138,16 +138,16 @@ CONV_CAUCHY_EPS= 1E-5
%
MESH_FILENAME= mesh_ONERAM6_turb_tets.su2
MESH_FORMAT= SU2
-MESH_OUT_FILENAME= mesh_out.su2
-SOLUTION_FILENAME= restart_flow.dat
-SOLUTION_ADJ_FILENAME= solution_adj.dat
+MESH_OUT_FILENAME= mesh_out
+SOLUTION_FILENAME= restart_flow
+SOLUTION_ADJ_FILENAME= solution_adj
TABULAR_FORMAT= CSV
CONV_FILENAME= history
-RESTART_FILENAME= restart_flow.dat
-RESTART_ADJ_FILENAME= restart_adj.dat
+RESTART_FILENAME= restart_flow
+RESTART_ADJ_FILENAME= restart_adj
VOLUME_FILENAME= flow
VOLUME_ADJ_FILENAME= adjoint
-GRAD_OBJFUNC_FILENAME= of_grad.dat
+GRAD_OBJFUNC_FILENAME= of_grad
SURFACE_FILENAME= surface_flow
SURFACE_ADJ_FILENAME= surface_adjoint
OUTPUT_WRT_FREQ= 1
diff --git a/TestCases/optimization_rans/steady_oneram6/turb_ONERAM6.cfg b/TestCases/optimization_rans/steady_oneram6/turb_ONERAM6.cfg
index b139814e3516..8d31c3c6a204 100644
--- a/TestCases/optimization_rans/steady_oneram6/turb_ONERAM6.cfg
+++ b/TestCases/optimization_rans/steady_oneram6/turb_ONERAM6.cfg
@@ -116,16 +116,16 @@ CONV_CAUCHY_EPS= 1E-5
%
MESH_FILENAME= mesh_ONERAM6_turb.su2
MESH_FORMAT= SU2
-MESH_OUT_FILENAME= mesh_out.su2
-SOLUTION_FILENAME= solution_flow.dat
-SOLUTION_ADJ_FILENAME= solution_adj.dat
+MESH_OUT_FILENAME= mesh_out
+SOLUTION_FILENAME= solution_flow
+SOLUTION_ADJ_FILENAME= solution_adj
TABULAR_FORMAT= CSV
CONV_FILENAME= history
-RESTART_FILENAME= restart_flow.dat
-RESTART_ADJ_FILENAME= restart_adj.dat
+RESTART_FILENAME= restart_flow
+RESTART_ADJ_FILENAME= restart_adj
VOLUME_FILENAME= flow
VOLUME_ADJ_FILENAME= adjoint
-GRAD_OBJFUNC_FILENAME= of_grad.dat
+GRAD_OBJFUNC_FILENAME= of_grad
SURFACE_FILENAME= surface_flow
SURFACE_ADJ_FILENAME= surface_adjoint
OUTPUT_WRT_FREQ= 1000
diff --git a/TestCases/optimization_rans/steady_rae2822/turb_SA_RAE2822.cfg b/TestCases/optimization_rans/steady_rae2822/turb_SA_RAE2822.cfg
index dbece40a3eb4..5f42da5832db 100644
--- a/TestCases/optimization_rans/steady_rae2822/turb_SA_RAE2822.cfg
+++ b/TestCases/optimization_rans/steady_rae2822/turb_SA_RAE2822.cfg
@@ -104,16 +104,16 @@ CONV_CAUCHY_EPS= 1E-6
%
MESH_FILENAME= mesh_RAE2822_turb.su2
MESH_FORMAT= SU2
-MESH_OUT_FILENAME= mesh_out.su2
-SOLUTION_FILENAME= solution_flow.dat
-SOLUTION_ADJ_FILENAME= solution_adj.dat
+MESH_OUT_FILENAME= mesh_out
+SOLUTION_FILENAME= solution_flow
+SOLUTION_ADJ_FILENAME= solution_adj
TABULAR_FORMAT= CSV
CONV_FILENAME= history
-RESTART_FILENAME= restart_flow.dat
-RESTART_ADJ_FILENAME= restart_adj.dat
+RESTART_FILENAME= restart_flow
+RESTART_ADJ_FILENAME= restart_adj
VOLUME_FILENAME= flow
VOLUME_ADJ_FILENAME= adjoint
-GRAD_OBJFUNC_FILENAME= of_grad.dat
+GRAD_OBJFUNC_FILENAME= of_grad
SURFACE_FILENAME= surface_flow
SURFACE_ADJ_FILENAME= surface_adjoint
OUTPUT_WRT_FREQ= 10000
diff --git a/TestCases/polar/naca0012/inv_NACA0012.cfg b/TestCases/polar/naca0012/inv_NACA0012.cfg
index dd8ed5d3f109..a19b72f2d5ab 100644
--- a/TestCases/polar/naca0012/inv_NACA0012.cfg
+++ b/TestCases/polar/naca0012/inv_NACA0012.cfg
@@ -110,16 +110,17 @@ CONV_CAUCHY_EPS= 1E-6
%
MESH_FILENAME= mesh_NACA0012_inv.su2
MESH_FORMAT= SU2
-MESH_OUT_FILENAME= mesh_out.su2
-SOLUTION_FILENAME= solution_flow.dat
-SOLUTION_ADJ_FILENAME= solution_adj.dat
+MESH_OUT_FILENAME= mesh_out
+READ_BINARY_RESTART= YES
+SOLUTION_FILENAME= solution_flow
+SOLUTION_ADJ_FILENAME= solution_adj
TABULAR_FORMAT= TECPLOT
CONV_FILENAME= history
-RESTART_FILENAME= restart_flow.dat
-RESTART_ADJ_FILENAME= restart_adj.dat
+RESTART_FILENAME= restart_flow
+RESTART_ADJ_FILENAME= restart_adj
VOLUME_FILENAME= flow
VOLUME_ADJ_FILENAME= adjoint
-GRAD_OBJFUNC_FILENAME= of_grad.dat
+GRAD_OBJFUNC_FILENAME= of_grad
SURFACE_FILENAME= surface_flow
SURFACE_ADJ_FILENAME= surface_adjoint
OUTPUT_WRT_FREQ= 250
diff --git a/TestCases/py_wrapper/custom_heat_flux/run_ad.py b/TestCases/py_wrapper/custom_heat_flux/run_ad.py
index cb8b945efc1c..3dbe840701c1 100644
--- a/TestCases/py_wrapper/custom_heat_flux/run_ad.py
+++ b/TestCases/py_wrapper/custom_heat_flux/run_ad.py
@@ -82,7 +82,7 @@
UNST_ADJOINT_ITER= 41
% Only interested in the final value of the objective.
ITER_AVERAGE_OBJ= 1
-SOLUTION_FILENAME= restart.dat
+SOLUTION_FILENAME= restart
VOLUME_OUTPUT= SOLUTION, SENSITIVITY, SENSITIVITY_N
"""
diff --git a/TestCases/py_wrapper/custom_load_fea/run_ad.py b/TestCases/py_wrapper/custom_load_fea/run_ad.py
index fe50a2e7410b..ad85d4e7467d 100644
--- a/TestCases/py_wrapper/custom_load_fea/run_ad.py
+++ b/TestCases/py_wrapper/custom_load_fea/run_ad.py
@@ -84,7 +84,7 @@
FEA_ADVANCED_MODE= YES
UNST_ADJOINT_ITER= 21
ITER_AVERAGE_OBJ= 0
-SOLUTION_FILENAME= restart.dat
+SOLUTION_FILENAME= restart
VOLUME_OUTPUT= SOLUTION, SENSITIVITY, SENSITIVITY_N
"""
diff --git a/TestCases/py_wrapper/disc_adj_fea/flow_load_sens/configAD_fem.cfg b/TestCases/py_wrapper/disc_adj_fea/flow_load_sens/configAD_fem.cfg
index b5d0f15d944f..1b33db81a775 100644
--- a/TestCases/py_wrapper/disc_adj_fea/flow_load_sens/configAD_fem.cfg
+++ b/TestCases/py_wrapper/disc_adj_fea/flow_load_sens/configAD_fem.cfg
@@ -44,11 +44,11 @@ CONV_FILENAME= history
VOLUME_FILENAME= beam
BREAKDOWN_FILENAME= forces_breakdown.dat
-SOLUTION_FILENAME= solution_beam.dat
-RESTART_FILENAME= restart_beam.dat
+SOLUTION_FILENAME= solution_beam
+RESTART_FILENAME= restart_beam
-SOLUTION_ADJ_FILENAME= solution_adj.dat
-RESTART_ADJ_FILENAME= restart_adj.dat
+SOLUTION_ADJ_FILENAME= solution_adj
+RESTART_ADJ_FILENAME= restart_adj
MESH_FORMAT= SU2
TABULAR_FORMAT= CSV
diff --git a/TestCases/py_wrapper/disc_adj_flow/mesh_disp_sens/configAD_flow.cfg b/TestCases/py_wrapper/disc_adj_flow/mesh_disp_sens/configAD_flow.cfg
index a387578e514c..c3f68857537b 100644
--- a/TestCases/py_wrapper/disc_adj_flow/mesh_disp_sens/configAD_flow.cfg
+++ b/TestCases/py_wrapper/disc_adj_flow/mesh_disp_sens/configAD_flow.cfg
@@ -100,9 +100,9 @@ CONV_CAUCHY_EPS= 1E-5
MESH_FILENAME= meshFlow.su2
MESH_FORMAT= SU2
-MESH_OUT_FILENAME= mesh_out.su2
-SOLUTION_FILENAME= solution_flow.dat
-RESTART_FILENAME= restart_flow.dat
+MESH_OUT_FILENAME= mesh_out
+SOLUTION_FILENAME= solution_flow
+RESTART_FILENAME= restart_flow
TABULAR_FORMAT= CSV
CONV_FILENAME= history
VOLUME_FILENAME= flow
diff --git a/TestCases/py_wrapper/dyn_fsi/configFEA.cfg b/TestCases/py_wrapper/dyn_fsi/configFEA.cfg
index d782e3a10030..ace587bba5b3 100644
--- a/TestCases/py_wrapper/dyn_fsi/configFEA.cfg
+++ b/TestCases/py_wrapper/dyn_fsi/configFEA.cfg
@@ -48,7 +48,7 @@ MESH_FORMAT= SU2
MESH_FILENAME= meshFEA.su2
VOLUME_FILENAME= results_wall
-RESTART_FILENAME= restart_wall.dat
-SOLUTION_FILENAME= solution_wall.dat
+RESTART_FILENAME= restart_wall
+SOLUTION_FILENAME= solution_wall
HISTORY_OUTPUT= ITER, RMS_RES, STRUCT_COEFF, TAVG_STRUCT_COEFF
diff --git a/TestCases/py_wrapper/dyn_fsi/configFlow.cfg b/TestCases/py_wrapper/dyn_fsi/configFlow.cfg
index 6b1df89cc7f9..71e615b2a11c 100644
--- a/TestCases/py_wrapper/dyn_fsi/configFlow.cfg
+++ b/TestCases/py_wrapper/dyn_fsi/configFlow.cfg
@@ -74,7 +74,7 @@ MESH_FORMAT= SU2
MESH_FILENAME= meshFlow.su2
VOLUME_FILENAME= results_flow
-RESTART_FILENAME= restart_flow.dat
-SOLUTION_FILENAME= solution_flow.dat
+RESTART_FILENAME= restart_flow
+SOLUTION_FILENAME= solution_flow
HISTORY_OUTPUT= ITER, RMS_RES, AERO_COEFF, TAVG_AERO_COEFF
diff --git a/TestCases/py_wrapper/flatPlate_unsteady_CHT/unsteady_CHT_FlatPlate_Conf.cfg b/TestCases/py_wrapper/flatPlate_unsteady_CHT/unsteady_CHT_FlatPlate_Conf.cfg
index 5734b053490a..673c4dc3e31a 100644
--- a/TestCases/py_wrapper/flatPlate_unsteady_CHT/unsteady_CHT_FlatPlate_Conf.cfg
+++ b/TestCases/py_wrapper/flatPlate_unsteady_CHT/unsteady_CHT_FlatPlate_Conf.cfg
@@ -169,18 +169,18 @@ CONV_CAUCHY_EPS= 1E-6
%
MESH_FILENAME= 2D_FlatPlate_Rounded.su2
MESH_FORMAT= SU2
-MESH_OUT_FILENAME= mesh_out.su2
-SOLUTION_FILENAME= restart_flow.dat
-SOLUTION_ADJ_FILENAME= solution_adj.dat
+MESH_OUT_FILENAME= mesh_out
+SOLUTION_FILENAME= restart_flow
+SOLUTION_ADJ_FILENAME= solution_adj
TABULAR_FORMAT= CSV
CONV_FILENAME= history
BREAKDOWN_FILENAME= forces_breakdown.dat
-RESTART_FILENAME= restart_flow.dat
-RESTART_ADJ_FILENAME= restart_adj.dat
+RESTART_FILENAME= restart_flow
+RESTART_ADJ_FILENAME= restart_adj
VOLUME_FILENAME= flow
VOLUME_ADJ_FILENAME= adjoint
-VALUE_OBJFUNC_FILENAME= of_eval.dat
-GRAD_OBJFUNC_FILENAME= of_grad.dat
+VALUE_OBJFUNC_FILENAME= of_eval
+GRAD_OBJFUNC_FILENAME= of_grad
SURFACE_FILENAME= surface_flow
SURFACE_ADJ_FILENAME= surface_adjoint
OUTPUT_WRT_FREQ= 3
diff --git a/TestCases/py_wrapper/rotating_cylinder/spinning_cylinder.cfg b/TestCases/py_wrapper/rotating_cylinder/spinning_cylinder.cfg
index 194a46064dd3..5e2bcaa06928 100644
--- a/TestCases/py_wrapper/rotating_cylinder/spinning_cylinder.cfg
+++ b/TestCases/py_wrapper/rotating_cylinder/spinning_cylinder.cfg
@@ -99,16 +99,16 @@ CONV_CAUCHY_EPS= 1E-7
%
MESH_FILENAME= mesh_cylinder_lam.su2
MESH_FORMAT= SU2
-MESH_OUT_FILENAME= mesh_out.su2
-SOLUTION_FILENAME= solution_flow.dat
-SOLUTION_ADJ_FILENAME= solution_adj.dat
+MESH_OUT_FILENAME= mesh_out
+SOLUTION_FILENAME= solution_flow
+SOLUTION_ADJ_FILENAME= solution_adj
TABULAR_FORMAT= CSV
CONV_FILENAME= history
-RESTART_FILENAME= restart_flow.dat
-RESTART_ADJ_FILENAME= restart_adj.dat
+RESTART_FILENAME= restart_flow
+RESTART_ADJ_FILENAME= restart_adj
VOLUME_FILENAME= flow
VOLUME_ADJ_FILENAME= adjoint
-GRAD_OBJFUNC_FILENAME= of_grad.dat
+GRAD_OBJFUNC_FILENAME= of_grad
SURFACE_FILENAME= surface_flow
SURFACE_ADJ_FILENAME= surface_adjoint
OUTPUT_WRT_FREQ= 100
diff --git a/TestCases/py_wrapper/wavy_wall/run_steady.py b/TestCases/py_wrapper/wavy_wall/run_steady.py
index 2bec62288967..5b080cce22d9 100644
--- a/TestCases/py_wrapper/wavy_wall/run_steady.py
+++ b/TestCases/py_wrapper/wavy_wall/run_steady.py
@@ -81,7 +81,7 @@
CUSTOM_OBJFUNC= 'p_drop'
OBJECTIVE_FUNCTION= CUSTOM_OBJFUNC
-SOLUTION_FILENAME= restart.dat
+SOLUTION_FILENAME= restart
OUTPUT_FILES= RESTART, PARAVIEW_MULTIBLOCK
OUTPUT_WRT_FREQ= 9999
SCREEN_WRT_FREQ_INNER= 10
diff --git a/TestCases/radiation/p1model/configp1.cfg b/TestCases/radiation/p1model/configp1.cfg
index ed727abf1d47..3bc1167de216 100644
--- a/TestCases/radiation/p1model/configp1.cfg
+++ b/TestCases/radiation/p1model/configp1.cfg
@@ -102,8 +102,8 @@ MESH_FORMAT= SU2
MESH_FILENAME= meshp1.su2
OUTPUT_FILES = (RESTART, PARAVIEW)
-SOLUTION_FILENAME= solution_flow_p1.dat
-RESTART_FILENAME= restart_flow_p1.dat
+SOLUTION_FILENAME= solution_flow_p1
+RESTART_FILENAME= restart_flow_p1
VOLUME_FILENAME= flow_p1
TABULAR_FORMAT= CSV
diff --git a/TestCases/rans/actuatordisk_bem/actuatordisk_bem.cfg b/TestCases/rans/actuatordisk_bem/actuatordisk_bem.cfg
index 5422539f6287..3d4bf9c16bec 100644
--- a/TestCases/rans/actuatordisk_bem/actuatordisk_bem.cfg
+++ b/TestCases/rans/actuatordisk_bem/actuatordisk_bem.cfg
@@ -106,14 +106,14 @@ CONV_STARTITER= 10
%
MESH_FILENAME= actuatordisk_bem.su2
MESH_FORMAT= SU2
-MESH_OUT_FILENAME= mesh_out.su2
-SOLUTION_FILENAME= actuatordisk_bem.dat
+MESH_OUT_FILENAME= mesh_out
+SOLUTION_FILENAME= actuatordisk_bem
TABULAR_FORMAT= CSV
CONV_FILENAME= history_actuatordisk_bem
OUTPUT_FILES= (RESTART, PARAVIEW, SURFACE_PARAVIEW)
WRT_FORCES_BREAKDOWN= YES
BREAKDOWN_FILENAME= forces_breakdown_actuatordisk_bem.dat
-RESTART_FILENAME= restart_flow_actuatordisk_bem.dat
+RESTART_FILENAME= restart_flow_actuatordisk_bem
VOLUME_FILENAME= flow_actuatordisk_bem
SURFACE_FILENAME= surface_flow_actuatordisk_bem
OUTPUT_WRT_FREQ= 500
diff --git a/TestCases/rans/actuatordisk_variable_load/propeller_variable_load.cfg b/TestCases/rans/actuatordisk_variable_load/propeller_variable_load.cfg
index bdcdaeafabc5..8a99c1585fff 100644
--- a/TestCases/rans/actuatordisk_variable_load/propeller_variable_load.cfg
+++ b/TestCases/rans/actuatordisk_variable_load/propeller_variable_load.cfg
@@ -97,13 +97,13 @@ CONV_STARTITER= 10
%
MESH_FILENAME= propeller_variable_load.su2
MESH_FORMAT= SU2
-MESH_OUT_FILENAME= mesh_out.su2
-SOLUTION_FILENAME= restart_flow.dat
+MESH_OUT_FILENAME= mesh_out
+SOLUTION_FILENAME= restart_flow
TABULAR_FORMAT= TECPLOT
CONV_FILENAME= history
WRT_FORCES_BREAKDOWN= YES
BREAKDOWN_FILENAME= forces_breakdown.dat
-RESTART_FILENAME= restart_flow.dat
+RESTART_FILENAME= restart_flow
VOLUME_FILENAME= flow
SURFACE_FILENAME= surface_flow
OUTPUT_WRT_FREQ= 250
diff --git a/TestCases/rans/flatplate/turb_SA_flatplate.cfg b/TestCases/rans/flatplate/turb_SA_flatplate.cfg
index 52d5142f9d80..c20141a3cc94 100644
--- a/TestCases/rans/flatplate/turb_SA_flatplate.cfg
+++ b/TestCases/rans/flatplate/turb_SA_flatplate.cfg
@@ -94,16 +94,16 @@ CONV_CAUCHY_EPS= 1E-6
%
MESH_FILENAME= mesh_flatplate_turb_137x97.su2
MESH_FORMAT= SU2
-MESH_OUT_FILENAME= mesh_out.su2
-SOLUTION_FILENAME= solution_flow.dat
-SOLUTION_ADJ_FILENAME= solution_adj.dat
+MESH_OUT_FILENAME= mesh_out
+SOLUTION_FILENAME= solution_flow
+SOLUTION_ADJ_FILENAME= solution_adj
TABULAR_FORMAT= CSV
CONV_FILENAME= history
-RESTART_FILENAME= restart_flow.dat
-RESTART_ADJ_FILENAME= restart_adj.dat
+RESTART_FILENAME= restart_flow
+RESTART_ADJ_FILENAME= restart_adj
VOLUME_FILENAME= flow
VOLUME_ADJ_FILENAME= adjoint
-GRAD_OBJFUNC_FILENAME= of_grad.dat
+GRAD_OBJFUNC_FILENAME= of_grad
SURFACE_FILENAME= surface_flow
SURFACE_ADJ_FILENAME= surface_adjoint
OUTPUT_WRT_FREQ= 1000
diff --git a/TestCases/rans/flatplate/turb_SST_flatplate.cfg b/TestCases/rans/flatplate/turb_SST_flatplate.cfg
index 52e21e4f23dd..00b200bb7965 100644
--- a/TestCases/rans/flatplate/turb_SST_flatplate.cfg
+++ b/TestCases/rans/flatplate/turb_SST_flatplate.cfg
@@ -93,16 +93,16 @@ CONV_CAUCHY_EPS= 1E-6
%
MESH_FILENAME= mesh_flatplate_turb_137x97.su2
MESH_FORMAT= SU2
-MESH_OUT_FILENAME= mesh_out.su2
-SOLUTION_FILENAME= solution_flow.dat
-SOLUTION_ADJ_FILENAME= solution_adj.dat
+MESH_OUT_FILENAME= mesh_out
+SOLUTION_FILENAME= solution_flow
+SOLUTION_ADJ_FILENAME= solution_adj
TABULAR_FORMAT= CSV
CONV_FILENAME= history
-RESTART_FILENAME= restart_flow.dat
-RESTART_ADJ_FILENAME= restart_adj.dat
+RESTART_FILENAME= restart_flow
+RESTART_ADJ_FILENAME= restart_adj
VOLUME_FILENAME= flow
VOLUME_ADJ_FILENAME= adjoint
-GRAD_OBJFUNC_FILENAME= of_grad.dat
+GRAD_OBJFUNC_FILENAME= of_grad
SURFACE_FILENAME= surface_flow
SURFACE_ADJ_FILENAME= surface_adjoint
OUTPUT_WRT_FREQ= 1000
diff --git a/TestCases/rans/flatplate/turb_SST_flatplate_compressibility_Sarkar.cfg b/TestCases/rans/flatplate/turb_SST_flatplate_compressibility_Sarkar.cfg
index 020fa1a3d977..efffbc1fe747 100644
--- a/TestCases/rans/flatplate/turb_SST_flatplate_compressibility_Sarkar.cfg
+++ b/TestCases/rans/flatplate/turb_SST_flatplate_compressibility_Sarkar.cfg
@@ -129,14 +129,14 @@ OUTPUT_WRT_FREQ= 1000
MESH_FILENAME= mesh_flatplate_turb_137x97.su2
MESH_FORMAT= SU2
-MESH_OUT_FILENAME= mesh_out.su2
-SOLUTION_FILENAME= restart_flow.dat
-SOLUTION_ADJ_FILENAME= solution_adj.dat
+MESH_OUT_FILENAME= mesh_out
+SOLUTION_FILENAME= restart_flow
+SOLUTION_ADJ_FILENAME= solution_adj
OUTPUT_FILES= (RESTART, PARAVIEW, SURFACE_PARAVIEW, TECPLOT, SURFACE_TECPLOT, CSV, SURFACE_CSV )
CONV_FILENAME= history
BREAKDOWN_FILENAME= forces_breakdown.dat
-RESTART_FILENAME= restart_flow.dat
-RESTART_ADJ_FILENAME= restart_adj.dat
+RESTART_FILENAME= restart_flow
+RESTART_ADJ_FILENAME= restart_adj
% ------------------------------- SOLVER CONTROL ------------------------------%
%
diff --git a/TestCases/rans/flatplate/turb_SST_flatplate_compressibility_Wilcox.cfg b/TestCases/rans/flatplate/turb_SST_flatplate_compressibility_Wilcox.cfg
index 56caf32cf417..e18b46fff321 100644
--- a/TestCases/rans/flatplate/turb_SST_flatplate_compressibility_Wilcox.cfg
+++ b/TestCases/rans/flatplate/turb_SST_flatplate_compressibility_Wilcox.cfg
@@ -129,14 +129,14 @@ OUTPUT_WRT_FREQ= 1000
MESH_FILENAME= mesh_flatplate_turb_137x97.su2
MESH_FORMAT= SU2
-MESH_OUT_FILENAME= mesh_out.su2
-SOLUTION_FILENAME= restart_flow.dat
-SOLUTION_ADJ_FILENAME= solution_adj.dat
+MESH_OUT_FILENAME= mesh_out
+SOLUTION_FILENAME= restart_flow
+SOLUTION_ADJ_FILENAME= solution_adj
OUTPUT_FILES= (RESTART, PARAVIEW, SURFACE_PARAVIEW, TECPLOT, SURFACE_TECPLOT, CSV, SURFACE_CSV )
CONV_FILENAME= history
BREAKDOWN_FILENAME= forces_breakdown.dat
-RESTART_FILENAME= restart_flow.dat
-RESTART_ADJ_FILENAME= restart_adj.dat
+RESTART_FILENAME= restart_flow
+RESTART_ADJ_FILENAME= restart_adj
% ------------------------------- SOLVER CONTROL ------------------------------%
%
diff --git a/TestCases/rans/naca0012/turb_NACA0012_sa.cfg b/TestCases/rans/naca0012/turb_NACA0012_sa.cfg
index 47558fced8ab..6eed291f1454 100644
--- a/TestCases/rans/naca0012/turb_NACA0012_sa.cfg
+++ b/TestCases/rans/naca0012/turb_NACA0012_sa.cfg
@@ -88,16 +88,16 @@ CONV_CAUCHY_EPS= 1E-6
%
MESH_FILENAME= n0012_225-65.su2
MESH_FORMAT= SU2
-MESH_OUT_FILENAME= mesh_out.su2
-SOLUTION_FILENAME= solution_flow_sa.dat
-SOLUTION_ADJ_FILENAME= solution_adj.dat
+MESH_OUT_FILENAME= mesh_out
+SOLUTION_FILENAME= solution_flow_sa
+SOLUTION_ADJ_FILENAME= solution_adj
TABULAR_FORMAT= CSV
CONV_FILENAME= history
-RESTART_FILENAME= restart_flow.dat
-RESTART_ADJ_FILENAME= restart_adj.dat
+RESTART_FILENAME= restart_flow
+RESTART_ADJ_FILENAME= restart_adj
VOLUME_FILENAME= flow
VOLUME_ADJ_FILENAME= adjoint
-GRAD_OBJFUNC_FILENAME= of_grad.dat
+GRAD_OBJFUNC_FILENAME= of_grad
SURFACE_FILENAME= surface_flow
SURFACE_ADJ_FILENAME= surface_adjoint
OUTPUT_WRT_FREQ= 10000
diff --git a/TestCases/rans/naca0012/turb_NACA0012_sst.cfg b/TestCases/rans/naca0012/turb_NACA0012_sst.cfg
index bfa3925c7c4d..85c68a6a8c56 100644
--- a/TestCases/rans/naca0012/turb_NACA0012_sst.cfg
+++ b/TestCases/rans/naca0012/turb_NACA0012_sst.cfg
@@ -93,16 +93,16 @@ CONV_CAUCHY_EPS= 1E-6
%
MESH_FILENAME= n0012_225-65.su2
MESH_FORMAT= SU2
-MESH_OUT_FILENAME= mesh_out.su2
-SOLUTION_FILENAME= solution_flow_sst.dat
-SOLUTION_ADJ_FILENAME= solution_adj.dat
+MESH_OUT_FILENAME= mesh_out
+SOLUTION_FILENAME= solution_flow_sst
+SOLUTION_ADJ_FILENAME= solution_adj
TABULAR_FORMAT= CSV
CONV_FILENAME= history
-RESTART_FILENAME= restart_flow.dat
-RESTART_ADJ_FILENAME= restart_adj.dat
+RESTART_FILENAME= restart_flow
+RESTART_ADJ_FILENAME= restart_adj
VOLUME_FILENAME= flow
VOLUME_ADJ_FILENAME= adjoint
-GRAD_OBJFUNC_FILENAME= of_grad.dat
+GRAD_OBJFUNC_FILENAME= of_grad
SURFACE_FILENAME= surface_flow
SURFACE_ADJ_FILENAME= surface_adjoint
OUTPUT_WRT_FREQ= 10000
diff --git a/TestCases/rans/naca0012/turb_NACA0012_sst_1994-KLm.cfg b/TestCases/rans/naca0012/turb_NACA0012_sst_1994-KLm.cfg
index d1c5ceb126e5..87f59fdf4551 100644
--- a/TestCases/rans/naca0012/turb_NACA0012_sst_1994-KLm.cfg
+++ b/TestCases/rans/naca0012/turb_NACA0012_sst_1994-KLm.cfg
@@ -90,16 +90,16 @@ CONV_CAUCHY_EPS= 1E-6
%
MESH_FILENAME= n0012_225-65.su2
MESH_FORMAT= SU2
-MESH_OUT_FILENAME= mesh_out.su2
-SOLUTION_FILENAME= solution_flow_sst.dat
-SOLUTION_ADJ_FILENAME= solution_adj.dat
+MESH_OUT_FILENAME= mesh_out
+SOLUTION_FILENAME= solution_flow_sst
+SOLUTION_ADJ_FILENAME= solution_adj
TABULAR_FORMAT= CSV
CONV_FILENAME= history
-RESTART_FILENAME= restart_flow.dat
-RESTART_ADJ_FILENAME= restart_adj.dat
+RESTART_FILENAME= restart_flow
+RESTART_ADJ_FILENAME= restart_adj
VOLUME_FILENAME= flow
VOLUME_ADJ_FILENAME= adjoint
-GRAD_OBJFUNC_FILENAME= of_grad.dat
+GRAD_OBJFUNC_FILENAME= of_grad
SURFACE_FILENAME= surface_flow
SURFACE_ADJ_FILENAME= surface_adjoint
OUTPUT_WRT_FREQ= 10000
diff --git a/TestCases/rans/naca0012/turb_NACA0012_sst_2003-Vm.cfg b/TestCases/rans/naca0012/turb_NACA0012_sst_2003-Vm.cfg
index 991ad431227c..ff158bd86774 100644
--- a/TestCases/rans/naca0012/turb_NACA0012_sst_2003-Vm.cfg
+++ b/TestCases/rans/naca0012/turb_NACA0012_sst_2003-Vm.cfg
@@ -90,16 +90,16 @@ CONV_CAUCHY_EPS= 1E-6
%
MESH_FILENAME= n0012_225-65.su2
MESH_FORMAT= SU2
-MESH_OUT_FILENAME= mesh_out.su2
-SOLUTION_FILENAME= solution_flow_sst.dat
-SOLUTION_ADJ_FILENAME= solution_adj.dat
+MESH_OUT_FILENAME= mesh_out
+SOLUTION_FILENAME= solution_flow_sst
+SOLUTION_ADJ_FILENAME= solution_adj
TABULAR_FORMAT= CSV
CONV_FILENAME= history
-RESTART_FILENAME= restart_flow.dat
-RESTART_ADJ_FILENAME= restart_adj.dat
+RESTART_FILENAME= restart_flow
+RESTART_ADJ_FILENAME= restart_adj
VOLUME_FILENAME= flow
VOLUME_ADJ_FILENAME= adjoint
-GRAD_OBJFUNC_FILENAME= of_grad.dat
+GRAD_OBJFUNC_FILENAME= of_grad
SURFACE_FILENAME= surface_flow
SURFACE_ADJ_FILENAME= surface_adjoint
OUTPUT_WRT_FREQ= 10000
diff --git a/TestCases/rans/naca0012/turb_NACA0012_sst_2003m.cfg b/TestCases/rans/naca0012/turb_NACA0012_sst_2003m.cfg
index c5c2e571050e..d827922629a1 100644
--- a/TestCases/rans/naca0012/turb_NACA0012_sst_2003m.cfg
+++ b/TestCases/rans/naca0012/turb_NACA0012_sst_2003m.cfg
@@ -82,11 +82,11 @@ CONV_STARTITER= 10
%
MESH_FILENAME= n0012_225-65.su2
MESH_FORMAT= SU2
-MESH_OUT_FILENAME= mesh_out.su2
-SOLUTION_FILENAME= solution_flow_sst.dat
+MESH_OUT_FILENAME= mesh_out
+SOLUTION_FILENAME= solution_flow_sst
TABULAR_FORMAT= CSV
CONV_FILENAME= history
-RESTART_FILENAME= restart_flow.dat
+RESTART_FILENAME= restart_flow
VOLUME_FILENAME= flow
SURFACE_FILENAME= surface_flow
OUTPUT_WRT_FREQ= 10000
diff --git a/TestCases/rans/naca0012/turb_NACA0012_sst_expliciteuler.cfg b/TestCases/rans/naca0012/turb_NACA0012_sst_expliciteuler.cfg
index e253b8c9a97b..0f7551a8aba0 100644
--- a/TestCases/rans/naca0012/turb_NACA0012_sst_expliciteuler.cfg
+++ b/TestCases/rans/naca0012/turb_NACA0012_sst_expliciteuler.cfg
@@ -69,7 +69,7 @@ TABULAR_FORMAT= CSV
CONV_FILENAME= history
OUTPUT_FILES= (RESTART_ASCII, PARAVIEW, SURFACE_PARAVIEW)
OUTPUT_WRT_FREQ= 10000
-RESTART_FILENAME= restart_flow.dat
-SOLUTION_FILENAME= solution_flow_sst_expliciteuler.dat
+RESTART_FILENAME= restart_flow
+SOLUTION_FILENAME= solution_flow_sst_expliciteuler
VOLUME_FILENAME= flow
SURFACE_FILENAME= surface_flow
diff --git a/TestCases/rans/naca0012/turb_NACA0012_sst_fixedvalues.cfg b/TestCases/rans/naca0012/turb_NACA0012_sst_fixedvalues.cfg
index 3ed7280ad688..652f3db9a970 100644
--- a/TestCases/rans/naca0012/turb_NACA0012_sst_fixedvalues.cfg
+++ b/TestCases/rans/naca0012/turb_NACA0012_sst_fixedvalues.cfg
@@ -77,11 +77,11 @@ CONV_CAUCHY_EPS= 1E-6
% ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
MESH_FILENAME= n0012_113-33.su2
MESH_FORMAT= SU2
-MESH_OUT_FILENAME= mesh_out.su2
-SOLUTION_FILENAME= solution_flow_sst_fixedvalues.dat
+MESH_OUT_FILENAME= mesh_out
+SOLUTION_FILENAME= solution_flow_sst_fixedvalues
TABULAR_FORMAT= CSV
CONV_FILENAME= history
-RESTART_FILENAME= restart_flow.dat
+RESTART_FILENAME= restart_flow
VOLUME_FILENAME= flow
SURFACE_FILENAME= surface_flow
OUTPUT_WRT_FREQ= 10000
diff --git a/TestCases/rans/naca0012/turb_NACA0012_sst_multigrid_restart.cfg b/TestCases/rans/naca0012/turb_NACA0012_sst_multigrid_restart.cfg
index 0f9fd3c9f492..6c371f59a24e 100644
--- a/TestCases/rans/naca0012/turb_NACA0012_sst_multigrid_restart.cfg
+++ b/TestCases/rans/naca0012/turb_NACA0012_sst_multigrid_restart.cfg
@@ -135,17 +135,17 @@ CONV_CAUCHY_EPS= 1E-6
%
MESH_FILENAME= n0012_113-33.su2
MESH_FORMAT= SU2
-MESH_OUT_FILENAME= mesh_out.su2
-SOLUTION_FILENAME= solution_flow_sst_restart.dat
-SOLUTION_ADJ_FILENAME= solution_adj.dat
+MESH_OUT_FILENAME= mesh_out
+SOLUTION_FILENAME= solution_flow_sst_restart
+SOLUTION_ADJ_FILENAME= solution_adj
TABULAR_FORMAT= CSV
CONV_FILENAME= history
-RESTART_FILENAME= restart_flow.dat
-RESTART_ADJ_FILENAME= restart_adj.dat
+RESTART_FILENAME= restart_flow
+RESTART_ADJ_FILENAME= restart_adj
VOLUME_FILENAME= flow
VOLUME_ADJ_FILENAME= adjoint
-VALUE_OBJFUNC_FILENAME= of_eval.dat
-GRAD_OBJFUNC_FILENAME= of_grad.dat
+VALUE_OBJFUNC_FILENAME= of_eval
+GRAD_OBJFUNC_FILENAME= of_grad
SURFACE_FILENAME= surface_flow
SURFACE_ADJ_FILENAME= surface_adjoint
OUTPUT_WRT_FREQ= 500
diff --git a/TestCases/rans/naca0012/turb_NACA0012_sst_sust.cfg b/TestCases/rans/naca0012/turb_NACA0012_sst_sust.cfg
index 984c4f951139..80fdd3b84b46 100644
--- a/TestCases/rans/naca0012/turb_NACA0012_sst_sust.cfg
+++ b/TestCases/rans/naca0012/turb_NACA0012_sst_sust.cfg
@@ -88,11 +88,11 @@ CONV_CAUCHY_EPS= 1E-6
%
MESH_FILENAME= n0012_225-65.su2
MESH_FORMAT= SU2
-MESH_OUT_FILENAME= mesh_out.su2
-SOLUTION_FILENAME= solution_flow_sst_sust.dat
+MESH_OUT_FILENAME= mesh_out
+SOLUTION_FILENAME= solution_flow_sst_sust
TABULAR_FORMAT= CSV
CONV_FILENAME= history
-RESTART_FILENAME= restart_flow.dat
+RESTART_FILENAME= restart_flow
VOLUME_FILENAME= flow
SURFACE_FILENAME= surface_flow
OUTPUT_WRT_FREQ= 10000
diff --git a/TestCases/rans/oneram6/turb_ONERAM6.cfg b/TestCases/rans/oneram6/turb_ONERAM6.cfg
index 98ac5377d2ae..e561035673f6 100644
--- a/TestCases/rans/oneram6/turb_ONERAM6.cfg
+++ b/TestCases/rans/oneram6/turb_ONERAM6.cfg
@@ -106,17 +106,17 @@ PARMETIS_EDGE_WEIGHT= 0
PARMETIS_POINT_WEIGHT= 1
MESH_FILENAME= mesh_ONERAM6_turb_hexa_43008.su2
MESH_FORMAT= SU2
-MESH_OUT_FILENAME= mesh_out.su2
-SOLUTION_FILENAME= restart_flow.dat
-SOLUTION_ADJ_FILENAME= solution_adj.dat
+MESH_OUT_FILENAME= mesh_out
+SOLUTION_FILENAME= restart_flow
+SOLUTION_ADJ_FILENAME= solution_adj
OUTPUT_FILES=(RESTART, STL_ASCII, PARAVIEW, SURFACE_PARAVIEW)
TABULAR_FORMAT= CSV
CONV_FILENAME= history
-RESTART_FILENAME= restart_flow.dat
-RESTART_ADJ_FILENAME= restart_adj.dat
+RESTART_FILENAME= restart_flow
+RESTART_ADJ_FILENAME= restart_adj
VOLUME_FILENAME= flow
VOLUME_ADJ_FILENAME= adjoint
-GRAD_OBJFUNC_FILENAME= of_grad.dat
+GRAD_OBJFUNC_FILENAME= of_grad
SURFACE_FILENAME= surface_flow
SURFACE_ADJ_FILENAME= surface_adjoint
OUTPUT_WRT_FREQ= 250
diff --git a/TestCases/rans/oneram6/turb_ONERAM6_nk.cfg b/TestCases/rans/oneram6/turb_ONERAM6_nk.cfg
index b24a9837a5a9..d89f8807e9a7 100644
--- a/TestCases/rans/oneram6/turb_ONERAM6_nk.cfg
+++ b/TestCases/rans/oneram6/turb_ONERAM6_nk.cfg
@@ -110,10 +110,10 @@ ITER= 2000
MESH_FILENAME= mesh_ONERAM6_turb_hexa_43008.su2
MESH_FORMAT= SU2
TABULAR_FORMAT= CSV
-SOLUTION_FILENAME= solution.dat
-RESTART_FILENAME= restart.dat
-SOLUTION_ADJ_FILENAME= solution_adj.dat
-RESTART_ADJ_FILENAME= restart_adj.dat
+SOLUTION_FILENAME= solution
+RESTART_FILENAME= restart
+SOLUTION_ADJ_FILENAME= solution_adj
+RESTART_ADJ_FILENAME= restart_adj
VOLUME_FILENAME= flow
VOLUME_ADJ_FILENAME= adjoint
SURFACE_FILENAME= surface_flow
diff --git a/TestCases/rans/oneram6/turb_ONERAM6_vc.cfg b/TestCases/rans/oneram6/turb_ONERAM6_vc.cfg
index 5b2ff072a9dd..59873304cffb 100644
--- a/TestCases/rans/oneram6/turb_ONERAM6_vc.cfg
+++ b/TestCases/rans/oneram6/turb_ONERAM6_vc.cfg
@@ -113,17 +113,17 @@ PARMETIS_EDGE_WEIGHT= 0
PARMETIS_POINT_WEIGHT= 1
MESH_FILENAME= mesh_ONERAM6_turb_hexa_43008.su2
MESH_FORMAT= SU2
-MESH_OUT_FILENAME= mesh_out.su2
-SOLUTION_FILENAME= restart_flow.dat
-SOLUTION_ADJ_FILENAME= solution_adj.dat
+MESH_OUT_FILENAME= mesh_out
+SOLUTION_FILENAME= restart_flow
+SOLUTION_ADJ_FILENAME= solution_adj
OUTPUT_FILES=(RESTART, STL_ASCII, PARAVIEW, SURFACE_PARAVIEW)
TABULAR_FORMAT= CSV
CONV_FILENAME= history
-RESTART_FILENAME= restart_flow.dat
-RESTART_ADJ_FILENAME= restart_adj.dat
+RESTART_FILENAME= restart_flow
+RESTART_ADJ_FILENAME= restart_adj
VOLUME_FILENAME= flow
VOLUME_ADJ_FILENAME= adjoint
-GRAD_OBJFUNC_FILENAME= of_grad.dat
+GRAD_OBJFUNC_FILENAME= of_grad
SURFACE_FILENAME= surface_flow
SURFACE_ADJ_FILENAME= surface_adjoint
OUTPUT_WRT_FREQ= 250
diff --git a/TestCases/rans/propeller/propeller.cfg b/TestCases/rans/propeller/propeller.cfg
index 8abec22dc62f..7ad82982c322 100644
--- a/TestCases/rans/propeller/propeller.cfg
+++ b/TestCases/rans/propeller/propeller.cfg
@@ -92,18 +92,18 @@ CONV_STARTITER= 10
%
MESH_FILENAME= ActuatorDisk.su2
MESH_FORMAT= SU2
-MESH_OUT_FILENAME= mesh_out.su2
-SOLUTION_FILENAME= solution_flow.dat
-SOLUTION_ADJ_FILENAME= solution_adj.dat
+MESH_OUT_FILENAME= mesh_out
+SOLUTION_FILENAME= solution_flow
+SOLUTION_ADJ_FILENAME= solution_adj
TABULAR_FORMAT= CSV
CONV_FILENAME= history
BREAKDOWN_FILENAME= forces_breakdown.dat
-RESTART_FILENAME= restart_flow.dat
-RESTART_ADJ_FILENAME= restart_adj.dat
+RESTART_FILENAME= restart_flow
+RESTART_ADJ_FILENAME= restart_adj
VOLUME_FILENAME= flow
VOLUME_ADJ_FILENAME= adjoint
-VALUE_OBJFUNC_FILENAME= of_eval.dat
-GRAD_OBJFUNC_FILENAME= of_grad.dat
+VALUE_OBJFUNC_FILENAME= of_eval
+GRAD_OBJFUNC_FILENAME= of_grad
SURFACE_FILENAME= surface_flow
SURFACE_ADJ_FILENAME= surface_adjoint
OUTPUT_WRT_FREQ= 1500
diff --git a/TestCases/rans/rae2822/turb_SA_RAE2822.cfg b/TestCases/rans/rae2822/turb_SA_RAE2822.cfg
index b9d0c0a74b3d..b1b9952bb61a 100644
--- a/TestCases/rans/rae2822/turb_SA_RAE2822.cfg
+++ b/TestCases/rans/rae2822/turb_SA_RAE2822.cfg
@@ -91,16 +91,16 @@ CONV_CAUCHY_EPS= 1E-6
%
MESH_FILENAME= mesh_RAE2822_turb.su2
MESH_FORMAT= SU2
-MESH_OUT_FILENAME= mesh_out.su2
-SOLUTION_FILENAME= solution_flow.dat
-SOLUTION_ADJ_FILENAME= solution_adj.dat
+MESH_OUT_FILENAME= mesh_out
+SOLUTION_FILENAME= solution_flow
+SOLUTION_ADJ_FILENAME= solution_adj
TABULAR_FORMAT= CSV
CONV_FILENAME= history
-RESTART_FILENAME= restart_flow.dat
-RESTART_ADJ_FILENAME= restart_adj.dat
+RESTART_FILENAME= restart_flow
+RESTART_ADJ_FILENAME= restart_adj
VOLUME_FILENAME= flow
VOLUME_ADJ_FILENAME= adjoint
-GRAD_OBJFUNC_FILENAME= of_grad.dat
+GRAD_OBJFUNC_FILENAME= of_grad
SURFACE_FILENAME= surface_flow
SURFACE_ADJ_FILENAME= surface_adjoint
OUTPUT_WRT_FREQ= 250
diff --git a/TestCases/rans/rae2822/turb_SST_RAE2822.cfg b/TestCases/rans/rae2822/turb_SST_RAE2822.cfg
index 7729ed092dbc..dfe26a2bcc17 100644
--- a/TestCases/rans/rae2822/turb_SST_RAE2822.cfg
+++ b/TestCases/rans/rae2822/turb_SST_RAE2822.cfg
@@ -87,16 +87,16 @@ CONV_CAUCHY_EPS= 1E-6
%
MESH_FILENAME= mesh_RAE2822_turb.su2
MESH_FORMAT= SU2
-MESH_OUT_FILENAME= mesh_out.su2
-SOLUTION_FILENAME= solution_flow.dat
-SOLUTION_ADJ_FILENAME= solution_adj.dat
+MESH_OUT_FILENAME= mesh_out
+SOLUTION_FILENAME= solution_flow
+SOLUTION_ADJ_FILENAME= solution_adj
TABULAR_FORMAT= CSV
CONV_FILENAME= history
-RESTART_FILENAME= restart_flow.dat
-RESTART_ADJ_FILENAME= restart_adj.dat
+RESTART_FILENAME= restart_flow
+RESTART_ADJ_FILENAME= restart_adj
VOLUME_FILENAME= flow
VOLUME_ADJ_FILENAME= adjoint
-GRAD_OBJFUNC_FILENAME= of_grad.dat
+GRAD_OBJFUNC_FILENAME= of_grad
SURFACE_FILENAME= surface_flow
SURFACE_ADJ_FILENAME= surface_adjoint
OUTPUT_WRT_FREQ= 250
diff --git a/TestCases/rans/rae2822/turb_SST_SUST_RAE2822.cfg b/TestCases/rans/rae2822/turb_SST_SUST_RAE2822.cfg
index 34c2752a5425..6ac01ff925dd 100644
--- a/TestCases/rans/rae2822/turb_SST_SUST_RAE2822.cfg
+++ b/TestCases/rans/rae2822/turb_SST_SUST_RAE2822.cfg
@@ -88,16 +88,16 @@ CONV_CAUCHY_EPS= 1E-6
%
MESH_FILENAME= mesh_RAE2822_turb.su2
MESH_FORMAT= SU2
-MESH_OUT_FILENAME= mesh_out.su2
-SOLUTION_FILENAME= solution_flow.dat
-SOLUTION_ADJ_FILENAME= solution_adj.dat
+MESH_OUT_FILENAME= mesh_out
+SOLUTION_FILENAME= solution_flow
+SOLUTION_ADJ_FILENAME= solution_adj
TABULAR_FORMAT= CSV
CONV_FILENAME= history
-RESTART_FILENAME= restart_flow.dat
-RESTART_ADJ_FILENAME= restart_adj.dat
+RESTART_FILENAME= restart_flow
+RESTART_ADJ_FILENAME= restart_adj
VOLUME_FILENAME= flow
VOLUME_ADJ_FILENAME= adjoint
-GRAD_OBJFUNC_FILENAME= of_grad.dat
+GRAD_OBJFUNC_FILENAME= of_grad
SURFACE_FILENAME= surface_flow
SURFACE_ADJ_FILENAME= surface_adjoint
OUTPUT_WRT_FREQ= 250
diff --git a/TestCases/rans/restart_directdiff_naca/naca0012.cfg b/TestCases/rans/restart_directdiff_naca/naca0012.cfg
index ab034cd0208d..975ca981aab5 100644
--- a/TestCases/rans/restart_directdiff_naca/naca0012.cfg
+++ b/TestCases/rans/restart_directdiff_naca/naca0012.cfg
@@ -97,13 +97,13 @@ SCREEN_OUTPUT=(INNER_ITER, TIME_ITER, RMS_ADJ_DENSITY, RMS_DENSITY, , REL_RMS_DE
HISTORY_OUTPUT=(D_AERO_COEFF,D_TAVG_AERO_COEFF)
MESH_FILENAME= naca0012_FFD.su2
MESH_FORMAT= SU2
-MESH_OUT_FILENAME= mesh_out.su2
-SOLUTION_FILENAME= restart_flow.dat
-SOLUTION_ADJ_FILENAME= restart_adj.dat
+MESH_OUT_FILENAME= mesh_out
+SOLUTION_FILENAME= restart_flow
+SOLUTION_ADJ_FILENAME= restart_adj
TABULAR_FORMAT= CSV
CONV_FILENAME= 0_history
-RESTART_FILENAME= restart_flow.dat
-RESTART_ADJ_FILENAME= restart_adj.dat
+RESTART_FILENAME= restart_flow
+RESTART_ADJ_FILENAME= restart_adj
VOLUME_FILENAME= flow
SURFACE_FILENAME= surface_flow
OUTPUT_WRT_FREQ= 1
diff --git a/TestCases/rans/s809/trans_s809.cfg b/TestCases/rans/s809/trans_s809.cfg
index ee2d5eed0ea3..a2d987d6670a 100644
--- a/TestCases/rans/s809/trans_s809.cfg
+++ b/TestCases/rans/s809/trans_s809.cfg
@@ -87,18 +87,18 @@ CONV_CAUCHY_EPS= 1E-6
%
MESH_FILENAME= s809_2e6.su2
MESH_FORMAT= SU2
-MESH_OUT_FILENAME= trans_mesh_out.su2
-SOLUTION_FILENAME= trans_solution_flow.dat
+MESH_OUT_FILENAME= trans_mesh_out
+SOLUTION_FILENAME= trans_solution_flow
SOLUTION_LIN_FILENAME= trans_solution_lin.dat
-SOLUTION_ADJ_FILENAME= trans_solution_adj.dat
+SOLUTION_ADJ_FILENAME= trans_solution_adj
TABULAR_FORMAT= CSV
CONV_FILENAME= trans_history
-RESTART_FILENAME= trans_restart_flow.dat
-RESTART_ADJ_FILENAME= trans_restart_adj.dat
+RESTART_FILENAME= trans_restart_flow
+RESTART_ADJ_FILENAME= trans_restart_adj
RESTART_LIN_FILENAME= trans_restart_lin.dat
VOLUME_FILENAME= trans_flow
VOLUME_ADJ_FILENAME= trans_adjoint
-GRAD_OBJFUNC_FILENAME= trans_of_grad.dat
+GRAD_OBJFUNC_FILENAME= trans_of_grad
SURFACE_FILENAME= trans_surface_flow
SURFACE_ADJ_FILENAME= trans_surface_adjoint
SURFACE_LIN_FILENAME= trans_surface_linear
diff --git a/TestCases/rans/s809/turb_S809.cfg b/TestCases/rans/s809/turb_S809.cfg
index d8f41f5dd622..68516c8f075c 100644
--- a/TestCases/rans/s809/turb_S809.cfg
+++ b/TestCases/rans/s809/turb_S809.cfg
@@ -83,16 +83,16 @@ CONV_CAUCHY_EPS= 1E-6
%
MESH_FILENAME= s809_2e6.su2
MESH_FORMAT= SU2
-MESH_OUT_FILENAME= mesh_out.su2
-SOLUTION_FILENAME= solution_flow.dat
-SOLUTION_ADJ_FILENAME= solution_adj.dat
+MESH_OUT_FILENAME= mesh_out
+SOLUTION_FILENAME= solution_flow
+SOLUTION_ADJ_FILENAME= solution_adj
TABULAR_FORMAT= CSV
CONV_FILENAME= history
-RESTART_FILENAME= restart_flow.dat
-RESTART_ADJ_FILENAME= restart_adj.dat
+RESTART_FILENAME= restart_flow
+RESTART_ADJ_FILENAME= restart_adj
VOLUME_FILENAME= flow
VOLUME_ADJ_FILENAME= adjoint
-GRAD_OBJFUNC_FILENAME= of_grad.dat
+GRAD_OBJFUNC_FILENAME= of_grad
SURFACE_FILENAME= surface_flow
SURFACE_ADJ_FILENAME= surface_adjoint
OUTPUT_WRT_FREQ= 1000
diff --git a/TestCases/rans/vki_turbine/turb_vki.cfg b/TestCases/rans/vki_turbine/turb_vki.cfg
index cb1b2255bcf3..6b5b380c4624 100644
--- a/TestCases/rans/vki_turbine/turb_vki.cfg
+++ b/TestCases/rans/vki_turbine/turb_vki.cfg
@@ -81,16 +81,16 @@ CONV_CAUCHY_EPS= 1E-6
%
MESH_FILENAME= mesh_vki_turbine_prepbc.su2
MESH_FORMAT= SU2
-MESH_OUT_FILENAME= mesh_out.su2
-SOLUTION_FILENAME= solution_flow.dat
-SOLUTION_ADJ_FILENAME= solution_adj.dat
+MESH_OUT_FILENAME= mesh_out
+SOLUTION_FILENAME= solution_flow
+SOLUTION_ADJ_FILENAME= solution_adj
TABULAR_FORMAT= CSV
CONV_FILENAME= history
-RESTART_FILENAME= restart_flow.dat
-RESTART_ADJ_FILENAME= restart_adj.dat
+RESTART_FILENAME= restart_flow
+RESTART_ADJ_FILENAME= restart_adj
VOLUME_FILENAME= flow
VOLUME_ADJ_FILENAME= adjoint
-GRAD_OBJFUNC_FILENAME= of_grad.dat
+GRAD_OBJFUNC_FILENAME= of_grad
SURFACE_FILENAME= surface_flow
SURFACE_ADJ_FILENAME= surface_adjoint
OUTPUT_WRT_FREQ= 1000
diff --git a/TestCases/rans_uq/naca0012/turb_NACA0012_uq.cfg b/TestCases/rans_uq/naca0012/turb_NACA0012_uq.cfg
index d653fae2d621..6a12decd43ce 100644
--- a/TestCases/rans_uq/naca0012/turb_NACA0012_uq.cfg
+++ b/TestCases/rans_uq/naca0012/turb_NACA0012_uq.cfg
@@ -87,16 +87,16 @@ CONV_CAUCHY_EPS= 1E-5
%
MESH_FILENAME= mesh_n0012_225-65.su2
MESH_FORMAT= SU2
-MESH_OUT_FILENAME= mesh_out.su2
-SOLUTION_FILENAME= solution_flow_sst.dat
-SOLUTION_ADJ_FILENAME= solution_adj.dat
+MESH_OUT_FILENAME= mesh_out
+SOLUTION_FILENAME= solution_flow_sst
+SOLUTION_ADJ_FILENAME= solution_adj
TABULAR_FORMAT= CSV
CONV_FILENAME= history
-RESTART_FILENAME= restart_flow.dat
-RESTART_ADJ_FILENAME= restart_adj.dat
+RESTART_FILENAME= restart_flow
+RESTART_ADJ_FILENAME= restart_adj
VOLUME_FILENAME= flow
VOLUME_ADJ_FILENAME= adjoint
-GRAD_OBJFUNC_FILENAME= of_grad.dat
+GRAD_OBJFUNC_FILENAME= of_grad
SURFACE_FILENAME= surface_flow
SURFACE_ADJ_FILENAME= surface_adjoint
OUTPUT_WRT_FREQ= 10000
diff --git a/TestCases/rans_uq/naca0012/turb_NACA0012_uq_1c.cfg b/TestCases/rans_uq/naca0012/turb_NACA0012_uq_1c.cfg
index fa98ddb075a3..094ccdb8b616 100644
--- a/TestCases/rans_uq/naca0012/turb_NACA0012_uq_1c.cfg
+++ b/TestCases/rans_uq/naca0012/turb_NACA0012_uq_1c.cfg
@@ -102,16 +102,16 @@ CONV_CAUCHY_EPS= 1E-5
%
MESH_FILENAME= mesh_n0012_225-65.su2
MESH_FORMAT= SU2
-MESH_OUT_FILENAME= mesh_out.su2
-SOLUTION_FILENAME= solution_flow.dat
-SOLUTION_ADJ_FILENAME= solution_adj.dat
+MESH_OUT_FILENAME= mesh_out
+SOLUTION_FILENAME= solution_flow
+SOLUTION_ADJ_FILENAME= solution_adj
TABULAR_FORMAT= CSV
CONV_FILENAME= history
-RESTART_FILENAME= restart_flow.dat
-RESTART_ADJ_FILENAME= restart_adj.dat
+RESTART_FILENAME= restart_flow
+RESTART_ADJ_FILENAME= restart_adj
VOLUME_FILENAME= flow
VOLUME_ADJ_FILENAME= adjoint
-GRAD_OBJFUNC_FILENAME= of_grad.dat
+GRAD_OBJFUNC_FILENAME= of_grad
SURFACE_FILENAME= surface_flow
SURFACE_ADJ_FILENAME= surface_adjoint
OUTPUT_WRT_FREQ= 10000
diff --git a/TestCases/rans_uq/naca0012/turb_NACA0012_uq_2c.cfg b/TestCases/rans_uq/naca0012/turb_NACA0012_uq_2c.cfg
index bc37038cf1d6..9723bc8987a0 100644
--- a/TestCases/rans_uq/naca0012/turb_NACA0012_uq_2c.cfg
+++ b/TestCases/rans_uq/naca0012/turb_NACA0012_uq_2c.cfg
@@ -101,16 +101,16 @@ CONV_CAUCHY_EPS= 1E-5
%
MESH_FILENAME= mesh_n0012_225-65.su2
MESH_FORMAT= SU2
-MESH_OUT_FILENAME= mesh_out.su2
-SOLUTION_FILENAME= solution_flow.dat
-SOLUTION_ADJ_FILENAME= solution_adj.dat
+MESH_OUT_FILENAME= mesh_out
+SOLUTION_FILENAME= solution_flow
+SOLUTION_ADJ_FILENAME= solution_adj
TABULAR_FORMAT= CSV
CONV_FILENAME= history
-RESTART_FILENAME= restart_flow.dat
-RESTART_ADJ_FILENAME= restart_adj.dat
+RESTART_FILENAME= restart_flow
+RESTART_ADJ_FILENAME= restart_adj
VOLUME_FILENAME= flow
VOLUME_ADJ_FILENAME= adjoint
-GRAD_OBJFUNC_FILENAME= of_grad.dat
+GRAD_OBJFUNC_FILENAME= of_grad
SURFACE_FILENAME= surface_flow
SURFACE_ADJ_FILENAME= surface_adjoint
OUTPUT_WRT_FREQ= 10000
diff --git a/TestCases/rans_uq/naca0012/turb_NACA0012_uq_3c.cfg b/TestCases/rans_uq/naca0012/turb_NACA0012_uq_3c.cfg
index 526a4f4f4057..2d8f1f020204 100644
--- a/TestCases/rans_uq/naca0012/turb_NACA0012_uq_3c.cfg
+++ b/TestCases/rans_uq/naca0012/turb_NACA0012_uq_3c.cfg
@@ -104,16 +104,16 @@ CONV_CAUCHY_EPS= 1E-5
%
MESH_FILENAME= mesh_n0012_225-65.su2
MESH_FORMAT= SU2
-MESH_OUT_FILENAME= mesh_out.su2
-SOLUTION_FILENAME= solution_flow.dat
-SOLUTION_ADJ_FILENAME= solution_adj.dat
+MESH_OUT_FILENAME= mesh_out
+SOLUTION_FILENAME= solution_flow
+SOLUTION_ADJ_FILENAME= solution_adj
TABULAR_FORMAT= CSV
CONV_FILENAME= history
-RESTART_FILENAME= restart_flow.dat
-RESTART_ADJ_FILENAME= restart_adj.dat
+RESTART_FILENAME= restart_flow
+RESTART_ADJ_FILENAME= restart_adj
VOLUME_FILENAME= flow
VOLUME_ADJ_FILENAME= adjoint
-GRAD_OBJFUNC_FILENAME= of_grad.dat
+GRAD_OBJFUNC_FILENAME= of_grad
SURFACE_FILENAME= surface_flow
SURFACE_ADJ_FILENAME= surface_adjoint
OUTPUT_WRT_FREQ= 10000
diff --git a/TestCases/rans_uq/naca0012/turb_NACA0012_uq_p1c1.cfg b/TestCases/rans_uq/naca0012/turb_NACA0012_uq_p1c1.cfg
index 8de0d20da42a..dc20e3915536 100644
--- a/TestCases/rans_uq/naca0012/turb_NACA0012_uq_p1c1.cfg
+++ b/TestCases/rans_uq/naca0012/turb_NACA0012_uq_p1c1.cfg
@@ -104,16 +104,16 @@ CONV_CAUCHY_EPS= 1E-5
%
MESH_FILENAME= mesh_n0012_225-65.su2
MESH_FORMAT= SU2
-MESH_OUT_FILENAME= mesh_out.su2
-SOLUTION_FILENAME= solution_flow.dat
-SOLUTION_ADJ_FILENAME= solution_adj.dat
+MESH_OUT_FILENAME= mesh_out
+SOLUTION_FILENAME= solution_flow
+SOLUTION_ADJ_FILENAME= solution_adj
TABULAR_FORMAT= CSV
CONV_FILENAME= history
-RESTART_FILENAME= restart_flow.dat
-RESTART_ADJ_FILENAME= restart_adj.dat
+RESTART_FILENAME= restart_flow
+RESTART_ADJ_FILENAME= restart_adj
VOLUME_FILENAME= flow
VOLUME_ADJ_FILENAME= adjoint
-GRAD_OBJFUNC_FILENAME= of_grad.dat
+GRAD_OBJFUNC_FILENAME= of_grad
SURFACE_FILENAME= surface_flow
SURFACE_ADJ_FILENAME= surface_adjoint
OUTPUT_WRT_FREQ= 10000
diff --git a/TestCases/rans_uq/naca0012/turb_NACA0012_uq_p1c2.cfg b/TestCases/rans_uq/naca0012/turb_NACA0012_uq_p1c2.cfg
index 5f4bbdb61025..bbdd9f90bc0f 100644
--- a/TestCases/rans_uq/naca0012/turb_NACA0012_uq_p1c2.cfg
+++ b/TestCases/rans_uq/naca0012/turb_NACA0012_uq_p1c2.cfg
@@ -104,16 +104,16 @@ CONV_CAUCHY_EPS= 1E-5
%
MESH_FILENAME= mesh_n0012_225-65.su2
MESH_FORMAT= SU2
-MESH_OUT_FILENAME= mesh_out.su2
-SOLUTION_FILENAME= solution_flow.dat
-SOLUTION_ADJ_FILENAME= solution_adj.dat
+MESH_OUT_FILENAME= mesh_out
+SOLUTION_FILENAME= solution_flow
+SOLUTION_ADJ_FILENAME= solution_adj
TABULAR_FORMAT= CSV
CONV_FILENAME= history
-RESTART_FILENAME= restart_flow.dat
-RESTART_ADJ_FILENAME= restart_adj.dat
+RESTART_FILENAME= restart_flow
+RESTART_ADJ_FILENAME= restart_adj
VOLUME_FILENAME= flow
VOLUME_ADJ_FILENAME= adjoint
-GRAD_OBJFUNC_FILENAME= of_grad.dat
+GRAD_OBJFUNC_FILENAME= of_grad
SURFACE_FILENAME= surface_flow
SURFACE_ADJ_FILENAME= surface_adjoint
OUTPUT_WRT_FREQ= 10000
diff --git a/TestCases/rotating/caradonna_tung/rot_caradonna_tung.cfg b/TestCases/rotating/caradonna_tung/rot_caradonna_tung.cfg
index 2336255f9149..309ef7110cb0 100644
--- a/TestCases/rotating/caradonna_tung/rot_caradonna_tung.cfg
+++ b/TestCases/rotating/caradonna_tung/rot_caradonna_tung.cfg
@@ -91,15 +91,15 @@ CONV_CAUCHY_EPS= 1E-10
MESH_FILENAME= mesh_caradonna_tung.su2
MESH_FORMAT= SU2
MESH_OUT_FILENAME= mesh_caradonna_tung_periodic.su2
-SOLUTION_FILENAME= solution_flow.dat
-SOLUTION_ADJ_FILENAME= solution_adj.dat
+SOLUTION_FILENAME= solution_flow
+SOLUTION_ADJ_FILENAME= solution_adj
TABULAR_FORMAT= CSV
CONV_FILENAME= history
-RESTART_FILENAME= restart_flow.dat
-RESTART_ADJ_FILENAME= restart_adj.dat
+RESTART_FILENAME= restart_flow
+RESTART_ADJ_FILENAME= restart_adj
VOLUME_FILENAME= flow
VOLUME_ADJ_FILENAME= adjoint
-GRAD_OBJFUNC_FILENAME= of_grad.dat
+GRAD_OBJFUNC_FILENAME= of_grad
SURFACE_FILENAME= surface_flow
SURFACE_ADJ_FILENAME= surface_adjoint
OUTPUT_WRT_FREQ= 100
diff --git a/TestCases/rotating/naca0012/rot_NACA0012.cfg b/TestCases/rotating/naca0012/rot_NACA0012.cfg
index e428d8ae7496..f9cba1351aaf 100644
--- a/TestCases/rotating/naca0012/rot_NACA0012.cfg
+++ b/TestCases/rotating/naca0012/rot_NACA0012.cfg
@@ -119,16 +119,16 @@ SCREEN_OUTPUT=(INNER_ITER, WALL_TIME, RMS_DENSITY, RMS_ENERGY, LIFT, DRAG)
%
MESH_FILENAME= mesh_NACA0012_rot.su2
MESH_FORMAT= SU2
-MESH_OUT_FILENAME= mesh_out.su2
-SOLUTION_FILENAME= solution_flow.dat
-SOLUTION_ADJ_FILENAME= solution_adj.dat
+MESH_OUT_FILENAME= mesh_out
+SOLUTION_FILENAME= solution_flow
+SOLUTION_ADJ_FILENAME= solution_adj
TABULAR_FORMAT= CSV
CONV_FILENAME= history
-RESTART_FILENAME= restart_flow.dat
-RESTART_ADJ_FILENAME= restart_adj.dat
+RESTART_FILENAME= restart_flow
+RESTART_ADJ_FILENAME= restart_adj
VOLUME_FILENAME= flow
VOLUME_ADJ_FILENAME= adjoint
-GRAD_OBJFUNC_FILENAME= of_grad.dat
+GRAD_OBJFUNC_FILENAME= of_grad
SURFACE_FILENAME= surface_flow
SURFACE_ADJ_FILENAME= surface_adjoint
OUTPUT_WRT_FREQ= 100
diff --git a/TestCases/sliding_interface/bars_SST_2D/bars.cfg b/TestCases/sliding_interface/bars_SST_2D/bars.cfg
index c29ecdcd043e..661c8cde510a 100644
--- a/TestCases/sliding_interface/bars_SST_2D/bars.cfg
+++ b/TestCases/sliding_interface/bars_SST_2D/bars.cfg
@@ -124,16 +124,16 @@ CONV_CAUCHY_EPS= 1E-6
%
MESH_FILENAME= mesh_bars_turb.su2
MESH_FORMAT= SU2
-MESH_OUT_FILENAME= mesh_out.su2
-SOLUTION_FILENAME= restart_flow.dat
-SOLUTION_ADJ_FILENAME= solution_adj.dat
+MESH_OUT_FILENAME= mesh_out
+SOLUTION_FILENAME= restart_flow
+SOLUTION_ADJ_FILENAME= solution_adj
TABULAR_FORMAT= CSV
CONV_FILENAME= history
-RESTART_FILENAME= restart_flow.dat
-RESTART_ADJ_FILENAME= restart_adj.dat
+RESTART_FILENAME= restart_flow
+RESTART_ADJ_FILENAME= restart_adj
VOLUME_FILENAME= flow
VOLUME_ADJ_FILENAME= adjoint
-GRAD_OBJFUNC_FILENAME= of_grad.dat
+GRAD_OBJFUNC_FILENAME= of_grad
SURFACE_FILENAME= surface_flow
SURFACE_ADJ_FILENAME= surface_adjoint
OUTPUT_WRT_FREQ= 50
diff --git a/TestCases/sliding_interface/channel_2D/channel_2D_NN.cfg b/TestCases/sliding_interface/channel_2D/channel_2D_NN.cfg
index ff54aae49c52..7af88e0d94fa 100644
--- a/TestCases/sliding_interface/channel_2D/channel_2D_NN.cfg
+++ b/TestCases/sliding_interface/channel_2D/channel_2D_NN.cfg
@@ -86,11 +86,11 @@ CONV_CAUCHY_EPS= 1E-6
%
MESH_FILENAME= channel_2D.su2
MESH_FORMAT= SU2
-MESH_OUT_FILENAME= su2mesh_per.su2
-SOLUTION_FILENAME= restart_flow.dat
+MESH_OUT_FILENAME= mesh_out
+SOLUTION_FILENAME= restart_flow
TABULAR_FORMAT= CSV
CONV_FILENAME= history
-RESTART_FILENAME= restart_flow.dat
+RESTART_FILENAME= restart_flow
VOLUME_FILENAME= flow
SURFACE_FILENAME= surface_flow
OUTPUT_WRT_FREQ= 1
diff --git a/TestCases/sliding_interface/channel_2D/channel_2D_WA.cfg b/TestCases/sliding_interface/channel_2D/channel_2D_WA.cfg
index 2a760df77cdb..e21f3d4c0d48 100644
--- a/TestCases/sliding_interface/channel_2D/channel_2D_WA.cfg
+++ b/TestCases/sliding_interface/channel_2D/channel_2D_WA.cfg
@@ -86,11 +86,11 @@ CONV_CAUCHY_EPS= 1E-6
%
MESH_FILENAME= channel_2D.su2
MESH_FORMAT= SU2
-MESH_OUT_FILENAME= su2mesh_per.su2
-SOLUTION_FILENAME= restart_flow.dat
+MESH_OUT_FILENAME= mesh_out
+SOLUTION_FILENAME= restart_flow
TABULAR_FORMAT= CSV
CONV_FILENAME= history
-RESTART_FILENAME= restart_flow.dat
+RESTART_FILENAME= restart_flow
VOLUME_FILENAME= flow
SURFACE_FILENAME= surface_flow
OUTPUT_WRT_FREQ= 1
diff --git a/TestCases/sliding_interface/channel_3D/channel_3D_NN.cfg b/TestCases/sliding_interface/channel_3D/channel_3D_NN.cfg
index 64d874411aaf..d9231709800b 100644
--- a/TestCases/sliding_interface/channel_3D/channel_3D_NN.cfg
+++ b/TestCases/sliding_interface/channel_3D/channel_3D_NN.cfg
@@ -85,11 +85,11 @@ CONV_CAUCHY_EPS= 1E-6
%
MESH_FILENAME= channel_3D.su2
MESH_FORMAT= SU2
-MESH_OUT_FILENAME= su2mesh_per.su2
-SOLUTION_FILENAME= restart_flow.dat
+MESH_OUT_FILENAME= mesh_out
+SOLUTION_FILENAME= restart_flow
TABULAR_FORMAT= CSV
CONV_FILENAME= history
-RESTART_FILENAME= restart_flow.dat
+RESTART_FILENAME= restart_flow
VOLUME_FILENAME= flow
SURFACE_FILENAME= surface_flow
OUTPUT_WRT_FREQ= 1
diff --git a/TestCases/sliding_interface/channel_3D/channel_3D_WA.cfg b/TestCases/sliding_interface/channel_3D/channel_3D_WA.cfg
index e495d584b164..a80d3b13e65b 100644
--- a/TestCases/sliding_interface/channel_3D/channel_3D_WA.cfg
+++ b/TestCases/sliding_interface/channel_3D/channel_3D_WA.cfg
@@ -86,11 +86,11 @@ CONV_CAUCHY_EPS= 1E-6
%
MESH_FILENAME= channel_3D.su2
MESH_FORMAT= SU2
-MESH_OUT_FILENAME= su2mesh_per.su2
-SOLUTION_FILENAME= restart_flow.dat
+MESH_OUT_FILENAME= mesh_out
+SOLUTION_FILENAME= restart_flow
TABULAR_FORMAT= CSV
CONV_FILENAME= history
-RESTART_FILENAME= restart_flow.dat
+RESTART_FILENAME= restart_flow
VOLUME_FILENAME= flow
SURFACE_FILENAME= surface_flow
OUTPUT_WRT_FREQ= 1
diff --git a/TestCases/sliding_interface/incompressible_steady/configCircle.cfg b/TestCases/sliding_interface/incompressible_steady/configCircle.cfg
index 8b0fc5db8a0a..f157aeafae1f 100644
--- a/TestCases/sliding_interface/incompressible_steady/configCircle.cfg
+++ b/TestCases/sliding_interface/incompressible_steady/configCircle.cfg
@@ -100,21 +100,21 @@ FREESTREAM_TURB2LAMVISCRATIO = 100.0
MESH_FILENAME= meshCircle.su2
MESH_FORMAT= SU2
-MESH_OUT_FILENAME= mesh_out.su2
+MESH_OUT_FILENAME= mesh_out
-SOLUTION_FILENAME= solution_flow.dat
-SOLUTION_ADJ_FILENAME= solution_adj.dat
+SOLUTION_FILENAME= solution_flow
+SOLUTION_ADJ_FILENAME= solution_adj
TABULAR_FORMAT= CSV
CONV_FILENAME= history_converge
-RESTART_FILENAME= restart_flow.dat
-RESTART_ADJ_FILENAME= restart_adj.dat
+RESTART_FILENAME= restart_flow
+RESTART_ADJ_FILENAME= restart_adj
VOLUME_FILENAME= flow
VOLUME_ADJ_FILENAME= adjoint
-GRAD_OBJFUNC_FILENAME= of_grad.dat
+GRAD_OBJFUNC_FILENAME= of_grad
SURFACE_FILENAME= surface_flow
SURFACE_ADJ_FILENAME= surface_adjoint
diff --git a/TestCases/sliding_interface/incompressible_steady/configOut.cfg b/TestCases/sliding_interface/incompressible_steady/configOut.cfg
index 8fe66a47a677..109cdca92eb8 100644
--- a/TestCases/sliding_interface/incompressible_steady/configOut.cfg
+++ b/TestCases/sliding_interface/incompressible_steady/configOut.cfg
@@ -105,21 +105,21 @@ CONV_CAUCHY_EPS= 1E-6
MESH_FILENAME= meshOut.su2
MESH_FORMAT= SU2
-MESH_OUT_FILENAME= mesh_out.su2
+MESH_OUT_FILENAME= mesh_out
-SOLUTION_FILENAME= solution_flow.dat
-SOLUTION_ADJ_FILENAME= solution_adj.dat
+SOLUTION_FILENAME= solution_flow
+SOLUTION_ADJ_FILENAME= solution_adj
TABULAR_FORMAT= CSV
CONV_FILENAME= history
-RESTART_FILENAME= restart_flow.dat
-RESTART_ADJ_FILENAME= restart_adj.dat
+RESTART_FILENAME= restart_flow
+RESTART_ADJ_FILENAME= restart_adj
VOLUME_FILENAME= flow
VOLUME_ADJ_FILENAME= adjoint
-GRAD_OBJFUNC_FILENAME= of_grad.dat
+GRAD_OBJFUNC_FILENAME= of_grad
SURFACE_FILENAME= surface_flow
SURFACE_ADJ_FILENAME= surface_adjoint
diff --git a/TestCases/sliding_interface/incompressible_unsteady/configCircle.cfg b/TestCases/sliding_interface/incompressible_unsteady/configCircle.cfg
index 36b5e623c341..097166cfa9d1 100644
--- a/TestCases/sliding_interface/incompressible_unsteady/configCircle.cfg
+++ b/TestCases/sliding_interface/incompressible_unsteady/configCircle.cfg
@@ -103,21 +103,21 @@ CONV_CAUCHY_EPS= 1E-6
MESH_FILENAME= meshCircle.su2
MESH_FORMAT= SU2
-MESH_OUT_FILENAME= mesh_out.su2
+MESH_OUT_FILENAME= mesh_out
-SOLUTION_FILENAME= solution_flow.dat
-SOLUTION_ADJ_FILENAME= solution_adj.dat
+SOLUTION_FILENAME= solution_flow
+SOLUTION_ADJ_FILENAME= solution_adj
TABULAR_FORMAT= CSV
CONV_FILENAME= history
-RESTART_FILENAME= restart_flow.dat
-RESTART_ADJ_FILENAME= restart_adj.dat
+RESTART_FILENAME= restart_flow
+RESTART_ADJ_FILENAME= restart_adj
VOLUME_FILENAME= flow
VOLUME_ADJ_FILENAME= adjoint
-GRAD_OBJFUNC_FILENAME= of_grad.dat
+GRAD_OBJFUNC_FILENAME= of_grad
SURFACE_FILENAME= surface_flow
SURFACE_ADJ_FILENAME= surface_adjoint
diff --git a/TestCases/sliding_interface/incompressible_unsteady/configOut.cfg b/TestCases/sliding_interface/incompressible_unsteady/configOut.cfg
index 6881c2227fcf..6d684fa9fae1 100644
--- a/TestCases/sliding_interface/incompressible_unsteady/configOut.cfg
+++ b/TestCases/sliding_interface/incompressible_unsteady/configOut.cfg
@@ -111,21 +111,21 @@ CONV_CAUCHY_EPS= 1E-6
MESH_FILENAME= meshOut.su2
MESH_FORMAT= SU2
-MESH_OUT_FILENAME= mesh_out.su2
+MESH_OUT_FILENAME= mesh_out
-SOLUTION_FILENAME= solution_flow.dat
-SOLUTION_ADJ_FILENAME= solution_adj.dat
+SOLUTION_FILENAME= solution_flow
+SOLUTION_ADJ_FILENAME= solution_adj
TABULAR_FORMAT= CSV
CONV_FILENAME= history
-RESTART_FILENAME= restart_flow.dat
-RESTART_ADJ_FILENAME= restart_adj.dat
+RESTART_FILENAME= restart_flow
+RESTART_ADJ_FILENAME= restart_adj
VOLUME_FILENAME= flow
VOLUME_ADJ_FILENAME= adjoint
-GRAD_OBJFUNC_FILENAME= of_grad.dat
+GRAD_OBJFUNC_FILENAME= of_grad
SURFACE_FILENAME= surface_flow
SURFACE_ADJ_FILENAME= surface_adjoint
diff --git a/TestCases/sliding_interface/pipe/pipe_NN.cfg b/TestCases/sliding_interface/pipe/pipe_NN.cfg
index d902070b8c8e..f1628fd19789 100644
--- a/TestCases/sliding_interface/pipe/pipe_NN.cfg
+++ b/TestCases/sliding_interface/pipe/pipe_NN.cfg
@@ -86,11 +86,11 @@ CONV_CAUCHY_EPS= 1E-6
%
MESH_FILENAME= pipe.su2
MESH_FORMAT= SU2
-MESH_OUT_FILENAME= su2mesh_per.su2
-SOLUTION_FILENAME= restart_flow.dat
+MESH_OUT_FILENAME= mesh_out
+SOLUTION_FILENAME= restart_flow
TABULAR_FORMAT= CSV
CONV_FILENAME= history
-RESTART_FILENAME= restart_flow.dat
+RESTART_FILENAME= restart_flow
VOLUME_FILENAME= flow
SURFACE_FILENAME= surface_flow
OUTPUT_WRT_FREQ= 50
diff --git a/TestCases/sliding_interface/pipe/pipe_WA.cfg b/TestCases/sliding_interface/pipe/pipe_WA.cfg
index 5ffaec1a0c47..06e0574e48e1 100644
--- a/TestCases/sliding_interface/pipe/pipe_WA.cfg
+++ b/TestCases/sliding_interface/pipe/pipe_WA.cfg
@@ -86,11 +86,11 @@ CONV_CAUCHY_EPS= 1E-6
%
MESH_FILENAME= pipe.su2
MESH_FORMAT= SU2
-MESH_OUT_FILENAME= su2mesh_per.su2
-SOLUTION_FILENAME= restart_flow.dat
+MESH_OUT_FILENAME= mesh_out
+SOLUTION_FILENAME= restart_flow
TABULAR_FORMAT= CSV
CONV_FILENAME= history
-RESTART_FILENAME= restart_flow.dat
+RESTART_FILENAME= restart_flow
VOLUME_FILENAME= flow
SURFACE_FILENAME= surface_flow
OUTPUT_WRT_FREQ= 50
diff --git a/TestCases/sliding_interface/rotating_cylinders/rot_cylinders_NN.cfg b/TestCases/sliding_interface/rotating_cylinders/rot_cylinders_NN.cfg
index 77d2b22fd0e4..43603513bcda 100644
--- a/TestCases/sliding_interface/rotating_cylinders/rot_cylinders_NN.cfg
+++ b/TestCases/sliding_interface/rotating_cylinders/rot_cylinders_NN.cfg
@@ -85,11 +85,11 @@ CONV_CAUCHY_EPS= 1E-6
%
MESH_FILENAME= rotating_cylinders.su2
MESH_FORMAT= SU2
-MESH_OUT_FILENAME= su2mesh_per.su2
-SOLUTION_FILENAME= restart_flow.dat
+MESH_OUT_FILENAME= mesh_out
+SOLUTION_FILENAME= restart_flow
TABULAR_FORMAT= CSV
CONV_FILENAME= history
-RESTART_FILENAME= restart_flow.dat
+RESTART_FILENAME= restart_flow
VOLUME_FILENAME= flow
SURFACE_FILENAME= surface_flow
OUTPUT_WRT_FREQ= 50
diff --git a/TestCases/sliding_interface/rotating_cylinders/rot_cylinders_WA.cfg b/TestCases/sliding_interface/rotating_cylinders/rot_cylinders_WA.cfg
index b223b5f6fccc..bfbc94319923 100644
--- a/TestCases/sliding_interface/rotating_cylinders/rot_cylinders_WA.cfg
+++ b/TestCases/sliding_interface/rotating_cylinders/rot_cylinders_WA.cfg
@@ -87,11 +87,11 @@ CONV_CAUCHY_EPS= 1E-6
%
MESH_FILENAME= rotating_cylinders.su2
MESH_FORMAT= SU2
-MESH_OUT_FILENAME= su2mesh_per.su2
-SOLUTION_FILENAME= restart_flow.dat
+MESH_OUT_FILENAME= mesh_out
+SOLUTION_FILENAME= restart_flow
TABULAR_FORMAT= CSV
CONV_FILENAME= history
-RESTART_FILENAME= restart_flow.dat
+RESTART_FILENAME= restart_flow
VOLUME_FILENAME= flow
SURFACE_FILENAME= surface_flow
OUTPUT_WRT_FREQ= 50
diff --git a/TestCases/sliding_interface/single_stage/single_stage_NN.cfg b/TestCases/sliding_interface/single_stage/single_stage_NN.cfg
index c4bd15fc2beb..80fba6bf1246 100644
--- a/TestCases/sliding_interface/single_stage/single_stage_NN.cfg
+++ b/TestCases/sliding_interface/single_stage/single_stage_NN.cfg
@@ -95,11 +95,11 @@ CONV_CAUCHY_EPS= 1E-6
%
MESH_FILENAME= mesh.su2
MESH_FORMAT= SU2
-MESH_OUT_FILENAME= su2mesh_per.su2
-SOLUTION_FILENAME= restart_flow.dat
+MESH_OUT_FILENAME= mesh_out
+SOLUTION_FILENAME= restart_flow
TABULAR_FORMAT= CSV
CONV_FILENAME= history
-RESTART_FILENAME= restart_flow.dat
+RESTART_FILENAME= restart_flow
VOLUME_FILENAME= flow
SURFACE_FILENAME= surface_flow
OUTPUT_WRT_FREQ= 50
diff --git a/TestCases/sliding_interface/single_stage/single_stage_WA.cfg b/TestCases/sliding_interface/single_stage/single_stage_WA.cfg
index cdb8a04e48e5..30c0cade027b 100644
--- a/TestCases/sliding_interface/single_stage/single_stage_WA.cfg
+++ b/TestCases/sliding_interface/single_stage/single_stage_WA.cfg
@@ -95,11 +95,11 @@ CONV_CAUCHY_EPS= 1E-6
%
MESH_FILENAME= mesh.su2
MESH_FORMAT= SU2
-MESH_OUT_FILENAME= su2mesh_per.su2
-SOLUTION_FILENAME= restart_flow.dat
+MESH_OUT_FILENAME= mesh_out
+SOLUTION_FILENAME= restart_flow
TABULAR_FORMAT= CSV
CONV_FILENAME= history
-RESTART_FILENAME= restart_flow.dat
+RESTART_FILENAME= restart_flow
VOLUME_FILENAME= flow
SURFACE_FILENAME= surface_flow
OUTPUT_WRT_FREQ= 50
diff --git a/TestCases/sliding_interface/supersonic_vortex_shedding/sup_vor_shed_NN.cfg b/TestCases/sliding_interface/supersonic_vortex_shedding/sup_vor_shed_NN.cfg
index b37b5f3a674f..f6081f718ad0 100644
--- a/TestCases/sliding_interface/supersonic_vortex_shedding/sup_vor_shed_NN.cfg
+++ b/TestCases/sliding_interface/supersonic_vortex_shedding/sup_vor_shed_NN.cfg
@@ -86,11 +86,11 @@ CONV_CAUCHY_EPS= 1E-6
%
MESH_FILENAME= cylinder.su2
MESH_FORMAT= SU2
-MESH_OUT_FILENAME= su2mesh_per.su2
-SOLUTION_FILENAME= restart_flow.dat
+MESH_OUT_FILENAME= mesh_out
+SOLUTION_FILENAME= restart_flow
TABULAR_FORMAT= CSV
CONV_FILENAME= history
-RESTART_FILENAME= restart_flow.dat
+RESTART_FILENAME= restart_flow
VOLUME_FILENAME= flow
SURFACE_FILENAME= surface_flow
OUTPUT_WRT_FREQ= 50
diff --git a/TestCases/sliding_interface/supersonic_vortex_shedding/sup_vor_shed_WA.cfg b/TestCases/sliding_interface/supersonic_vortex_shedding/sup_vor_shed_WA.cfg
index b88941af7c14..a9011fe1d0c4 100644
--- a/TestCases/sliding_interface/supersonic_vortex_shedding/sup_vor_shed_WA.cfg
+++ b/TestCases/sliding_interface/supersonic_vortex_shedding/sup_vor_shed_WA.cfg
@@ -88,11 +88,11 @@ CONV_CAUCHY_EPS= 1E-6
%
MESH_FILENAME= cylinder.su2
MESH_FORMAT= SU2
-MESH_OUT_FILENAME= su2mesh_per.su2
-SOLUTION_FILENAME= restart_flow.dat
+MESH_OUT_FILENAME= mesh_out
+SOLUTION_FILENAME= restart_flow
TABULAR_FORMAT= CSV
CONV_FILENAME= history
-RESTART_FILENAME= restart_flow.dat
+RESTART_FILENAME= restart_flow
VOLUME_FILENAME= flow
SURFACE_FILENAME= surface_flow
OUTPUT_WRT_FREQ= 50
diff --git a/TestCases/sliding_interface/uniform_flow/uniform_NN.cfg b/TestCases/sliding_interface/uniform_flow/uniform_NN.cfg
index 55cf9bef4bdc..8b893dc04eb4 100644
--- a/TestCases/sliding_interface/uniform_flow/uniform_NN.cfg
+++ b/TestCases/sliding_interface/uniform_flow/uniform_NN.cfg
@@ -87,11 +87,11 @@ CONV_CAUCHY_EPS= 1E-6
%
MESH_FILENAME= mesh.su2
MESH_FORMAT= SU2
-MESH_OUT_FILENAME= su2mesh_per.su2
-SOLUTION_FILENAME= restart_flow.dat
+MESH_OUT_FILENAME= mesh_out
+SOLUTION_FILENAME= restart_flow
TABULAR_FORMAT= CSV
CONV_FILENAME= history
-RESTART_FILENAME= restart_flow.dat
+RESTART_FILENAME= restart_flow
VOLUME_FILENAME= flow
SURFACE_FILENAME= surface_flow
OUTPUT_WRT_FREQ= 50
diff --git a/TestCases/sliding_interface/uniform_flow/uniform_WA.cfg b/TestCases/sliding_interface/uniform_flow/uniform_WA.cfg
index 7960be6ee52a..097427db992c 100644
--- a/TestCases/sliding_interface/uniform_flow/uniform_WA.cfg
+++ b/TestCases/sliding_interface/uniform_flow/uniform_WA.cfg
@@ -87,11 +87,11 @@ CONV_CAUCHY_EPS= 1E-6
%
MESH_FILENAME= mesh.su2
MESH_FORMAT= SU2
-MESH_OUT_FILENAME= su2mesh_per.su2
-SOLUTION_FILENAME= restart_flow.dat
+MESH_OUT_FILENAME= mesh_out
+SOLUTION_FILENAME= restart_flow
TABULAR_FORMAT= CSV
CONV_FILENAME= history
-RESTART_FILENAME= restart_flow.dat
+RESTART_FILENAME= restart_flow
VOLUME_FILENAME= flow
SURFACE_FILENAME= surface_flow
OUTPUT_WRT_FREQ= 50
diff --git a/TestCases/species_transport/venturi_primitive_3species/species2_primitiveVenturi.cfg b/TestCases/species_transport/venturi_primitive_3species/species2_primitiveVenturi.cfg
index f08b48f92797..a6181b67d0c5 100644
--- a/TestCases/species_transport/venturi_primitive_3species/species2_primitiveVenturi.cfg
+++ b/TestCases/species_transport/venturi_primitive_3species/species2_primitiveVenturi.cfg
@@ -125,6 +125,6 @@ OUTPUT_WRT_FREQ= 1000
%
RESTART_SOL= NO
SOLUTION_FILENAME= solution
-RESTART_FILENAME= restart.dat
+RESTART_FILENAME= restart
%
WRT_PERFORMANCE= YES
diff --git a/TestCases/species_transport/venturi_primitive_3species/species2_primitiveVenturi_boundedscalar.cfg b/TestCases/species_transport/venturi_primitive_3species/species2_primitiveVenturi_boundedscalar.cfg
index e38bc56e5b06..7e34656028bb 100644
--- a/TestCases/species_transport/venturi_primitive_3species/species2_primitiveVenturi_boundedscalar.cfg
+++ b/TestCases/species_transport/venturi_primitive_3species/species2_primitiveVenturi_boundedscalar.cfg
@@ -125,6 +125,6 @@ OUTPUT_WRT_FREQ= 1000
%
RESTART_SOL= NO
SOLUTION_FILENAME= solution
-RESTART_FILENAME= restart.dat
+RESTART_FILENAME= restart
%
WRT_PERFORMANCE= YES
diff --git a/TestCases/species_transport/venturi_primitive_3species/species2_primitiveVenturi_mixingmodel.cfg b/TestCases/species_transport/venturi_primitive_3species/species2_primitiveVenturi_mixingmodel.cfg
index 86cbbb9a33bc..d63a5a470fb8 100644
--- a/TestCases/species_transport/venturi_primitive_3species/species2_primitiveVenturi_mixingmodel.cfg
+++ b/TestCases/species_transport/venturi_primitive_3species/species2_primitiveVenturi_mixingmodel.cfg
@@ -137,6 +137,6 @@ OUTPUT_WRT_FREQ= 1000
%
RESTART_SOL= NO
SOLUTION_FILENAME= solution
-RESTART_FILENAME= restart.dat
+RESTART_FILENAME= restart
%
WRT_PERFORMANCE= YES
diff --git a/TestCases/species_transport/venturi_primitive_3species/species2_primitiveVenturi_mixingmodel_boundedscalar.cfg b/TestCases/species_transport/venturi_primitive_3species/species2_primitiveVenturi_mixingmodel_boundedscalar.cfg
index 12807b4d4973..e0ef37f51b76 100644
--- a/TestCases/species_transport/venturi_primitive_3species/species2_primitiveVenturi_mixingmodel_boundedscalar.cfg
+++ b/TestCases/species_transport/venturi_primitive_3species/species2_primitiveVenturi_mixingmodel_boundedscalar.cfg
@@ -137,6 +137,6 @@ OUTPUT_WRT_FREQ= 1000
%
RESTART_SOL= NO
SOLUTION_FILENAME= solution
-RESTART_FILENAME= restart.dat
+RESTART_FILENAME= restart
%
WRT_PERFORMANCE= YES
diff --git a/TestCases/species_transport/venturi_primitive_3species/species3_primitiveVenturi_inletFile.cfg b/TestCases/species_transport/venturi_primitive_3species/species3_primitiveVenturi_inletFile.cfg
index 6ef15ea2b9c3..a5bfbe210db6 100644
--- a/TestCases/species_transport/venturi_primitive_3species/species3_primitiveVenturi_inletFile.cfg
+++ b/TestCases/species_transport/venturi_primitive_3species/species3_primitiveVenturi_inletFile.cfg
@@ -132,6 +132,6 @@ OUTPUT_WRT_FREQ= 1000
%
RESTART_SOL= NO
SOLUTION_FILENAME= solution
-RESTART_FILENAME= restart.dat
+RESTART_FILENAME= restart
%
WRT_PERFORMANCE= YES
diff --git a/TestCases/transition/E387_Airfoil/transitional_BC_model_ConfigFile.cfg b/TestCases/transition/E387_Airfoil/transitional_BC_model_ConfigFile.cfg
index 67dee8f54a65..baf6a49c14bc 100644
--- a/TestCases/transition/E387_Airfoil/transitional_BC_model_ConfigFile.cfg
+++ b/TestCases/transition/E387_Airfoil/transitional_BC_model_ConfigFile.cfg
@@ -89,16 +89,16 @@ CONV_CAUCHY_EPS= 1E-6
%
MESH_FILENAME= e387_Ogrid.su2
MESH_FORMAT= SU2
-MESH_OUT_FILENAME= mesh_out.su2
-SOLUTION_FILENAME= solution_flow.dat
-SOLUTION_ADJ_FILENAME= solution_adj.dat
+MESH_OUT_FILENAME= mesh_out
+SOLUTION_FILENAME= solution_flow
+SOLUTION_ADJ_FILENAME= solution_adj
TABULAR_FORMAT= CSV
CONV_FILENAME= history
-RESTART_FILENAME= restart_flow.dat
-RESTART_ADJ_FILENAME= restart_adj.dat
+RESTART_FILENAME= restart_flow
+RESTART_ADJ_FILENAME= restart_adj
VOLUME_FILENAME= flow
VOLUME_ADJ_FILENAME= adjoint
-GRAD_OBJFUNC_FILENAME= of_grad.dat
+GRAD_OBJFUNC_FILENAME= of_grad
SURFACE_FILENAME= surface_flow
SURFACE_ADJ_FILENAME= surface_adjoint
OUTPUT_WRT_FREQ= 250
diff --git a/TestCases/transition/Schubauer_Klebanoff/transitional_BC_model_ConfigFile.cfg b/TestCases/transition/Schubauer_Klebanoff/transitional_BC_model_ConfigFile.cfg
index 8ccc174953b2..690818a1e14d 100644
--- a/TestCases/transition/Schubauer_Klebanoff/transitional_BC_model_ConfigFile.cfg
+++ b/TestCases/transition/Schubauer_Klebanoff/transitional_BC_model_ConfigFile.cfg
@@ -98,16 +98,16 @@ CONV_CAUCHY_EPS= 1E-6
%
MESH_FILENAME= grid.su2
MESH_FORMAT= SU2
-MESH_OUT_FILENAME= mesh_out.su2
-SOLUTION_FILENAME= restart_flow.dat
-SOLUTION_ADJ_FILENAME= solution_adj.dat
+MESH_OUT_FILENAME= mesh_out
+SOLUTION_FILENAME= restart_flow
+SOLUTION_ADJ_FILENAME= solution_adj
TABULAR_FORMAT= CSV
CONV_FILENAME= history
-RESTART_FILENAME= restart_flow.dat
-RESTART_ADJ_FILENAME= restart_adj.dat
+RESTART_FILENAME= restart_flow
+RESTART_ADJ_FILENAME= restart_adj
VOLUME_FILENAME= flow
VOLUME_ADJ_FILENAME= adjoint
-GRAD_OBJFUNC_FILENAME= of_grad.dat
+GRAD_OBJFUNC_FILENAME= of_grad
SURFACE_FILENAME= surface_flow
SURFACE_ADJ_FILENAME= surface_adjoint
OUTPUT_WRT_FREQ= 500
diff --git a/TestCases/transition/T3A_FlatPlate/transitional_BC_model_ConfigFile.cfg b/TestCases/transition/T3A_FlatPlate/transitional_BC_model_ConfigFile.cfg
index bdefe3e16a8d..f7f3e5ec0228 100644
--- a/TestCases/transition/T3A_FlatPlate/transitional_BC_model_ConfigFile.cfg
+++ b/TestCases/transition/T3A_FlatPlate/transitional_BC_model_ConfigFile.cfg
@@ -92,16 +92,16 @@ CONV_CAUCHY_EPS= 1E-6
%
MESH_FILENAME= grid.su2
MESH_FORMAT= SU2
-MESH_OUT_FILENAME= mesh_out.su2
-SOLUTION_FILENAME= solution_flow.dat
-SOLUTION_ADJ_FILENAME= solution_adj.dat
+MESH_OUT_FILENAME= mesh_out
+SOLUTION_FILENAME= solution_flow
+SOLUTION_ADJ_FILENAME= solution_adj
TABULAR_FORMAT= CSV
CONV_FILENAME= history
-RESTART_FILENAME= restart_flow.dat
-RESTART_ADJ_FILENAME= restart_adj.dat
+RESTART_FILENAME= restart_flow
+RESTART_ADJ_FILENAME= restart_adj
VOLUME_FILENAME= flow
VOLUME_ADJ_FILENAME= adjoint
-GRAD_OBJFUNC_FILENAME= of_grad.dat
+GRAD_OBJFUNC_FILENAME= of_grad
SURFACE_FILENAME= surface_flow
SURFACE_ADJ_FILENAME= surface_adjoint
OUTPUT_WRT_FREQ= 500
diff --git a/TestCases/turbomachinery/APU_turbocharger/Jones_restart.cfg b/TestCases/turbomachinery/APU_turbocharger/Jones_restart.cfg
index 054791aabb3f..20265b77d7c1 100755
--- a/TestCases/turbomachinery/APU_turbocharger/Jones_restart.cfg
+++ b/TestCases/turbomachinery/APU_turbocharger/Jones_restart.cfg
@@ -143,15 +143,15 @@ SCREEN_OUTPUT= OUTER_ITER, AVG_BGS_RES[0], AVG_BGS_RES[1], RMS_DENSITY[0], RMS_E
MESH_FILENAME= mesh_jones_turbine.su2
MESH_FORMAT= SU2
MESH_OUT_FILENAME= meshout.su2
-SOLUTION_FILENAME= solution_flow.dat
-SOLUTION_ADJ_FILENAME= solution_adj.dat
+SOLUTION_FILENAME= solution_flow
+SOLUTION_ADJ_FILENAME= solution_adj
TABULAR_FORMAT= CSV
CONV_FILENAME= history
-RESTART_FILENAME= restart_flow.dat
-RESTART_ADJ_FILENAME= restart_adj.dat
+RESTART_FILENAME= restart_flow
+RESTART_ADJ_FILENAME= restart_adj
VOLUME_FILENAME= flow
VOLUME_ADJ_FILENAME= adjoint
-GRAD_OBJFUNC_FILENAME= of_grad.dat
+GRAD_OBJFUNC_FILENAME= of_grad
SURFACE_FILENAME= surface_flow
SURFACE_ADJ_FILENAME= surface_adjoint
OUTPUT_WRT_FREQ= 100
diff --git a/TestCases/turbomachinery/Aachen_turbine/aachen_3D_MP_restart.cfg b/TestCases/turbomachinery/Aachen_turbine/aachen_3D_MP_restart.cfg
index 05c383114b8b..1b1e91ea07f1 100755
--- a/TestCases/turbomachinery/Aachen_turbine/aachen_3D_MP_restart.cfg
+++ b/TestCases/turbomachinery/Aachen_turbine/aachen_3D_MP_restart.cfg
@@ -11,7 +11,7 @@
%
% ------------- DIRECT, ADJOINT, AND LINEARIZED PROBLEM DEFINITION ------------%
%
-% Physical governing equations
+% Physical governing equations
SOLVER= RANS
%
% Specify turbulent model (NONE, SA, SST)
@@ -68,7 +68,7 @@ REF_ORIGIN_MOMENT_Z = 0.00
% Reference area for force coefficients (0 implies automatic calculation)
REF_AREA= 1.0
%
-% Flow non-dimensionalization
+% Flow non-dimensionalization
REF_DIMENSIONALIZATION= DIMENSIONAL
%
%
@@ -90,7 +90,7 @@ CRITICAL_TEMPERATURE= 273.15
CRITICAL_PRESSURE= 101325.0
%
% Acentri factor (0.035 (air))
-ACENTRIC_FACTOR= 0.035
+ACENTRIC_FACTOR= 0.035
%
% --------------------------- VISCOSITY MODEL ---------------------------------%
%
@@ -141,7 +141,7 @@ MARKER_ANALYZE = (INFLOW_STATOR1, OUTFLOW_STATOR2)
% Mixing-plane interface markers must be specified to activate the transfer of information between zones
MARKER_MIXINGPLANE_INTERFACE= (OUTFLOW_STATOR1, INFLOW_ROTOR, OUTFLOW_ROTOR, INFLOW_STATOR2)
% Mixing-plane interface markers must be specified to activate the transfer of information between zones
-MARKER_ZONE_INTERFACE= (OUTFLOW_STATOR1, INFLOW_ROTOR, OUTFLOW_ROTOR, INFLOW_STATOR2)
+MARKER_ZONE_INTERFACE= (OUTFLOW_STATOR1, INFLOW_ROTOR, OUTFLOW_ROTOR, INFLOW_STATOR2)
%
% Non reflecting boundary condition for inflow, outfolw and mixing-plane
% Format inlet: ( marker, TOTAL_CONDITIONS_PT, Total Pressure , Total Temperature, Flow dir-norm, Flow dir-tang, Flow dir-span, under-relax-avg, under-relax-fourier)
@@ -161,7 +161,7 @@ GILES_EXTRA_RELAXFACTOR= (0.05, 0.05)
MARKER_SHROUD= (SHROUD1, SHROUD2, SHROUD3)
%
% Specify kind of architecture (AXIAL, CENTRIPETAL, CENTRIFUGAL, CENTRIPETAL_AXIAL)
-TURBOMACHINERY_KIND= AXIAL AXIAL AXIAL
+TURBOMACHINERY_KIND= AXIAL AXIAL AXIAL
%
% Uncomment to work with new_turbo_outputs
TURBO_PERF_KIND= (TURBINE, TURBINE, TURBINE)
@@ -179,14 +179,14 @@ RAMP_OUTLET_PRESSURE= NO
RAMP_OUTLET_PRESSURE_COEFF= (140000.0, 150.0, 2000)
%
% Specify Kind of average process for linearizing the Navier-Stokes equation at inflow and outflow BC included mixing-plane
-% (ALGEBRAIC, AREA, MASSSFLUX, MIXEDOUT) default AREA
+% (ALGEBRAIC, AREA, MASSSFLUX, MIXEDOUT) default AREA
AVERAGE_PROCESS_KIND= MIXEDOUT
%
% Specify Kind of average process for computing turbomachienry performance parameters
% (ALGEBRAIC, AREA, MASSSFLUX, MIXEDOUT) default AREA
PERFORMANCE_AVERAGE_PROCESS_KIND= MIXEDOUT
%
-%Parameters of the Newton method for the MIXEDOUT average algorithm (under relaxation factor, tollerance, max number of iterations)
+%Parameters of the Newton method for the MIXEDOUT average algorithm (under relaxation factor, tollerance, max number of iterations)
MIXEDOUT_COEFF= (1.0, 1.0E-05, 15)
%
% Limit of Mach number below which the mixedout algorithm is substituted with a AREA average algorithm
@@ -216,7 +216,7 @@ CFL_ADAPT_PARAM= ( 1.3, 1.2, 1.0, 10.0)
%
% ------------------------ LINEAR SOLVER DEFINITION ---------------------------%
%
-% Linear solver or smoother for implicit formulations
+% Linear solver or smoother for implicit formulations
LINEAR_SOLVER= FGMRES
%
% Preconditioner of the Krylov linear solver (ILU, LU_SGS, LINELET, JACOBI)
@@ -238,12 +238,12 @@ LIMITER_ITER= 999999
%
% -------------------- FLOW NUMERICAL METHOD DEFINITION -----------------------%
%
-% Convective numerical method
+% Convective numerical method
CONV_NUM_METHOD_FLOW= JST
ENTROPY_FIX_COEFF= 0.3
%
JST_SENSOR_COEFF= ( 0.5, 0.25 )
-% Spatial numerical order integration
+% Spatial numerical order integration
MUSCL_FLOW= NO
%
% Slope limiter (VENKATAKRISHNAN, VAN_ALBADA)
@@ -278,7 +278,7 @@ CFL_REDUCTION_TURB= 0.1
% FFD_CONTROL_POINT_2D, FFD_CAMBER_2D, FFD_THICKNESS_2D, FFD_TWIST_2D,
% HICKS_HENNE, SURFACE_BUMP)
DV_KIND= NO_DEFORMATION
-%
+%
% Marker of the surface in which we are going apply the shape deformation
DV_MARKER= (BLADE1, BLADE2, BLADE3)
%
@@ -294,7 +294,7 @@ DV_VALUE= 0.01
OUTER_ITER=10
%
% Convergence criteria (CAUCHY, RESIDUAL)
-CONV_FIELD=RMS_ENERGY[0]
+CONV_FIELD=RMS_ENERGY[0]
%
% Min value of the residual (log10 of the residual)
CONV_RESIDUAL_MINVAL= -12
@@ -322,25 +322,25 @@ MESH_FILENAME= Aachen_3D_41_blade_coarse.su2
MESH_FORMAT= SU2
%
% Mesh output file
-MESH_OUT_FILENAME= Aachen_3D_41_blade_coarse.su2
+MESH_OUT_FILENAME= mesh_out
%
% Restart flow input file
-SOLUTION_FILENAME= solution_flow.dat
+SOLUTION_FILENAME= solution_flow
%
% Restart adjoint input file
-SOLUTION_ADJ_FILENAME= solution_adj.dat
+SOLUTION_ADJ_FILENAME= solution_adj
%
-% Output file format
+% Output file format
TABULAR_FORMAT= TECPLOT
%
% Output file convergence history (w/o extension)
CONV_FILENAME= history
%
% Output file restart flow
-RESTART_FILENAME= restart_flow.dat
+RESTART_FILENAME= restart_flow
%
% Output file restart adjoint
-RESTART_ADJ_FILENAME= restart_adj.dat
+RESTART_ADJ_FILENAME= restart_adj
%
% Output file flow (w/o extension) variables
VOLUME_FILENAME= flow
@@ -349,7 +349,7 @@ VOLUME_FILENAME= flow
VOLUME_ADJ_FILENAME= adjoint
%
% Output objective function gradient (using continuous adjoint)
-GRAD_OBJFUNC_FILENAME= of_grad.dat
+GRAD_OBJFUNC_FILENAME= of_grad
%
% Output file surface flow coefficient (w/o extension)
SURFACE_FILENAME= surface_flow
diff --git a/TestCases/turbomachinery/axial_stage_2D/Axial_stage2D.cfg b/TestCases/turbomachinery/axial_stage_2D/Axial_stage2D.cfg
index e0f2a0a8ab4d..416d9cfc2fc1 100755
--- a/TestCases/turbomachinery/axial_stage_2D/Axial_stage2D.cfg
+++ b/TestCases/turbomachinery/axial_stage_2D/Axial_stage2D.cfg
@@ -145,15 +145,15 @@ SCREEN_OUTPUT= OUTER_ITER, AVG_BGS_RES[0], AVG_BGS_RES[1], RMS_DENSITY[0], RMS_E
MESH_FILENAME= mesh_axial_stage_2d_turb.su2
MESH_FORMAT= SU2
MESH_OUT_FILENAME= meshout.su2
-SOLUTION_FILENAME= restart_flow.dat
-SOLUTION_ADJ_FILENAME= solution_adj.dat
+SOLUTION_FILENAME= restart_flow
+SOLUTION_ADJ_FILENAME= solution_adj
TABULAR_FORMAT= CSV
CONV_FILENAME= history
-RESTART_FILENAME= restart_flow.dat
-RESTART_ADJ_FILENAME= restart_adj.dat
+RESTART_FILENAME= restart_flow
+RESTART_ADJ_FILENAME= restart_adj
VOLUME_FILENAME= flow
VOLUME_ADJ_FILENAME= adjoint
-GRAD_OBJFUNC_FILENAME= of_grad.dat
+GRAD_OBJFUNC_FILENAME= of_grad
SURFACE_FILENAME= surface_flow
SURFACE_ADJ_FILENAME= surface_adjoint
OUTPUT_WRT_FREQ= 1000
diff --git a/TestCases/turbomachinery/centrifugal_blade/centrifugal_blade.cfg b/TestCases/turbomachinery/centrifugal_blade/centrifugal_blade.cfg
index 7dce6faded11..fb0c49a00e18 100755
--- a/TestCases/turbomachinery/centrifugal_blade/centrifugal_blade.cfg
+++ b/TestCases/turbomachinery/centrifugal_blade/centrifugal_blade.cfg
@@ -66,7 +66,7 @@ MARKER_PERIODIC= ( periodic1, periodic2, 0.0, 0.0, 0.0, 0.0, 0.0, 9.47, 0.0, 0.0
%
MARKER_PLOTTING= ( wall1, wall2 )
%
-% Marker(s) between turbomachinery performance are evaluated. Use BLADE for single blade, STAGE for stage and TURBINE for a multi-stage.
+% Marker(s) between turbomachinery performance are evaluated. Use BLADE for single blade, STAGE for stage and TURBINE for a multi-stage.
MARKER_TURBO_PERFORMANCE= (inflow, outflow, BLADE)
TURBO_PERF_KIND = TURBINE
%
@@ -127,11 +127,11 @@ CONV_CAUCHY_EPS= 1E-6
%
MESH_FILENAME= su2mesh_periodic.su2
MESH_FORMAT= SU2
-MESH_OUT_FILENAME= su2mesh_per.su2
-SOLUTION_FILENAME= restart_flow.dat
+MESH_OUT_FILENAME= mesh_out
+SOLUTION_FILENAME= restart_flow
TABULAR_FORMAT= CSV
CONV_FILENAME= history
-RESTART_FILENAME= restart_flow.dat
+RESTART_FILENAME= restart_flow
VOLUME_FILENAME= flow
SURFACE_FILENAME= surface_flow
OUTPUT_WRT_FREQ= 500
\ No newline at end of file
diff --git a/TestCases/turbomachinery/centrifugal_stage/centrifugal_stage.cfg b/TestCases/turbomachinery/centrifugal_stage/centrifugal_stage.cfg
index 41fbe6aee81c..22bcba421fab 100755
--- a/TestCases/turbomachinery/centrifugal_stage/centrifugal_stage.cfg
+++ b/TestCases/turbomachinery/centrifugal_stage/centrifugal_stage.cfg
@@ -75,8 +75,8 @@ TURBO_PERF_KIND = TURBINE TURBINE
GRID_MOVEMENT= YES
GRID_MOVEMENT_KIND= ROTATING_FRAME ROTATING_FRAME
MACH_MOTION= 0.35
-ROTATION_RATE_X = 0.0 0.0
-ROTATION_RATE_Y = 0.0 0.0
+ROTATION_RATE_X = 0.0 0.0
+ROTATION_RATE_Y = 0.0 0.0
ROTATION_RATE_Z = 0.0 1990.0
%
% ------------- COMMON PARAMETERS DEFINING THE NUMERICAL METHOD ---------------%
@@ -127,11 +127,11 @@ CONV_CAUCHY_EPS= 1E-6
%
MESH_FILENAME= su2mesh_periodic.su2
MESH_FORMAT= SU2
-MESH_OUT_FILENAME= su2mesh_per.su2
-SOLUTION_FILENAME= restart_flow.dat
+MESH_OUT_FILENAME= mesh_out
+SOLUTION_FILENAME= restart_flow
TABULAR_FORMAT= CSV
CONV_FILENAME= history
-RESTART_FILENAME= restart_flow.dat
+RESTART_FILENAME= restart_flow
VOLUME_FILENAME= flow
SURFACE_FILENAME= surface_flow
OUTPUT_WRT_FREQ= 500
diff --git a/TestCases/turbomachinery/multi_interface/multi_interface_rst.cfg b/TestCases/turbomachinery/multi_interface/multi_interface_rst.cfg
index b91511acf66e..c49c040ea68a 100644
--- a/TestCases/turbomachinery/multi_interface/multi_interface_rst.cfg
+++ b/TestCases/turbomachinery/multi_interface/multi_interface_rst.cfg
@@ -133,16 +133,16 @@ OUTPUT_FILES= RESTART
%
MESH_FILENAME= three_zone_quarter_cyl.su2
MESH_FORMAT= SU2
-MESH_OUT_FILENAME= mesh_out.su2
-SOLUTION_FILENAME= solution_flow.dat
-SOLUTION_ADJ_FILENAME= solution_adj.dat
+MESH_OUT_FILENAME= mesh_out
+SOLUTION_FILENAME= solution_flow
+SOLUTION_ADJ_FILENAME= solution_adj
TABULAR_FORMAT= TECPLOT
CONV_FILENAME= history
-RESTART_FILENAME= restart_flow.dat
-RESTART_ADJ_FILENAME= restart_adj.dat
+RESTART_FILENAME= restart_flow
+RESTART_ADJ_FILENAME= restart_adj
VOLUME_FILENAME= flow
VOLUME_ADJ_FILENAME= adjoint
-GRAD_OBJFUNC_FILENAME= of_grad.dat
+GRAD_OBJFUNC_FILENAME= of_grad
SURFACE_FILENAME= surface_flow
SURFACE_ADJ_FILENAME= surface_adjoint
OUTPUT_WRT_FREQ= 100
diff --git a/TestCases/turbomachinery/transonic_stator_2D/transonic_stator_restart.cfg b/TestCases/turbomachinery/transonic_stator_2D/transonic_stator_restart.cfg
index 1650b6e03e20..ddb64501ca95 100644
--- a/TestCases/turbomachinery/transonic_stator_2D/transonic_stator_restart.cfg
+++ b/TestCases/turbomachinery/transonic_stator_2D/transonic_stator_restart.cfg
@@ -142,16 +142,16 @@ CONV_CAUCHY_EPS= 1E-6
SCREEN_OUTPUT= INNER_ITER, RMS_RES, SURFACE_PRESSURE_DROP, MassFlowOut_1, TotalStaticEfficiency
MESH_FILENAME= mesh_stator_turb.su2
MESH_FORMAT= SU2
-MESH_OUT_FILENAME= su2mesh_per.su2
-SOLUTION_FILENAME= solution_flow.dat
-SOLUTION_ADJ_FILENAME= solution_adj.dat
+MESH_OUT_FILENAME= mesh_out
+SOLUTION_FILENAME= solution_flow
+SOLUTION_ADJ_FILENAME= solution_adj
TABULAR_FORMAT= CSV
CONV_FILENAME= history
-RESTART_FILENAME= restart_flow.dat
-RESTART_ADJ_FILENAME= restart_adj.dat
+RESTART_FILENAME= restart_flow
+RESTART_ADJ_FILENAME= restart_adj
VOLUME_FILENAME= flow
VOLUME_ADJ_FILENAME= adjoint
-GRAD_OBJFUNC_FILENAME= of_grad.dat
+GRAD_OBJFUNC_FILENAME= of_grad
SURFACE_FILENAME= surface_flow
SURFACE_ADJ_FILENAME= surface_adjoint
OUTPUT_WRT_FREQ= 500
diff --git a/TestCases/turbulence_models/sa/rae2822/turb_SA_BSL_RAE2822.cfg b/TestCases/turbulence_models/sa/rae2822/turb_SA_BSL_RAE2822.cfg
index 4c8538ba5ec0..50604b60db70 100644
--- a/TestCases/turbulence_models/sa/rae2822/turb_SA_BSL_RAE2822.cfg
+++ b/TestCases/turbulence_models/sa/rae2822/turb_SA_BSL_RAE2822.cfg
@@ -69,11 +69,11 @@ CONV_CAUCHY_EPS= 1E-6
%
MESH_FILENAME= mesh_RAE2822_turb.su2
MESH_FORMAT= SU2
-MESH_OUT_FILENAME= mesh_out.su2
-SOLUTION_FILENAME= solution_flow.dat
+MESH_OUT_FILENAME= mesh_out
+SOLUTION_FILENAME= solution_flow
TABULAR_FORMAT= CSV
CONV_FILENAME= history
-RESTART_FILENAME= restart_flow.dat
+RESTART_FILENAME= restart_flow
VOLUME_FILENAME= flow
SURFACE_FILENAME= surface_flow
OUTPUT_WRT_FREQ= 250
diff --git a/TestCases/turbulence_models/sa/rae2822/turb_SA_COMP_EDW_RAE2822.cfg b/TestCases/turbulence_models/sa/rae2822/turb_SA_COMP_EDW_RAE2822.cfg
index 39cd89c64b47..ba6787239985 100644
--- a/TestCases/turbulence_models/sa/rae2822/turb_SA_COMP_EDW_RAE2822.cfg
+++ b/TestCases/turbulence_models/sa/rae2822/turb_SA_COMP_EDW_RAE2822.cfg
@@ -69,11 +69,11 @@ CONV_CAUCHY_EPS= 1E-6
%
MESH_FILENAME= mesh_RAE2822_turb.su2
MESH_FORMAT= SU2
-MESH_OUT_FILENAME= mesh_out.su2
-SOLUTION_FILENAME= solution_flow.dat
+MESH_OUT_FILENAME= mesh_out
+SOLUTION_FILENAME= solution_flow
TABULAR_FORMAT= CSV
CONV_FILENAME= history
-RESTART_FILENAME= restart_flow.dat
+RESTART_FILENAME= restart_flow
VOLUME_FILENAME= flow
SURFACE_FILENAME= surface_flow
OUTPUT_WRT_FREQ= 250
diff --git a/TestCases/turbulence_models/sa/rae2822/turb_SA_COMP_RAE2822.cfg b/TestCases/turbulence_models/sa/rae2822/turb_SA_COMP_RAE2822.cfg
index 8f847257a3aa..8f783b5d7fc0 100644
--- a/TestCases/turbulence_models/sa/rae2822/turb_SA_COMP_RAE2822.cfg
+++ b/TestCases/turbulence_models/sa/rae2822/turb_SA_COMP_RAE2822.cfg
@@ -70,11 +70,11 @@ CONV_CAUCHY_EPS= 1E-6
%
MESH_FILENAME= mesh_RAE2822_turb.su2
MESH_FORMAT= SU2
-MESH_OUT_FILENAME= mesh_out.su2
-SOLUTION_FILENAME= solution_flow.dat
+MESH_OUT_FILENAME= mesh_out
+SOLUTION_FILENAME= solution_flow
TABULAR_FORMAT= CSV
CONV_FILENAME= history
-RESTART_FILENAME= restart_flow.dat
+RESTART_FILENAME= restart_flow
VOLUME_FILENAME= flow
SURFACE_FILENAME= surface_flow
OUTPUT_WRT_FREQ= 250
diff --git a/TestCases/turbulence_models/sa/rae2822/turb_SA_EDW_RAE2822.cfg b/TestCases/turbulence_models/sa/rae2822/turb_SA_EDW_RAE2822.cfg
index 894dfdf7e7a1..3eefc408141e 100644
--- a/TestCases/turbulence_models/sa/rae2822/turb_SA_EDW_RAE2822.cfg
+++ b/TestCases/turbulence_models/sa/rae2822/turb_SA_EDW_RAE2822.cfg
@@ -70,11 +70,11 @@ CONV_CAUCHY_EPS= 1E-6
%
MESH_FILENAME= mesh_RAE2822_turb.su2
MESH_FORMAT= SU2
-MESH_OUT_FILENAME= mesh_out.su2
-SOLUTION_FILENAME= solution_flow.dat
+MESH_OUT_FILENAME= mesh_out
+SOLUTION_FILENAME= solution_flow
TABULAR_FORMAT= CSV
CONV_FILENAME= history
-RESTART_FILENAME= restart_flow.dat
+RESTART_FILENAME= restart_flow
VOLUME_FILENAME= flow
SURFACE_FILENAME= surface_flow
OUTPUT_WRT_FREQ= 250
diff --git a/TestCases/turbulence_models/sa/rae2822/turb_SA_NEG_RAE2822.cfg b/TestCases/turbulence_models/sa/rae2822/turb_SA_NEG_RAE2822.cfg
index 7f54aad59459..c4973abe904e 100644
--- a/TestCases/turbulence_models/sa/rae2822/turb_SA_NEG_RAE2822.cfg
+++ b/TestCases/turbulence_models/sa/rae2822/turb_SA_NEG_RAE2822.cfg
@@ -77,11 +77,11 @@ CONV_CAUCHY_EPS= 1E-6
%
MESH_FILENAME= mesh_RAE2822_turb.su2
MESH_FORMAT= SU2
-MESH_OUT_FILENAME= mesh_out.su2
-SOLUTION_FILENAME= solution_flow.dat
+MESH_OUT_FILENAME= mesh_out
+SOLUTION_FILENAME= solution_flow
TABULAR_FORMAT= CSV
CONV_FILENAME= history
-RESTART_FILENAME= restart_flow.dat
+RESTART_FILENAME= restart_flow
VOLUME_FILENAME= flow
SURFACE_FILENAME= surface_flow
OUTPUT_WRT_FREQ= 250
diff --git a/TestCases/turbulence_models/sa/rae2822/turb_SA_QCR_RAE2822.cfg b/TestCases/turbulence_models/sa/rae2822/turb_SA_QCR_RAE2822.cfg
index fba16360d751..d038f5ff7e60 100644
--- a/TestCases/turbulence_models/sa/rae2822/turb_SA_QCR_RAE2822.cfg
+++ b/TestCases/turbulence_models/sa/rae2822/turb_SA_QCR_RAE2822.cfg
@@ -70,11 +70,11 @@ CONV_CAUCHY_EPS= 1E-6
%
MESH_FILENAME= mesh_RAE2822_turb.su2
MESH_FORMAT= SU2
-MESH_OUT_FILENAME= mesh_out.su2
-SOLUTION_FILENAME= solution_flow.dat
+MESH_OUT_FILENAME= mesh_out
+SOLUTION_FILENAME= solution_flow
TABULAR_FORMAT= CSV
CONV_FILENAME= history
-RESTART_FILENAME= restart_flow.dat
+RESTART_FILENAME= restart_flow
VOLUME_FILENAME= flow
SURFACE_FILENAME= surface_flow
OUTPUT_WRT_FREQ= 250
diff --git a/TestCases/unsteady/pitching_naca0015_rans_inc/config_incomp_turb_sa.cfg b/TestCases/unsteady/pitching_naca0015_rans_inc/config_incomp_turb_sa.cfg
index 0f84217b43dd..8a224313d0b7 100644
--- a/TestCases/unsteady/pitching_naca0015_rans_inc/config_incomp_turb_sa.cfg
+++ b/TestCases/unsteady/pitching_naca0015_rans_inc/config_incomp_turb_sa.cfg
@@ -87,16 +87,16 @@ CONV_CAUCHY_ELEMS= 100
%
MESH_FILENAME= mesh_naca0015_ogrid_m151_cvc_v2_147.su2
MESH_FORMAT= SU2
-MESH_OUT_FILENAME= mesh_out.su2
-SOLUTION_FILENAME= solution_flow.dat
-SOLUTION_ADJ_FILENAME= solution_adj.dat
+MESH_OUT_FILENAME= mesh_out
+SOLUTION_FILENAME= solution_flow
+SOLUTION_ADJ_FILENAME= solution_adj
TABULAR_FORMAT= CSV
CONV_FILENAME= history
-RESTART_FILENAME= solution_flow.dat
-RESTART_ADJ_FILENAME= solution_adj.dat
+RESTART_FILENAME= solution_flow
+RESTART_ADJ_FILENAME= solution_adj
VOLUME_FILENAME= flow
VOLUME_ADJ_FILENAME= adjoint
-GRAD_OBJFUNC_FILENAME= of_grad.dat
+GRAD_OBJFUNC_FILENAME= of_grad
SURFACE_FILENAME= surface_flow
SURFACE_ADJ_FILENAME= surface_adjoint
OUTPUT_WRT_FREQ= 1
diff --git a/TestCases/unsteady/pitching_naca64a010_euler/pitching_NACA64A010.cfg b/TestCases/unsteady/pitching_naca64a010_euler/pitching_NACA64A010.cfg
index 87218fb08320..affc6be7a64f 100644
--- a/TestCases/unsteady/pitching_naca64a010_euler/pitching_NACA64A010.cfg
+++ b/TestCases/unsteady/pitching_naca64a010_euler/pitching_NACA64A010.cfg
@@ -130,16 +130,16 @@ CONV_CAUCHY_EPS= 1E-6
%
MESH_FILENAME= mesh_NACA64A010_inv.su2
MESH_FORMAT= SU2
-MESH_OUT_FILENAME= mesh_out.su2
-SOLUTION_FILENAME= restart_flow.dat
-SOLUTION_ADJ_FILENAME= solution_adj.dat
+MESH_OUT_FILENAME= mesh_out
+SOLUTION_FILENAME= restart_flow
+SOLUTION_ADJ_FILENAME= solution_adj
TABULAR_FORMAT= CSV
CONV_FILENAME= history
-RESTART_FILENAME= restart_flow.dat
-RESTART_ADJ_FILENAME= restart_adj.dat
+RESTART_FILENAME= restart_flow
+RESTART_ADJ_FILENAME= restart_adj
VOLUME_FILENAME= flow
VOLUME_ADJ_FILENAME= adjoint
-GRAD_OBJFUNC_FILENAME= of_grad.dat
+GRAD_OBJFUNC_FILENAME= of_grad
SURFACE_FILENAME= surface_flow
SURFACE_ADJ_FILENAME= surface_adjoint
OUTPUT_WRT_FREQ= 250
diff --git a/TestCases/unsteady/pitching_naca64a010_rans/turb_NACA64A010.cfg b/TestCases/unsteady/pitching_naca64a010_rans/turb_NACA64A010.cfg
index 6cc9cd1dfff5..b55c4440b1ea 100644
--- a/TestCases/unsteady/pitching_naca64a010_rans/turb_NACA64A010.cfg
+++ b/TestCases/unsteady/pitching_naca64a010_rans/turb_NACA64A010.cfg
@@ -138,16 +138,16 @@ CONV_CAUCHY_EPS= 1E-5
%
MESH_FILENAME= mesh_NACA64A010_turb.su2
MESH_FORMAT= SU2
-MESH_OUT_FILENAME= mesh_out.su2
-SOLUTION_FILENAME= restart_flow.dat
-SOLUTION_ADJ_FILENAME= restart_adj.dat
+MESH_OUT_FILENAME= mesh_out
+SOLUTION_FILENAME= restart_flow
+SOLUTION_ADJ_FILENAME= restart_adj
TABULAR_FORMAT= CSV
CONV_FILENAME= history
-RESTART_FILENAME= restart_flow.dat
-RESTART_ADJ_FILENAME= restart_adj.dat
+RESTART_FILENAME= restart_flow
+RESTART_ADJ_FILENAME= restart_adj
VOLUME_FILENAME= flow
VOLUME_ADJ_FILENAME= adjoint
-GRAD_OBJFUNC_FILENAME= of_grad.dat
+GRAD_OBJFUNC_FILENAME= of_grad
SURFACE_FILENAME= surface_flow
SURFACE_ADJ_FILENAME= surface_adjoint
OUTPUT_WRT_FREQ= 1
diff --git a/TestCases/unsteady/plunging_naca0012/plunging_NACA0012.cfg b/TestCases/unsteady/plunging_naca0012/plunging_NACA0012.cfg
index 932499ec970a..186af4a58d86 100644
--- a/TestCases/unsteady/plunging_naca0012/plunging_NACA0012.cfg
+++ b/TestCases/unsteady/plunging_naca0012/plunging_NACA0012.cfg
@@ -106,16 +106,16 @@ CONV_CAUCHY_ELEMS= 100
%
MESH_FILENAME= mesh_NACA0012_lam.su2
MESH_FORMAT= SU2
-MESH_OUT_FILENAME= mesh_out.su2
-SOLUTION_FILENAME= solution_flow.dat
-SOLUTION_ADJ_FILENAME= solution_adj.dat
+MESH_OUT_FILENAME= mesh_out
+SOLUTION_FILENAME= solution_flow
+SOLUTION_ADJ_FILENAME= solution_adj
TABULAR_FORMAT= CSV
CONV_FILENAME= history
-RESTART_FILENAME= restart_flow.dat
-RESTART_ADJ_FILENAME= restart_adj.dat
+RESTART_FILENAME= restart_flow
+RESTART_ADJ_FILENAME= restart_adj
VOLUME_FILENAME= flow
VOLUME_ADJ_FILENAME= adjoint
-GRAD_OBJFUNC_FILENAME= of_grad.dat
+GRAD_OBJFUNC_FILENAME= of_grad
SURFACE_FILENAME= surface_flow
SURFACE_ADJ_FILENAME= surface_adjoint
OUTPUT_WRT_FREQ= 1
diff --git a/TestCases/unsteady/square_cylinder/turb_square.cfg b/TestCases/unsteady/square_cylinder/turb_square.cfg
index 356b1510e13d..60b78917b253 100644
--- a/TestCases/unsteady/square_cylinder/turb_square.cfg
+++ b/TestCases/unsteady/square_cylinder/turb_square.cfg
@@ -96,16 +96,16 @@ CONV_CAUCHY_EPS= 1E-5
%
MESH_FILENAME= mesh_square_turb_hybrid.su2
MESH_FORMAT= SU2
-MESH_OUT_FILENAME= mesh_out.su2
-SOLUTION_FILENAME= solution_flow.dat
-SOLUTION_ADJ_FILENAME= solution_adj.dat
+MESH_OUT_FILENAME= mesh_out
+SOLUTION_FILENAME= solution_flow
+SOLUTION_ADJ_FILENAME= solution_adj
TABULAR_FORMAT= CSV
CONV_FILENAME= history
-RESTART_FILENAME= restart_flow.dat
-RESTART_ADJ_FILENAME= restart_adj.dat
+RESTART_FILENAME= restart_flow
+RESTART_ADJ_FILENAME= restart_adj
VOLUME_FILENAME= flow
VOLUME_ADJ_FILENAME= adjoint
-GRAD_OBJFUNC_FILENAME= of_grad.dat
+GRAD_OBJFUNC_FILENAME= of_grad
SURFACE_FILENAME= surface_flow
SURFACE_ADJ_FILENAME= surface_adjoint
OUTPUT_WRT_FREQ= 1
diff --git a/TestCases/vandv/rans/bump_in_channel/turb_bump_sst.cfg b/TestCases/vandv/rans/bump_in_channel/turb_bump_sst.cfg
index b30ea280f108..78cb105956ba 100644
--- a/TestCases/vandv/rans/bump_in_channel/turb_bump_sst.cfg
+++ b/TestCases/vandv/rans/bump_in_channel/turb_bump_sst.cfg
@@ -52,11 +52,11 @@ CONV_RESIDUAL_MINVAL= -13
% ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
MESH_FILENAME= mesh_bump_2d_0089x041.cgns
MESH_FORMAT= CGNS
-MESH_OUT_FILENAME= mesh_out.su2
-SOLUTION_FILENAME= solution_flow.dat
+MESH_OUT_FILENAME= mesh_out
+SOLUTION_FILENAME= solution_flow
CONV_FILENAME= history
-RESTART_FILENAME= restart_flow.dat
+RESTART_FILENAME= restart_flow
VOLUME_FILENAME= flow
SURFACE_FILENAME= surface_flow
SCREEN_OUTPUT= INNER_ITER WALL_TIME RMS_RES DRAG
diff --git a/TestCases/vandv/rans/dsma661/dsma661_sa_config.cfg b/TestCases/vandv/rans/dsma661/dsma661_sa_config.cfg
index 41c902232a42..73c8b83f23bd 100644
--- a/TestCases/vandv/rans/dsma661/dsma661_sa_config.cfg
+++ b/TestCases/vandv/rans/dsma661/dsma661_sa_config.cfg
@@ -118,14 +118,14 @@ MESH_FILENAME= mesh_turb_dsma661_65.su2 % mesh_turb_dsma661_65.su2, mesh_turb_ds
%mesh_turb_dsma661_257.su2, mesh_turb_dsma661_513.su2, mesh_turb_dsma661_1025.su2
MESH_FORMAT= SU2
% 149_29, 297_57, 593_113, 1185_225, 2369_449,
-RESTART_FILENAME= restart_flow-149_29.dat
+RESTART_FILENAME= restart_flow-149_29
VOLUME_FILENAME= flow-149_29
BREAKDOWN_FILENAME= forces_breakdown-149_29.dat
CONV_FILENAME= history-149_29
SURFACE_FILENAME= suface-149_29
-MESH_OUT_FILENAME= mesh_out.su2
-SOLUTION_FILENAME= sa_restart_flow-149_29.dat
+MESH_OUT_FILENAME= mesh_out
+SOLUTION_FILENAME= sa_restart_flow-149_29
TABULAR_FORMAT= CSV
OUTPUT_PRECISION= 15
% Files to output
@@ -134,7 +134,7 @@ OUTPUT_PRECISION= 15
% SURFACE_PARAVIEW_LEGACY, PARAVIEW, SURFACE_PARAVIEW, RESTART_ASCII, RESTART, CGNS, SURFACE_CGNS, STL_ASCII, STL_BINARY)
% default : (RESTART, PARAVIEW, SURFACE_PARAVIEW)
OUTPUT_FILES= (RESTART, PARAVIEW, SURFACE_PARAVIEW)
-VALUE_OBJFUNC_FILENAME= of_eval.dat
+VALUE_OBJFUNC_FILENAME= of_eval
READ_BINARY_RESTART= YES
REORIENT_ELEMENTS= YES
%
diff --git a/TestCases/vandv/rans/dsma661/dsma661_sst_config.cfg b/TestCases/vandv/rans/dsma661/dsma661_sst_config.cfg
index e3bcc532d696..4121ab490887 100644
--- a/TestCases/vandv/rans/dsma661/dsma661_sst_config.cfg
+++ b/TestCases/vandv/rans/dsma661/dsma661_sst_config.cfg
@@ -118,14 +118,14 @@ MESH_FILENAME= mesh_turb_dsma661_65.su2 % mesh_turb_dsma661_65.su2, mesh_turb_ds
%mesh_turb_dsma661_257.su2, mesh_turb_dsma661_513.su2, mesh_turb_dsma661_1025.su2
MESH_FORMAT= SU2
% 149_29, 297_57, 593_113, 1185_225, 2369_449,
-RESTART_FILENAME= restart_flow-149_29.dat
+RESTART_FILENAME= restart_flow-149_29
VOLUME_FILENAME= flow-149_29
BREAKDOWN_FILENAME= forces_breakdown-149_29.dat
CONV_FILENAME= history-149_29
SURFACE_FILENAME= suface-149_29
-MESH_OUT_FILENAME= mesh_out.su2
-SOLUTION_FILENAME= sst_restart_flow-149_29.dat
+MESH_OUT_FILENAME= mesh_out
+SOLUTION_FILENAME= sst_restart_flow-149_29
TABULAR_FORMAT= CSV
OUTPUT_PRECISION= 15
% Files to output
@@ -134,7 +134,7 @@ OUTPUT_PRECISION= 15
% SURFACE_PARAVIEW_LEGACY, PARAVIEW, SURFACE_PARAVIEW, RESTART_ASCII, RESTART, CGNS, SURFACE_CGNS, STL_ASCII, STL_BINARY)
% default : (RESTART, PARAVIEW, SURFACE_PARAVIEW)
OUTPUT_FILES= (RESTART, PARAVIEW, SURFACE_PARAVIEW)
-VALUE_OBJFUNC_FILENAME= of_eval.dat
+VALUE_OBJFUNC_FILENAME= of_eval
READ_BINARY_RESTART= YES
REORIENT_ELEMENTS= YES
%
diff --git a/TestCases/vandv/rans/flatplate/turb_flatplate_sst.cfg b/TestCases/vandv/rans/flatplate/turb_flatplate_sst.cfg
index 2b53ee86d711..4b0450cf00a9 100644
--- a/TestCases/vandv/rans/flatplate/turb_flatplate_sst.cfg
+++ b/TestCases/vandv/rans/flatplate/turb_flatplate_sst.cfg
@@ -57,11 +57,11 @@ CONV_RESIDUAL_MINVAL= -13
% ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
MESH_FILENAME= mesh_flatplate_turb_035x025.su2
MESH_FORMAT= SU2
-MESH_OUT_FILENAME= mesh_out.su2
-SOLUTION_FILENAME= solution_flow.dat
+MESH_OUT_FILENAME= mesh_out
+SOLUTION_FILENAME= solution_flow
TABULAR_FORMAT= CSV
CONV_FILENAME= history
-RESTART_FILENAME= restart_flow.dat
+RESTART_FILENAME= restart_flow
VOLUME_FILENAME= flow
SURFACE_FILENAME= surface_flow
SCREEN_OUTPUT= INNER_ITER WALL_TIME RMS_RES DRAG
diff --git a/TestCases/vandv/rans/swbli/config_sa.cfg b/TestCases/vandv/rans/swbli/config_sa.cfg
index 9c5e1ac0d0f5..3ab03c94ce60 100644
--- a/TestCases/vandv/rans/swbli/config_sa.cfg
+++ b/TestCases/vandv/rans/swbli/config_sa.cfg
@@ -90,7 +90,7 @@ CONV_RESIDUAL_MINVAL= -11.5
MESH_FILENAME= mesh.su2
MESH_FORMAT= SU2
RESTART_SOL= YES
-SOLUTION_FILENAME= solution_sa.dat
+SOLUTION_FILENAME= solution_sa
OUTPUT_WRT_FREQ= 500
SCREEN_WRT_FREQ_INNER= 1
HISTORY_OUTPUT= ( ITER, RMS_RES, AERO_COEFF )
diff --git a/TestCases/vandv/rans/swbli/config_sst.cfg b/TestCases/vandv/rans/swbli/config_sst.cfg
index 42d3684879fc..8336a3562f4a 100644
--- a/TestCases/vandv/rans/swbli/config_sst.cfg
+++ b/TestCases/vandv/rans/swbli/config_sst.cfg
@@ -92,7 +92,7 @@ CONV_RESIDUAL_MINVAL= -11.5
MESH_FILENAME= mesh.su2
MESH_FORMAT= SU2
RESTART_SOL= YES
-SOLUTION_FILENAME= solution_sst.dat
+SOLUTION_FILENAME= solution_sst
OUTPUT_WRT_FREQ= 500
SCREEN_WRT_FREQ_INNER= 1
HISTORY_OUTPUT= ( ITER, RMS_RES, AERO_COEFF )
diff --git a/TestCases/vandv/species_transport/sandia_jet/validation.cfg b/TestCases/vandv/species_transport/sandia_jet/validation.cfg
index 087a2851dcf2..ed6aaa281108 100644
--- a/TestCases/vandv/species_transport/sandia_jet/validation.cfg
+++ b/TestCases/vandv/species_transport/sandia_jet/validation.cfg
@@ -144,8 +144,8 @@ VOLUME_OUTPUT= RESIDUAL, PRIMITIVE
OUTPUT_WRT_FREQ= 100
%
READ_BINARY_RESTART= NO
-RESTART_FILENAME= restart.csv
-SOLUTION_FILENAME= solution.csv
+RESTART_FILENAME= restart
+SOLUTION_FILENAME= solution
%
WRT_PERFORMANCE= YES
OUTPUT_PRECISION= 16
diff --git a/config_template.cfg b/config_template.cfg
index b733de0c0a2b..cd6200dcdfbd 100644
--- a/config_template.cfg
+++ b/config_template.cfg
@@ -1836,7 +1836,7 @@ ELECTRIC_FIELD_DIR= (0.0, 1.0)
PRESTRETCH= NO
%
% Filename to input for prestretching membranes
-PRESTRETCH_FILENAME= prestretch_file.dat
+PRESTRETCH_FILENAME= prestretch_file
%
% ----------------------- Body Forces -----------------------%
%
@@ -2129,7 +2129,7 @@ REFERENCE_GEOMETRY= NO
REFERENCE_GEOMETRY_PENALTY= 1.0E6
%
% Reference geometry filename
-REFERENCE_GEOMETRY_FILENAME= reference_geometry.dat
+REFERENCE_GEOMETRY_FILENAME= reference_geometry
%
% Format of the reference geometry file
REFERENCE_GEOMETRY_FORMAT= SU2_REF
@@ -2369,7 +2369,7 @@ EXTRA_HEAT_ZONE_OUTPUT= -1
% ------------------------- INPUT/OUTPUT FILE INFORMATION --------------------------%
%
% Mesh input file
-MESH_FILENAME= mesh_NACA0012_inv.su2
+MESH_FILENAME= mesh_NACA0012_inv
%
% Mesh input file format (SU2, CGNS)
MESH_FORMAT= SU2
@@ -2384,13 +2384,13 @@ MESH_BOX_LENGTH= (1.0, 1.0, 1.0)
MESH_BOX_OFFSET= (0.0, 0.0, 0.0)
%
% Mesh output file
-MESH_OUT_FILENAME= mesh_out.su2
+MESH_OUT_FILENAME= mesh_out
%
% Restart flow input file
-SOLUTION_FILENAME= solution_flow.dat
+SOLUTION_FILENAME= solution_flow
%
% Restart adjoint input file
-SOLUTION_ADJ_FILENAME= solution_adj.dat
+SOLUTION_ADJ_FILENAME= solution_adj
%
% Output tabular file format (TECPLOT, CSV)
TABULAR_FORMAT= CSV
@@ -2415,10 +2415,10 @@ CONV_FILENAME= history
BREAKDOWN_FILENAME= forces_breakdown.dat
%
% Output file restart flow
-RESTART_FILENAME= restart_flow.dat
+RESTART_FILENAME= restart_flow
%
% Output file restart adjoint
-RESTART_ADJ_FILENAME= restart_adj.dat
+RESTART_ADJ_FILENAME= restart_adj
%
% Output file flow (w/o extension) variables
VOLUME_FILENAME= flow
@@ -2426,11 +2426,11 @@ VOLUME_FILENAME= flow
% Output file adjoint (w/o extension) variables
VOLUME_ADJ_FILENAME= adjoint
%
-% Output Objective function
-VALUE_OBJFUNC_FILENAME= of_eval.dat
+% Output Objective function (in tecplot .dat or .csv format)
+VALUE_OBJFUNC_FILENAME= of_eval
%
% Output objective function gradient (using continuous adjoint)
-GRAD_OBJFUNC_FILENAME= of_grad.dat
+GRAD_OBJFUNC_FILENAME= of_grad
%
% Output file surface flow coefficient (w/o extension)
SURFACE_FILENAME= surface_flow