diff --git a/Common/include/CConfig.hpp b/Common/include/CConfig.hpp
index e0b86e704ce..4698f4d9747 100644
--- a/Common/include/CConfig.hpp
+++ b/Common/include/CConfig.hpp
@@ -80,6 +80,7 @@ class CConfig {
su2double EA_ScaleFactor; /*!< \brief Equivalent Area scaling factor */
su2double AdjointLimit; /*!< \brief Adjoint variable limit */
string* ConvField; /*!< \brief Field used for convergence check.*/
+ string ConvCriteria; // This option is deprecated. After a grace period until 7.2.0 the usage warning should become an error.
string* WndConvField; /*!< \brief Function where to apply the windowed convergence criteria for the time average of the unsteady (single zone) flow problem. */
unsigned short nConvField; /*!< \brief Number of fields used to monitor convergence.*/
@@ -96,7 +97,6 @@ class CConfig {
bool ActDisk_DoubleSurface; /*!< \brief actuator disk double surface */
bool Engine_HalfModel; /*!< \brief only half model is in the computational grid */
bool ActDisk_SU2_DEF; /*!< \brief actuator disk double surface */
- unsigned short ConvCriteria; /*!< \brief Kind of convergence criteria. */
unsigned short nFFD_Iter; /*!< \brief Iteration for the point inversion problem. */
unsigned short FFD_Blending; /*!< \brief Kind of FFD Blending function. */
su2double FFD_Tol; /*!< \brief Tolerance in the point inversion problem. */
@@ -5865,12 +5865,6 @@ class CConfig {
*/
su2double GetBuffet_lambda(void) const { return Buffet_lambda; }
- /*!
- * \brief Obtain the kind of convergence criteria to establish the convergence of the CFD code.
- * \return Kind of convergence criteria.
- */
- unsigned short GetConvCriteria(void) const { return ConvCriteria; }
-
/*!
* \brief Get the index in the config information of the marker val_marker.
* \note When we read the config file, it stores the markers in a particular vector.
diff --git a/Common/include/geometry/CGeometry.hpp b/Common/include/geometry/CGeometry.hpp
index 4941e62d219..583ffab12fd 100644
--- a/Common/include/geometry/CGeometry.hpp
+++ b/Common/include/geometry/CGeometry.hpp
@@ -1168,16 +1168,6 @@ class CGeometry {
*/
inline unsigned long GetnElemPyra(void) const { return nelem_pyramid; }
- /*!
- * \brief Indentify geometrical planes in the mesh
- */
- void SetGeometryPlanes(CConfig *config);
-
- /*!
- * \brief Get geometrical planes in the mesh
- */
- inline vector GetGeometryPlanes() const {return XCoordList;}
-
/*!
* \brief Get x coords of geometrical planes in the mesh
*/
diff --git a/Common/include/option_structure.hpp b/Common/include/option_structure.hpp
index c85d64ec882..083f43df8fe 100644
--- a/Common/include/option_structure.hpp
+++ b/Common/include/option_structure.hpp
@@ -1494,6 +1494,7 @@ enum ENUM_OBJECTIVE {
BUFFET_SENSOR = 20, /*!< \brief Sensor for detecting separation. */
SURFACE_TOTAL_PRESSURE = 28, /*!< \brief Total Pressure objective function definition. */
SURFACE_STATIC_PRESSURE = 29, /*!< \brief Static Pressure objective function definition. */
+ SURFACE_STATIC_TEMPERATURE = 57, /*!< \brief Static Temperature objective function definition. */
SURFACE_MASSFLOW = 30, /*!< \brief Mass Flow Rate objective function definition. */
SURFACE_MACH = 51, /*!< \brief Mach number objective function definition. */
SURFACE_UNIFORMITY = 52, /*!< \brief Flow uniformity objective function definition. */
@@ -1545,6 +1546,7 @@ static const MapType Objective_Map = {
MakePair("BUFFET", BUFFET_SENSOR)
MakePair("SURFACE_TOTAL_PRESSURE", SURFACE_TOTAL_PRESSURE)
MakePair("SURFACE_STATIC_PRESSURE", SURFACE_STATIC_PRESSURE)
+ MakePair("SURFACE_STATIC_TEMPERATURE", SURFACE_STATIC_TEMPERATURE)
MakePair("SURFACE_MASSFLOW", SURFACE_MASSFLOW)
MakePair("SURFACE_MACH", SURFACE_MACH)
MakePair("SURFACE_UNIFORMITY", SURFACE_UNIFORMITY)
@@ -2021,18 +2023,6 @@ static const MapType TimeMarching_Map = {
MakePair("ROTATIONAL_FRAME", ROTATIONAL_FRAME)
};
-/*!
- * \brief Types of criteria to determine when the solution is converged
- */
-enum ENUM_CONVERGE_CRIT {
- CAUCHY = 1, /*!< \brief Cauchy criteria to establish the convergence of the code. */
- RESIDUAL = 2 /*!< \brief Residual criteria to establish the convergence of the code. */
-};
-static const MapType Converge_Crit_Map = {
- MakePair("CAUCHY", CAUCHY)
- MakePair("RESIDUAL", RESIDUAL)
-};
-
/*!
* \brief Types of element stiffnesses imposed for FEA mesh deformation
*/
diff --git a/Common/src/CConfig.cpp b/Common/src/CConfig.cpp
index ce826bf8748..fd7ebb04e9c 100644
--- a/Common/src/CConfig.cpp
+++ b/Common/src/CConfig.cpp
@@ -1727,9 +1727,8 @@ void CConfig::SetConfig_Options() {
/*!\par CONFIG_CATEGORY: Convergence\ingroup Config*/
/*--- Options related to convergence ---*/
- /*!\brief CONV_CRITERIA
- * \n DESCRIPTION: Convergence criteria \n OPTIONS: see \link Converge_Crit_Map \endlink \n DEFAULT: RESIDUAL \ingroup Config*/
- addEnumOption("CONV_CRITERIA", ConvCriteria, Converge_Crit_Map, RESIDUAL);
+ // This option is deprecated. After a grace period until 7.2.0 the usage warning should become an error.
+ addStringOption("CONV_CRITERIA", ConvCriteria, "this option is deprecated");
/*!\brief CONV_RESIDUAL_MINVAL\n DESCRIPTION: Min value of the residual (log10 of the residual)\n DEFAULT: -14.0 \ingroup Config*/
addDoubleOption("CONV_RESIDUAL_MINVAL", MinLogResidual, -14.0);
/*!\brief CONV_STARTITER\n DESCRIPTION: Iteration number to begin convergence monitoring\n DEFAULT: 5 \ingroup Config*/
@@ -2887,6 +2886,10 @@ void CConfig::SetConfig_Parsing(istream& config_buffer){
newString.append("WRT_SOL_FREQ is deprecated. Use OUTPUT_WRT_FREQ instead.\n\n");
if (!option_name.compare("WRT_SOL_FREQ_DUALTIME"))
newString.append("WRT_SOL_FREQ_DUALTIME is deprecated. Use OUTPUT_WRT_FREQ instead.\n\n");
+ // This option is deprecated. After a grace period until 7.2.0 the usage warning should become an error.
+ /*if (!option_name.compare("CONV_CRITERIA"))
+ newString.append(string("CONV_CRITERIA is deprecated. SU2 will choose the criteria automatically based on the CONV_FIELD.\n") +
+ string("RESIDUAL for any RMS_* BGS_* value. CAUCHY for coefficients like DRAG etc.\n\n"));*/
errorString.append(newString);
err_count++;
line_count++;
@@ -3274,6 +3277,9 @@ void CConfig::SetPostprocessing(unsigned short val_software, unsigned short val_
SU2_MPI::Error(string("Fixed CL mode not implemented for the incompressible solver. \n"), CURRENT_FUNCTION);
}
+ /*--- Inc CHT simulation, but energy equation of fluid is inactive. ---*/
+ if (Multizone_Problem && (nMarker_CHTInterface > 0) && !Energy_Equation)
+ SU2_MPI::Error(string("You probably want to set INC_ENERGY_EQUATION= YES for the fluid solver. \n"), CURRENT_FUNCTION);
}
/*--- By default, in 2D we should use TWOD_AIRFOIL (independenly from the input file) ---*/
@@ -3377,6 +3383,7 @@ void CConfig::SetPostprocessing(unsigned short val_software, unsigned short val_
case FIGURE_OF_MERIT:
case SURFACE_TOTAL_PRESSURE:
case SURFACE_STATIC_PRESSURE:
+ case SURFACE_STATIC_TEMPERATURE:
case SURFACE_MASSFLOW:
case SURFACE_UNIFORMITY:
case SURFACE_SECONDARY:
@@ -3390,7 +3397,7 @@ void CConfig::SetPostprocessing(unsigned short val_software, unsigned short val_
string("INVERSE_DESIGN_PRESSURE, INVERSE_DESIGN_HEATFLUX, THRUST_COEFFICIENT, TORQUE_COEFFICIENT\n")+
string("FIGURE_OF_MERIT, SURFACE_TOTAL_PRESSURE, SURFACE_STATIC_PRESSURE, SURFACE_MASSFLOW\n")+
string("SURFACE_UNIFORMITY, SURFACE_SECONDARY, SURFACE_MOM_DISTORTION, SURFACE_SECOND_OVER_UNIFORM\n")+
- string("SURFACE_PRESSURE_DROP, CUSTOM_OBJFUNC.\n"), CURRENT_FUNCTION);
+ string("SURFACE_PRESSURE_DROP, SURFACE_STATIC_TEMPERATURE, CUSTOM_OBJFUNC.\n"), CURRENT_FUNCTION);
}
break;
default:
@@ -3421,7 +3428,11 @@ void CConfig::SetPostprocessing(unsigned short val_software, unsigned short val_
if (!OptionIsSet("HISTORY_WRT_FREQ_INNER")) { HistoryWrtFreq[2] = 0; }
if (!OptionIsSet("HISTORY_WRT_FREQ_OUTER")) { HistoryWrtFreq[1] = 0; }
- if (Restart == NO) { Restart_Iter = 0; }
+ if (Restart == NO) {
+ Restart_Iter = 0;
+ } else {
+ if(nTimeIter <= Restart_Iter) SU2_MPI::Error("TIME_ITER must be larger than RESTART_ITER.", CURRENT_FUNCTION);
+ }
if (Time_Step <= 0.0 && Unst_CFL == 0.0){ SU2_MPI::Error("Invalid value for TIME_STEP.", CURRENT_FUNCTION); }
} else {
@@ -4450,7 +4461,6 @@ void CConfig::SetPostprocessing(unsigned short val_software, unsigned short val_
if (Fixed_CM_Mode) {
nInnerIter += Iter_dCL_dAlpha;
- ConvCriteria = RESIDUAL;
MinLogResidual = -24;
}
}
@@ -4980,6 +4990,12 @@ void CConfig::SetPostprocessing(unsigned short val_software, unsigned short val_
if (GetSurface_Movement(DEFORMING)) Deform_Mesh = true;
if (GetGasModel() == "ARGON") monoatomic = true;
+
+ // This option is deprecated. After a grace period until 7.2.0 the usage warning should become an error.
+ if(OptionIsSet("CONV_CRITERIA")) {
+ cout << string("\n\nWARNING: CONV_CRITERIA is deprecated. SU2 will choose the criteria automatically based on the CONV_FIELD.\n") +
+ string("RESIDUAL for any RMS_* BGS_* value. CAUCHY for coefficients like DRAG etc.\n\n");
+ }
}
void CConfig::SetMarkers(unsigned short val_software) {
@@ -6013,6 +6029,7 @@ void CConfig::SetOutput(unsigned short val_software, unsigned short val_izone) {
case BUFFET_SENSOR: cout << "Buffet sensor objective function." << endl; break;
case SURFACE_TOTAL_PRESSURE: cout << "Average total pressure objective function." << endl; break;
case SURFACE_STATIC_PRESSURE: cout << "Average static pressure objective function." << endl; break;
+ case SURFACE_STATIC_TEMPERATURE: cout << "Average static temperature objective function." << endl; break;
case SURFACE_MASSFLOW: cout << "Mass flow rate objective function." << endl; break;
case SURFACE_MACH: cout << "Mach number objective function." << endl; break;
case CUSTOM_OBJFUNC: cout << "Custom objective function." << endl; break;
@@ -7916,6 +7933,7 @@ string CConfig::GetObjFunc_Extension(string val_filename) const {
case BUFFET_SENSOR: AdjExt = "_buffet"; break;
case SURFACE_TOTAL_PRESSURE: AdjExt = "_pt"; break;
case SURFACE_STATIC_PRESSURE: AdjExt = "_pe"; break;
+ case SURFACE_STATIC_TEMPERATURE: AdjExt = "_T"; break;
case SURFACE_MASSFLOW: AdjExt = "_mfr"; break;
case SURFACE_UNIFORMITY: AdjExt = "_uniform"; break;
case SURFACE_SECONDARY: AdjExt = "_second"; break;
diff --git a/Common/src/geometry/CGeometry.cpp b/Common/src/geometry/CGeometry.cpp
index 3f4229208ef..d8fb07b0eed 100644
--- a/Common/src/geometry/CGeometry.cpp
+++ b/Common/src/geometry/CGeometry.cpp
@@ -3534,101 +3534,6 @@ void CGeometry::SetElemVolume()
} // end SU2_OMP_PARALLEL
}
-void CGeometry::SetGeometryPlanes(CConfig *config) {
-
- bool loop_on;
- unsigned short iMarker = 0;
- su2double *Face_Normal = nullptr, *Xcoord = nullptr, *Ycoord = nullptr, *Zcoord = nullptr, *FaceArea = nullptr;
- unsigned long jVertex, iVertex, ixCoord, iPoint, iVertex_Wall, nVertex_Wall = 0;
-
- /*--- Compute the total number of points on the near-field ---*/
- nVertex_Wall = 0;
- for (iMarker = 0; iMarker < config->GetnMarker_All(); iMarker++)
- if (config->GetSolid_Wall(iMarker))
- nVertex_Wall += nVertex[iMarker];
-
- /*--- Create an array with all the coordinates, points, pressures, face area,
- equivalent area, and nearfield weight ---*/
- Xcoord = new su2double[nVertex_Wall];
- Ycoord = new su2double[nVertex_Wall];
- if (nDim == 3) Zcoord = new su2double[nVertex_Wall];
- FaceArea = new su2double[nVertex_Wall];
-
- /*--- Copy the boundary information to an array ---*/
- iVertex_Wall = 0;
- for (iMarker = 0; iMarker < config->GetnMarker_All(); iMarker++)
- if (config->GetSolid_Wall(iMarker))
- for (iVertex = 0; iVertex < nVertex[iMarker]; iVertex++) {
- iPoint = vertex[iMarker][iVertex]->GetNode();
- Xcoord[iVertex_Wall] = nodes->GetCoord(iPoint, 0);
- Ycoord[iVertex_Wall] = nodes->GetCoord(iPoint, 1);
- if (nDim==3) Zcoord[iVertex_Wall] = nodes->GetCoord(iPoint, 2);
- Face_Normal = vertex[iMarker][iVertex]->GetNormal();
- FaceArea[iVertex_Wall] = fabs(Face_Normal[nDim-1]);
- iVertex_Wall ++;
- }
-
-
- //vector XCoordList;
- vector::iterator IterXCoordList;
-
- for (iVertex = 0; iVertex < nVertex_Wall; iVertex++)
- XCoordList.push_back(Xcoord[iVertex]);
-
- sort( XCoordList.begin(), XCoordList.end());
- IterXCoordList = unique( XCoordList.begin(), XCoordList.end());
- XCoordList.resize( IterXCoordList - XCoordList.begin() );
-
- /*--- Create vectors and distribute the values among the different PhiAngle queues ---*/
- Xcoord_plane.resize(XCoordList.size());
- Ycoord_plane.resize(XCoordList.size());
- if (nDim==3) Zcoord_plane.resize(XCoordList.size());
- FaceArea_plane.resize(XCoordList.size());
- Plane_points.resize(XCoordList.size());
-
-
- su2double dist_ratio;
- unsigned long iCoord;
-
- /*--- Distribute the values among the different PhiAngles ---*/
- for (iPoint = 0; iPoint < nPoint; iPoint++) {
- if (nodes->GetDomain(iPoint)) {
- loop_on = true;
- for (ixCoord = 0; ixCoord < XCoordList.size()-1 && loop_on; ixCoord++) {
- dist_ratio = (nodes->GetCoord(iPoint, 0) - XCoordList[ixCoord])/(XCoordList[ixCoord+1]- XCoordList[ixCoord]);
- if (dist_ratio >= 0 && dist_ratio <= 1.0) {
- if (dist_ratio <= 0.5) iCoord = ixCoord;
- else iCoord = ixCoord+1;
- Xcoord_plane[iCoord].push_back(nodes->GetCoord(iPoint, 0) );
- Ycoord_plane[iCoord].push_back(nodes->GetCoord(iPoint, 1) );
- if (nDim==3) Zcoord_plane[iCoord].push_back(nodes->GetCoord(iPoint, 2) );
- FaceArea_plane[iCoord].push_back(nodes->GetVolume(iPoint)); ///// CHECK AREA CALCULATION
- Plane_points[iCoord].push_back(iPoint );
- loop_on = false;
- }
- }
- }
- }
-
- /*--- Order the arrays in ascending values of y ---*/
- /// TODO: Depending on the size of the arrays, this may not be a good way of sorting them.
- for (ixCoord = 0; ixCoord < XCoordList.size(); ixCoord++)
- for (iVertex = 0; iVertex < Xcoord_plane[ixCoord].size(); iVertex++)
- for (jVertex = 0; jVertex < Xcoord_plane[ixCoord].size() - 1 - iVertex; jVertex++)
- if (Ycoord_plane[ixCoord][jVertex] > Ycoord_plane[ixCoord][jVertex+1]) {
- swap(Xcoord_plane[ixCoord][jVertex], Xcoord_plane[ixCoord][jVertex+1]);
- swap(Ycoord_plane[ixCoord][jVertex], Ycoord_plane[ixCoord][jVertex+1]);
- if (nDim==3) swap(Zcoord_plane[ixCoord][jVertex], Zcoord_plane[ixCoord][jVertex+1]);
- swap(Plane_points[ixCoord][jVertex], Plane_points[ixCoord][jVertex+1]);
- swap(FaceArea_plane[ixCoord][jVertex], FaceArea_plane[ixCoord][jVertex+1]);
- }
-
- /*--- Delete structures ---*/
- delete[] Xcoord; delete[] Ycoord;
- delete[] Zcoord;
- delete[] FaceArea;
-}
-
void CGeometry::SetRotationalVelocity(CConfig *config, bool print) {
unsigned long iPoint;
diff --git a/QuickStart/inv_NACA0012.cfg b/QuickStart/inv_NACA0012.cfg
index 10bcc036c34..40d6326df88 100644
--- a/QuickStart/inv_NACA0012.cfg
+++ b/QuickStart/inv_NACA0012.cfg
@@ -239,7 +239,6 @@ DEFORM_CONSOLE_OUTPUT= YES
DEFORM_STIFFNESS_TYPE= INVERSE_VOLUME
% --------------------------- CONVERGENCE PARAMETERS --------------------------%
-% Convergence criteria (CAUCHY, RESIDUAL)
%
CONV_FIELD= RMS_DENSITY
%
diff --git a/SU2_CFD/include/output/COutput.hpp b/SU2_CFD/include/output/COutput.hpp
index 5e2ca59c472..95a07335e7b 100644
--- a/SU2_CFD/include/output/COutput.hpp
+++ b/SU2_CFD/include/output/COutput.hpp
@@ -425,6 +425,12 @@ class COutput {
*/
bool GetConvergence() const {return convergence;}
+ /*!
+ * \brief Set the value of the convergence flag.
+ * \param[in] conv - New value of the convergence flag.
+ */
+ void SetConvergence(const bool conv) {convergence = conv;}
+
/*!
* \brief Monitor the time convergence of the specified windowed-time-averaged ouput
* \param[in] config - Definition of the particular problem.
@@ -434,17 +440,11 @@ class COutput {
bool MonitorTimeConvergence(CConfig *config, unsigned long Iteration);
/*!
- * \brief Get convergence time convergence of the specified windowed-time-averaged ouput of the problem.
+ * \brief Get time convergence of the specified windowed-time-averaged ouput of the problem.
+ * Indicates, if the time loop is converged. COnvergence criterion: Windowed time average
* \return Boolean indicating whether the problem is converged.
*/
- bool GetTimeConvergence()const {return TimeConvergence;} /*! \brief Indicates, if the time loop is converged. COnvergence criterion: Windowed time average */
-
-
- /*!
- * \brief Set the value of the convergence flag.
- * \param[in] conv - New value of the convergence flag.
- */
- void SetConvergence(bool conv) {convergence = conv;}
+ bool GetTimeConvergence() const {return TimeConvergence;}
/*!
* \brief Print a list of all history output fields to screen.
diff --git a/SU2_CFD/include/solvers/CFVMFlowSolverBase.inl b/SU2_CFD/include/solvers/CFVMFlowSolverBase.inl
index f43fa5a655e..62ef45e8895 100644
--- a/SU2_CFD/include/solvers/CFVMFlowSolverBase.inl
+++ b/SU2_CFD/include/solvers/CFVMFlowSolverBase.inl
@@ -2901,6 +2901,9 @@ su2double CFVMFlowSolverBase::EvaluateCommonObjFunc(const CConfig& config)
case SURFACE_STATIC_PRESSURE:
objFun += weight * config.GetSurface_Pressure(0);
break;
+ case SURFACE_STATIC_TEMPERATURE:
+ objFun += weight * config.GetSurface_Temperature(0);
+ break;
case SURFACE_MASSFLOW:
objFun += weight * config.GetSurface_MassFlow(0);
break;
diff --git a/SU2_CFD/src/drivers/CMultizoneDriver.cpp b/SU2_CFD/src/drivers/CMultizoneDriver.cpp
index 90c296dff4f..32090de8d49 100644
--- a/SU2_CFD/src/drivers/CMultizoneDriver.cpp
+++ b/SU2_CFD/src/drivers/CMultizoneDriver.cpp
@@ -173,7 +173,7 @@ void CMultizoneDriver::StartSolver() {
if (rank == MASTER_NODE){
cout << endl <<"Simulation Run using the Multizone Driver" << endl;
if (driver_config->GetTime_Domain())
- cout << "The simulation will run for " << driver_config->GetnTime_Iter() << " time steps." << endl;
+ cout << "The simulation will run until time step " << driver_config->GetnTime_Iter() << "." << endl;
}
/*--- Set the initial time iteration to the restart iteration. ---*/
diff --git a/SU2_CFD/src/output/CHeatOutput.cpp b/SU2_CFD/src/output/CHeatOutput.cpp
index 634bec2004e..831c2afa98b 100644
--- a/SU2_CFD/src/output/CHeatOutput.cpp
+++ b/SU2_CFD/src/output/CHeatOutput.cpp
@@ -104,7 +104,7 @@ void CHeatOutput::SetHistoryOutputFields(CConfig *config){
AddHistoryOutput("RMS_TEMPERATURE", "rms[T]", ScreenOutputFormat::FIXED, "RMS_RES", "Root mean square residual of the temperature", HistoryFieldType::RESIDUAL);
AddHistoryOutput("MAX_TEMPERATURE", "max[T]", ScreenOutputFormat::FIXED, "MAX_RES", "Maximum residual of the temperature", HistoryFieldType::RESIDUAL);
- AddHistoryOutput("BGS_TEMPERATURE", "bgs[T]", ScreenOutputFormat::FIXED, "BGS_RES", "Block-Gauss seidel residual of the temperature", HistoryFieldType::RESIDUAL);
+ AddHistoryOutput("BGS_TEMPERATURE", "bgs[T]", ScreenOutputFormat::FIXED, "BGS_RES", "Block-Gauss-Seidel residual of the temperature", HistoryFieldType::RESIDUAL);
AddHistoryOutput("TOTAL_HEATFLUX", "HF", ScreenOutputFormat::SCIENTIFIC, "HEAT", "Total heatflux on all surfaces defined in MARKER_MONITORING", HistoryFieldType::COEFFICIENT);
AddHistoryOutput("MAXIMUM_HEATFLUX", "MaxHF", ScreenOutputFormat::SCIENTIFIC, "HEAT", "Total maximal heatflux on all surfaces defined in MARKER_MONITORING", HistoryFieldType::COEFFICIENT);
diff --git a/SU2_CFD/src/solvers/CDiscAdjSolver.cpp b/SU2_CFD/src/solvers/CDiscAdjSolver.cpp
index af0c7dee26b..77ba74ab257 100644
--- a/SU2_CFD/src/solvers/CDiscAdjSolver.cpp
+++ b/SU2_CFD/src/solvers/CDiscAdjSolver.cpp
@@ -760,22 +760,21 @@ void CDiscAdjSolver::SetSurface_Sensitivity(CGeometry *geometry, CConfig *config
}
void CDiscAdjSolver::Preprocessing(CGeometry *geometry, CSolver **solver_container, CConfig *config_container, unsigned short iMesh, unsigned short iRKStep, unsigned short RunTime_EqSystem, bool Output) {
- bool dual_time_1st = (config_container->GetTime_Marching() == DT_STEPPING_1ST);
- bool dual_time_2nd = (config_container->GetTime_Marching() == DT_STEPPING_2ND);
- bool dual_time = (dual_time_1st || dual_time_2nd);
+ const bool dual_time_1st = (config_container->GetTime_Marching() == DT_STEPPING_1ST);
+ const bool dual_time_2nd = (config_container->GetTime_Marching() == DT_STEPPING_2ND);
+ const bool dual_time = (dual_time_1st || dual_time_2nd);
su2double *solution_n, *solution_n1;
- unsigned long iPoint;
- unsigned short iVar;
+
if (dual_time) {
- for (iPoint = 0; iPointGetnPoint(); iPoint++) {
+ for (auto iPoint = 0ul; iPointGetnPoint(); iPoint++) {
solution_n = nodes->GetSolution_time_n(iPoint);
solution_n1 = nodes->GetSolution_time_n1(iPoint);
- for (iVar=0; iVar < nVar; iVar++) {
+ for (unsigned short iVar=0; iVar < nVar; iVar++) {
nodes->SetDual_Time_Derivative(iPoint, iVar, solution_n[iVar]+nodes->GetDual_Time_Derivative_n(iPoint, iVar));
nodes->SetDual_Time_Derivative_n(iPoint,iVar, solution_n1[iVar]);
}
- }
- }
+ } // for iPoint
+ } // if dual_time
}
void CDiscAdjSolver::LoadRestart(CGeometry **geometry, CSolver ***solver, CConfig *config, int val_iter, bool val_update_geo) {
diff --git a/SU2_CFD/src/solvers/CIncNSSolver.cpp b/SU2_CFD/src/solvers/CIncNSSolver.cpp
index a2a12b947a2..05b354f769b 100644
--- a/SU2_CFD/src/solvers/CIncNSSolver.cpp
+++ b/SU2_CFD/src/solvers/CIncNSSolver.cpp
@@ -374,7 +374,7 @@ void CIncNSSolver::BC_Wall_Generic(const CGeometry *geometry, const CConfig *con
const auto Wall_Function = config->GetWallFunction_Treatment(Marker_Tag);
if (Wall_Function != NO_WALL_FUNCTION)
- SU2_MPI::Error("Wall function treament not implemented yet", CURRENT_FUNCTION);
+ SU2_MPI::Error("Wall function treatment not implemented yet", CURRENT_FUNCTION);
/*--- Loop over all of the vertices on this boundary marker ---*/
diff --git a/SU2_PY/SU2/io/config.py b/SU2_PY/SU2/io/config.py
index 1803318cca0..f4c7f68a87a 100755
--- a/SU2_PY/SU2/io/config.py
+++ b/SU2_PY/SU2/io/config.py
@@ -576,6 +576,7 @@ def read_config(filename):
raise SystemExit('Multiple occurrences of the same objective in the OPT_OBJECTIVE definition are not currently supported. To evaluate one objective over multiple surfaces, list the objective once.')
# Set up dict for objective, including scale, whether it is a penalty, and constraint value
this_def.update({ this_name : {'SCALE':this_scale, 'OBJTYPE':this_type, 'VALUE':this_val} })
+ # OPT_OBJECTIVE has to appear after MARKER_MONITORING in the .cfg, maybe catch that here
if (len(data_dict['MARKER_MONITORING'])>1):
this_def[this_name]['MARKER'] = data_dict['MARKER_MONITORING'][len(this_def)-1]
else:
diff --git a/TestCases/aeroelastic/aeroelastic_NACA64A010.cfg b/TestCases/aeroelastic/aeroelastic_NACA64A010.cfg
index 4b0e1af21f7..5c602f3dc55 100644
--- a/TestCases/aeroelastic/aeroelastic_NACA64A010.cfg
+++ b/TestCases/aeroelastic/aeroelastic_NACA64A010.cfg
@@ -251,11 +251,6 @@ DEFORM_STIFFNESS_TYPE= INVERSE_VOLUME
% Number of total iterations
TIME_ITER= 360
%
-% Convergence criteria (CAUCHY, RESIDUAL)
-%
-CONV_CRITERIA= RESIDUAL
-%
-%
% Min value of the residual (log10 of the residual)
CONV_RESIDUAL_MINVAL= -8
%
diff --git a/TestCases/axisymmetric_rans/air_nozzle/air_nozzle.cfg b/TestCases/axisymmetric_rans/air_nozzle/air_nozzle.cfg
index f40f1775b49..5455f7ca6d5 100644
--- a/TestCases/axisymmetric_rans/air_nozzle/air_nozzle.cfg
+++ b/TestCases/axisymmetric_rans/air_nozzle/air_nozzle.cfg
@@ -187,9 +187,6 @@ CFL_REDUCTION_TURB= 1.0
% Number of total iterations
ITER= 1000
%
-% Convergence criteria (CAUCHY, RESIDUAL)
-CONV_CRITERIA= RESIDUAL
-%
% Min value of the residual (log10 of the residual)
CONV_RESIDUAL_MINVAL= -12
%
diff --git a/TestCases/cont_adj_euler/naca0012/inv_NACA0012.cfg b/TestCases/cont_adj_euler/naca0012/inv_NACA0012.cfg
index 8e900c460e8..eeaeb3ac3a8 100644
--- a/TestCases/cont_adj_euler/naca0012/inv_NACA0012.cfg
+++ b/TestCases/cont_adj_euler/naca0012/inv_NACA0012.cfg
@@ -235,10 +235,6 @@ DEFORM_COEFF = 1E6
DEFORM_STIFFNESS_TYPE= WALL_DISTANCE
% --------------------------- CONVERGENCE PARAMETERS --------------------------%
-% Convergence criteria (CAUCHY, RESIDUAL)
-%
-CONV_CRITERIA= RESIDUAL
-%
%
% Min value of the residual (log10 of the residual)
CONV_RESIDUAL_MINVAL= -12
diff --git a/TestCases/cont_adj_euler/naca0012/inv_NACA0012_FD.cfg b/TestCases/cont_adj_euler/naca0012/inv_NACA0012_FD.cfg
index 336c812eef1..b10677aa4fa 100644
--- a/TestCases/cont_adj_euler/naca0012/inv_NACA0012_FD.cfg
+++ b/TestCases/cont_adj_euler/naca0012/inv_NACA0012_FD.cfg
@@ -233,10 +233,6 @@ DEFORM_COEFF = 1E6
DEFORM_STIFFNESS_TYPE= WALL_DISTANCE
% --------------------------- CONVERGENCE PARAMETERS --------------------------%
-% Convergence criteria (CAUCHY, RESIDUAL)
-%
-CONV_CRITERIA= RESIDUAL
-%
%
% Min value of the residual (log10 of the residual)
CONV_RESIDUAL_MINVAL= -12
diff --git a/TestCases/cont_adj_euler/naca0012/inv_NACA0012_discadj.cfg b/TestCases/cont_adj_euler/naca0012/inv_NACA0012_discadj.cfg
index 91212cb018d..a8c7eab5c08 100644
--- a/TestCases/cont_adj_euler/naca0012/inv_NACA0012_discadj.cfg
+++ b/TestCases/cont_adj_euler/naca0012/inv_NACA0012_discadj.cfg
@@ -195,10 +195,6 @@ DV_VALUE= 0.01
DEFORM_STIFFNESS_TYPE= WALL_DISTANCE
% --------------------------- CONVERGENCE PARAMETERS --------------------------%
-% Convergence criteria (CAUCHY, RESIDUAL)
-%
-CONV_CRITERIA= RESIDUAL
-%
%
% Min value of the residual (log10 of the residual)
CONV_RESIDUAL_MINVAL= -12
diff --git a/TestCases/cont_adj_euler/oneram6/inv_ONERAM6.cfg b/TestCases/cont_adj_euler/oneram6/inv_ONERAM6.cfg
index 786d4594004..5bed7689569 100644
--- a/TestCases/cont_adj_euler/oneram6/inv_ONERAM6.cfg
+++ b/TestCases/cont_adj_euler/oneram6/inv_ONERAM6.cfg
@@ -200,10 +200,6 @@ TIME_DISCRE_ADJFLOW= EULER_IMPLICIT
% --------------------------- CONVERGENCE PARAMETERS --------------------------&
%
-% Convergence criteria (CAUCHY, RESIDUAL)
-CONV_CRITERIA= RESIDUAL
-%
-%
% Min value of the residual (log10 of the residual)
CONV_RESIDUAL_MINVAL= -12
%
diff --git a/TestCases/cont_adj_euler/wedge/inv_wedge_ROE.cfg b/TestCases/cont_adj_euler/wedge/inv_wedge_ROE.cfg
index 8345cee9d9f..0bc02c832b0 100644
--- a/TestCases/cont_adj_euler/wedge/inv_wedge_ROE.cfg
+++ b/TestCases/cont_adj_euler/wedge/inv_wedge_ROE.cfg
@@ -198,11 +198,6 @@ MARKER_ANALYZE = (outlet)
% --------------------------- CONVERGENCE PARAMETERS --------------------------%
%
-% Convergence criteria (CAUCHY, RESIDUAL)
-%
-CONV_CRITERIA= RESIDUAL
-%
-%
% Min value of the residual (log10 of the residual)
CONV_RESIDUAL_MINVAL= -11
%
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 5857b07586d..cb704140465 100644
--- a/TestCases/cont_adj_euler/wedge/inv_wedge_ROE_multiobj.cfg
+++ b/TestCases/cont_adj_euler/wedge/inv_wedge_ROE_multiobj.cfg
@@ -215,11 +215,6 @@ MARKER_ANALYZE_AVERAGE = AREA
% --------------------------- CONVERGENCE PARAMETERS --------------------------%
%
-% Convergence criteria (CAUCHY, RESIDUAL)
-%
-CONV_CRITERIA= RESIDUAL
-%
-%
% Min value of the residual (log10 of the residual)
CONV_RESIDUAL_MINVAL= -11
%
diff --git a/TestCases/cont_adj_navierstokes/cylinder/lam_cylinder.cfg b/TestCases/cont_adj_navierstokes/cylinder/lam_cylinder.cfg
index 90316841376..076e0cb56bd 100644
--- a/TestCases/cont_adj_navierstokes/cylinder/lam_cylinder.cfg
+++ b/TestCases/cont_adj_navierstokes/cylinder/lam_cylinder.cfg
@@ -202,11 +202,6 @@ HOLD_GRID_FIXED_COORD= ( -0.5, -0.49, 0.0, 2.5, 0.49, 0.0 )
% --------------------------- CONVERGENCE PARAMETERS --------------------------%
%
-% Convergence criteria (CAUCHY, RESIDUAL)
-%
-CONV_CRITERIA= RESIDUAL
-%
-%
% Min value of the residual (log10 of the residual)
CONV_RESIDUAL_MINVAL= -14
%
diff --git a/TestCases/cont_adj_navierstokes/naca0012_sub/lam_NACA0012.cfg b/TestCases/cont_adj_navierstokes/naca0012_sub/lam_NACA0012.cfg
index 0ebb8b70f64..fceca967c38 100644
--- a/TestCases/cont_adj_navierstokes/naca0012_sub/lam_NACA0012.cfg
+++ b/TestCases/cont_adj_navierstokes/naca0012_sub/lam_NACA0012.cfg
@@ -193,11 +193,6 @@ DV_VALUE= 0.01
% --------------------------- CONVERGENCE PARAMETERS --------------------------%
%
-% Convergence criteria (CAUCHY, RESIDUAL)
-%
-CONV_CRITERIA= RESIDUAL
-%
-%
% Min value of the residual (log10 of the residual)
CONV_RESIDUAL_MINVAL= -12
%
diff --git a/TestCases/cont_adj_navierstokes/naca0012_trans/lam_NACA0012.cfg b/TestCases/cont_adj_navierstokes/naca0012_trans/lam_NACA0012.cfg
index 55a1c41fd9b..41c5ea096d9 100644
--- a/TestCases/cont_adj_navierstokes/naca0012_trans/lam_NACA0012.cfg
+++ b/TestCases/cont_adj_navierstokes/naca0012_trans/lam_NACA0012.cfg
@@ -204,11 +204,6 @@ DV_VALUE= 0.01
% --------------------------- CONVERGENCE PARAMETERS --------------------------%
%
-% Convergence criteria (CAUCHY, RESIDUAL)
-%
-CONV_CRITERIA= RESIDUAL
-%
-%
% Min value of the residual (log10 of the residual)
CONV_RESIDUAL_MINVAL= -13
%
diff --git a/TestCases/cont_adj_rans/naca0012/turb_nasa.cfg b/TestCases/cont_adj_rans/naca0012/turb_nasa.cfg
index 58120e751a4..74038b1a17b 100644
--- a/TestCases/cont_adj_rans/naca0012/turb_nasa.cfg
+++ b/TestCases/cont_adj_rans/naca0012/turb_nasa.cfg
@@ -241,11 +241,6 @@ HOLD_GRID_FIXED_COORD= ( -0.5, -0.49, 0.0, 2.5, 0.49, 0.0 )
% --------------------------- CONVERGENCE PARAMETERS --------------------------%
%
-% Convergence criteria (CAUCHY, RESIDUAL)
-%
-CONV_CRITERIA= CAUCHY
-%
-%
% Min value of the residual (log10 of the residual)
CONV_RESIDUAL_MINVAL= -10
%
diff --git a/TestCases/cont_adj_rans/naca0012/turb_nasa_binary.cfg b/TestCases/cont_adj_rans/naca0012/turb_nasa_binary.cfg
index f4d84af47db..3d5625fff4f 100644
--- a/TestCases/cont_adj_rans/naca0012/turb_nasa_binary.cfg
+++ b/TestCases/cont_adj_rans/naca0012/turb_nasa_binary.cfg
@@ -241,11 +241,6 @@ HOLD_GRID_FIXED_COORD= ( -0.5, -0.49, 0.0, 2.5, 0.49, 0.0 )
% --------------------------- CONVERGENCE PARAMETERS --------------------------%
%
-% Convergence criteria (CAUCHY, RESIDUAL)
-%
-CONV_CRITERIA= CAUCHY
-%
-%
% Min value of the residual (log10 of the residual)
CONV_RESIDUAL_MINVAL= -10
%
diff --git a/TestCases/cont_adj_rans/oneram6/turb_ONERAM6.cfg b/TestCases/cont_adj_rans/oneram6/turb_ONERAM6.cfg
index c99768abe2f..4c937949135 100644
--- a/TestCases/cont_adj_rans/oneram6/turb_ONERAM6.cfg
+++ b/TestCases/cont_adj_rans/oneram6/turb_ONERAM6.cfg
@@ -257,11 +257,6 @@ DV_VALUE= 0.1
% --------------------------- CONVERGENCE PARAMETERS --------------------------%
%
-% Convergence criteria (CAUCHY, RESIDUAL)
-%
-CONV_CRITERIA= CAUCHY
-%
-%
% Min value of the residual (log10 of the residual)
CONV_RESIDUAL_MINVAL= -8
%
diff --git a/TestCases/cont_adj_rans/rae2822/turb_SA_RAE2822.cfg b/TestCases/cont_adj_rans/rae2822/turb_SA_RAE2822.cfg
index a434b460159..469ff6f5d99 100644
--- a/TestCases/cont_adj_rans/rae2822/turb_SA_RAE2822.cfg
+++ b/TestCases/cont_adj_rans/rae2822/turb_SA_RAE2822.cfg
@@ -179,11 +179,6 @@ FROZEN_VISC_CONT= YES
% --------------------------- CONVERGENCE PARAMETERS --------------------------%
%
-% Convergence criteria (CAUCHY, RESIDUAL)
-%
-CONV_CRITERIA= RESIDUAL
-%
-%
% Min value of the residual (log10 of the residual)
CONV_RESIDUAL_MINVAL= -13
%
diff --git a/TestCases/control_surface/inv_ONERAM6_moving.cfg b/TestCases/control_surface/inv_ONERAM6_moving.cfg
index 9234a272406..dbfc9a255eb 100644
--- a/TestCases/control_surface/inv_ONERAM6_moving.cfg
+++ b/TestCases/control_surface/inv_ONERAM6_moving.cfg
@@ -189,10 +189,6 @@ TIME_DISCRE_ADJFLOW= EULER_IMPLICIT
% --------------------------- CONVERGENCE PARAMETERS --------------------------&
%
-% Convergence criteria (CAUCHY, RESIDUAL)
-CONV_CRITERIA= RESIDUAL
-%
-%
% Min value of the residual (log10 of the residual)
CONV_RESIDUAL_MINVAL= -6
%
diff --git a/TestCases/control_surface/inv_ONERAM6_setting.cfg b/TestCases/control_surface/inv_ONERAM6_setting.cfg
index 244383bc307..eda4fad9a3d 100644
--- a/TestCases/control_surface/inv_ONERAM6_setting.cfg
+++ b/TestCases/control_surface/inv_ONERAM6_setting.cfg
@@ -189,10 +189,6 @@ TIME_DISCRE_ADJFLOW= EULER_IMPLICIT
% --------------------------- CONVERGENCE PARAMETERS --------------------------&
%
-% Convergence criteria (CAUCHY, RESIDUAL)
-CONV_CRITERIA= RESIDUAL
-%
-%
% Min value of the residual (log10 of the residual)
CONV_RESIDUAL_MINVAL= -6
%
diff --git a/TestCases/ddes/flatplate/ddes_flatplate.cfg b/TestCases/ddes/flatplate/ddes_flatplate.cfg
index 5ebc821109d..99c38013816 100644
--- a/TestCases/ddes/flatplate/ddes_flatplate.cfg
+++ b/TestCases/ddes/flatplate/ddes_flatplate.cfg
@@ -165,10 +165,6 @@ TIME_DISCRE_TURB= EULER_IMPLICIT
% --------------------------- CONVERGENCE PARAMETERS --------------------------%
%
-% Convergence criteria (CAUCHY, RESIDUAL)
-CONV_CRITERIA= RESIDUAL
-%
-%
% Min value of the residual (log10 of the residual)
CONV_RESIDUAL_MINVAL= -15
%
diff --git a/TestCases/deformation/brick_hex/def_brick_hex.cfg b/TestCases/deformation/brick_hex/def_brick_hex.cfg
index 62d9ce5443c..011784fc771 100755
--- a/TestCases/deformation/brick_hex/def_brick_hex.cfg
+++ b/TestCases/deformation/brick_hex/def_brick_hex.cfg
@@ -191,10 +191,6 @@ FFD_DEGREE= (4, 4, 1)
FFD_CONTINUITY= 1ST_DERIVATIVE
% --------------------------- CONVERGENCE PARAMETERS --------------------------%
-% Convergence criteria (CAUCHY, RESIDUAL)
-%
-CONV_CRITERIA= RESIDUAL
-%
%
% Min value of the residual (log10 of the residual)
CONV_RESIDUAL_MINVAL= -10
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 23034d0e7b1..4b0b135022d 100755
--- a/TestCases/deformation/brick_hex_rans/def_brick_hex_rans.cfg
+++ b/TestCases/deformation/brick_hex_rans/def_brick_hex_rans.cfg
@@ -191,9 +191,6 @@ FFD_DEGREE= (4, 4, 1)
FFD_CONTINUITY= 1ST_DERIVATIVE
% --------------------------- CONVERGENCE PARAMETERS --------------------------%
-% Convergence criteria (CAUCHY, RESIDUAL)
-%
-CONV_CRITERIA= RESIDUAL
%
%
% Min value of the residual (log10 of the residual)
diff --git a/TestCases/deformation/brick_prism/def_brick_prism.cfg b/TestCases/deformation/brick_prism/def_brick_prism.cfg
index b88702e06f3..15db979d79e 100755
--- a/TestCases/deformation/brick_prism/def_brick_prism.cfg
+++ b/TestCases/deformation/brick_prism/def_brick_prism.cfg
@@ -191,10 +191,6 @@ FFD_DEGREE= (4, 4, 1)
FFD_CONTINUITY= 1ST_DERIVATIVE
% --------------------------- CONVERGENCE PARAMETERS --------------------------%
-% Convergence criteria (CAUCHY, RESIDUAL)
-%
-CONV_CRITERIA= RESIDUAL
-%
%
% Min value of the residual (log10 of the residual)
CONV_RESIDUAL_MINVAL= -10
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 633a5058ce7..f20d5927929 100755
--- a/TestCases/deformation/brick_prism_rans/def_brick_prism_rans.cfg
+++ b/TestCases/deformation/brick_prism_rans/def_brick_prism_rans.cfg
@@ -191,10 +191,6 @@ FFD_DEGREE= (4, 4, 1)
FFD_CONTINUITY= 1ST_DERIVATIVE
% --------------------------- CONVERGENCE PARAMETERS --------------------------%
-% Convergence criteria (CAUCHY, RESIDUAL)
-%
-CONV_CRITERIA= RESIDUAL
-%
%
% Min value of the residual (log10 of the residual)
CONV_RESIDUAL_MINVAL= -10
diff --git a/TestCases/deformation/brick_pyra/def_brick_pyra.cfg b/TestCases/deformation/brick_pyra/def_brick_pyra.cfg
index d7ad3ec4ad9..1198d226fd3 100755
--- a/TestCases/deformation/brick_pyra/def_brick_pyra.cfg
+++ b/TestCases/deformation/brick_pyra/def_brick_pyra.cfg
@@ -191,10 +191,6 @@ FFD_DEGREE= (4, 4, 1)
FFD_CONTINUITY= 1ST_DERIVATIVE
% --------------------------- CONVERGENCE PARAMETERS --------------------------%
-% Convergence criteria (CAUCHY, RESIDUAL)
-%
-CONV_CRITERIA= RESIDUAL
-%
%
% Min value of the residual (log10 of the residual)
CONV_RESIDUAL_MINVAL= -10
diff --git a/TestCases/deformation/brick_tets/def_brick_tets.cfg b/TestCases/deformation/brick_tets/def_brick_tets.cfg
index 7e282788c47..75dfec4360b 100755
--- a/TestCases/deformation/brick_tets/def_brick_tets.cfg
+++ b/TestCases/deformation/brick_tets/def_brick_tets.cfg
@@ -191,10 +191,6 @@ FFD_DEGREE= (4, 4, 1)
FFD_CONTINUITY= 1ST_DERIVATIVE
% --------------------------- CONVERGENCE PARAMETERS --------------------------%
-% Convergence criteria (CAUCHY, RESIDUAL)
-%
-CONV_CRITERIA= RESIDUAL
-%
%
% Min value of the residual (log10 of the residual)
CONV_RESIDUAL_MINVAL= -10
diff --git a/TestCases/deformation/cylindrical_ffd/def_cylindrical.cfg b/TestCases/deformation/cylindrical_ffd/def_cylindrical.cfg
index a5a2b071d5b..b264686551c 100644
--- a/TestCases/deformation/cylindrical_ffd/def_cylindrical.cfg
+++ b/TestCases/deformation/cylindrical_ffd/def_cylindrical.cfg
@@ -238,11 +238,6 @@ FFD_AXIS= (0.0, 0.0, 0.0)
% Number of total iterations
ITER= 5
%
-% Convergence criteria (CAUCHY, RESIDUAL)
-%
-CONV_CRITERIA= RESIDUAL
-%
-%
% Min value of the residual (log10 of the residual)
CONV_RESIDUAL_MINVAL= -12
%
diff --git a/TestCases/deformation/intersection_prevention/def_intersect.cfg b/TestCases/deformation/intersection_prevention/def_intersect.cfg
index 9da3baedc89..5a934a6e1cb 100644
--- a/TestCases/deformation/intersection_prevention/def_intersect.cfg
+++ b/TestCases/deformation/intersection_prevention/def_intersect.cfg
@@ -242,11 +242,7 @@ TIME_DISCRE_ADJFLOW= EULER_IMPLICIT
% --------------------------- CONVERGENCE PARAMETERS --------------------------%
-% Convergence criteria (CAUCHY, RESIDUAL)
-CONV_CRITERIA= RESIDUAL
-
% Min value of the residual (log10 of the residual)
-%RESIDUAL_MINVAL= -13
CONV_RESIDUAL_MINVAL= -10
% Start convergence criteria at iteration number
@@ -266,13 +262,10 @@ CONV_FIELD = (RMS_PRESSURE, RMS_ADJ_PRESSURE)
% ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
-
-
% Mesh input file format (SU2, CGNS, NETCDF_ASCII)
MESH_FORMAT= SU2
% Restart flow input file
-%SOLUTION_FLOW_FILENAME= solution_flow.dat
SOLUTION_FILENAME= solution_flow.dat
% Restart adjoint input file
@@ -286,14 +279,12 @@ TABULAR_FORMAT = CSV
CONV_FILENAME= history
% Output file restart flow
-%RESTART_FLOW_FILENAME= restart_flow.dat
RESTART_FILENAME= restart_flow.dat
% Output file restart adjoint
RESTART_ADJ_FILENAME= restart_adj.dat
% Output file flow (w/o extension) variables
-%VOLUME_FLOW_FILENAME= flow
VOLUME_FILENAME= flow
% Output file adjoint (w/o extension) variables
@@ -303,7 +294,6 @@ VOLUME_ADJ_FILENAME= adjoint
GRAD_OBJFUNC_FILENAME= of_grad.dat
% Output file surface flow coefficient (w/o extension)
-%SURFACE_FLOW_FILENAME= surface_flow
SURFACE_FILENAME= surface_flow
% Output file surface adjoint coefficient (w/o extension)
diff --git a/TestCases/deformation/naca0012/def_NACA0012.cfg b/TestCases/deformation/naca0012/def_NACA0012.cfg
index 237649bcff9..fdcc411915b 100644
--- a/TestCases/deformation/naca0012/def_NACA0012.cfg
+++ b/TestCases/deformation/naca0012/def_NACA0012.cfg
@@ -235,10 +235,6 @@ DEFORM_COEFF = 1E6
DEFORM_STIFFNESS_TYPE= INVERSE_VOLUME
% --------------------------- CONVERGENCE PARAMETERS --------------------------%
-% Convergence criteria (CAUCHY, RESIDUAL)
-%
-CONV_CRITERIA= CAUCHY
-%
%
% Min value of the residual (log10 of the residual)
CONV_RESIDUAL_MINVAL= -8
diff --git a/TestCases/deformation/naca0012/surface_file_NACA0012.cfg b/TestCases/deformation/naca0012/surface_file_NACA0012.cfg
index 38c2686b7b6..dd812276e77 100644
--- a/TestCases/deformation/naca0012/surface_file_NACA0012.cfg
+++ b/TestCases/deformation/naca0012/surface_file_NACA0012.cfg
@@ -245,10 +245,6 @@ DEFORM_COEFF = 1E6
DEFORM_STIFFNESS_TYPE= INVERSE_VOLUME
% --------------------------- CONVERGENCE PARAMETERS --------------------------%
-% Convergence criteria (CAUCHY, RESIDUAL)
-%
-CONV_CRITERIA= CAUCHY
-%
%
% Min value of the residual (log10 of the residual)
CONV_RESIDUAL_MINVAL= -8
diff --git a/TestCases/deformation/naca4412/def_NACA4412.cfg b/TestCases/deformation/naca4412/def_NACA4412.cfg
index 21574c36151..62e4556a7ea 100644
--- a/TestCases/deformation/naca4412/def_NACA4412.cfg
+++ b/TestCases/deformation/naca4412/def_NACA4412.cfg
@@ -218,11 +218,6 @@ LIMIT_ADJFLOW= 1E6
% --------------------------- CONVERGENCE PARAMETERS --------------------------%
%
-% Convergence criteria (CAUCHY, RESIDUAL)
-%
-CONV_CRITERIA= RESIDUAL
-%
-%
% Min value of the residual (log10 of the residual)
CONV_RESIDUAL_MINVAL= -12
%
diff --git a/TestCases/deformation/rae2822/def_RAE2822.cfg b/TestCases/deformation/rae2822/def_RAE2822.cfg
index f335445d751..f1d8888d3b7 100644
--- a/TestCases/deformation/rae2822/def_RAE2822.cfg
+++ b/TestCases/deformation/rae2822/def_RAE2822.cfg
@@ -194,10 +194,6 @@ FROZEN_VISC_CONT= YES
% --------------------------- CONVERGENCE PARAMETERS --------------------------%
%
-% Convergence criteria (CAUCHY, RESIDUAL)
-CONV_CRITERIA= RESIDUAL
-%
-%
% Min value of the residual (log10 of the residual)
CONV_RESIDUAL_MINVAL= -13
%
diff --git a/TestCases/deformation/spherical_ffd/def_spherical.cfg b/TestCases/deformation/spherical_ffd/def_spherical.cfg
index 76f747ad6fc..9b6423b8531 100644
--- a/TestCases/deformation/spherical_ffd/def_spherical.cfg
+++ b/TestCases/deformation/spherical_ffd/def_spherical.cfg
@@ -241,11 +241,6 @@ FFD_AXIS= (0.0, 0.0, 0.0)
% Number of total iterations
ITER= 5
%
-% Convergence criteria (CAUCHY, RESIDUAL)
-%
-CONV_CRITERIA= RESIDUAL
-%
-%
% Min value of the residual (log10 of the residual)
CONV_RESIDUAL_MINVAL= -12
%
diff --git a/TestCases/deformation/spherical_ffd/def_spherical_bspline.cfg b/TestCases/deformation/spherical_ffd/def_spherical_bspline.cfg
index af96e91c9b1..2a2d7821823 100644
--- a/TestCases/deformation/spherical_ffd/def_spherical_bspline.cfg
+++ b/TestCases/deformation/spherical_ffd/def_spherical_bspline.cfg
@@ -248,11 +248,6 @@ FFD_AXIS= (0.0, 0.0, 0.0)
% Number of total iterations
ITER= 5
%
-% Convergence criteria (CAUCHY, RESIDUAL)
-%
-CONV_CRITERIA= RESIDUAL
-%
-%
% Min value of the residual (log10 of the residual)
CONV_RESIDUAL_MINVAL= -12
%
diff --git a/TestCases/disc_adj_euler/arina2k/Arina2KRS.cfg b/TestCases/disc_adj_euler/arina2k/Arina2KRS.cfg
index d201209a652..aa2f40ef719 100644
--- a/TestCases/disc_adj_euler/arina2k/Arina2KRS.cfg
+++ b/TestCases/disc_adj_euler/arina2k/Arina2KRS.cfg
@@ -452,11 +452,6 @@ DEFORM_LIMIT = 0.3
% Number of total iterations
ITER= 12000
%
-% Convergence criteria (CAUCHY, RESIDUAL)
-%
-CONV_CRITERIA= RESIDUAL
-%
-%
% Min value of the residual (log10 of the residual)
CONV_RESIDUAL_MINVAL= -9.00
%
diff --git a/TestCases/disc_adj_euler/cylinder3D/inv_cylinder3D.cfg b/TestCases/disc_adj_euler/cylinder3D/inv_cylinder3D.cfg
index ce67c9b4b57..cebc7581e27 100644
--- a/TestCases/disc_adj_euler/cylinder3D/inv_cylinder3D.cfg
+++ b/TestCases/disc_adj_euler/cylinder3D/inv_cylinder3D.cfg
@@ -250,11 +250,6 @@ CFL_REDUCTION_ADJFLOW= 0.8
% Number of total iterations
ITER= 100
%
-% Convergence criteria (CAUCHY, RESIDUAL)
-%
-CONV_CRITERIA= RESIDUAL
-%
-%
% Min value of the residual (log10 of the residual)
CONV_RESIDUAL_MINVAL= -10
%
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 31a8143368c..8825db75313 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
@@ -101,7 +101,6 @@ DEFORM_STIFFNESS_TYPE= INVERSE_VOLUME
DEFORM_POISSONS_RATIO= 1e6
% --------------------------- CONVERGENCE PARAMETERS --------------------------%
-CONV_CRITERIA= RESIDUAL
CONV_RESIDUAL_MINVAL= -20
CONV_STARTITER= 10
CONV_CAUCHY_ELEMS= 100
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 6ea04d7b1aa..a57a965f2dc 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
@@ -101,7 +101,6 @@ DEFORM_STIFFNESS_TYPE= INVERSE_VOLUME
DEFORM_POISSONS_RATIO= 1e6
% --------------------------- CONVERGENCE PARAMETERS --------------------------%
-CONV_CRITERIA= RESIDUAL
CONV_RESIDUAL_MINVAL= -20
CONV_STARTITER= 10
CONV_CAUCHY_ELEMS= 100
diff --git a/TestCases/disc_adj_euler/oneram6/inv_ONERAM6.cfg b/TestCases/disc_adj_euler/oneram6/inv_ONERAM6.cfg
index 65d3a91bfe7..b39538d99cd 100644
--- a/TestCases/disc_adj_euler/oneram6/inv_ONERAM6.cfg
+++ b/TestCases/disc_adj_euler/oneram6/inv_ONERAM6.cfg
@@ -180,10 +180,6 @@ GEO_MODE= FUNCTION
% --------------------------- CONVERGENCE PARAMETERS --------------------------&
%
-% Convergence criteria (CAUCHY, RESIDUAL)
-CONV_CRITERIA= RESIDUAL
-%
-%
% Min value of the residual (log10 of the residual)
CONV_RESIDUAL_MINVAL= -12
%
diff --git a/TestCases/disc_adj_fsi/Airfoil_2d/configFlow.cfg b/TestCases/disc_adj_fsi/Airfoil_2d/configFlow.cfg
index ed655c6d94f..03ae5b6d85e 100755
--- a/TestCases/disc_adj_fsi/Airfoil_2d/configFlow.cfg
+++ b/TestCases/disc_adj_fsi/Airfoil_2d/configFlow.cfg
@@ -77,7 +77,6 @@ BGS_RELAXATION= FIXED_PARAMETER
STAT_RELAX_PARAMETER= 1.0
% fluid
INNER_ITER= 51
-CONV_CRITERIA= RESIDUAL
CONV_STARTITER= 0
CONV_RESIDUAL_MINVAL= -9
%
diff --git a/TestCases/disc_adj_fsi/configFEA.cfg b/TestCases/disc_adj_fsi/configFEA.cfg
index 5106c504075..59a1d914a16 100644
--- a/TestCases/disc_adj_fsi/configFEA.cfg
+++ b/TestCases/disc_adj_fsi/configFEA.cfg
@@ -57,7 +57,6 @@ LINEAR_SOLVER_ITER= 50000
DISCADJ_LIN_SOLVER = CONJUGATE_GRADIENT
DISCADJ_LIN_PREC = JACOBI
-CONV_CRITERIA= RESIDUAL
CONV_RESIDUAL_MINVAL= -10
CONV_STARTITER= 10
CONV_CAUCHY_ELEMS= 100
diff --git a/TestCases/disc_adj_fsi/configFlow.cfg b/TestCases/disc_adj_fsi/configFlow.cfg
index 5b1d91c1be1..cd38979eccc 100644
--- a/TestCases/disc_adj_fsi/configFlow.cfg
+++ b/TestCases/disc_adj_fsi/configFlow.cfg
@@ -73,7 +73,6 @@ SLOPE_LIMITER_FLOW= VENKATAKRISHNAN
VENKAT_LIMITER_COEFF= 1.0
TIME_DISCRE_FLOW= EULER_IMPLICIT
-CONV_CRITERIA= RESIDUAL
CONV_RESIDUAL_MINVAL= -10
CONV_STARTITER= 0
CONV_CAUCHY_ELEMS= 100
diff --git a/TestCases/disc_adj_heat/disc_adj_heat.cfg b/TestCases/disc_adj_heat/disc_adj_heat.cfg
index f708e010951..9207cabea29 100644
--- a/TestCases/disc_adj_heat/disc_adj_heat.cfg
+++ b/TestCases/disc_adj_heat/disc_adj_heat.cfg
@@ -140,10 +140,6 @@ TIME_DISCRE_HEAT= EULER_IMPLICIT
% --------------------------- CONVERGENCE PARAMETERS --------------------------%
-
-CONV_CRITERIA= RESIDUAL
-
-
CONV_RESIDUAL_MINVAL= -32
CONV_STARTITER= 200
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 e23f83ed910..f185b7c2605 100644
--- a/TestCases/disc_adj_incomp_euler/naca0012/incomp_NACA0012_disc.cfg
+++ b/TestCases/disc_adj_incomp_euler/naca0012/incomp_NACA0012_disc.cfg
@@ -162,10 +162,6 @@ DV_PARAM= ( 1, 0.5 )
DV_VALUE= 0.01
% --------------------------- CONVERGENCE PARAMETERS --------------------------%
-% Convergence criteria (CAUCHY, RESIDUAL)
-%
-CONV_CRITERIA= RESIDUAL
-%
%
% Min value of the residual (log10 of the residual)
CONV_RESIDUAL_MINVAL= -15
diff --git a/TestCases/disc_adj_incomp_navierstokes/cylinder/heated_cylinder.cfg b/TestCases/disc_adj_incomp_navierstokes/cylinder/heated_cylinder.cfg
index 60c8139f98c..ad90e53b985 100644
--- a/TestCases/disc_adj_incomp_navierstokes/cylinder/heated_cylinder.cfg
+++ b/TestCases/disc_adj_incomp_navierstokes/cylinder/heated_cylinder.cfg
@@ -240,10 +240,6 @@ TIME_DISCRE_FLOW= EULER_IMPLICIT
% --------------------------- CONVERGENCE PARAMETERS --------------------------%
%
-% Convergence criteria (CAUCHY, RESIDUAL)
-CONV_CRITERIA= RESIDUAL
-%
-%
% Min value of the residual (log10 of the residual)
CONV_RESIDUAL_MINVAL= -16
%
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 919ce23a2e1..b83aadcb766 100755
--- a/TestCases/disc_adj_incomp_rans/naca0012/turb_naca0012_sa.cfg
+++ b/TestCases/disc_adj_incomp_rans/naca0012/turb_naca0012_sa.cfg
@@ -220,11 +220,6 @@ DV_VALUE= 0.01
% --------------------------- CONVERGENCE PARAMETERS --------------------------%
%
-% Convergence criteria (CAUCHY, RESIDUAL)
-%
-CONV_CRITERIA= RESIDUAL
-%
-%
% Min value of the residual (log10 of the residual)
CONV_RESIDUAL_MINVAL= -14
%
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 6393a25ea83..c5a60d908b5 100755
--- a/TestCases/disc_adj_incomp_rans/naca0012/turb_naca0012_sst.cfg
+++ b/TestCases/disc_adj_incomp_rans/naca0012/turb_naca0012_sst.cfg
@@ -220,11 +220,6 @@ DV_VALUE= 0.01
% --------------------------- CONVERGENCE PARAMETERS --------------------------%
%
-% Convergence criteria (CAUCHY, RESIDUAL)
-%
-CONV_CRITERIA= RESIDUAL
-%
-%
% Min value of the residual (log10 of the residual)
CONV_RESIDUAL_MINVAL= -14
%
diff --git a/TestCases/disc_adj_rans/cylinder/cylinder.cfg b/TestCases/disc_adj_rans/cylinder/cylinder.cfg
index fc98978e6c1..eb008d5a254 100644
--- a/TestCases/disc_adj_rans/cylinder/cylinder.cfg
+++ b/TestCases/disc_adj_rans/cylinder/cylinder.cfg
@@ -195,11 +195,6 @@ TIME_DISCRE_TURB= EULER_IMPLICIT
% --------------------------- CONVERGENCE PARAMETERS --------------------------%
%
-% Convergence criteria (CAUCHY, RESIDUAL)
-%
-CONV_CRITERIA= RESIDUAL
-%
-%
% Min value of the residual (log10 of the residual)
CONV_RESIDUAL_MINVAL= -16
%
diff --git a/TestCases/disc_adj_rans/cylinder/cylinder_Windowing.cfg b/TestCases/disc_adj_rans/cylinder/cylinder_Windowing.cfg
index ff680ef53cf..8243441ad17 100644
--- a/TestCases/disc_adj_rans/cylinder/cylinder_Windowing.cfg
+++ b/TestCases/disc_adj_rans/cylinder/cylinder_Windowing.cfg
@@ -166,10 +166,6 @@ TIME_DISCRE_TURB= EULER_IMPLICIT
% --------------------------- CONVERGENCE PARAMETERS --------------------------%
%
-% Convergence criteria (CAUCHY, RESIDUAL)
-%
-CONV_CRITERIA= RESIDUAL
-%
% Min value of the residual (log10 of the residual)
CONV_RESIDUAL_MINVAL= -16
%
diff --git a/TestCases/disc_adj_rans/cylinder/cylinder_Windowing_AD.cfg b/TestCases/disc_adj_rans/cylinder/cylinder_Windowing_AD.cfg
index 679728cb36d..ac050e34e4f 100644
--- a/TestCases/disc_adj_rans/cylinder/cylinder_Windowing_AD.cfg
+++ b/TestCases/disc_adj_rans/cylinder/cylinder_Windowing_AD.cfg
@@ -166,11 +166,6 @@ TIME_DISCRE_TURB= EULER_IMPLICIT
% --------------------------- CONVERGENCE PARAMETERS --------------------------%
%
-% Convergence criteria (CAUCHY, RESIDUAL)
-%
-CONV_CRITERIA= RESIDUAL
-%
-%
% Min value of the residual (log10 of the residual)
CONV_RESIDUAL_MINVAL= -16
%
diff --git a/TestCases/disc_adj_rans/cylinder_DT_1ST/cylinder.cfg b/TestCases/disc_adj_rans/cylinder_DT_1ST/cylinder.cfg
index 18c88595faf..910f4f8e97d 100644
--- a/TestCases/disc_adj_rans/cylinder_DT_1ST/cylinder.cfg
+++ b/TestCases/disc_adj_rans/cylinder_DT_1ST/cylinder.cfg
@@ -196,11 +196,6 @@ TIME_DISCRE_TURB= EULER_IMPLICIT
% --------------------------- CONVERGENCE PARAMETERS --------------------------%
%
-% Convergence criteria (CAUCHY, RESIDUAL)
-%
-CONV_CRITERIA= RESIDUAL
-%
-%
% Min value of the residual (log10 of the residual)
CONV_RESIDUAL_MINVAL= -16
%
diff --git a/TestCases/disc_adj_rans/naca0012/naca0012.cfg b/TestCases/disc_adj_rans/naca0012/naca0012.cfg
index 4c9a1e86b7a..674d9c37c06 100644
--- a/TestCases/disc_adj_rans/naca0012/naca0012.cfg
+++ b/TestCases/disc_adj_rans/naca0012/naca0012.cfg
@@ -125,8 +125,6 @@ TIME_DISCRE_TURB= EULER_IMPLICIT
%
% --------------------------- CONVERGENCE PARAMETERS --------------------------%
%
-% Convergence criteria (CAUCHY, RESIDUAL)
-CONV_CRITERIA = RESIDUAL
% Field to apply Cauchy Criterion to
CONV_FIELD= REL_RMS_DENSITY
% Min value of the residual (log10 of the residual)
diff --git a/TestCases/disc_adj_rans/naca0012/turb_NACA0012_sa.cfg b/TestCases/disc_adj_rans/naca0012/turb_NACA0012_sa.cfg
index d6f881b02d3..a6fa41a303e 100644
--- a/TestCases/disc_adj_rans/naca0012/turb_NACA0012_sa.cfg
+++ b/TestCases/disc_adj_rans/naca0012/turb_NACA0012_sa.cfg
@@ -177,11 +177,6 @@ CFL_REDUCTION_TURB= 1.0
% --------------------------- CONVERGENCE PARAMETERS --------------------------%
%
-% Convergence criteria (CAUCHY, RESIDUAL)
-%
-CONV_CRITERIA= RESIDUAL
-%
-%
% Min value of the residual (log10 of the residual)
CONV_RESIDUAL_MINVAL= -12
%
diff --git a/TestCases/disc_adj_rans/naca0012/turb_NACA0012_sst.cfg b/TestCases/disc_adj_rans/naca0012/turb_NACA0012_sst.cfg
index fb672dde358..219c40f6639 100644
--- a/TestCases/disc_adj_rans/naca0012/turb_NACA0012_sst.cfg
+++ b/TestCases/disc_adj_rans/naca0012/turb_NACA0012_sst.cfg
@@ -177,11 +177,6 @@ CFL_REDUCTION_TURB= 1.0
% --------------------------- CONVERGENCE PARAMETERS --------------------------%
%
-% Convergence criteria (CAUCHY, RESIDUAL)
-%
-CONV_CRITERIA= RESIDUAL
-%
-%
% Min value of the residual (log10 of the residual)
CONV_RESIDUAL_MINVAL= -12
%
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 e354059f006..79d6f2319ee 100644
--- a/TestCases/disc_adj_turbomachinery/transonic_stator_2D/transonic_stator.cfg
+++ b/TestCases/disc_adj_turbomachinery/transonic_stator_2D/transonic_stator.cfg
@@ -351,11 +351,6 @@ OBJECTIVE_FUNCTION= ENTROPY_GENERATION
%
% Number of total iterations
ITER= 2001
-% Convergence criteria (CAUCHY, RESIDUAL)
-%
-CONV_CRITERIA= RESIDUAL
-%
-%
%
% Min value of the residual (log10 of the residual)
CONV_RESIDUAL_MINVAL= -16
diff --git a/TestCases/euler/CRM/inv_CRM_JST.cfg b/TestCases/euler/CRM/inv_CRM_JST.cfg
index 336a3de0424..62e6fbbbc35 100644
--- a/TestCases/euler/CRM/inv_CRM_JST.cfg
+++ b/TestCases/euler/CRM/inv_CRM_JST.cfg
@@ -181,10 +181,6 @@ TIME_DISCRE_ADJFLOW= EULER_IMPLICIT
% --------------------------- CONVERGENCE PARAMETERS --------------------------&
%
-% Convergence criteria (CAUCHY, RESIDUAL)
-CONV_CRITERIA= RESIDUAL
-%
-%
% Min value of the residual (log10 of the residual)
CONV_RESIDUAL_MINVAL= -6
%
diff --git a/TestCases/euler/biparabolic/BIPARABOLIC.cfg b/TestCases/euler/biparabolic/BIPARABOLIC.cfg
index 44c033f3567..b9cf89166ca 100644
--- a/TestCases/euler/biparabolic/BIPARABOLIC.cfg
+++ b/TestCases/euler/biparabolic/BIPARABOLIC.cfg
@@ -209,11 +209,6 @@ HOLD_GRID_FIXED_COORD= ( -0.2, -0.4, 0.0, 2.2, 0.4, 0.0 )
% --------------------------- CONVERGENCE PARAMETERS --------------------------%
%
-% Convergence criteria (CAUCHY, RESIDUAL)
-%
-CONV_CRITERIA= RESIDUAL
-%
-%
% Min value of the residual (log10 of the residual)
CONV_RESIDUAL_MINVAL= -6
%
diff --git a/TestCases/euler/bluntbody/blunt.cfg b/TestCases/euler/bluntbody/blunt.cfg
index 7070027f3a3..1e0a66b9b43 100644
--- a/TestCases/euler/bluntbody/blunt.cfg
+++ b/TestCases/euler/bluntbody/blunt.cfg
@@ -138,10 +138,6 @@ SLOPE_LIMITER_FLOW= VENKATAKRISHNAN
TIME_DISCRE_FLOW= EULER_IMPLICIT
% --------------------------- CONVERGENCE PARAMETERS --------------------------%
-% Convergence criteria (CAUCHY, RESIDUAL)
-%
-CONV_CRITERIA= CAUCHY
-%
%
% Min value of the residual (log10 of the residual)
CONV_RESIDUAL_MINVAL= -8
diff --git a/TestCases/euler/channel/inv_channel.cfg b/TestCases/euler/channel/inv_channel.cfg
index 5f6d169a93b..ef3947c061a 100644
--- a/TestCases/euler/channel/inv_channel.cfg
+++ b/TestCases/euler/channel/inv_channel.cfg
@@ -159,11 +159,6 @@ TIME_DISCRE_FLOW= EULER_IMPLICIT
% --------------------------- CONVERGENCE PARAMETERS --------------------------%
%
-% Convergence criteria (CAUCHY, RESIDUAL)
-%
-CONV_CRITERIA= RESIDUAL
-%
-%
% Min value of the residual (log10 of the residual)
CONV_RESIDUAL_MINVAL= -12
%
diff --git a/TestCases/euler/channel/inv_channel_RK.cfg b/TestCases/euler/channel/inv_channel_RK.cfg
index f51a9465eba..6fdf27242b7 100644
--- a/TestCases/euler/channel/inv_channel_RK.cfg
+++ b/TestCases/euler/channel/inv_channel_RK.cfg
@@ -152,11 +152,6 @@ TIME_DISCRE_FLOW= RUNGE-KUTTA_EXPLICIT
% --------------------------- CONVERGENCE PARAMETERS --------------------------%
%
-% Convergence criteria (CAUCHY, RESIDUAL)
-%
-CONV_CRITERIA= RESIDUAL
-%
-%
% Min value of the residual (log10 of the residual)
CONV_RESIDUAL_MINVAL= -12
%
diff --git a/TestCases/euler/naca0012/inv_NACA0012.cfg b/TestCases/euler/naca0012/inv_NACA0012.cfg
index e09e6d323a6..869034d94fd 100644
--- a/TestCases/euler/naca0012/inv_NACA0012.cfg
+++ b/TestCases/euler/naca0012/inv_NACA0012.cfg
@@ -225,10 +225,6 @@ DEFORM_LINEAR_SOLVER_ERROR= 1E-14
DEFORM_STIFFNESS_TYPE= INVERSE_VOLUME
% --------------------------- CONVERGENCE PARAMETERS --------------------------%
-% Convergence criteria (CAUCHY, RESIDUAL)
-%
-CONV_CRITERIA= CAUCHY
-%
%
% Min value of the residual (log10 of the residual)
CONV_RESIDUAL_MINVAL= -8
diff --git a/TestCases/euler/naca0012/inv_NACA0012_Roe.cfg b/TestCases/euler/naca0012/inv_NACA0012_Roe.cfg
index c3e78b809b7..cfe8fdc3571 100644
--- a/TestCases/euler/naca0012/inv_NACA0012_Roe.cfg
+++ b/TestCases/euler/naca0012/inv_NACA0012_Roe.cfg
@@ -142,10 +142,6 @@ JST_SENSOR_COEFF= ( 0.5, 0.02 )
TIME_DISCRE_FLOW= EULER_IMPLICIT
% --------------------------- CONVERGENCE PARAMETERS --------------------------%
-% Convergence criteria (CAUCHY, RESIDUAL)
-%
-CONV_CRITERIA= RESIDUAL
-%
%
% Min value of the residual (log10 of the residual)
CONV_RESIDUAL_MINVAL= -10
diff --git a/TestCases/euler/oneram6/inv_ONERAM6.cfg b/TestCases/euler/oneram6/inv_ONERAM6.cfg
index 994d0972a4f..3fff11dc24e 100644
--- a/TestCases/euler/oneram6/inv_ONERAM6.cfg
+++ b/TestCases/euler/oneram6/inv_ONERAM6.cfg
@@ -203,10 +203,6 @@ TIME_DISCRE_ADJFLOW= EULER_IMPLICIT
% --------------------------- CONVERGENCE PARAMETERS --------------------------&
%
-% Convergence criteria (CAUCHY, RESIDUAL)
-CONV_CRITERIA= RESIDUAL
-%
-%
% Min value of the residual (log10 of the residual)
CONV_RESIDUAL_MINVAL= -12
%
diff --git a/TestCases/euler/wedge/inv_wedge_HLLC.cfg b/TestCases/euler/wedge/inv_wedge_HLLC.cfg
index 1ca52a45772..240e53d599d 100644
--- a/TestCases/euler/wedge/inv_wedge_HLLC.cfg
+++ b/TestCases/euler/wedge/inv_wedge_HLLC.cfg
@@ -152,11 +152,6 @@ TIME_DISCRE_FLOW= EULER_IMPLICIT
% --------------------------- CONVERGENCE PARAMETERS --------------------------%
%
-% Convergence criteria (CAUCHY, RESIDUAL)
-%
-CONV_CRITERIA= RESIDUAL
-%
-%
% Min value of the residual (log10 of the residual)
CONV_RESIDUAL_MINVAL= -13
%
diff --git a/TestCases/fea_fsi/Airfoil_RBF/configFlow.cfg b/TestCases/fea_fsi/Airfoil_RBF/configFlow.cfg
index 97d415216b0..5ada0da49fc 100644
--- a/TestCases/fea_fsi/Airfoil_RBF/configFlow.cfg
+++ b/TestCases/fea_fsi/Airfoil_RBF/configFlow.cfg
@@ -106,7 +106,6 @@ DEFORM_LINEAR_SOLVER_ITER= 1000
%
% Convergence criteria ------------------------------------------------- %
INNER_ITER= 60
-CONV_CRITERIA= RESIDUAL
CONV_STARTITER= 0
CONV_RESIDUAL_MINVAL= -9
%
diff --git a/TestCases/fea_fsi/SquareCyl_Beam/config.cfg b/TestCases/fea_fsi/SquareCyl_Beam/config.cfg
index be65f753f06..311b9687653 100644
--- a/TestCases/fea_fsi/SquareCyl_Beam/config.cfg
+++ b/TestCases/fea_fsi/SquareCyl_Beam/config.cfg
@@ -327,11 +327,6 @@ TIME_DISCRE_FLOW= EULER_IMPLICIT
% --------------------------- CONVERGENCE PARAMETERS --------------------------%
%
-% Convergence criteria (CAUCHY, RESIDUAL)
-%
-CONV_CRITERIA= RESIDUAL
-%
-%
% Min value of the residual (log10 of the residual)
CONV_RESIDUAL_MINVAL= -10
%
diff --git a/TestCases/fea_fsi/WallChannel_2d/configFlow.cfg b/TestCases/fea_fsi/WallChannel_2d/configFlow.cfg
index 1257c794f95..b2fae4869db 100644
--- a/TestCases/fea_fsi/WallChannel_2d/configFlow.cfg
+++ b/TestCases/fea_fsi/WallChannel_2d/configFlow.cfg
@@ -56,7 +56,6 @@ MUSCL_FLOW= YES
VENKAT_LIMITER_COEFF= 1.0
JST_SENSOR_COEFF= ( 0.5, 0.02 )
TIME_DISCRE_FLOW= EULER_IMPLICIT
-CONV_CRITERIA= RESIDUAL
CONV_RESIDUAL_MINVAL= -10
CONV_STARTITER= 10
CONV_CAUCHY_ELEMS= 100
diff --git a/TestCases/fea_fsi/dyn_fsi/configFlow.cfg b/TestCases/fea_fsi/dyn_fsi/configFlow.cfg
index 978c66da2ed..17104d089ed 100644
--- a/TestCases/fea_fsi/dyn_fsi/configFlow.cfg
+++ b/TestCases/fea_fsi/dyn_fsi/configFlow.cfg
@@ -54,7 +54,6 @@ MUSCL_FLOW= YES
VENKAT_LIMITER_COEFF= 1.0
JST_SENSOR_COEFF= ( 0.5, 0.02 )
TIME_DISCRE_FLOW= EULER_IMPLICIT
-CONV_CRITERIA= RESIDUAL
CONV_RESIDUAL_MINVAL= -10
CONV_STARTITER= 10
CONV_CAUCHY_ELEMS= 100
diff --git a/TestCases/fea_fsi/stat_fsi/configFlow.cfg b/TestCases/fea_fsi/stat_fsi/configFlow.cfg
index 9d430682d2a..0fc8c53c8b5 100755
--- a/TestCases/fea_fsi/stat_fsi/configFlow.cfg
+++ b/TestCases/fea_fsi/stat_fsi/configFlow.cfg
@@ -119,7 +119,6 @@ TIME_DISCRE_FLOW= EULER_IMPLICIT
% --------------------------- CONVERGENCE PARAMETERS --------------------------%
-CONV_CRITERIA= RESIDUAL
CONV_RESIDUAL_MINVAL= -10
CONV_STARTITER= 10
CONV_CAUCHY_ELEMS= 100
diff --git a/TestCases/fixed_cl/naca0012/inv_NACA0012.cfg b/TestCases/fixed_cl/naca0012/inv_NACA0012.cfg
index d9070a047b0..1b662bdc67a 100644
--- a/TestCases/fixed_cl/naca0012/inv_NACA0012.cfg
+++ b/TestCases/fixed_cl/naca0012/inv_NACA0012.cfg
@@ -236,10 +236,6 @@ DEFORM_LINEAR_SOLVER_ERROR= 1E-14
DEFORM_STIFFNESS_TYPE= INVERSE_VOLUME
% --------------------------- CONVERGENCE PARAMETERS --------------------------%
-% Convergence criteria (CAUCHY, RESIDUAL)
-%
-CONV_CRITERIA= RESIDUAL
-%
%
% Min value of the residual (log10 of the residual)
CONV_RESIDUAL_MINVAL= -12
diff --git a/TestCases/fixed_cl/naca0012/inv_NACA0012_ContAdj.cfg b/TestCases/fixed_cl/naca0012/inv_NACA0012_ContAdj.cfg
index bf990b8de42..4bcea99b789 100644
--- a/TestCases/fixed_cl/naca0012/inv_NACA0012_ContAdj.cfg
+++ b/TestCases/fixed_cl/naca0012/inv_NACA0012_ContAdj.cfg
@@ -241,10 +241,6 @@ DEFORM_LINEAR_SOLVER_ERROR= 1E-14
DEFORM_STIFFNESS_TYPE= INVERSE_VOLUME
% --------------------------- CONVERGENCE PARAMETERS --------------------------%
-% Convergence criteria (CAUCHY, RESIDUAL)
-%
-CONV_CRITERIA= RESIDUAL
-%
%
% Min value of the residual (log10 of the residual)
CONV_RESIDUAL_MINVAL= -14
diff --git a/TestCases/gust/inv_gust_NACA0012.cfg b/TestCases/gust/inv_gust_NACA0012.cfg
index 17d8ec72dbb..2805dc00199 100644
--- a/TestCases/gust/inv_gust_NACA0012.cfg
+++ b/TestCases/gust/inv_gust_NACA0012.cfg
@@ -214,11 +214,6 @@ TIME_DISCRE_FLOW= EULER_IMPLICIT
% Number of total iterations
TIME_ITER= 401
%
-% Convergence criteria (CAUCHY, RESIDUAL)
-%
-CONV_CRITERIA= RESIDUAL
-%
-%
% Min value of the residual (log10 of the residual)
CONV_RESIDUAL_MINVAL= -8
%
diff --git a/TestCases/harmonic_balance/HB.cfg b/TestCases/harmonic_balance/HB.cfg
index 9dfcb122b4a..d6b6aec2e8c 100644
--- a/TestCases/harmonic_balance/HB.cfg
+++ b/TestCases/harmonic_balance/HB.cfg
@@ -253,10 +253,6 @@ DEFORM_LINEAR_SOLVER_ERROR= 1E-14
DEFORM_STIFFNESS_TYPE= INVERSE_VOLUME
% --------------------------- CONVERGENCE PARAMETERS --------------------------%
-% Convergence criteria (CAUCHY, RESIDUAL)
-%
-CONV_CRITERIA= RESIDUAL
-%
%
% Min value of the residual (log10 of the residual)
CONV_RESIDUAL_MINVAL= -10
diff --git a/TestCases/harmonic_balance/hb_rans_preconditioning/davis.cfg b/TestCases/harmonic_balance/hb_rans_preconditioning/davis.cfg
index 5ee0581dd9e..241b740d5ad 100644
--- a/TestCases/harmonic_balance/hb_rans_preconditioning/davis.cfg
+++ b/TestCases/harmonic_balance/hb_rans_preconditioning/davis.cfg
@@ -196,10 +196,6 @@ TIME_DISCRE_TURB= EULER_IMPLICIT
CFL_REDUCTION_TURB= 1.0
% --------------------------- CONVERGENCE PARAMETERS --------------------------%
-% Convergence criteria (CAUCHY, RESIDUAL)
-%
-CONV_CRITERIA= RESIDUAL
-%
%
% Min value of the residual (log10 of the residual)
CONV_RESIDUAL_MINVAL= -10
diff --git a/TestCases/hom_euler/InviscidVortex/2D/Quad32X32_nPoly4/InviscidVortex.cfg b/TestCases/hom_euler/InviscidVortex/2D/Quad32X32_nPoly4/InviscidVortex.cfg
index e5ac537d7d9..829ca16c11c 100644
--- a/TestCases/hom_euler/InviscidVortex/2D/Quad32X32_nPoly4/InviscidVortex.cfg
+++ b/TestCases/hom_euler/InviscidVortex/2D/Quad32X32_nPoly4/InviscidVortex.cfg
@@ -121,10 +121,6 @@ TIME_DISCRE_FLOW= CLASSICAL_RK4_EXPLICIT
% --------------------------- CONVERGENCE PARAMETERS --------------------------%
%
-% Convergence criteria (CAUCHY, RESIDUAL)
-CONV_CRITERIA= RESIDUAL
-%
-%
% Min value of the residual (log10 of the residual)
CONV_RESIDUAL_MINVAL= -15
%
diff --git a/TestCases/hom_euler/InviscidVortex/3D/nPoly2_Tets/InviscidVortex.cfg b/TestCases/hom_euler/InviscidVortex/3D/nPoly2_Tets/InviscidVortex.cfg
index 522a764fb40..34a07e54f39 100644
--- a/TestCases/hom_euler/InviscidVortex/3D/nPoly2_Tets/InviscidVortex.cfg
+++ b/TestCases/hom_euler/InviscidVortex/3D/nPoly2_Tets/InviscidVortex.cfg
@@ -120,10 +120,6 @@ TIME_DISCRE_FLOW= CLASSICAL_RK4_EXPLICIT
% --------------------------- CONVERGENCE PARAMETERS --------------------------%
%
-% Convergence criteria (CAUCHY, RESIDUAL)
-CONV_CRITERIA= RESIDUAL
-%
-%
% Min value of the residual (log10 of the residual)
CONV_RESIDUAL_MINVAL= -15
%
diff --git a/TestCases/hom_euler/InviscidVortex/3D/nPoly4_Tets/InviscidVortex.cfg b/TestCases/hom_euler/InviscidVortex/3D/nPoly4_Tets/InviscidVortex.cfg
index 099263ebb85..e36f588996f 100644
--- a/TestCases/hom_euler/InviscidVortex/3D/nPoly4_Tets/InviscidVortex.cfg
+++ b/TestCases/hom_euler/InviscidVortex/3D/nPoly4_Tets/InviscidVortex.cfg
@@ -120,10 +120,6 @@ TIME_DISCRE_FLOW= CLASSICAL_RK4_EXPLICIT
% --------------------------- CONVERGENCE PARAMETERS --------------------------%
%
-% Convergence criteria (CAUCHY, RESIDUAL)
-CONV_CRITERIA= RESIDUAL
-%
-%
% Min value of the residual (log10 of the residual)
CONV_RESIDUAL_MINVAL= -15
%
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 3ae0b6beb02..85b193d14d8 100644
--- a/TestCases/hom_euler/NACA0012_3D_Hybrid_4thOrder/fem_NACA0012.cfg
+++ b/TestCases/hom_euler/NACA0012_3D_Hybrid_4thOrder/fem_NACA0012.cfg
@@ -116,10 +116,6 @@ TIME_DISCRE_FLOW= RUNGE-KUTTA_EXPLICIT
% --------------------------- CONVERGENCE PARAMETERS --------------------------%
%
-% Convergence criteria (CAUCHY, RESIDUAL)
-CONV_CRITERIA= RESIDUAL
-%
-%
% Min value of the residual (log10 of the residual)
CONV_RESIDUAL_MINVAL= -8
%
diff --git a/TestCases/hom_euler/NACA0012_5thOrder/fem_NACA0012.cfg b/TestCases/hom_euler/NACA0012_5thOrder/fem_NACA0012.cfg
index 18140671830..0da573ced66 100644
--- a/TestCases/hom_euler/NACA0012_5thOrder/fem_NACA0012.cfg
+++ b/TestCases/hom_euler/NACA0012_5thOrder/fem_NACA0012.cfg
@@ -120,10 +120,6 @@ TIME_DISCRE_FLOW= RUNGE-KUTTA_EXPLICIT
% --------------------------- CONVERGENCE PARAMETERS --------------------------%
%
-% Convergence criteria (CAUCHY, RESIDUAL)
-CONV_CRITERIA= RESIDUAL
-%
-%
% Min value of the residual (log10 of the residual)
CONV_RESIDUAL_MINVAL= -8
%
diff --git a/TestCases/hom_euler/NACA0012_5thOrder/fem_NACA0012_reg.cfg b/TestCases/hom_euler/NACA0012_5thOrder/fem_NACA0012_reg.cfg
index c6b91e727d5..0512dbae26b 100644
--- a/TestCases/hom_euler/NACA0012_5thOrder/fem_NACA0012_reg.cfg
+++ b/TestCases/hom_euler/NACA0012_5thOrder/fem_NACA0012_reg.cfg
@@ -124,10 +124,6 @@ TIME_DISCRE_FLOW= RUNGE-KUTTA_EXPLICIT
% --------------------------- CONVERGENCE PARAMETERS --------------------------%
%
-% Convergence criteria (CAUCHY, RESIDUAL)
-CONV_CRITERIA= RESIDUAL
-%
-%
% Min value of the residual (log10 of the residual)
CONV_RESIDUAL_MINVAL= -12
%
diff --git a/TestCases/hom_euler/Ringleb/Quad100X50_nPoly3/Ringleb.cfg b/TestCases/hom_euler/Ringleb/Quad100X50_nPoly3/Ringleb.cfg
index 08dcc9cf1a3..ef9515c4014 100644
--- a/TestCases/hom_euler/Ringleb/Quad100X50_nPoly3/Ringleb.cfg
+++ b/TestCases/hom_euler/Ringleb/Quad100X50_nPoly3/Ringleb.cfg
@@ -113,10 +113,6 @@ TIME_DISCRE_FEM_FLOW= RUNGE-KUTTA_EXPLICIT
% --------------------------- CONVERGENCE PARAMETERS --------------------------%
%
-% Convergence criteria (CAUCHY, RESIDUAL)
-CONV_CRITERIA= RESIDUAL
-%
-%
% Min value of the residual (log10 of the residual)
CONV_RESIDUAL_MINVAL= -8
%
diff --git a/TestCases/hom_euler/Ringleb/Quad100X50_nPoly3/Ringleb_WallBC.cfg b/TestCases/hom_euler/Ringleb/Quad100X50_nPoly3/Ringleb_WallBC.cfg
index 4434222802d..1720bf551d2 100644
--- a/TestCases/hom_euler/Ringleb/Quad100X50_nPoly3/Ringleb_WallBC.cfg
+++ b/TestCases/hom_euler/Ringleb/Quad100X50_nPoly3/Ringleb_WallBC.cfg
@@ -113,10 +113,6 @@ TIME_DISCRE_FEM_FLOW= RUNGE-KUTTA_EXPLICIT
% --------------------------- CONVERGENCE PARAMETERS --------------------------%
%
-% Convergence criteria (CAUCHY, RESIDUAL)
-CONV_CRITERIA= RESIDUAL
-%
-%
% Min value of the residual (log10 of the residual)
CONV_RESIDUAL_MINVAL= -8
%
diff --git a/TestCases/hom_euler/Ringleb/Quad100X50_nPoly4/Ringleb.cfg b/TestCases/hom_euler/Ringleb/Quad100X50_nPoly4/Ringleb.cfg
index a496a516743..77f512b87c3 100644
--- a/TestCases/hom_euler/Ringleb/Quad100X50_nPoly4/Ringleb.cfg
+++ b/TestCases/hom_euler/Ringleb/Quad100X50_nPoly4/Ringleb.cfg
@@ -113,10 +113,6 @@ TIME_DISCRE_FEM_FLOW= RUNGE-KUTTA_EXPLICIT
% --------------------------- CONVERGENCE PARAMETERS --------------------------%
%
-% Convergence criteria (CAUCHY, RESIDUAL)
-CONV_CRITERIA= RESIDUAL
-%
-%
% Min value of the residual (log10 of the residual)
CONV_RESIDUAL_MINVAL= -8
%
diff --git a/TestCases/hom_euler/Ringleb/Quad100X50_nPoly4/Ringleb_WallBC.cfg b/TestCases/hom_euler/Ringleb/Quad100X50_nPoly4/Ringleb_WallBC.cfg
index 3411911b567..2747bb01c8a 100644
--- a/TestCases/hom_euler/Ringleb/Quad100X50_nPoly4/Ringleb_WallBC.cfg
+++ b/TestCases/hom_euler/Ringleb/Quad100X50_nPoly4/Ringleb_WallBC.cfg
@@ -113,10 +113,6 @@ TIME_DISCRE_FEM_FLOW= RUNGE-KUTTA_EXPLICIT
% --------------------------- CONVERGENCE PARAMETERS --------------------------%
%
-% Convergence criteria (CAUCHY, RESIDUAL)
-CONV_CRITERIA= RESIDUAL
-%
-%
% Min value of the residual (log10 of the residual)
CONV_RESIDUAL_MINVAL= -8
%
diff --git a/TestCases/hom_euler/Ringleb/Quad200X100_nPoly4/Ringleb.cfg b/TestCases/hom_euler/Ringleb/Quad200X100_nPoly4/Ringleb.cfg
index bb46103376c..b89f2a642dd 100644
--- a/TestCases/hom_euler/Ringleb/Quad200X100_nPoly4/Ringleb.cfg
+++ b/TestCases/hom_euler/Ringleb/Quad200X100_nPoly4/Ringleb.cfg
@@ -113,10 +113,6 @@ TIME_DISCRE_FEM_FLOW= RUNGE-KUTTA_EXPLICIT
% --------------------------- CONVERGENCE PARAMETERS --------------------------%
%
-% Convergence criteria (CAUCHY, RESIDUAL)
-CONV_CRITERIA= RESIDUAL
-%
-%
% Min value of the residual (log10 of the residual)
CONV_RESIDUAL_MINVAL= -8
%
diff --git a/TestCases/hom_euler/Ringleb/Quad200X100_nPoly4/Ringleb_WallBC.cfg b/TestCases/hom_euler/Ringleb/Quad200X100_nPoly4/Ringleb_WallBC.cfg
index 902ddb06647..03c5f54c1af 100644
--- a/TestCases/hom_euler/Ringleb/Quad200X100_nPoly4/Ringleb_WallBC.cfg
+++ b/TestCases/hom_euler/Ringleb/Quad200X100_nPoly4/Ringleb_WallBC.cfg
@@ -113,10 +113,6 @@ TIME_DISCRE_FEM_FLOW= RUNGE-KUTTA_EXPLICIT
% --------------------------- CONVERGENCE PARAMETERS --------------------------%
%
-% Convergence criteria (CAUCHY, RESIDUAL)
-CONV_CRITERIA= RESIDUAL
-%
-%
% Min value of the residual (log10 of the residual)
CONV_RESIDUAL_MINVAL= -8
%
diff --git a/TestCases/hom_euler/Ringleb/Quad50X50_HalfGeom_nPoly4/Ringleb.cfg b/TestCases/hom_euler/Ringleb/Quad50X50_HalfGeom_nPoly4/Ringleb.cfg
index 3acd6ce906c..4daf0eb1f16 100644
--- a/TestCases/hom_euler/Ringleb/Quad50X50_HalfGeom_nPoly4/Ringleb.cfg
+++ b/TestCases/hom_euler/Ringleb/Quad50X50_HalfGeom_nPoly4/Ringleb.cfg
@@ -113,10 +113,6 @@ TIME_DISCRE_FEM_FLOW= RUNGE-KUTTA_EXPLICIT
% --------------------------- CONVERGENCE PARAMETERS --------------------------%
%
-% Convergence criteria (CAUCHY, RESIDUAL)
-CONV_CRITERIA= RESIDUAL
-%
-%
% Min value of the residual (log10 of the residual)
CONV_RESIDUAL_MINVAL= -8
%
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 a138f70ced8..61b3ebbc00f 100644
--- a/TestCases/hom_euler/Ringleb/Quad50X50_HalfGeom_nPoly4/Ringleb_WallBC.cfg
+++ b/TestCases/hom_euler/Ringleb/Quad50X50_HalfGeom_nPoly4/Ringleb_WallBC.cfg
@@ -113,10 +113,6 @@ TIME_DISCRE_FEM_FLOW= RUNGE-KUTTA_EXPLICIT
% --------------------------- CONVERGENCE PARAMETERS --------------------------%
%
-% Convergence criteria (CAUCHY, RESIDUAL)
-CONV_CRITERIA= RESIDUAL
-%
-%
% Min value of the residual (log10 of the residual)
CONV_RESIDUAL_MINVAL= -8
%
diff --git a/TestCases/hom_euler/Ringleb/QuadDominantUnstr100X100_HalfGeom_nPoly4/Ringleb.cfg b/TestCases/hom_euler/Ringleb/QuadDominantUnstr100X100_HalfGeom_nPoly4/Ringleb.cfg
index 497fe62167d..07c83b98452 100644
--- a/TestCases/hom_euler/Ringleb/QuadDominantUnstr100X100_HalfGeom_nPoly4/Ringleb.cfg
+++ b/TestCases/hom_euler/Ringleb/QuadDominantUnstr100X100_HalfGeom_nPoly4/Ringleb.cfg
@@ -113,10 +113,6 @@ TIME_DISCRE_FEM_FLOW= RUNGE-KUTTA_EXPLICIT
% --------------------------- CONVERGENCE PARAMETERS --------------------------%
%
-% Convergence criteria (CAUCHY, RESIDUAL)
-CONV_CRITERIA= RESIDUAL
-%
-%
% Min value of the residual (log10 of the residual)
CONV_RESIDUAL_MINVAL= -8
%
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 f40a45980a0..34839222a07 100644
--- a/TestCases/hom_euler/Ringleb/QuadDominantUnstr100X100_HalfGeom_nPoly4/Ringleb_WallBC.cfg
+++ b/TestCases/hom_euler/Ringleb/QuadDominantUnstr100X100_HalfGeom_nPoly4/Ringleb_WallBC.cfg
@@ -113,10 +113,6 @@ TIME_DISCRE_FEM_FLOW= RUNGE-KUTTA_EXPLICIT
% --------------------------- CONVERGENCE PARAMETERS --------------------------%
%
-% Convergence criteria (CAUCHY, RESIDUAL)
-CONV_CRITERIA= RESIDUAL
-%
-%
% Min value of the residual (log10 of the residual)
CONV_RESIDUAL_MINVAL= -8
%
diff --git a/TestCases/hom_euler/Ringleb/Triangle50X50_HalfGeom_nPoly4/Ringleb.cfg b/TestCases/hom_euler/Ringleb/Triangle50X50_HalfGeom_nPoly4/Ringleb.cfg
index 8a46168cffc..34b3111c39c 100644
--- a/TestCases/hom_euler/Ringleb/Triangle50X50_HalfGeom_nPoly4/Ringleb.cfg
+++ b/TestCases/hom_euler/Ringleb/Triangle50X50_HalfGeom_nPoly4/Ringleb.cfg
@@ -113,10 +113,6 @@ TIME_DISCRE_FEM_FLOW= RUNGE-KUTTA_EXPLICIT
% --------------------------- CONVERGENCE PARAMETERS --------------------------%
%
-% Convergence criteria (CAUCHY, RESIDUAL)
-CONV_CRITERIA= RESIDUAL
-%
-%
% Min value of the residual (log10 of the residual)
CONV_RESIDUAL_MINVAL= -8
%
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 94e42fa571a..54b70b3ea73 100644
--- a/TestCases/hom_euler/Ringleb/Triangle50X50_HalfGeom_nPoly4/Ringleb_WallBC.cfg
+++ b/TestCases/hom_euler/Ringleb/Triangle50X50_HalfGeom_nPoly4/Ringleb_WallBC.cfg
@@ -113,10 +113,6 @@ TIME_DISCRE_FEM_FLOW= RUNGE-KUTTA_EXPLICIT
% --------------------------- CONVERGENCE PARAMETERS --------------------------%
%
-% Convergence criteria (CAUCHY, RESIDUAL)
-CONV_CRITERIA= RESIDUAL
-%
-%
% Min value of the residual (log10 of the residual)
CONV_RESIDUAL_MINVAL= -8
%
diff --git a/TestCases/hom_euler/Sphere_4thOrder_Hexa/fem_Sphere.cfg b/TestCases/hom_euler/Sphere_4thOrder_Hexa/fem_Sphere.cfg
index e16acb08163..1f759073605 100644
--- a/TestCases/hom_euler/Sphere_4thOrder_Hexa/fem_Sphere.cfg
+++ b/TestCases/hom_euler/Sphere_4thOrder_Hexa/fem_Sphere.cfg
@@ -116,10 +116,6 @@ TIME_DISCRE_FLOW= RUNGE-KUTTA_EXPLICIT
% --------------------------- CONVERGENCE PARAMETERS --------------------------%
%
-% Convergence criteria (CAUCHY, RESIDUAL)
-CONV_CRITERIA= RESIDUAL
-%
-%
% Min value of the residual (log10 of the residual)
CONV_RESIDUAL_MINVAL= -8
%
diff --git a/TestCases/hom_euler/Sphere_4thOrder_Tet/fem_Sphere.cfg b/TestCases/hom_euler/Sphere_4thOrder_Tet/fem_Sphere.cfg
index 6bace675413..a715b53fd69 100644
--- a/TestCases/hom_euler/Sphere_4thOrder_Tet/fem_Sphere.cfg
+++ b/TestCases/hom_euler/Sphere_4thOrder_Tet/fem_Sphere.cfg
@@ -118,10 +118,6 @@ TIME_DISCRE_FLOW= RUNGE-KUTTA_EXPLICIT
% --------------------------- CONVERGENCE PARAMETERS --------------------------%
%
-% Convergence criteria (CAUCHY, RESIDUAL)
-CONV_CRITERIA= RESIDUAL
-%
-%
% Min value of the residual (log10 of the residual)
CONV_RESIDUAL_MINVAL= -8
%
diff --git a/TestCases/hom_euler/SubsonicChannel/nPoly1/fem_SubsonicChannel.cfg b/TestCases/hom_euler/SubsonicChannel/nPoly1/fem_SubsonicChannel.cfg
index de36771e973..52dd81c7fc6 100644
--- a/TestCases/hom_euler/SubsonicChannel/nPoly1/fem_SubsonicChannel.cfg
+++ b/TestCases/hom_euler/SubsonicChannel/nPoly1/fem_SubsonicChannel.cfg
@@ -126,10 +126,6 @@ TIME_DISCRE_FEM_FLOW= RUNGE-KUTTA_EXPLICIT
% --------------------------- CONVERGENCE PARAMETERS --------------------------%
%
-% Convergence criteria (CAUCHY, RESIDUAL)
-CONV_CRITERIA= RESIDUAL
-%
-%
% Min value of the residual (log10 of the residual)
CONV_RESIDUAL_MINVAL= -8
%
diff --git a/TestCases/hom_euler/SubsonicChannel/nPoly1/fem_SubsonicChannel_Farfield.cfg b/TestCases/hom_euler/SubsonicChannel/nPoly1/fem_SubsonicChannel_Farfield.cfg
index 55ee0a156fc..0b88572a508 100644
--- a/TestCases/hom_euler/SubsonicChannel/nPoly1/fem_SubsonicChannel_Farfield.cfg
+++ b/TestCases/hom_euler/SubsonicChannel/nPoly1/fem_SubsonicChannel_Farfield.cfg
@@ -119,10 +119,6 @@ TIME_DISCRE_FEM_FLOW= RUNGE-KUTTA_EXPLICIT
% --------------------------- CONVERGENCE PARAMETERS --------------------------%
%
-% Convergence criteria (CAUCHY, RESIDUAL)
-CONV_CRITERIA= RESIDUAL
-%
-%
% Min value of the residual (log10 of the residual)
CONV_RESIDUAL_MINVAL= -8
%
diff --git a/TestCases/hom_euler/SubsonicChannel/nPoly2/fem_SubsonicChannel.cfg b/TestCases/hom_euler/SubsonicChannel/nPoly2/fem_SubsonicChannel.cfg
index d92e605ee0f..4c569e97238 100644
--- a/TestCases/hom_euler/SubsonicChannel/nPoly2/fem_SubsonicChannel.cfg
+++ b/TestCases/hom_euler/SubsonicChannel/nPoly2/fem_SubsonicChannel.cfg
@@ -126,10 +126,6 @@ TIME_DISCRE_FEM_FLOW= RUNGE-KUTTA_EXPLICIT
% --------------------------- CONVERGENCE PARAMETERS --------------------------%
%
-% Convergence criteria (CAUCHY, RESIDUAL)
-CONV_CRITERIA= RESIDUAL
-%
-%
% Min value of the residual (log10 of the residual)
CONV_RESIDUAL_MINVAL= -8
%
diff --git a/TestCases/hom_euler/SubsonicChannel/nPoly2/fem_SubsonicChannel_Farfield.cfg b/TestCases/hom_euler/SubsonicChannel/nPoly2/fem_SubsonicChannel_Farfield.cfg
index eabc7275c6f..07577d47575 100644
--- a/TestCases/hom_euler/SubsonicChannel/nPoly2/fem_SubsonicChannel_Farfield.cfg
+++ b/TestCases/hom_euler/SubsonicChannel/nPoly2/fem_SubsonicChannel_Farfield.cfg
@@ -119,10 +119,6 @@ TIME_DISCRE_FEM_FLOW= RUNGE-KUTTA_EXPLICIT
% --------------------------- CONVERGENCE PARAMETERS --------------------------%
%
-% Convergence criteria (CAUCHY, RESIDUAL)
-CONV_CRITERIA= RESIDUAL
-%
-%
% Min value of the residual (log10 of the residual)
CONV_RESIDUAL_MINVAL= -8
%
diff --git a/TestCases/hom_euler/SubsonicChannel/nPoly4/fem_SubsonicChannel.cfg b/TestCases/hom_euler/SubsonicChannel/nPoly4/fem_SubsonicChannel.cfg
index 31c47cb59ca..7401f50a178 100644
--- a/TestCases/hom_euler/SubsonicChannel/nPoly4/fem_SubsonicChannel.cfg
+++ b/TestCases/hom_euler/SubsonicChannel/nPoly4/fem_SubsonicChannel.cfg
@@ -126,10 +126,6 @@ TIME_DISCRE_FEM_FLOW= RUNGE-KUTTA_EXPLICIT
% --------------------------- CONVERGENCE PARAMETERS --------------------------%
%
-% Convergence criteria (CAUCHY, RESIDUAL)
-CONV_CRITERIA= RESIDUAL
-%
-%
% Min value of the residual (log10 of the residual)
CONV_RESIDUAL_MINVAL= -8
%
diff --git a/TestCases/hom_euler/SubsonicChannel/nPoly4/fem_SubsonicChannel_Farfield.cfg b/TestCases/hom_euler/SubsonicChannel/nPoly4/fem_SubsonicChannel_Farfield.cfg
index 84aad1673ee..fa7e2982f8e 100644
--- a/TestCases/hom_euler/SubsonicChannel/nPoly4/fem_SubsonicChannel_Farfield.cfg
+++ b/TestCases/hom_euler/SubsonicChannel/nPoly4/fem_SubsonicChannel_Farfield.cfg
@@ -119,10 +119,6 @@ TIME_DISCRE_FEM_FLOW= RUNGE-KUTTA_EXPLICIT
% --------------------------- CONVERGENCE PARAMETERS --------------------------%
%
-% Convergence criteria (CAUCHY, RESIDUAL)
-CONV_CRITERIA= RESIDUAL
-%
-%
% Min value of the residual (log10 of the residual)
CONV_RESIDUAL_MINVAL= -8
%
diff --git a/TestCases/hom_navierstokes/CylinderViscous/nPoly3/fem_Cylinder_reg.cfg b/TestCases/hom_navierstokes/CylinderViscous/nPoly3/fem_Cylinder_reg.cfg
index 002ef01668b..e83803e0b38 100644
--- a/TestCases/hom_navierstokes/CylinderViscous/nPoly3/fem_Cylinder_reg.cfg
+++ b/TestCases/hom_navierstokes/CylinderViscous/nPoly3/fem_Cylinder_reg.cfg
@@ -117,10 +117,6 @@ TIME_DISCRE_FEM_FLOW= RUNGE-KUTTA_EXPLICIT
%
% --------------------------- CONVERGENCE PARAMETERS --------------------------%
%
-% Convergence criteria (CAUCHY, RESIDUAL)
-CONV_CRITERIA= RESIDUAL
-%
-%
% Min value of the residual (log10 of the residual)
CONV_RESIDUAL_MINVAL= -8
%
diff --git a/TestCases/hom_navierstokes/FlatPlate/nPoly4/lam_flatplate_reg.cfg b/TestCases/hom_navierstokes/FlatPlate/nPoly4/lam_flatplate_reg.cfg
index 0dd05452886..f11fd15b5d8 100644
--- a/TestCases/hom_navierstokes/FlatPlate/nPoly4/lam_flatplate_reg.cfg
+++ b/TestCases/hom_navierstokes/FlatPlate/nPoly4/lam_flatplate_reg.cfg
@@ -124,11 +124,6 @@ TIME_DISCRE_FEM_FLOW= RUNGE-KUTTA_EXPLICIT
% --------------------------- CONVERGENCE PARAMETERS --------------------------%
%
-% Convergence criteria (CAUCHY, RESIDUAL)
-%
-CONV_CRITERIA= RESIDUAL
-%
-%
% Min value of the residual (log10 of the residual)
CONV_RESIDUAL_MINVAL= -15
%
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 50e605568ed..6b6739b43e5 100644
--- a/TestCases/hom_navierstokes/SphereViscous/nPoly3_QuadDominant/fem_Sphere_reg.cfg
+++ b/TestCases/hom_navierstokes/SphereViscous/nPoly3_QuadDominant/fem_Sphere_reg.cfg
@@ -118,10 +118,6 @@ TIME_DISCRE_FEM_FLOW= RUNGE-KUTTA_EXPLICIT
%
% --------------------------- CONVERGENCE PARAMETERS --------------------------%
%
-% Convergence criteria (CAUCHY, RESIDUAL)
-CONV_CRITERIA= RESIDUAL
-%
-%
% Min value of the residual (log10 of the residual)
CONV_RESIDUAL_MINVAL= -8
%
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 71c22aa583e..101a4f4ec54 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
@@ -141,10 +141,6 @@ LEVELS_TIME_ACCURATE_LTS= 4
% --------------------------- CONVERGENCE PARAMETERS --------------------------%
%
-% Convergence criteria (CAUCHY, RESIDUAL)
-CONV_CRITERIA= RESIDUAL
-%
-%
% Min value of the residual (log10 of the residual)
CONV_RESIDUAL_MINVAL= -15
%
diff --git a/TestCases/hom_navierstokes/UnsteadyCylinder/nPoly4/fem_unst_cylinder.cfg b/TestCases/hom_navierstokes/UnsteadyCylinder/nPoly4/fem_unst_cylinder.cfg
index 40de22f8066..50803c63e4a 100644
--- a/TestCases/hom_navierstokes/UnsteadyCylinder/nPoly4/fem_unst_cylinder.cfg
+++ b/TestCases/hom_navierstokes/UnsteadyCylinder/nPoly4/fem_unst_cylinder.cfg
@@ -136,10 +136,6 @@ TIME_DISCRE_FLOW= CLASSICAL_RK4_EXPLICIT
% --------------------------- CONVERGENCE PARAMETERS --------------------------%
%
-% Convergence criteria (CAUCHY, RESIDUAL)
-CONV_CRITERIA= RESIDUAL
-%
-%
% Min value of the residual (log10 of the residual)
CONV_RESIDUAL_MINVAL= -15
%
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 744417f1a5c..e947a6ecab1 100644
--- a/TestCases/hom_navierstokes/UnsteadyCylinder/nPoly4/fem_unst_cylinder_ADER.cfg
+++ b/TestCases/hom_navierstokes/UnsteadyCylinder/nPoly4/fem_unst_cylinder_ADER.cfg
@@ -148,10 +148,6 @@ LEVELS_TIME_ACCURATE_LTS= 8
% --------------------------- CONVERGENCE PARAMETERS --------------------------%
%
-% Convergence criteria (CAUCHY, RESIDUAL)
-CONV_CRITERIA= RESIDUAL
-%
-%
% Min value of the residual (log10 of the residual)
CONV_RESIDUAL_MINVAL= -15
%
diff --git a/TestCases/incomp_euler/naca0012/incomp_NACA0012.cfg b/TestCases/incomp_euler/naca0012/incomp_NACA0012.cfg
index cb374e90f6b..1f3012e66de 100644
--- a/TestCases/incomp_euler/naca0012/incomp_NACA0012.cfg
+++ b/TestCases/incomp_euler/naca0012/incomp_NACA0012.cfg
@@ -143,10 +143,6 @@ JST_SENSOR_COEFF= ( 0.5, 0.04 )
TIME_DISCRE_FLOW= EULER_IMPLICIT
% --------------------------- CONVERGENCE PARAMETERS --------------------------%
-% Convergence criteria (CAUCHY, RESIDUAL)
-%
-CONV_CRITERIA= RESIDUAL
-%
%
% Min value of the residual (log10 of the residual)
CONV_RESIDUAL_MINVAL= -10
diff --git a/TestCases/incomp_navierstokes/buoyancy_cavity/lam_buoyancy_cavity.cfg b/TestCases/incomp_navierstokes/buoyancy_cavity/lam_buoyancy_cavity.cfg
index 474e719298a..9cdd52d5736 100644
--- a/TestCases/incomp_navierstokes/buoyancy_cavity/lam_buoyancy_cavity.cfg
+++ b/TestCases/incomp_navierstokes/buoyancy_cavity/lam_buoyancy_cavity.cfg
@@ -196,10 +196,6 @@ TIME_DISCRE_FLOW= EULER_IMPLICIT
% --------------------------- CONVERGENCE PARAMETERS --------------------------%
%
-% Convergence criteria (CAUCHY, RESIDUAL)
-CONV_CRITERIA= RESIDUAL
-%
-%
% Min value of the residual (log10 of the residual)
CONV_RESIDUAL_MINVAL= -12
%
diff --git a/TestCases/incomp_navierstokes/cylinder/incomp_cylinder.cfg b/TestCases/incomp_navierstokes/cylinder/incomp_cylinder.cfg
index 2817c932700..dbde42cd5f4 100644
--- a/TestCases/incomp_navierstokes/cylinder/incomp_cylinder.cfg
+++ b/TestCases/incomp_navierstokes/cylinder/incomp_cylinder.cfg
@@ -140,11 +140,6 @@ TIME_DISCRE_FLOW= EULER_IMPLICIT
% --------------------------- CONVERGENCE PARAMETERS --------------------------%
%
-% Convergence criteria (CAUCHY, RESIDUAL)
-%
-CONV_CRITERIA= RESIDUAL
-%
-%
% Min value of the residual (log10 of the residual)
CONV_RESIDUAL_MINVAL= -10
%
diff --git a/TestCases/incomp_navierstokes/cylinder/poly_cylinder.cfg b/TestCases/incomp_navierstokes/cylinder/poly_cylinder.cfg
index 17438af462b..46aa9d45aff 100644
--- a/TestCases/incomp_navierstokes/cylinder/poly_cylinder.cfg
+++ b/TestCases/incomp_navierstokes/cylinder/poly_cylinder.cfg
@@ -223,10 +223,6 @@ TIME_DISCRE_FLOW= EULER_IMPLICIT
% --------------------------- CONVERGENCE PARAMETERS --------------------------%
%
-% Convergence criteria (CAUCHY, RESIDUAL)
-CONV_CRITERIA= RESIDUAL
-%
-%
% Min value of the residual (log10 of the residual)
CONV_RESIDUAL_MINVAL= -14
%
diff --git a/TestCases/incomp_navierstokes/streamwise_periodic/chtPinArray_2d/configFluid.cfg b/TestCases/incomp_navierstokes/streamwise_periodic/chtPinArray_2d/configFluid.cfg
index 9f156eaa909..2cf3958cda3 100644
--- a/TestCases/incomp_navierstokes/streamwise_periodic/chtPinArray_2d/configFluid.cfg
+++ b/TestCases/incomp_navierstokes/streamwise_periodic/chtPinArray_2d/configFluid.cfg
@@ -117,7 +117,6 @@ TIME_DISCRE_TURB= EULER_IMPLICIT
%
% --------------------------- CONVERGENCE PARAMETERS --------------------------%
%
-CONV_CRITERIA= RESIDUAL
CONV_RESIDUAL_MINVAL= -26
CONV_STARTITER= 100000000
%
diff --git a/TestCases/incomp_navierstokes/streamwise_periodic/chtPinArray_2d/configSolid.cfg b/TestCases/incomp_navierstokes/streamwise_periodic/chtPinArray_2d/configSolid.cfg
index 3b49b93125e..087f1c97ed7 100644
--- a/TestCases/incomp_navierstokes/streamwise_periodic/chtPinArray_2d/configSolid.cfg
+++ b/TestCases/incomp_navierstokes/streamwise_periodic/chtPinArray_2d/configSolid.cfg
@@ -55,7 +55,6 @@ LINEAR_SOLVER_ITER= 20
%
% --------------------------- CONVERGENCE PARAMETERS --------------------------%
%
-CONV_CRITERIA= RESIDUAL
CONV_RESIDUAL_MINVAL= -20
CONV_STARTITER= 10000000000
%
diff --git a/TestCases/incomp_navierstokes/streamwise_periodic/chtPinArray_3d/configFluid.cfg b/TestCases/incomp_navierstokes/streamwise_periodic/chtPinArray_3d/configFluid.cfg
index b7ef1fa5a75..7ba014312a0 100644
--- a/TestCases/incomp_navierstokes/streamwise_periodic/chtPinArray_3d/configFluid.cfg
+++ b/TestCases/incomp_navierstokes/streamwise_periodic/chtPinArray_3d/configFluid.cfg
@@ -105,7 +105,6 @@ TIME_DISCRE_TURB= EULER_IMPLICIT
%
% --------------------------- CONVERGENCE PARAMETERS --------------------------%
%
-CONV_CRITERIA= RESIDUAL
CONV_RESIDUAL_MINVAL= -26
CONV_STARTITER= 100000000
%
diff --git a/TestCases/incomp_navierstokes/streamwise_periodic/chtPinArray_3d/configSolid.cfg b/TestCases/incomp_navierstokes/streamwise_periodic/chtPinArray_3d/configSolid.cfg
index a1362711f77..c9a3a6ed6ed 100644
--- a/TestCases/incomp_navierstokes/streamwise_periodic/chtPinArray_3d/configSolid.cfg
+++ b/TestCases/incomp_navierstokes/streamwise_periodic/chtPinArray_3d/configSolid.cfg
@@ -56,7 +56,6 @@ LINEAR_SOLVER_ITER= 15
%
% --------------------------- CONVERGENCE PARAMETERS --------------------------%
%
-CONV_CRITERIA= RESIDUAL
CONV_RESIDUAL_MINVAL= -20
CONV_STARTITER= 10000000000
%
diff --git a/TestCases/incomp_navierstokes/streamwise_periodic/pipeSlice_3d/sp_pipeSlice_3d_dp_hf_tp.cfg b/TestCases/incomp_navierstokes/streamwise_periodic/pipeSlice_3d/sp_pipeSlice_3d_dp_hf_tp.cfg
index 249beb91e71..756d48188e6 100644
--- a/TestCases/incomp_navierstokes/streamwise_periodic/pipeSlice_3d/sp_pipeSlice_3d_dp_hf_tp.cfg
+++ b/TestCases/incomp_navierstokes/streamwise_periodic/pipeSlice_3d/sp_pipeSlice_3d_dp_hf_tp.cfg
@@ -69,7 +69,6 @@ TIME_DISCRE_FLOW= EULER_IMPLICIT
%
% --------------------------- CONVERGENCE PARAMETERS --------------------------%
%
-CONV_CRITERIA= RESIDUAL
CONV_RESIDUAL_MINVAL= -24
CONV_STARTITER= 10
%
diff --git a/TestCases/incomp_rans/AhmedBody/turb_ahmed.cfg b/TestCases/incomp_rans/AhmedBody/turb_ahmed.cfg
index bfcc4892d16..f6b22a35da5 100644
--- a/TestCases/incomp_rans/AhmedBody/turb_ahmed.cfg
+++ b/TestCases/incomp_rans/AhmedBody/turb_ahmed.cfg
@@ -269,11 +269,6 @@ FFD_ITERATIONS= 500
% --------------------------- CONVERGENCE PARAMETERS --------------------------%
%
-% Convergence criteria (CAUCHY, RESIDUAL)
-%
-CONV_CRITERIA= RESIDUAL
-%
-%
% Min value of the residual (log10 of the residual)
CONV_RESIDUAL_MINVAL= -14
%
diff --git a/TestCases/incomp_rans/naca0012/naca0012.cfg b/TestCases/incomp_rans/naca0012/naca0012.cfg
index 5cd1ee3b0ad..89d8200f629 100644
--- a/TestCases/incomp_rans/naca0012/naca0012.cfg
+++ b/TestCases/incomp_rans/naca0012/naca0012.cfg
@@ -181,11 +181,6 @@ TIME_DISCRE_TURB= EULER_IMPLICIT
% --------------------------- CONVERGENCE PARAMETERS --------------------------%
%
-% Convergence criteria (CAUCHY, RESIDUAL)
-%
-CONV_CRITERIA= RESIDUAL
-%
-%
% Min value of the residual (log10 of the residual)
CONV_RESIDUAL_MINVAL= -10
%
diff --git a/TestCases/incomp_rans/naca0012/naca0012_SST_SUST.cfg b/TestCases/incomp_rans/naca0012/naca0012_SST_SUST.cfg
index 73392f31c69..61aa1285ba2 100644
--- a/TestCases/incomp_rans/naca0012/naca0012_SST_SUST.cfg
+++ b/TestCases/incomp_rans/naca0012/naca0012_SST_SUST.cfg
@@ -180,11 +180,6 @@ TIME_DISCRE_TURB= EULER_IMPLICIT
% --------------------------- CONVERGENCE PARAMETERS --------------------------%
%
-% Convergence criteria (CAUCHY, RESIDUAL)
-%
-CONV_CRITERIA= RESIDUAL
-%
-%
% Min value of the residual (log10 of the residual)
CONV_RESIDUAL_MINVAL= -10
%
diff --git a/TestCases/incomp_rans/rough_flatplate/rough_flatplate_incomp.cfg b/TestCases/incomp_rans/rough_flatplate/rough_flatplate_incomp.cfg
index 8b50e4df8e2..906d02008bc 100644
--- a/TestCases/incomp_rans/rough_flatplate/rough_flatplate_incomp.cfg
+++ b/TestCases/incomp_rans/rough_flatplate/rough_flatplate_incomp.cfg
@@ -237,8 +237,6 @@ SLOPE_LIMITER_TURB= VENKATAKRISHNAN
TIME_DISCRE_TURB= EULER_IMPLICIT
% --------------------------- CONVERGENCE PARAMETERS --------------------------%
%
-% Convergence criteria (CAUCHY, RESIDUAL)
-%
CONV_FIELD= RMS_VELOCITY-X
%
% Min value of the residual (log10 of the residual)
diff --git a/TestCases/mms/dg_navierstokes/lam_mms_dg.cfg b/TestCases/mms/dg_navierstokes/lam_mms_dg.cfg
index 010a314d4ad..311f93431e4 100644
--- a/TestCases/mms/dg_navierstokes/lam_mms_dg.cfg
+++ b/TestCases/mms/dg_navierstokes/lam_mms_dg.cfg
@@ -114,10 +114,6 @@ TIME_DISCRE_FEM_FLOW= RUNGE-KUTTA_EXPLICIT
%
% --------------------------- CONVERGENCE PARAMETERS --------------------------%
%
-% Convergence criteria (CAUCHY, RESIDUAL)
-CONV_CRITERIA= RESIDUAL
-%
-%
% Min value of the residual (log10 of the residual)
CONV_RESIDUAL_MINVAL= -8
%
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 eb0519a3047..6704b7616fc 100644
--- a/TestCases/mms/dg_navierstokes_3d/lam_mms_dg_3d.cfg
+++ b/TestCases/mms/dg_navierstokes_3d/lam_mms_dg_3d.cfg
@@ -132,10 +132,6 @@ TIME_DISCRE_FEM_FLOW= RUNGE-KUTTA_EXPLICIT
%
% --------------------------- CONVERGENCE PARAMETERS --------------------------%
%
-% Convergence criteria (CAUCHY, RESIDUAL)
-CONV_CRITERIA= RESIDUAL
-%
-%
% Min value of the residual (log10 of the residual)
CONV_RESIDUAL_MINVAL= -8
%
diff --git a/TestCases/mms/dg_ringleb/ringleb_dg.cfg b/TestCases/mms/dg_ringleb/ringleb_dg.cfg
index 91fb76892e1..81a40814dfc 100644
--- a/TestCases/mms/dg_ringleb/ringleb_dg.cfg
+++ b/TestCases/mms/dg_ringleb/ringleb_dg.cfg
@@ -131,10 +131,6 @@ USE_LUMPED_MASSMATRIX_DGFEM= YES
% --------------------------- CONVERGENCE PARAMETERS --------------------------%
%
-% Convergence criteria (CAUCHY, RESIDUAL)
-CONV_CRITERIA= RESIDUAL
-%
-%
% Min value of the residual (log10 of the residual)
CONV_RESIDUAL_MINVAL= -8
%
diff --git a/TestCases/mms/fvm_incomp_euler/inv_mms_jst.cfg b/TestCases/mms/fvm_incomp_euler/inv_mms_jst.cfg
index e52d87969f9..770647a8aad 100755
--- a/TestCases/mms/fvm_incomp_euler/inv_mms_jst.cfg
+++ b/TestCases/mms/fvm_incomp_euler/inv_mms_jst.cfg
@@ -157,11 +157,6 @@ TIME_DISCRE_FLOW= EULER_IMPLICIT
% --------------------------- CONVERGENCE PARAMETERS --------------------------%
%
-% Convergence criteria (CAUCHY, RESIDUAL)
-%
-CONV_CRITERIA= RESIDUAL
-%
-%
% Min value of the residual (log10 of the residual)
CONV_RESIDUAL_MINVAL= -15
%
diff --git a/TestCases/mms/fvm_incomp_navierstokes/lam_mms_fds.cfg b/TestCases/mms/fvm_incomp_navierstokes/lam_mms_fds.cfg
index a361a2e7933..3f7ade6273f 100755
--- a/TestCases/mms/fvm_incomp_navierstokes/lam_mms_fds.cfg
+++ b/TestCases/mms/fvm_incomp_navierstokes/lam_mms_fds.cfg
@@ -179,11 +179,6 @@ TIME_DISCRE_FLOW= EULER_IMPLICIT
% --------------------------- CONVERGENCE PARAMETERS --------------------------%
%
-% Convergence criteria (CAUCHY, RESIDUAL)
-%
-CONV_CRITERIA= RESIDUAL
-%
-%
% Min value of the residual (log10 of the residual)
CONV_RESIDUAL_MINVAL= -15
%
diff --git a/TestCases/mms/fvm_navierstokes/lam_mms_roe.cfg b/TestCases/mms/fvm_navierstokes/lam_mms_roe.cfg
index a571fe89562..bbabba3e973 100755
--- a/TestCases/mms/fvm_navierstokes/lam_mms_roe.cfg
+++ b/TestCases/mms/fvm_navierstokes/lam_mms_roe.cfg
@@ -196,11 +196,6 @@ TIME_DISCRE_FLOW= EULER_IMPLICIT
% --------------------------- CONVERGENCE PARAMETERS --------------------------%
%
-% Convergence criteria (CAUCHY, RESIDUAL)
-%
-CONV_CRITERIA= RESIDUAL
-%
-%
% Min value of the residual (log10 of the residual)
CONV_RESIDUAL_MINVAL= -14
%
diff --git a/TestCases/moving_wall/cavity/lam_cavity.cfg b/TestCases/moving_wall/cavity/lam_cavity.cfg
index dd68814dc41..fcdebf10a02 100644
--- a/TestCases/moving_wall/cavity/lam_cavity.cfg
+++ b/TestCases/moving_wall/cavity/lam_cavity.cfg
@@ -163,11 +163,6 @@ TIME_DISCRE_FLOW= EULER_IMPLICIT
% --------------------------- CONVERGENCE PARAMETERS --------------------------%
%
-% Convergence criteria (CAUCHY, RESIDUAL)
-%
-CONV_CRITERIA= RESIDUAL
-%
-%
% Min value of the residual (log10 of the residual)
CONV_RESIDUAL_MINVAL= -10
%
diff --git a/TestCases/moving_wall/spinning_cylinder/spinning_cylinder.cfg b/TestCases/moving_wall/spinning_cylinder/spinning_cylinder.cfg
index 88af508918a..00940797949 100644
--- a/TestCases/moving_wall/spinning_cylinder/spinning_cylinder.cfg
+++ b/TestCases/moving_wall/spinning_cylinder/spinning_cylinder.cfg
@@ -181,11 +181,6 @@ TIME_DISCRE_FLOW= EULER_IMPLICIT
% --------------------------- CONVERGENCE PARAMETERS --------------------------%
%
-% Convergence criteria (CAUCHY, RESIDUAL)
-%
-CONV_CRITERIA= CAUCHY
-%
-%
% Min value of the residual (log10 of the residual)
CONV_RESIDUAL_MINVAL= -15
%
diff --git a/TestCases/multiple_ffd/naca0012/inv_NACA0012_ffd.cfg b/TestCases/multiple_ffd/naca0012/inv_NACA0012_ffd.cfg
index 805bc713066..6e3a9528e40 100644
--- a/TestCases/multiple_ffd/naca0012/inv_NACA0012_ffd.cfg
+++ b/TestCases/multiple_ffd/naca0012/inv_NACA0012_ffd.cfg
@@ -253,10 +253,6 @@ FFD_FIX_K= (15)
% --------------------------- CONVERGENCE PARAMETERS --------------------------%
-% Convergence criteria (CAUCHY, RESIDUAL)
-%
-CONV_CRITERIA= RESIDUAL
-%
%
% Min value of the residual (log10 of the residual)
CONV_RESIDUAL_MINVAL= -9
diff --git a/TestCases/navierstokes/cylinder/cylinder_lowmach.cfg b/TestCases/navierstokes/cylinder/cylinder_lowmach.cfg
index de990f8c225..4446ff74cf9 100644
--- a/TestCases/navierstokes/cylinder/cylinder_lowmach.cfg
+++ b/TestCases/navierstokes/cylinder/cylinder_lowmach.cfg
@@ -157,10 +157,6 @@ TIME_DISCRE_FLOW= EULER_IMPLICIT
% --------------------------- CONVERGENCE PARAMETERS --------------------------%
%
-% Convergence criteria (CAUCHY, RESIDUAL)
-CONV_CRITERIA= RESIDUAL
-%
-%
% Min value of the residual (log10 of the residual)
CONV_RESIDUAL_MINVAL= -12
%
diff --git a/TestCases/navierstokes/cylinder/lam_cylinder.cfg b/TestCases/navierstokes/cylinder/lam_cylinder.cfg
index b5e7d9cc60d..9d6d509b80d 100644
--- a/TestCases/navierstokes/cylinder/lam_cylinder.cfg
+++ b/TestCases/navierstokes/cylinder/lam_cylinder.cfg
@@ -151,10 +151,6 @@ TIME_DISCRE_FLOW= EULER_IMPLICIT
% --------------------------- CONVERGENCE PARAMETERS --------------------------%
%
-% Convergence criteria (CAUCHY, RESIDUAL)
-CONV_CRITERIA= RESIDUAL
-%
-%
% Min value of the residual (log10 of the residual)
CONV_RESIDUAL_MINVAL= -12
%
diff --git a/TestCases/navierstokes/flatplate/lam_flatplate.cfg b/TestCases/navierstokes/flatplate/lam_flatplate.cfg
index 7b470bd118d..168d6ac6238 100644
--- a/TestCases/navierstokes/flatplate/lam_flatplate.cfg
+++ b/TestCases/navierstokes/flatplate/lam_flatplate.cfg
@@ -168,11 +168,6 @@ TIME_DISCRE_FLOW= EULER_IMPLICIT
% --------------------------- CONVERGENCE PARAMETERS --------------------------%
%
-% Convergence criteria (CAUCHY, RESIDUAL)
-%
-CONV_CRITERIA= CAUCHY
-%
-%
% Min value of the residual (log10 of the residual)
CONV_RESIDUAL_MINVAL= -12
%
diff --git a/TestCases/navierstokes/naca0012/lam_NACA0012.cfg b/TestCases/navierstokes/naca0012/lam_NACA0012.cfg
index 9545f582201..0c8b01c0e97 100644
--- a/TestCases/navierstokes/naca0012/lam_NACA0012.cfg
+++ b/TestCases/navierstokes/naca0012/lam_NACA0012.cfg
@@ -145,11 +145,6 @@ TIME_DISCRE_FLOW= EULER_IMPLICIT
% --------------------------- CONVERGENCE PARAMETERS --------------------------%
%
-% Convergence criteria (CAUCHY, RESIDUAL)
-%
-CONV_CRITERIA= RESIDUAL
-%
-%
% Min value of the residual (log10 of the residual)
CONV_RESIDUAL_MINVAL= -12
%
diff --git a/TestCases/navierstokes/poiseuille/lam_poiseuille.cfg b/TestCases/navierstokes/poiseuille/lam_poiseuille.cfg
index 0aba572cd34..c5a80010ebe 100644
--- a/TestCases/navierstokes/poiseuille/lam_poiseuille.cfg
+++ b/TestCases/navierstokes/poiseuille/lam_poiseuille.cfg
@@ -188,11 +188,6 @@ TIME_DISCRE_FLOW= EULER_IMPLICIT
% --------------------------- CONVERGENCE PARAMETERS --------------------------%
%
-% Convergence criteria (CAUCHY, RESIDUAL)
-%
-CONV_CRITERIA= RESIDUAL
-%
-%
% Min value of the residual (log10 of the residual)
CONV_RESIDUAL_MINVAL= -12
%
diff --git a/TestCases/navierstokes/poiseuille/profile_poiseuille.cfg b/TestCases/navierstokes/poiseuille/profile_poiseuille.cfg
index d91ca807083..9f3aa142194 100644
--- a/TestCases/navierstokes/poiseuille/profile_poiseuille.cfg
+++ b/TestCases/navierstokes/poiseuille/profile_poiseuille.cfg
@@ -222,11 +222,6 @@ TIME_DISCRE_FLOW= EULER_IMPLICIT
% --------------------------- CONVERGENCE PARAMETERS --------------------------%
%
-% Convergence criteria (CAUCHY, RESIDUAL)
-%
-CONV_CRITERIA= RESIDUAL
-%
-%
% Min value of the residual (log10 of the residual)
CONV_RESIDUAL_MINVAL= -12
%
diff --git a/TestCases/nicf/LS89/turb_SA_PR.cfg b/TestCases/nicf/LS89/turb_SA_PR.cfg
index ed25c46db18..7c1fa4fe5d6 100644
--- a/TestCases/nicf/LS89/turb_SA_PR.cfg
+++ b/TestCases/nicf/LS89/turb_SA_PR.cfg
@@ -252,11 +252,6 @@ CFL_REDUCTION_TURB= 1.0
% --------------------------- CONVERGENCE PARAMETERS --------------------------%
%
-% Convergence criteria (CAUCHY, RESIDUAL)
-%
-CONV_CRITERIA= RESIDUAL
-%
-%
% Min value of the residual (log10 of the residual)
CONV_RESIDUAL_MINVAL= -10
%
diff --git a/TestCases/nicf/LS89/turb_SST_PR.cfg b/TestCases/nicf/LS89/turb_SST_PR.cfg
index f686f935135..6f41a50d4a8 100644
--- a/TestCases/nicf/LS89/turb_SST_PR.cfg
+++ b/TestCases/nicf/LS89/turb_SST_PR.cfg
@@ -251,11 +251,6 @@ CFL_REDUCTION_TURB= 1.0
% --------------------------- CONVERGENCE PARAMETERS --------------------------%
%
-% Convergence criteria (CAUCHY, RESIDUAL)
-%
-CONV_CRITERIA= RESIDUAL
-%
-%
% Min value of the residual (log10 of the residual)
CONV_RESIDUAL_MINVAL= -10
%
diff --git a/TestCases/nicf/edge/edge_PPR.cfg b/TestCases/nicf/edge/edge_PPR.cfg
index c0924e6b139..5842d35de74 100644
--- a/TestCases/nicf/edge/edge_PPR.cfg
+++ b/TestCases/nicf/edge/edge_PPR.cfg
@@ -172,11 +172,6 @@ TIME_DISCRE_FLOW= EULER_IMPLICIT
% --------------------------- CONVERGENCE PARAMETERS --------------------------%
%
-% Convergence criteria (CAUCHY, RESIDUAL)
-%
-CONV_CRITERIA= RESIDUAL
-%
-%
% Min value of the residual (log10 of the residual)
CONV_RESIDUAL_MINVAL= -12
%
diff --git a/TestCases/nicf/edge/edge_VW.cfg b/TestCases/nicf/edge/edge_VW.cfg
index 2a2e2bbcace..5a7a60e8492 100644
--- a/TestCases/nicf/edge/edge_VW.cfg
+++ b/TestCases/nicf/edge/edge_VW.cfg
@@ -172,11 +172,6 @@ TIME_DISCRE_FLOW= EULER_IMPLICIT
% --------------------------- CONVERGENCE PARAMETERS --------------------------%
%
-% Convergence criteria (CAUCHY, RESIDUAL)
-%
-CONV_CRITERIA= RESIDUAL
-%
-%
% Min value of the residual (log10 of the residual)
CONV_RESIDUAL_MINVAL= -12
%
diff --git a/TestCases/nonequilibrium/invwedge/invwedge.cfg b/TestCases/nonequilibrium/invwedge/invwedge.cfg
index bedfd32f6c7..81b588f8e9b 100644
--- a/TestCases/nonequilibrium/invwedge/invwedge.cfg
+++ b/TestCases/nonequilibrium/invwedge/invwedge.cfg
@@ -105,10 +105,6 @@ TIME_DISCRE_FLOW= EULER_EXPLICIT
% --------------------------- CONVERGENCE PARAMETERS --------------------------%
%
-% Convergence criteria (CAUCHY, RESIDUAL)
-%
-CONV_CRITERIA= RESIDUAL
-%
% Min value of the residual (log10 of the residual)
CONV_RESIDUAL_MINVAL= -50
%
diff --git a/TestCases/nonequilibrium/thermalbath/finitechemistry/thermalbath.cfg b/TestCases/nonequilibrium/thermalbath/finitechemistry/thermalbath.cfg
index 0db3484ba6a..bb61cbdf1ab 100644
--- a/TestCases/nonequilibrium/thermalbath/finitechemistry/thermalbath.cfg
+++ b/TestCases/nonequilibrium/thermalbath/finitechemistry/thermalbath.cfg
@@ -105,10 +105,6 @@ TIME_DISCRE_FLOW= EULER_EXPLICIT
% --------------------------- CONVERGENCE PARAMETERS --------------------------%
%
-% Convergence criteria (CAUCHY, RESIDUAL)
-%
-CONV_CRITERIA= RESIDUAL
-%
% Min value of the residual (log10 of the residual)
CONV_RESIDUAL_MINVAL= -50
%
diff --git a/TestCases/nonequilibrium/thermalbath/frozen/thermalbath_frozen.cfg b/TestCases/nonequilibrium/thermalbath/frozen/thermalbath_frozen.cfg
index 523c0d04557..8ddd0b7fd3a 100644
--- a/TestCases/nonequilibrium/thermalbath/frozen/thermalbath_frozen.cfg
+++ b/TestCases/nonequilibrium/thermalbath/frozen/thermalbath_frozen.cfg
@@ -106,10 +106,6 @@ TIME_DISCRE_FLOW= EULER_EXPLICIT
% --------------------------- CONVERGENCE PARAMETERS --------------------------%
%
-% Convergence criteria (CAUCHY, RESIDUAL)
-%
-CONV_CRITERIA= RESIDUAL
-%
% Min value of the residual (log10 of the residual)
CONV_RESIDUAL_MINVAL= -50
%
diff --git a/TestCases/nonequilibrium/viscwedge/viscwedge.cfg b/TestCases/nonequilibrium/viscwedge/viscwedge.cfg
index df60ff248c2..57898e11b7c 100644
--- a/TestCases/nonequilibrium/viscwedge/viscwedge.cfg
+++ b/TestCases/nonequilibrium/viscwedge/viscwedge.cfg
@@ -116,10 +116,6 @@ TIME_DISCRE_FLOW= EULER_EXPLICIT
% --------------------------- CONVERGENCE PARAMETERS --------------------------%
%
-% Convergence criteria (CAUCHY, RESIDUAL)
-%
-CONV_CRITERIA= RESIDUAL
-%
% Min value of the residual (log10 of the residual)
CONV_RESIDUAL_MINVAL= -15
%
diff --git a/TestCases/nonequilibrium/viscwedge_mpp/viscwedge_mpp.cfg b/TestCases/nonequilibrium/viscwedge_mpp/viscwedge_mpp.cfg
index b230e52a280..76c8bbdba23 100644
--- a/TestCases/nonequilibrium/viscwedge_mpp/viscwedge_mpp.cfg
+++ b/TestCases/nonequilibrium/viscwedge_mpp/viscwedge_mpp.cfg
@@ -116,10 +116,6 @@ TIME_DISCRE_FLOW= EULER_EXPLICIT
% --------------------------- CONVERGENCE PARAMETERS --------------------------%
%
-% Convergence criteria (CAUCHY, RESIDUAL)
-%
-CONV_CRITERIA= RESIDUAL
-%
% Min value of the residual (log10 of the residual)
CONV_RESIDUAL_MINVAL= -15
%
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 75081c5600d..859e370750b 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
@@ -214,11 +214,6 @@ MARKER_ANALYZE_AVERAGE = AREA
% --------------------------- CONVERGENCE PARAMETERS --------------------------%
%
-% Convergence criteria (CAUCHY, RESIDUAL)
-%
-CONV_CRITERIA= RESIDUAL
-%
-%
% Min value of the residual (log10 of the residual)
CONV_RESIDUAL_MINVAL= -11
%
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 94ebce1f915..4545b6457d8 100644
--- a/TestCases/optimization_euler/multiobjective_wedge/inv_wedge_ROE_multiobj.cfg
+++ b/TestCases/optimization_euler/multiobjective_wedge/inv_wedge_ROE_multiobj.cfg
@@ -215,11 +215,6 @@ MARKER_ANALYZE_AVERAGE = AREA
% --------------------------- CONVERGENCE PARAMETERS --------------------------%
%
-% Convergence criteria (CAUCHY, RESIDUAL)
-%
-CONV_CRITERIA= RESIDUAL
-%
-%
% Min value of the residual (log10 of the residual)
CONV_RESIDUAL_MINVAL= -11
%
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 322bee977cc..f7a2080d9fb 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
@@ -215,11 +215,6 @@ MARKER_ANALYZE_AVERAGE = AREA
% --------------------------- CONVERGENCE PARAMETERS --------------------------%
%
-% Convergence criteria (CAUCHY, RESIDUAL)
-%
-CONV_CRITERIA= RESIDUAL
-%
-%
% Min value of the residual (log10 of the residual)
CONV_RESIDUAL_MINVAL= -11
%
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 a724e5c6d18..ca4714151f2 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
@@ -217,11 +217,6 @@ MARKER_ANALYZE_AVERAGE = AREA
% --------------------------- CONVERGENCE PARAMETERS --------------------------%
%
-% Convergence criteria (CAUCHY, RESIDUAL)
-%
-CONV_CRITERIA= RESIDUAL
-%
-%
% Min value of the residual (log10 of the residual)
CONV_RESIDUAL_MINVAL= -11
%
diff --git a/TestCases/optimization_euler/multipoint_naca0012/inv_NACA0012_multipoint.cfg b/TestCases/optimization_euler/multipoint_naca0012/inv_NACA0012_multipoint.cfg
index bcc58353134..41839ec4991 100644
--- a/TestCases/optimization_euler/multipoint_naca0012/inv_NACA0012_multipoint.cfg
+++ b/TestCases/optimization_euler/multipoint_naca0012/inv_NACA0012_multipoint.cfg
@@ -212,10 +212,6 @@ DEFORM_LINEAR_SOLVER_ERROR= 1E-14
DEFORM_STIFFNESS_TYPE= INVERSE_VOLUME
% --------------------------- CONVERGENCE PARAMETERS --------------------------%
-% Convergence criteria (CAUCHY, RESIDUAL)
-%
-CONV_CRITERIA= RESIDUAL
-%
%
% Min value of the residual (log10 of the residual)
CONV_RESIDUAL_MINVAL= -13
diff --git a/TestCases/optimization_euler/pitching_naca64a010/pitching_NACA64A010.cfg b/TestCases/optimization_euler/pitching_naca64a010/pitching_NACA64A010.cfg
index c5eb434078d..082473f4263 100644
--- a/TestCases/optimization_euler/pitching_naca64a010/pitching_NACA64A010.cfg
+++ b/TestCases/optimization_euler/pitching_naca64a010/pitching_NACA64A010.cfg
@@ -263,9 +263,6 @@ DV_PARAM= ( 1, 0.5 )
DV_VALUE= 0.0
% --------------------------- CONVERGENCE PARAMETERS --------------------------%
-% Convergence criteria (CAUCHY, RESIDUAL)
-%
-CONV_CRITERIA= RESIDUAL
%
%
% Min value of the residual (log10 of the residual)
diff --git a/TestCases/optimization_euler/pitching_oneram6/pitching_ONERAM6.cfg b/TestCases/optimization_euler/pitching_oneram6/pitching_ONERAM6.cfg
index 5e148350c5b..e8025161479 100644
--- a/TestCases/optimization_euler/pitching_oneram6/pitching_ONERAM6.cfg
+++ b/TestCases/optimization_euler/pitching_oneram6/pitching_ONERAM6.cfg
@@ -249,10 +249,6 @@ GEO_MODE= FUNCTION
% --------------------------- CONVERGENCE PARAMETERS --------------------------&
%
-% Convergence criteria (CAUCHY, RESIDUAL)
-CONV_CRITERIA= RESIDUAL
-%
-%
% Min value of the residual (log10 of the residual)
CONV_RESIDUAL_MINVAL= -10
%
diff --git a/TestCases/optimization_euler/rotating_naca0012/rotating_NACA0012.cfg b/TestCases/optimization_euler/rotating_naca0012/rotating_NACA0012.cfg
index b139c62ffee..35e63c5f3ed 100644
--- a/TestCases/optimization_euler/rotating_naca0012/rotating_NACA0012.cfg
+++ b/TestCases/optimization_euler/rotating_naca0012/rotating_NACA0012.cfg
@@ -233,9 +233,6 @@ DV_PARAM= ( 1, 0.5 )
DV_VALUE= 0.05
% --------------------------- CONVERGENCE PARAMETERS --------------------------%
-% Convergence criteria (CAUCHY, RESIDUAL)
-%
-CONV_CRITERIA= RESIDUAL
%
%
% Min value of the residual (log10 of the residual)
diff --git a/TestCases/optimization_euler/steady_inverse_design/inv_NACA0012.cfg b/TestCases/optimization_euler/steady_inverse_design/inv_NACA0012.cfg
index 47c4186c9a0..d24de29bff2 100644
--- a/TestCases/optimization_euler/steady_inverse_design/inv_NACA0012.cfg
+++ b/TestCases/optimization_euler/steady_inverse_design/inv_NACA0012.cfg
@@ -223,10 +223,6 @@ DEFORM_LINEAR_SOLVER_ERROR= 1E-14
DEFORM_STIFFNESS_TYPE= INVERSE_VOLUME
% --------------------------- CONVERGENCE PARAMETERS --------------------------%
-% Convergence criteria (CAUCHY, RESIDUAL)
-%
-CONV_CRITERIA= CAUCHY
-%
%
% Min value of the residual (log10 of the residual)
CONV_RESIDUAL_MINVAL= -8
diff --git a/TestCases/optimization_euler/steady_naca0012/inv_NACA0012_adv.cfg b/TestCases/optimization_euler/steady_naca0012/inv_NACA0012_adv.cfg
index 6226b16062c..52e13588223 100644
--- a/TestCases/optimization_euler/steady_naca0012/inv_NACA0012_adv.cfg
+++ b/TestCases/optimization_euler/steady_naca0012/inv_NACA0012_adv.cfg
@@ -233,10 +233,6 @@ DEFORM_LINEAR_SOLVER_ERROR= 1E-14
DEFORM_STIFFNESS_TYPE= INVERSE_VOLUME
% --------------------------- CONVERGENCE PARAMETERS --------------------------%
-% Convergence criteria (CAUCHY, RESIDUAL)
-%
-CONV_CRITERIA= RESIDUAL
-%
%
% Min value of the residual (log10 of the residual)
CONV_RESIDUAL_MINVAL= -9
diff --git a/TestCases/optimization_euler/steady_naca0012/inv_NACA0012_basic.cfg b/TestCases/optimization_euler/steady_naca0012/inv_NACA0012_basic.cfg
index 856ce071735..a71ae442fe4 100644
--- a/TestCases/optimization_euler/steady_naca0012/inv_NACA0012_basic.cfg
+++ b/TestCases/optimization_euler/steady_naca0012/inv_NACA0012_basic.cfg
@@ -221,10 +221,6 @@ DEFORM_LINEAR_SOLVER_ERROR= 1E-14
DEFORM_STIFFNESS_TYPE= INVERSE_VOLUME
% --------------------------- CONVERGENCE PARAMETERS --------------------------%
-% Convergence criteria (CAUCHY, RESIDUAL)
-%
-CONV_CRITERIA= RESIDUAL
-%
%
% Min value of the residual (log10 of the residual)
CONV_RESIDUAL_MINVAL= -13
diff --git a/TestCases/optimization_euler/steady_oneram6/inv_ONERAM6_adv.cfg b/TestCases/optimization_euler/steady_oneram6/inv_ONERAM6_adv.cfg
index b183a7738f3..54922c0bbb5 100644
--- a/TestCases/optimization_euler/steady_oneram6/inv_ONERAM6_adv.cfg
+++ b/TestCases/optimization_euler/steady_oneram6/inv_ONERAM6_adv.cfg
@@ -206,10 +206,6 @@ GEO_MODE= FUNCTION
% --------------------------- CONVERGENCE PARAMETERS --------------------------&
%
-% Convergence criteria (CAUCHY, RESIDUAL)
-CONV_CRITERIA= RESIDUAL
-%
-%
% Min value of the residual (log10 of the residual)
CONV_RESIDUAL_MINVAL= -9
%
diff --git a/TestCases/optimization_euler/steady_oneram6/inv_ONERAM6_basic.cfg b/TestCases/optimization_euler/steady_oneram6/inv_ONERAM6_basic.cfg
index 7058184e15b..2b8fbfe0f38 100644
--- a/TestCases/optimization_euler/steady_oneram6/inv_ONERAM6_basic.cfg
+++ b/TestCases/optimization_euler/steady_oneram6/inv_ONERAM6_basic.cfg
@@ -206,10 +206,6 @@ GEO_MODE= FUNCTION
% --------------------------- CONVERGENCE PARAMETERS --------------------------&
%
-% Convergence criteria (CAUCHY, RESIDUAL)
-CONV_CRITERIA= RESIDUAL
-%
-%
% Min value of the residual (log10 of the residual)
CONV_RESIDUAL_MINVAL= -9
%
diff --git a/TestCases/optimization_rans/naca0012/naca0012.cfg b/TestCases/optimization_rans/naca0012/naca0012.cfg
index 2d0c373a422..37097bdc3c3 100644
--- a/TestCases/optimization_rans/naca0012/naca0012.cfg
+++ b/TestCases/optimization_rans/naca0012/naca0012.cfg
@@ -125,8 +125,6 @@ TIME_DISCRE_TURB= EULER_IMPLICIT
%
% --------------------------- CONVERGENCE PARAMETERS --------------------------%
%
-% Convergence criteria (CAUCHY, RESIDUAL)
-CONV_CRITERIA = RESIDUAL
% Field to apply Cauchy Criterion to
CONV_FIELD= REL_RMS_DENSITY
% Min value of the residual (log10 of the residual)
diff --git a/TestCases/optimization_rans/pitching_naca64a010/turb_NACA64A010.cfg b/TestCases/optimization_rans/pitching_naca64a010/turb_NACA64A010.cfg
index 15f61229e8b..32c40735cfe 100644
--- a/TestCases/optimization_rans/pitching_naca64a010/turb_NACA64A010.cfg
+++ b/TestCases/optimization_rans/pitching_naca64a010/turb_NACA64A010.cfg
@@ -279,10 +279,6 @@ DV_PARAM= ( 1, 0.5 )
DV_VALUE= 0.05
% --------------------------- CONVERGENCE PARAMETERS --------------------------%
-% Convergence criteria (CAUCHY, RESIDUAL)
-%
-CONV_CRITERIA= CAUCHY
-%
%
% Min value of the residual (log10 of the residual)
CONV_RESIDUAL_MINVAL= -8
diff --git a/TestCases/optimization_rans/pitching_oneram6/turb_ONERAM6.cfg b/TestCases/optimization_rans/pitching_oneram6/turb_ONERAM6.cfg
index 02dc5dd6480..b7fcd7d62ee 100644
--- a/TestCases/optimization_rans/pitching_oneram6/turb_ONERAM6.cfg
+++ b/TestCases/optimization_rans/pitching_oneram6/turb_ONERAM6.cfg
@@ -302,11 +302,6 @@ DV_VALUE= 0.1
% --------------------------- CONVERGENCE PARAMETERS --------------------------%
%
-% Convergence criteria (CAUCHY, RESIDUAL)
-%
-CONV_CRITERIA= CAUCHY
-%
-%
% Min value of the residual (log10 of the residual)
CONV_RESIDUAL_MINVAL= -8
%
diff --git a/TestCases/optimization_rans/steady_oneram6/turb_ONERAM6.cfg b/TestCases/optimization_rans/steady_oneram6/turb_ONERAM6.cfg
index a078945f5ce..c8b997bfb69 100644
--- a/TestCases/optimization_rans/steady_oneram6/turb_ONERAM6.cfg
+++ b/TestCases/optimization_rans/steady_oneram6/turb_ONERAM6.cfg
@@ -249,11 +249,6 @@ DV_VALUE= 0.1
% --------------------------- CONVERGENCE PARAMETERS --------------------------%
%
-% Convergence criteria (CAUCHY, RESIDUAL)
-%
-CONV_CRITERIA= CAUCHY
-%
-%
% Min value of the residual (log10 of the residual)
CONV_RESIDUAL_MINVAL= -8
%
diff --git a/TestCases/optimization_rans/steady_rae2822/turb_SA_RAE2822.cfg b/TestCases/optimization_rans/steady_rae2822/turb_SA_RAE2822.cfg
index 99c6487b5b7..731c85dca7b 100644
--- a/TestCases/optimization_rans/steady_rae2822/turb_SA_RAE2822.cfg
+++ b/TestCases/optimization_rans/steady_rae2822/turb_SA_RAE2822.cfg
@@ -200,11 +200,6 @@ GEO_MODE= FUNCTION
% --------------------------- CONVERGENCE PARAMETERS --------------------------%
%
-% Convergence criteria (CAUCHY, RESIDUAL)
-%
-CONV_CRITERIA= RESIDUAL
-%
-%
% Min value of the residual (log10 of the residual)
CONV_RESIDUAL_MINVAL= -9
%
diff --git a/TestCases/polar/naca0012/inv_NACA0012.cfg b/TestCases/polar/naca0012/inv_NACA0012.cfg
index 9832313a221..6fcb4df34d4 100644
--- a/TestCases/polar/naca0012/inv_NACA0012.cfg
+++ b/TestCases/polar/naca0012/inv_NACA0012.cfg
@@ -238,10 +238,6 @@ DEFORM_LINEAR_SOLVER_ERROR= 1E-14
DEFORM_STIFFNESS_TYPE= INVERSE_VOLUME
% --------------------------- CONVERGENCE PARAMETERS --------------------------%
-% Convergence criteria (CAUCHY, RESIDUAL)
-%
-CONV_CRITERIA= CAUCHY
-%
%
% Min value of the residual (log10 of the residual)
CONV_RESIDUAL_MINVAL= -8
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 af96cf4e0fa..9e2a8b1ecfc 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
@@ -122,7 +122,6 @@ TIME_DISCRE_TURB= EULER_IMPLICIT
% --------------------------- CONVERGENCE PARAMETERS --------------------------%
CONV_FIELD = RMS_ADJ_DENSITY
-CONV_CRITERIA= RESIDUAL
CONV_RESIDUAL_MINVAL= -16
CONV_STARTITER= 10
CONV_CAUCHY_ELEMS= 100
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 c1781b361ea..98de1c9154e 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
@@ -426,11 +426,6 @@ DEFORM_LIMIT = 1E6
% --------------------------- CONVERGENCE PARAMETERS --------------------------%
%
-% Convergence criteria (CAUCHY, RESIDUAL)
-%
-CONV_CRITERIA= CAUCHY
-%
-%
% Min value of the residual (log10 of the residual)
CONV_RESIDUAL_MINVAL= -10
%
diff --git a/TestCases/radiation/p1adjoint/configp1adjoint.cfg b/TestCases/radiation/p1adjoint/configp1adjoint.cfg
index a544cb86437..ac2ed71bbc6 100644
--- a/TestCases/radiation/p1adjoint/configp1adjoint.cfg
+++ b/TestCases/radiation/p1adjoint/configp1adjoint.cfg
@@ -101,7 +101,6 @@ REF_AREA = 1.0
INNER_ITER = 500
-CONV_CRITERIA = RESIDUAL
CONV_FIELD = RMS_PRESSURE, RMS_ADJ_PRESSURE
CONV_RESIDUAL_MINVAL = -12
diff --git a/TestCases/radiation/p1model/configp1.cfg b/TestCases/radiation/p1model/configp1.cfg
index 35cfe695db1..6fab911c2cd 100644
--- a/TestCases/radiation/p1model/configp1.cfg
+++ b/TestCases/radiation/p1model/configp1.cfg
@@ -87,7 +87,6 @@ CFL_NUMBER= 100
INNER_ITER= 101
-CONV_CRITERIA= RESIDUAL
CONV_RESIDUAL_MINVAL= -10
CONV_STARTITER= 10
CONV_CAUCHY_ELEMS= 100
diff --git a/TestCases/rans/actuatordisk_variable_load/propeller_variable_load.cfg b/TestCases/rans/actuatordisk_variable_load/propeller_variable_load.cfg
index 7e2c33b9873..4cff2cab7bc 100644
--- a/TestCases/rans/actuatordisk_variable_load/propeller_variable_load.cfg
+++ b/TestCases/rans/actuatordisk_variable_load/propeller_variable_load.cfg
@@ -184,9 +184,6 @@ TIME_DISCRE_TURB= EULER_IMPLICIT
% Maximum number of iterations
ITER= 1500
%
-% Convergence criteria (CAUCHY, RESIDUAL)
-CONV_CRITERIA= RESIDUAL
-%
% Min value of the residual (log10 of the residual)
CONV_RESIDUAL_MINVAL= -8
%
diff --git a/TestCases/rans/flatplate/turb_SA_flatplate.cfg b/TestCases/rans/flatplate/turb_SA_flatplate.cfg
index c2adda14f57..8d091b991ee 100644
--- a/TestCases/rans/flatplate/turb_SA_flatplate.cfg
+++ b/TestCases/rans/flatplate/turb_SA_flatplate.cfg
@@ -178,10 +178,6 @@ TIME_DISCRE_TURB= EULER_IMPLICIT
% --------------------------- CONVERGENCE PARAMETERS --------------------------%
%
-% Convergence criteria (CAUCHY, RESIDUAL)
-CONV_CRITERIA= RESIDUAL
-%
-%
% Min value of the residual (log10 of the residual)
CONV_RESIDUAL_MINVAL= -15
%
diff --git a/TestCases/rans/flatplate/turb_SST_flatplate.cfg b/TestCases/rans/flatplate/turb_SST_flatplate.cfg
index 77b8f8f61cc..09376ab4305 100644
--- a/TestCases/rans/flatplate/turb_SST_flatplate.cfg
+++ b/TestCases/rans/flatplate/turb_SST_flatplate.cfg
@@ -177,10 +177,6 @@ TIME_DISCRE_TURB= EULER_IMPLICIT
% --------------------------- CONVERGENCE PARAMETERS --------------------------%
%
-% Convergence criteria (CAUCHY, RESIDUAL)
-CONV_CRITERIA= CAUCHY
-%
-%
% Min value of the residual (log10 of the residual)
CONV_RESIDUAL_MINVAL= -15
%
diff --git a/TestCases/rans/naca0012/turb_NACA0012_sa.cfg b/TestCases/rans/naca0012/turb_NACA0012_sa.cfg
index fa91f63fa82..2191db91136 100644
--- a/TestCases/rans/naca0012/turb_NACA0012_sa.cfg
+++ b/TestCases/rans/naca0012/turb_NACA0012_sa.cfg
@@ -179,10 +179,6 @@ CFL_REDUCTION_TURB= 1.0
% --------------------------- CONVERGENCE PARAMETERS --------------------------%
%
-% Convergence criteria (CAUCHY, RESIDUAL)
-%
-CONV_CRITERIA= RESIDUAL
-%
% Min value of the residual (log10 of the residual)
CONV_RESIDUAL_MINVAL= -12
%
diff --git a/TestCases/rans/naca0012/turb_NACA0012_sa_binary.cfg b/TestCases/rans/naca0012/turb_NACA0012_sa_binary.cfg
index 3838a627d48..81cfe385e56 100644
--- a/TestCases/rans/naca0012/turb_NACA0012_sa_binary.cfg
+++ b/TestCases/rans/naca0012/turb_NACA0012_sa_binary.cfg
@@ -186,11 +186,6 @@ CFL_REDUCTION_TURB= 1.0
% --------------------------- CONVERGENCE PARAMETERS --------------------------%
%
-% Convergence criteria (CAUCHY, RESIDUAL)
-%
-CONV_CRITERIA= RESIDUAL
-%
-%
% Min value of the residual (log10 of the residual)
CONV_RESIDUAL_MINVAL= -12
%
diff --git a/TestCases/rans/naca0012/turb_NACA0012_sa_neg.cfg b/TestCases/rans/naca0012/turb_NACA0012_sa_neg.cfg
index 104b4fb3618..c7777fcbf39 100644
--- a/TestCases/rans/naca0012/turb_NACA0012_sa_neg.cfg
+++ b/TestCases/rans/naca0012/turb_NACA0012_sa_neg.cfg
@@ -177,11 +177,6 @@ CFL_REDUCTION_TURB= 1.0
% --------------------------- CONVERGENCE PARAMETERS --------------------------%
%
-% Convergence criteria (CAUCHY, RESIDUAL)
-%
-CONV_CRITERIA= RESIDUAL
-%
-%
% Min value of the residual (log10 of the residual)
CONV_RESIDUAL_MINVAL= -12
%
diff --git a/TestCases/rans/naca0012/turb_NACA0012_sst.cfg b/TestCases/rans/naca0012/turb_NACA0012_sst.cfg
index 9dfd5c24ec9..51cc1a01a69 100644
--- a/TestCases/rans/naca0012/turb_NACA0012_sst.cfg
+++ b/TestCases/rans/naca0012/turb_NACA0012_sst.cfg
@@ -181,10 +181,6 @@ CFL_REDUCTION_TURB= 1.0
% --------------------------- CONVERGENCE PARAMETERS --------------------------%
%
-% Convergence criteria (CAUCHY, RESIDUAL)
-%
-CONV_CRITERIA= RESIDUAL
-%
% Min value of the residual (log10 of the residual)
CONV_RESIDUAL_MINVAL= -12
%
diff --git a/TestCases/rans/naca0012/turb_NACA0012_sst_fixedvalues.cfg b/TestCases/rans/naca0012/turb_NACA0012_sst_fixedvalues.cfg
index cc9fca832b5..eb5d3f4945e 100644
--- a/TestCases/rans/naca0012/turb_NACA0012_sst_fixedvalues.cfg
+++ b/TestCases/rans/naca0012/turb_NACA0012_sst_fixedvalues.cfg
@@ -190,10 +190,6 @@ CFL_REDUCTION_TURB= 1.0
% --------------------------- CONVERGENCE PARAMETERS --------------------------%
%
-% Convergence criteria (CAUCHY, RESIDUAL)
-%
-CONV_CRITERIA= RESIDUAL
-%
% Min value of the residual (log10 of the residual)
CONV_RESIDUAL_MINVAL= -12
%
diff --git a/TestCases/rans/naca0012/turb_NACA0012_sst_multigrid_restart.cfg b/TestCases/rans/naca0012/turb_NACA0012_sst_multigrid_restart.cfg
index 71227c60c0e..03ef2ac709d 100644
--- a/TestCases/rans/naca0012/turb_NACA0012_sst_multigrid_restart.cfg
+++ b/TestCases/rans/naca0012/turb_NACA0012_sst_multigrid_restart.cfg
@@ -319,11 +319,6 @@ LIMIT_ADJFLOW= 1E6
% Number of total iterations
ITER= 100
%
-% Convergence criteria (CAUCHY, RESIDUAL)
-%
-CONV_CRITERIA= CAUCHY
-%
-%
% Min value of the residual (log10 of the residual)
CONV_RESIDUAL_MINVAL= -12
%
diff --git a/TestCases/rans/naca0012/turb_NACA0012_sst_sust.cfg b/TestCases/rans/naca0012/turb_NACA0012_sst_sust.cfg
index 92750082434..92269d5f642 100644
--- a/TestCases/rans/naca0012/turb_NACA0012_sst_sust.cfg
+++ b/TestCases/rans/naca0012/turb_NACA0012_sst_sust.cfg
@@ -187,10 +187,6 @@ CFL_REDUCTION_TURB= 1.0
% --------------------------- CONVERGENCE PARAMETERS --------------------------%
%
-% Convergence criteria (CAUCHY, RESIDUAL)
-%
-CONV_CRITERIA= RESIDUAL
-%
% Min value of the residual (log10 of the residual)
CONV_RESIDUAL_MINVAL= -12
%
diff --git a/TestCases/rans/oneram6/turb_ONERAM6.cfg b/TestCases/rans/oneram6/turb_ONERAM6.cfg
index e7229150f0e..320efc1e3f7 100644
--- a/TestCases/rans/oneram6/turb_ONERAM6.cfg
+++ b/TestCases/rans/oneram6/turb_ONERAM6.cfg
@@ -214,11 +214,6 @@ TIME_DISCRE_TURB= EULER_IMPLICIT
% --------------------------- CONVERGENCE PARAMETERS --------------------------%
%
-% Convergence criteria (CAUCHY, RESIDUAL)
-%
-CONV_CRITERIA= CAUCHY
-%
-%
% Min value of the residual (log10 of the residual)
CONV_RESIDUAL_MINVAL= -10
%
diff --git a/TestCases/rans/oneram6/turb_ONERAM6_nk.cfg b/TestCases/rans/oneram6/turb_ONERAM6_nk.cfg
index 63bea201339..a3ebee2c55e 100644
--- a/TestCases/rans/oneram6/turb_ONERAM6_nk.cfg
+++ b/TestCases/rans/oneram6/turb_ONERAM6_nk.cfg
@@ -102,7 +102,6 @@ TIME_DISCRE_TURB= EULER_IMPLICIT
% --------------------------- CONVERGENCE PARAMETERS --------------------------%
%
-CONV_CRITERIA= RESIDUAL
CONV_RESIDUAL_MINVAL= -11
CONV_STARTITER= 10
ITER= 2000
diff --git a/TestCases/rans/propeller/propeller.cfg b/TestCases/rans/propeller/propeller.cfg
index 99ee5a22d9e..d3906e0885f 100644
--- a/TestCases/rans/propeller/propeller.cfg
+++ b/TestCases/rans/propeller/propeller.cfg
@@ -203,11 +203,6 @@ TIME_DISCRE_TURB= EULER_IMPLICIT
% Number of total iterations
ITER= 9999
%
-% Convergence criteria (CAUCHY, RESIDUAL)
-%
-CONV_CRITERIA= RESIDUAL
-%
-%
% Min value of the residual (log10 of the residual)
CONV_RESIDUAL_MINVAL= -12
%
diff --git a/TestCases/rans/rae2822/turb_SA_RAE2822.cfg b/TestCases/rans/rae2822/turb_SA_RAE2822.cfg
index ce48b26de81..38e289186ea 100644
--- a/TestCases/rans/rae2822/turb_SA_RAE2822.cfg
+++ b/TestCases/rans/rae2822/turb_SA_RAE2822.cfg
@@ -190,11 +190,6 @@ FROZEN_VISC_CONT= YES
% --------------------------- CONVERGENCE PARAMETERS --------------------------%
%
-% Convergence criteria (CAUCHY, RESIDUAL)
-%
-CONV_CRITERIA= RESIDUAL
-%
-%
% Min value of the residual (log10 of the residual)
CONV_RESIDUAL_MINVAL= -8
%
diff --git a/TestCases/rans/rae2822/turb_SST_RAE2822.cfg b/TestCases/rans/rae2822/turb_SST_RAE2822.cfg
index e0d4b5239f7..4a40012bba3 100644
--- a/TestCases/rans/rae2822/turb_SST_RAE2822.cfg
+++ b/TestCases/rans/rae2822/turb_SST_RAE2822.cfg
@@ -167,11 +167,6 @@ TIME_DISCRE_TURB= EULER_IMPLICIT
% --------------------------- CONVERGENCE PARAMETERS --------------------------%
%
-% Convergence criteria (CAUCHY, RESIDUAL)
-%
-CONV_CRITERIA= RESIDUAL
-%
-%
% Min value of the residual (log10 of the residual)
CONV_RESIDUAL_MINVAL= -8
%
diff --git a/TestCases/rans/rae2822/turb_SST_SUST_RAE2822.cfg b/TestCases/rans/rae2822/turb_SST_SUST_RAE2822.cfg
index ccb93d4e65a..a26abbb8c46 100644
--- a/TestCases/rans/rae2822/turb_SST_SUST_RAE2822.cfg
+++ b/TestCases/rans/rae2822/turb_SST_SUST_RAE2822.cfg
@@ -168,11 +168,6 @@ TIME_DISCRE_TURB= EULER_IMPLICIT
% --------------------------- CONVERGENCE PARAMETERS --------------------------%
%
-% Convergence criteria (CAUCHY, RESIDUAL)
-%
-CONV_CRITERIA= RESIDUAL
-%
-%
% Min value of the residual (log10 of the residual)
CONV_RESIDUAL_MINVAL= -8
%
diff --git a/TestCases/rans/restart_directdiff_naca/naca0012.cfg b/TestCases/rans/restart_directdiff_naca/naca0012.cfg
index a6f7452d55c..01fc3dcd8cc 100644
--- a/TestCases/rans/restart_directdiff_naca/naca0012.cfg
+++ b/TestCases/rans/restart_directdiff_naca/naca0012.cfg
@@ -125,8 +125,6 @@ TIME_DISCRE_TURB= EULER_IMPLICIT
%
% --------------------------- CONVERGENCE PARAMETERS --------------------------%
%
-% Convergence criteria (CAUCHY, RESIDUAL)
-CONV_CRITERIA = RESIDUAL
% Field to apply Cauchy Criterion to
CONV_FIELD= REL_RMS_DENSITY
% Min value of the residual (log10 of the residual)
diff --git a/TestCases/rans/s809/trans_s809.cfg b/TestCases/rans/s809/trans_s809.cfg
index 3aabee6d853..c7b99040880 100644
--- a/TestCases/rans/s809/trans_s809.cfg
+++ b/TestCases/rans/s809/trans_s809.cfg
@@ -162,11 +162,6 @@ TIME_DISCRE_TURB= EULER_IMPLICIT
% --------------------------- CONVERGENCE PARAMETERS --------------------------%
%
-% Convergence criteria (CAUCHY, RESIDUAL)
-%
-CONV_CRITERIA= RESIDUAL
-%
-%
% Min value of the residual (log10 of the residual)
CONV_RESIDUAL_MINVAL= -8
%
diff --git a/TestCases/rans/s809/turb_S809.cfg b/TestCases/rans/s809/turb_S809.cfg
index 6e4cbf0a0c1..00a8fa32ddd 100644
--- a/TestCases/rans/s809/turb_S809.cfg
+++ b/TestCases/rans/s809/turb_S809.cfg
@@ -177,10 +177,6 @@ TIME_DISCRE_TURB= EULER_IMPLICIT
% --------------------------- CONVERGENCE PARAMETERS --------------------------%
%
-% Convergence criteria (CAUCHY, RESIDUAL)
-CONV_CRITERIA= RESIDUAL
-%
-%
% Min value of the residual (log10 of the residual)
CONV_RESIDUAL_MINVAL= -12
%
diff --git a/TestCases/rans/vki_turbine/turb_vki.cfg b/TestCases/rans/vki_turbine/turb_vki.cfg
index 984f2abc149..80837552d2c 100644
--- a/TestCases/rans/vki_turbine/turb_vki.cfg
+++ b/TestCases/rans/vki_turbine/turb_vki.cfg
@@ -183,11 +183,6 @@ CFL_REDUCTION_TURB= 1.0
% --------------------------- CONVERGENCE PARAMETERS --------------------------%
%
-% Convergence criteria (CAUCHY, RESIDUAL)
-%
-CONV_CRITERIA= RESIDUAL
-%
-%
% Min value of the residual (log10 of the residual)
CONV_RESIDUAL_MINVAL= -12
%
diff --git a/TestCases/rans_uq/naca0012/turb_NACA0012_uq.cfg b/TestCases/rans_uq/naca0012/turb_NACA0012_uq.cfg
index 29e0e686e52..7a544fec73e 100644
--- a/TestCases/rans_uq/naca0012/turb_NACA0012_uq.cfg
+++ b/TestCases/rans_uq/naca0012/turb_NACA0012_uq.cfg
@@ -175,11 +175,6 @@ CFL_REDUCTION_TURB= 1.0
% --------------------------- CONVERGENCE PARAMETERS --------------------------%
%
-% Convergence criteria (CAUCHY, RESIDUAL)
-%
-CONV_CRITERIA= CAUCHY
-%
-%
% Min value of the residual (log10 of the residual)
CONV_RESIDUAL_MINVAL= -9
%
diff --git a/TestCases/rans_uq/naca0012/turb_NACA0012_uq_1c.cfg b/TestCases/rans_uq/naca0012/turb_NACA0012_uq_1c.cfg
index 46d5a0092c9..394791d5d9a 100644
--- a/TestCases/rans_uq/naca0012/turb_NACA0012_uq_1c.cfg
+++ b/TestCases/rans_uq/naca0012/turb_NACA0012_uq_1c.cfg
@@ -191,11 +191,6 @@ CFL_REDUCTION_TURB= 1.0
% --------------------------- CONVERGENCE PARAMETERS --------------------------%
%
-% Convergence criteria (CAUCHY, RESIDUAL)
-%
-CONV_CRITERIA= CAUCHY
-%
-%
% Min value of the residual (log10 of the residual)
CONV_RESIDUAL_MINVAL= -9
%
diff --git a/TestCases/rans_uq/naca0012/turb_NACA0012_uq_2c.cfg b/TestCases/rans_uq/naca0012/turb_NACA0012_uq_2c.cfg
index 82cf246944b..1a2bbe9883f 100644
--- a/TestCases/rans_uq/naca0012/turb_NACA0012_uq_2c.cfg
+++ b/TestCases/rans_uq/naca0012/turb_NACA0012_uq_2c.cfg
@@ -190,11 +190,6 @@ CFL_REDUCTION_TURB= 1.0
% --------------------------- CONVERGENCE PARAMETERS --------------------------%
%
-% Convergence criteria (CAUCHY, RESIDUAL)
-%
-CONV_CRITERIA= CAUCHY
-%
-%
% Min value of the residual (log10 of the residual)
CONV_RESIDUAL_MINVAL= -9
%
diff --git a/TestCases/rans_uq/naca0012/turb_NACA0012_uq_3c.cfg b/TestCases/rans_uq/naca0012/turb_NACA0012_uq_3c.cfg
index e78242f4340..fd9d8d96c7f 100644
--- a/TestCases/rans_uq/naca0012/turb_NACA0012_uq_3c.cfg
+++ b/TestCases/rans_uq/naca0012/turb_NACA0012_uq_3c.cfg
@@ -190,11 +190,6 @@ CFL_REDUCTION_TURB= 1.0
% --------------------------- CONVERGENCE PARAMETERS --------------------------%
%
-% Convergence criteria (CAUCHY, RESIDUAL)
-%
-CONV_CRITERIA= CAUCHY
-%
-%
% Min value of the residual (log10 of the residual)
CONV_RESIDUAL_MINVAL= -9
%
diff --git a/TestCases/rans_uq/naca0012/turb_NACA0012_uq_p1c1.cfg b/TestCases/rans_uq/naca0012/turb_NACA0012_uq_p1c1.cfg
index 29c436c3032..b8b89ac9611 100644
--- a/TestCases/rans_uq/naca0012/turb_NACA0012_uq_p1c1.cfg
+++ b/TestCases/rans_uq/naca0012/turb_NACA0012_uq_p1c1.cfg
@@ -190,11 +190,6 @@ CFL_REDUCTION_TURB= 1.0
% --------------------------- CONVERGENCE PARAMETERS --------------------------%
%
-% Convergence criteria (CAUCHY, RESIDUAL)
-%
-CONV_CRITERIA= CAUCHY
-%
-%
% Min value of the residual (log10 of the residual)
CONV_RESIDUAL_MINVAL= -9
%
diff --git a/TestCases/rans_uq/naca0012/turb_NACA0012_uq_p1c2.cfg b/TestCases/rans_uq/naca0012/turb_NACA0012_uq_p1c2.cfg
index e31c42a443d..31880344bb4 100644
--- a/TestCases/rans_uq/naca0012/turb_NACA0012_uq_p1c2.cfg
+++ b/TestCases/rans_uq/naca0012/turb_NACA0012_uq_p1c2.cfg
@@ -190,11 +190,6 @@ CFL_REDUCTION_TURB= 1.0
% --------------------------- CONVERGENCE PARAMETERS --------------------------%
%
-% Convergence criteria (CAUCHY, RESIDUAL)
-%
-CONV_CRITERIA= CAUCHY
-%
-%
% Min value of the residual (log10 of the residual)
CONV_RESIDUAL_MINVAL= -9
%
diff --git a/TestCases/rotating/caradonna_tung/rot_caradonna_tung.cfg b/TestCases/rotating/caradonna_tung/rot_caradonna_tung.cfg
index 310939f2d5a..c529f0370d4 100644
--- a/TestCases/rotating/caradonna_tung/rot_caradonna_tung.cfg
+++ b/TestCases/rotating/caradonna_tung/rot_caradonna_tung.cfg
@@ -164,10 +164,6 @@ TIME_DISCRE_FLOW= EULER_IMPLICIT
% --------------------------- CONVERGENCE PARAMETERS --------------------------%
%
-% Convergence criteria (CAUCHY, RESIDUAL)
-%
-CONV_CRITERIA= RESIDUAL
-%
% Min value of the residual (log10 of the residual)
CONV_RESIDUAL_MINVAL= -12
%
diff --git a/TestCases/rotating/naca0012/rot_NACA0012.cfg b/TestCases/rotating/naca0012/rot_NACA0012.cfg
index 63f3c151f21..ca3db6804a5 100644
--- a/TestCases/rotating/naca0012/rot_NACA0012.cfg
+++ b/TestCases/rotating/naca0012/rot_NACA0012.cfg
@@ -254,7 +254,6 @@ HOLD_GRID_FIXED= NO
% HOLD_GRID_FIXED_COORD= ( -0.5, -0.49, 0.0, 2.5, 0.49, 0.0 )
% --------------------------- CONVERGENCE PARAMETERS --------------------------%
-% Convergence criteria (CAUCHY, RESIDUAL)
%
CONV_FIELD= RMS_DENSITY
%
diff --git a/TestCases/sliding_interface/bars_SST_2D/bars.cfg b/TestCases/sliding_interface/bars_SST_2D/bars.cfg
index 71d77128098..5587e62d463 100644
--- a/TestCases/sliding_interface/bars_SST_2D/bars.cfg
+++ b/TestCases/sliding_interface/bars_SST_2D/bars.cfg
@@ -256,12 +256,6 @@ CFL_REDUCTION_TURB= 1.0
% --------------------------- CONVERGENCE PARAMETERS --------------------------%
%
-% Convergence criteria (CAUCHY, RESIDUAL)
-%
-CONV_CRITERIA= RESIDUAL
-%
-%
-%
% Min value of the residual (log10 of the residual)
CONV_RESIDUAL_MINVAL= -16
%
diff --git a/TestCases/sliding_interface/channel_2D/channel_2D_NN.cfg b/TestCases/sliding_interface/channel_2D/channel_2D_NN.cfg
index b3b7a75085e..f0a679bbd43 100644
--- a/TestCases/sliding_interface/channel_2D/channel_2D_NN.cfg
+++ b/TestCases/sliding_interface/channel_2D/channel_2D_NN.cfg
@@ -179,13 +179,6 @@ TIME_DISCRE_FLOW= EULER_IMPLICIT
%
% --------------------------- CONVERGENCE PARAMETERS --------------------------%
%
-%
-% Convergence criteria (CAUCHY, RESIDUAL)
-CONV_CRITERIA= RESIDUAL
-%
-% Flow functional for the Residual criteria (RHO, RHO_ENERGY)
-%
-%
% Min value of the residual (log10 of the residual)
CONV_RESIDUAL_MINVAL= -16
%
diff --git a/TestCases/sliding_interface/channel_2D/channel_2D_WA.cfg b/TestCases/sliding_interface/channel_2D/channel_2D_WA.cfg
index 75311492230..1686b4f7d76 100644
--- a/TestCases/sliding_interface/channel_2D/channel_2D_WA.cfg
+++ b/TestCases/sliding_interface/channel_2D/channel_2D_WA.cfg
@@ -178,12 +178,6 @@ TIME_DISCRE_FLOW= EULER_IMPLICIT
%
% --------------------------- CONVERGENCE PARAMETERS --------------------------%
%
-% Convergence criteria (CAUCHY, RESIDUAL)
-CONV_CRITERIA= RESIDUAL
-%
-% Flow functional for the Residual criteria (RHO, RHO_ENERGY)
-%
-%
% Min value of the residual (log10 of the residual)
CONV_RESIDUAL_MINVAL= -16
%
diff --git a/TestCases/sliding_interface/channel_3D/channel_3D_NN.cfg b/TestCases/sliding_interface/channel_3D/channel_3D_NN.cfg
index 6e00b13b6e3..2f27f2f4d8b 100644
--- a/TestCases/sliding_interface/channel_3D/channel_3D_NN.cfg
+++ b/TestCases/sliding_interface/channel_3D/channel_3D_NN.cfg
@@ -180,12 +180,6 @@ TIME_DISCRE_FLOW= EULER_IMPLICIT
%
% --------------------------- CONVERGENCE PARAMETERS --------------------------%
%
-% Convergence criteria (CAUCHY, RESIDUAL)
-CONV_CRITERIA= RESIDUAL
-%
-% Flow functional for the Residual criteria (RHO, RHO_ENERGY)
-%
-%
% Min value of the residual (log10 of the residual)
CONV_RESIDUAL_MINVAL= -16
%
diff --git a/TestCases/sliding_interface/channel_3D/channel_3D_WA.cfg b/TestCases/sliding_interface/channel_3D/channel_3D_WA.cfg
index cf83150bebd..38594f853df 100644
--- a/TestCases/sliding_interface/channel_3D/channel_3D_WA.cfg
+++ b/TestCases/sliding_interface/channel_3D/channel_3D_WA.cfg
@@ -178,12 +178,6 @@ TIME_DISCRE_FLOW= EULER_IMPLICIT
%
% --------------------------- CONVERGENCE PARAMETERS --------------------------%
%
-% Convergence criteria (CAUCHY, RESIDUAL)
-CONV_CRITERIA= RESIDUAL
-%
-% Flow functional for the Residual criteria (RHO, RHO_ENERGY)
-%
-%
% Min value of the residual (log10 of the residual)
CONV_RESIDUAL_MINVAL= -16
%
diff --git a/TestCases/sliding_interface/incompressible_steady/configCircle.cfg b/TestCases/sliding_interface/incompressible_steady/configCircle.cfg
index e8407db3bef..16b4df86d65 100644
--- a/TestCases/sliding_interface/incompressible_steady/configCircle.cfg
+++ b/TestCases/sliding_interface/incompressible_steady/configCircle.cfg
@@ -98,7 +98,6 @@ TIME_DISCRE_TURB= EULER_IMPLICIT
% --------------------------- CONVERGENCE PARAMETERS --------------------------%
-CONV_CRITERIA= RESIDUAL
CONV_RESIDUAL_MINVAL= -16
CONV_STARTITER= 10
CONV_CAUCHY_ELEMS= 100
diff --git a/TestCases/sliding_interface/incompressible_steady/configOut.cfg b/TestCases/sliding_interface/incompressible_steady/configOut.cfg
index e7ef64e9db9..9e42a671236 100644
--- a/TestCases/sliding_interface/incompressible_steady/configOut.cfg
+++ b/TestCases/sliding_interface/incompressible_steady/configOut.cfg
@@ -108,7 +108,6 @@ TIME_DISCRE_TURB= EULER_IMPLICIT
% --------------------------- CONVERGENCE PARAMETERS --------------------------%
-CONV_CRITERIA= RESIDUAL
CONV_RESIDUAL_MINVAL= -16
CONV_STARTITER= 10
CONV_CAUCHY_ELEMS= 100
diff --git a/TestCases/sliding_interface/incompressible_unsteady/configCircle.cfg b/TestCases/sliding_interface/incompressible_unsteady/configCircle.cfg
index 2bffacac519..4082db97ddf 100644
--- a/TestCases/sliding_interface/incompressible_unsteady/configCircle.cfg
+++ b/TestCases/sliding_interface/incompressible_unsteady/configCircle.cfg
@@ -106,7 +106,6 @@ TIME_DISCRE_TURB= EULER_IMPLICIT
% --------------------------- CONVERGENCE PARAMETERS --------------------------%
-CONV_CRITERIA= RESIDUAL
CONV_RESIDUAL_MINVAL= -16
CONV_STARTITER= 10
CONV_CAUCHY_ELEMS= 100
diff --git a/TestCases/sliding_interface/incompressible_unsteady/configOut.cfg b/TestCases/sliding_interface/incompressible_unsteady/configOut.cfg
index 35a17cfa398..c104e40ec79 100644
--- a/TestCases/sliding_interface/incompressible_unsteady/configOut.cfg
+++ b/TestCases/sliding_interface/incompressible_unsteady/configOut.cfg
@@ -116,7 +116,6 @@ TIME_DISCRE_TURB= EULER_IMPLICIT
% --------------------------- CONVERGENCE PARAMETERS --------------------------%
-CONV_CRITERIA= RESIDUAL
CONV_RESIDUAL_MINVAL= -16
CONV_STARTITER= 10
CONV_CAUCHY_ELEMS= 100
diff --git a/TestCases/sliding_interface/pipe/pipe_NN.cfg b/TestCases/sliding_interface/pipe/pipe_NN.cfg
index 913ba4c38a8..9814d9a8152 100644
--- a/TestCases/sliding_interface/pipe/pipe_NN.cfg
+++ b/TestCases/sliding_interface/pipe/pipe_NN.cfg
@@ -184,11 +184,6 @@ TIME_DISCRE_FLOW= EULER_IMPLICIT
%
%
% --------------------------- CONVERGENCE PARAMETERS --------------------------%
-% Convergence criteria (CAUCHY, RESIDUAL)
-CONV_CRITERIA= RESIDUAL
-%
-% Flow functional for the Residual criteria (RHO, RHO_ENERGY)
-%
%
% Min value of the residual (log10 of the residual)
CONV_RESIDUAL_MINVAL= -16
diff --git a/TestCases/sliding_interface/pipe/pipe_WA.cfg b/TestCases/sliding_interface/pipe/pipe_WA.cfg
index 04d38488e12..c59374a4b67 100644
--- a/TestCases/sliding_interface/pipe/pipe_WA.cfg
+++ b/TestCases/sliding_interface/pipe/pipe_WA.cfg
@@ -183,11 +183,6 @@ TIME_DISCRE_FLOW= EULER_IMPLICIT
%
%
% --------------------------- CONVERGENCE PARAMETERS --------------------------%
-% Convergence criteria (CAUCHY, RESIDUAL)
-CONV_CRITERIA= RESIDUAL
-%
-% Flow functional for the Residual criteria (RHO, RHO_ENERGY)
-%
%
% Min value of the residual (log10 of the residual)
CONV_RESIDUAL_MINVAL= -16
diff --git a/TestCases/sliding_interface/rotating_cylinders/rot_cylinders_NN.cfg b/TestCases/sliding_interface/rotating_cylinders/rot_cylinders_NN.cfg
index 5d788fe62be..6978fb60251 100644
--- a/TestCases/sliding_interface/rotating_cylinders/rot_cylinders_NN.cfg
+++ b/TestCases/sliding_interface/rotating_cylinders/rot_cylinders_NN.cfg
@@ -183,12 +183,6 @@ TIME_DISCRE_FLOW= EULER_IMPLICIT
%
% --------------------------- CONVERGENCE PARAMETERS --------------------------%
%
-% Convergence criteria (CAUCHY, RESIDUAL)
-CONV_CRITERIA= RESIDUAL
-%
-% Flow functional for the Residual criteria (RHO, RHO_ENERGY)
-%
-%
% Min value of the residual (log10 of the residual)
CONV_RESIDUAL_MINVAL= -16
%
diff --git a/TestCases/sliding_interface/rotating_cylinders/rot_cylinders_WA.cfg b/TestCases/sliding_interface/rotating_cylinders/rot_cylinders_WA.cfg
index 2a0ec112c1e..88b93d6a4c4 100644
--- a/TestCases/sliding_interface/rotating_cylinders/rot_cylinders_WA.cfg
+++ b/TestCases/sliding_interface/rotating_cylinders/rot_cylinders_WA.cfg
@@ -185,11 +185,6 @@ TIME_DISCRE_FLOW= EULER_IMPLICIT
%
%
% --------------------------- CONVERGENCE PARAMETERS --------------------------%
-% Convergence criteria (CAUCHY, RESIDUAL)
-CONV_CRITERIA= RESIDUAL
-%
-% Flow functional for the Residual criteria (RHO, RHO_ENERGY)
-%
%
% Min value of the residual (log10 of the residual)
CONV_RESIDUAL_MINVAL= -16
diff --git a/TestCases/sliding_interface/single_stage/single_stage_NN.cfg b/TestCases/sliding_interface/single_stage/single_stage_NN.cfg
index 141cb2081ae..af408c66940 100644
--- a/TestCases/sliding_interface/single_stage/single_stage_NN.cfg
+++ b/TestCases/sliding_interface/single_stage/single_stage_NN.cfg
@@ -220,11 +220,6 @@ TIME_DISCRE_TURB= EULER_IMPLICIT
CFL_REDUCTION_TURB= 1.0
%
% --------------------------- CONVERGENCE PARAMETERS --------------------------%
-% Convergence criteria (CAUCHY, RESIDUAL)
-CONV_CRITERIA= RESIDUAL
-%
-% Flow functional for the Residual criteria (RHO, RHO_ENERGY)
-%
%
% Min value of the residual (log10 of the residual)
CONV_RESIDUAL_MINVAL= -16
diff --git a/TestCases/sliding_interface/single_stage/single_stage_WA.cfg b/TestCases/sliding_interface/single_stage/single_stage_WA.cfg
index a64ac575c78..85d46c8bb50 100644
--- a/TestCases/sliding_interface/single_stage/single_stage_WA.cfg
+++ b/TestCases/sliding_interface/single_stage/single_stage_WA.cfg
@@ -218,12 +218,6 @@ CFL_REDUCTION_TURB= 1.0
%
% --------------------------- CONVERGENCE PARAMETERS --------------------------%
%
-% Convergence criteria (CAUCHY, RESIDUAL)
-CONV_CRITERIA= RESIDUAL
-%
-% Flow functional for the Residual criteria (RHO, RHO_ENERGY)
-%
-%
% Min value of the residual (log10 of the residual)
CONV_RESIDUAL_MINVAL= -16
%
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 c67f4e33299..7c162900718 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
@@ -186,12 +186,6 @@ TIME_DISCRE_FLOW= EULER_IMPLICIT
%
% --------------------------- CONVERGENCE PARAMETERS --------------------------%
%
-% Convergence criteria (CAUCHY, RESIDUAL)
-CONV_CRITERIA= RESIDUAL
-%
-% Flow functional for the Residual criteria (RHO, RHO_ENERGY)
-%
-%
% Min value of the residual (log10 of the residual)
CONV_RESIDUAL_MINVAL= -16
%
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 1b55ee492f2..02d5f916fed 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
@@ -186,12 +186,6 @@ TIME_DISCRE_FLOW= EULER_IMPLICIT
%
% --------------------------- CONVERGENCE PARAMETERS --------------------------%
%
-% Convergence criteria (CAUCHY, RESIDUAL)
-CONV_CRITERIA= RESIDUAL
-%
-% Flow functional for the Residual criteria (RHO, RHO_ENERGY)
-%
-%
% Min value of the residual (log10 of the residual)
CONV_RESIDUAL_MINVAL= -16
%
diff --git a/TestCases/sliding_interface/uniform_flow/uniform_NN.cfg b/TestCases/sliding_interface/uniform_flow/uniform_NN.cfg
index 5cb885c84f0..507b75beb92 100644
--- a/TestCases/sliding_interface/uniform_flow/uniform_NN.cfg
+++ b/TestCases/sliding_interface/uniform_flow/uniform_NN.cfg
@@ -183,12 +183,6 @@ TIME_DISCRE_FLOW= EULER_IMPLICIT
%
% --------------------------- CONVERGENCE PARAMETERS --------------------------%
%
-% Convergence criteria (CAUCHY, RESIDUAL)
-CONV_CRITERIA= RESIDUAL
-%
-% Flow functional for the Residual criteria (RHO, RHO_ENERGY)
-%
-%
% Min value of the residual (log10 of the residual)
CONV_RESIDUAL_MINVAL= -16
%
diff --git a/TestCases/sliding_interface/uniform_flow/uniform_WA.cfg b/TestCases/sliding_interface/uniform_flow/uniform_WA.cfg
index 31def6809ef..5ea9fc4819d 100644
--- a/TestCases/sliding_interface/uniform_flow/uniform_WA.cfg
+++ b/TestCases/sliding_interface/uniform_flow/uniform_WA.cfg
@@ -183,12 +183,6 @@ TIME_DISCRE_FLOW= EULER_IMPLICIT
%
% --------------------------- CONVERGENCE PARAMETERS --------------------------%
%
-% Convergence criteria (CAUCHY, RESIDUAL)
-CONV_CRITERIA= RESIDUAL
-%
-% Flow functional for the Residual criteria (RHO, RHO_ENERGY)
-%
-%
% Min value of the residual (log10 of the residual)
CONV_RESIDUAL_MINVAL= -16
%
diff --git a/TestCases/transition/E387_Airfoil/transitional_BC_model_ConfigFile.cfg b/TestCases/transition/E387_Airfoil/transitional_BC_model_ConfigFile.cfg
index 792b3faa62a..ed55385aff0 100644
--- a/TestCases/transition/E387_Airfoil/transitional_BC_model_ConfigFile.cfg
+++ b/TestCases/transition/E387_Airfoil/transitional_BC_model_ConfigFile.cfg
@@ -175,11 +175,6 @@ TIME_DISCRE_TURB= EULER_IMPLICIT
% --------------------------- CONVERGENCE PARAMETERS --------------------------%
%
-% Convergence criteria (CAUCHY, RESIDUAL)
-%
-CONV_CRITERIA= RESIDUAL
-%
-%
% Min value of the residual (log10 of the residual)
CONV_RESIDUAL_MINVAL= -20
%
diff --git a/TestCases/transition/Schubauer_Klebanoff/transitional_BC_model_ConfigFile.cfg b/TestCases/transition/Schubauer_Klebanoff/transitional_BC_model_ConfigFile.cfg
index 9d32610dae1..8f645fc64e7 100644
--- a/TestCases/transition/Schubauer_Klebanoff/transitional_BC_model_ConfigFile.cfg
+++ b/TestCases/transition/Schubauer_Klebanoff/transitional_BC_model_ConfigFile.cfg
@@ -208,11 +208,6 @@ TIME_DISCRE_TURB= EULER_IMPLICIT
% --------------------------- CONVERGENCE PARAMETERS --------------------------%
%
-% Convergence criteria (CAUCHY, RESIDUAL)
-%
-CONV_CRITERIA= RESIDUAL
-%
-%
% Min value of the residual (log10 of the residual)
CONV_RESIDUAL_MINVAL= -20
%
diff --git a/TestCases/transition/T3A_FlatPlate/transitional_BC_model_ConfigFile.cfg b/TestCases/transition/T3A_FlatPlate/transitional_BC_model_ConfigFile.cfg
index bc262ad4138..8ea6762c334 100644
--- a/TestCases/transition/T3A_FlatPlate/transitional_BC_model_ConfigFile.cfg
+++ b/TestCases/transition/T3A_FlatPlate/transitional_BC_model_ConfigFile.cfg
@@ -194,11 +194,6 @@ TIME_DISCRE_TURB= EULER_IMPLICIT
% --------------------------- CONVERGENCE PARAMETERS --------------------------%
%
-% Convergence criteria (CAUCHY, RESIDUAL)
-%
-CONV_CRITERIA= RESIDUAL
-%
-%
% Min value of the residual (log10 of the residual)
CONV_RESIDUAL_MINVAL= -20
%
diff --git a/TestCases/turbomachinery/APU_turbocharger/Jones.cfg b/TestCases/turbomachinery/APU_turbocharger/Jones.cfg
index 3b34e71a76e..7e30abe447d 100755
--- a/TestCases/turbomachinery/APU_turbocharger/Jones.cfg
+++ b/TestCases/turbomachinery/APU_turbocharger/Jones.cfg
@@ -275,11 +275,6 @@ CFL_REDUCTION_TURB= 0.5
%
% Number of total iterations
OUTER_ITER= 6
-% Convergence criteria (CAUCHY, RESIDUAL)
-%
-CONV_CRITERIA= RESIDUAL
-%
-%
%
% Min value of the residual (log10 of the residual)
CONV_RESIDUAL_MINVAL= -16
diff --git a/TestCases/turbomachinery/APU_turbocharger/Jones_rst.cfg b/TestCases/turbomachinery/APU_turbocharger/Jones_rst.cfg
index 3d327e87961..333c460f3ed 100755
--- a/TestCases/turbomachinery/APU_turbocharger/Jones_rst.cfg
+++ b/TestCases/turbomachinery/APU_turbocharger/Jones_rst.cfg
@@ -280,11 +280,6 @@ CFL_REDUCTION_TURB= 0.5
%
% Number of total iterations
OUTER_ITER= 6
-% Convergence criteria (CAUCHY, RESIDUAL)
-%
-CONV_CRITERIA= RESIDUAL
-%
-%
%
% Min value of the residual (log10 of the residual)
CONV_RESIDUAL_MINVAL= -16
diff --git a/TestCases/turbomachinery/axial_stage_2D/Axial_stage2D.cfg b/TestCases/turbomachinery/axial_stage_2D/Axial_stage2D.cfg
index 57e5a63d1f6..278775aa873 100755
--- a/TestCases/turbomachinery/axial_stage_2D/Axial_stage2D.cfg
+++ b/TestCases/turbomachinery/axial_stage_2D/Axial_stage2D.cfg
@@ -267,11 +267,6 @@ CFL_REDUCTION_TURB= 1.0
%
% Number of total iterations
OUTER_ITER= 21
-% Convergence criteria (CAUCHY, RESIDUAL)
-%
-CONV_CRITERIA= RESIDUAL
-%
-%
%
% Min value of the residual (log10 of the residual)
CONV_RESIDUAL_MINVAL= -16
diff --git a/TestCases/turbomachinery/centrifugal_blade/centrifugal_blade.cfg b/TestCases/turbomachinery/centrifugal_blade/centrifugal_blade.cfg
index caa0b59ec86..140c6d8dfa1 100755
--- a/TestCases/turbomachinery/centrifugal_blade/centrifugal_blade.cfg
+++ b/TestCases/turbomachinery/centrifugal_blade/centrifugal_blade.cfg
@@ -295,12 +295,6 @@ CFL_REDUCTION_TURB= 1.0
% Number of total iterations
ITER= 12000
%
-% Convergence criteria (CAUCHY, RESIDUAL)
-CONV_CRITERIA= RESIDUAL
-%
-% Flow functional for the Residual criteria (RHO, RHO_ENERGY)
-%
-%
% Min value of the residual (log10 of the residual)
CONV_RESIDUAL_MINVAL= -16
%
diff --git a/TestCases/turbomachinery/centrifugal_stage/centrifugal_stage.cfg b/TestCases/turbomachinery/centrifugal_stage/centrifugal_stage.cfg
index bb572ed5c13..69740ee71b8 100755
--- a/TestCases/turbomachinery/centrifugal_stage/centrifugal_stage.cfg
+++ b/TestCases/turbomachinery/centrifugal_stage/centrifugal_stage.cfg
@@ -302,12 +302,6 @@ CFL_REDUCTION_TURB= 1.0
% Number of total iterations
ITER= 32000
%
-% Convergence criteria (CAUCHY, RESIDUAL)
-CONV_CRITERIA= RESIDUAL
-%
-% Flow functional for the Residual criteria (RHO, RHO_ENERGY)
-%
-%
% Min value of the residual (log10 of the residual)
CONV_RESIDUAL_MINVAL= -16
%
diff --git a/TestCases/turbomachinery/transonic_stator_2D/transonic_stator.cfg b/TestCases/turbomachinery/transonic_stator_2D/transonic_stator.cfg
index 9a86ea4578b..25d1cb0b3a2 100644
--- a/TestCases/turbomachinery/transonic_stator_2D/transonic_stator.cfg
+++ b/TestCases/turbomachinery/transonic_stator_2D/transonic_stator.cfg
@@ -275,11 +275,6 @@ CFL_REDUCTION_TURB= 1.0
%
% Number of total iterations
ITER= 2001
-% Convergence criteria (CAUCHY, RESIDUAL)
-%
-CONV_CRITERIA= RESIDUAL
-%
-%
%
% Min value of the residual (log10 of the residual)
CONV_RESIDUAL_MINVAL= -16
diff --git a/TestCases/turbomachinery/transonic_stator_2D/transonic_stator_rst.cfg b/TestCases/turbomachinery/transonic_stator_2D/transonic_stator_rst.cfg
index 6646c803dcb..eded8208271 100644
--- a/TestCases/turbomachinery/transonic_stator_2D/transonic_stator_rst.cfg
+++ b/TestCases/turbomachinery/transonic_stator_2D/transonic_stator_rst.cfg
@@ -280,11 +280,6 @@ CFL_REDUCTION_TURB= 1.0
%
% Number of total iterations
ITER= 201
-% Convergence criteria (CAUCHY, RESIDUAL)
-%
-CONV_CRITERIA= RESIDUAL
-%
-%
%
% Min value of the residual (log10 of the residual)
CONV_RESIDUAL_MINVAL= -16
diff --git a/TestCases/unsteady/pitching_naca64a010_euler/pitching_NACA64A010.cfg b/TestCases/unsteady/pitching_naca64a010_euler/pitching_NACA64A010.cfg
index 0bb4beb2298..b3e3e3cc5c1 100644
--- a/TestCases/unsteady/pitching_naca64a010_euler/pitching_NACA64A010.cfg
+++ b/TestCases/unsteady/pitching_naca64a010_euler/pitching_NACA64A010.cfg
@@ -255,10 +255,6 @@ DV_PARAM= ( 1, 0.5 )
DV_VALUE= 0.0
% --------------------------- CONVERGENCE PARAMETERS --------------------------%
-% Convergence criteria (CAUCHY, RESIDUAL)
-%
-CONV_CRITERIA= RESIDUAL
-%
%
% Min value of the residual (log10 of the residual)
CONV_RESIDUAL_MINVAL= -10
diff --git a/TestCases/unsteady/pitching_naca64a010_rans/turb_NACA64A010.cfg b/TestCases/unsteady/pitching_naca64a010_rans/turb_NACA64A010.cfg
index 7c74ee76c38..21cd0b75d2d 100644
--- a/TestCases/unsteady/pitching_naca64a010_rans/turb_NACA64A010.cfg
+++ b/TestCases/unsteady/pitching_naca64a010_rans/turb_NACA64A010.cfg
@@ -279,10 +279,6 @@ DV_PARAM= ( 1, 0.5 )
DV_VALUE= 0.05
% --------------------------- CONVERGENCE PARAMETERS --------------------------%
-% Convergence criteria (CAUCHY, RESIDUAL)
-%
-CONV_CRITERIA= CAUCHY
-%
%
% Min value of the residual (log10 of the residual)
CONV_RESIDUAL_MINVAL= -8
diff --git a/TestCases/unsteady/plunging_naca0012/plunging_NACA0012.cfg b/TestCases/unsteady/plunging_naca0012/plunging_NACA0012.cfg
index 8470bf0cb4c..6f35880fb3a 100644
--- a/TestCases/unsteady/plunging_naca0012/plunging_NACA0012.cfg
+++ b/TestCases/unsteady/plunging_naca0012/plunging_NACA0012.cfg
@@ -188,10 +188,6 @@ TIME_DISCRE_FLOW= EULER_IMPLICIT
% --------------------------- CONVERGENCE PARAMETERS --------------------------%
%
-% Convergence criteria (CAUCHY, RESIDUAL)
-CONV_CRITERIA= RESIDUAL
-%
-%
% Min value of the residual (log10 of the residual)
CONV_RESIDUAL_MINVAL= -12
%
diff --git a/TestCases/unsteady/square_cylinder/turb_square.cfg b/TestCases/unsteady/square_cylinder/turb_square.cfg
index ca0b55cfe7c..e24db037294 100644
--- a/TestCases/unsteady/square_cylinder/turb_square.cfg
+++ b/TestCases/unsteady/square_cylinder/turb_square.cfg
@@ -193,11 +193,6 @@ TIME_DISCRE_TURB= EULER_IMPLICIT
% --------------------------- CONVERGENCE PARAMETERS --------------------------%
%
-% Convergence criteria (CAUCHY, RESIDUAL)
-%
-CONV_CRITERIA= RESIDUAL
-%
-%
% Min value of the residual (log10 of the residual)
CONV_RESIDUAL_MINVAL= -10
%