From 1f4dca2ec368b87f964256ccba61a26f94fa475d Mon Sep 17 00:00:00 2001
From: bigfooted <bigfootedrockmidget@hotmail.com>
Date: Mon, 6 Nov 2023 11:33:25 +0100
Subject: [PATCH] remove duplicate entries, add deprecation statements

---
 Common/include/CConfig.hpp |  8 +++---
 Common/src/CConfig.cpp     |  4 +--
 config_template.cfg        | 52 +++++---------------------------------
 3 files changed, 13 insertions(+), 51 deletions(-)

diff --git a/Common/include/CConfig.hpp b/Common/include/CConfig.hpp
index 580e4c9329d..ed235fee02c 100644
--- a/Common/include/CConfig.hpp
+++ b/Common/include/CConfig.hpp
@@ -6443,8 +6443,8 @@ class CConfig {
   su2double GetWeightCd(void) const { return WeightCd; }
 
   /*!
-   * \brief Value of the weight of the CD, CL, CM optimization.
-   * \return Value of the weight of the CD, CL, CM optimization.
+   * \brief Value of the damping factor for the Thrust BC (actuator disk).
+   * \return Value of the damping factor.
    */
   void SetdNetThrust_dBCThrust(su2double val_dnetthrust_dbcthrust);
 
@@ -8560,8 +8560,8 @@ class CConfig {
   unsigned long GetIter_Fixed_NetThrust(void) const { return Iter_Fixed_NetThrust; }
 
   /*!
-   * \brief Get the value of the damping coefficient for fixed CL mode.
-   * \return Damping coefficient for fixed CL mode.
+   * \brief Get the value of NetThrust_dBCThrust.
+   * \return Value NetThrust_dBCThrust.
    */
   su2double GetdNetThrust_dBCThrust(void) const { return dNetThrust_dBCThrust; }
 
diff --git a/Common/src/CConfig.cpp b/Common/src/CConfig.cpp
index 45771e6b3a6..696fe17326e 100644
--- a/Common/src/CConfig.cpp
+++ b/Common/src/CConfig.cpp
@@ -1415,7 +1415,7 @@ void CConfig::SetConfig_Options() {
   addDoubleOption("TARGET_CL", Target_CL, 0.0);
   /* DESCRIPTION: Damping factor for fixed CL mode. */
   addDoubleOption("DCL_DALPHA", dCL_dAlpha, 0.2);
-  /* DESCRIPTION: Damping factor for fixed CL mode. */
+  /* DESCRIPTION: dCM/dHi */
   addDoubleOption("DCM_DIH", dCM_diH, 0.05);
   /* DESCRIPTION: Maximum number of iterations between AoA updates for fixed CL problem. */
   addUnsignedLongOption("UPDATE_AOA_ITER_LIMIT", Update_AoA_Iter_Limit, 200);
@@ -1423,7 +1423,7 @@ void CConfig::SetConfig_Options() {
   addUnsignedLongOption("UPDATE_IH", Update_iH, 5);
   /* DESCRIPTION: Number of iterations to evaluate dCL_dAlpha . */
   addUnsignedLongOption("ITER_DCL_DALPHA", Iter_dCL_dAlpha, 500);
-  /* DESCRIPTION: Damping factor for fixed CL mode. */
+  /* DESCRIPTION:  Value of dNetThrust/dBCThrust */
   addDoubleOption("DNETTHRUST_DBCTHRUST", dNetThrust_dBCThrust, 1.0);
   /* DESCRIPTION: Number of times Alpha is updated in a fix CL problem. */
   addUnsignedLongOption("UPDATE_BCTHRUST", Update_BCThrust, 5);
diff --git a/config_template.cfg b/config_template.cfg
index 19930447b06..0a3daef4450 100644
--- a/config_template.cfg
+++ b/config_template.cfg
@@ -310,7 +310,7 @@ TARGET_CL= 0.80
 % Estimation of dCL/dAlpha (0.2 per degree by default)
 DCL_DALPHA= 0.2
 %
-% Damping factor for fixed CL mode
+% Value of dCm/dHi (0.05 by default)
 DCM_DIH= 0.05
 %
 % Maximum number of iterations between AoA updates
@@ -324,7 +324,8 @@ ITER_DCL_DALPHA= 500
 %
 % Evaluate the dOF_dCL or dOF_dCMy during run time
 EVAL_DOF_DCX= NO
-% Damping factor for fixed CL mode.
+%
+% Damping factor for thrust BC (actuator disk).
 NETTHRUST_DBCTHRUST= 1.0
 %
 % parameter for the definition of a complex objective function
@@ -448,20 +449,6 @@ VT_RESIDUAL_LIMITING= NO
 INLET_TEMPERATURE_VE = 288.15
 INLET_GAS_COMPOSITION = (0.77, 0.23, 0.0, 0.0, 0.0)
 
-% --------------------------- REFERENCE VALUES FOR DEFORMATION ----------------%
-%
-% Consider a reference solution for the structure
-REFERENCE_GEOMETRY= NO
-%
-% Penalty weight value for the objective function
-REFERENCE_GEOMETRY_PENALTY= 1E6
-%
-% Reference geometry filename
-REFERENCE_GEOMETRY_FILENAME= reference_geometry.dat
-%
-% Format of the reference geometry file
-REFERENCE_GEOMETRY_FORMAT=
-
 % --------------------------- VISCOSITY MODEL ---------------------------------%
 %
 % Viscosity model (SUTHERLAND, CONSTANT_VISCOSITY, POLYNOMIAL_VISCOSITY, FLAMELET).
@@ -781,7 +768,7 @@ HB_PRECONDITION= NO
 % Omega_HB = 2*PI*frequency - frequencies for Harmonic Balance method
 OMEGA_HB= (0,1.0,-1.0)
 %
-% Determines if the single-zone driver is used. (TEMPORARY)
+% Determines if the single-zone driver is used. (deprecated)
 SINGLEZONE_DRIVER= NO
 %
 % Determines if the special output is written out
@@ -1964,13 +1951,13 @@ DEAD_LOAD= NO
 % pseudo static analysis (no density in dynamic analysis)
 PSEUDO_STATIC= NO
 %
-% Dynamic or static structural analysis
+% Dynamic or static structural analysis (deprecated -> use TIME_DOMAIN)
 DYNAMIC_ANALYSIS= NO
 %
-% Time Step for dynamic analysis (s)
+% Time Step for dynamic analysis (s) (deprecated -> use TIME_STEP)
 DYN_TIMESTEP= 0.0
 %
-% Total Physical Time for dual time stepping simulations (s)
+% Total Physical Time for dual time stepping simulations (s) (deprecated -> use MAX_TIME)
 DYN_TIME= 1.0
 
 % ---------------- MESH DEFORMATION PARAMETERS (NEW SOLVER) -------------------%
@@ -2472,28 +2459,3 @@ PASTIX_VERBOSITY_LEVEL= 0
 %
 % Level of fill for PaStiX incomplete LU factorization
 PASTIX_FILL_LEVEL= 1
-
-% --------------------- PYTHON PARAMETERS -----------------------%
-% DESCRIPTION: Gradient method
-%GRADIENT_METHOD
-%
-% DESCRIPTION: Geometrical Parameter
-%GEO_PARAM
-%
-% DESCRIPTION: Current value of the design variables
-%DV_VALUE_NEW
-%
-% DESCRIPTION: Previous value of the design variables
-%DV_VALUE_OLD
-%
-% DESCRIPTION: Number of partitions of the mesh
-NUMBER_PART= 1
-%
-% DESCRIPTION: Verbosity of the python scripts to Stdout
-%CONSOLE
-%
-% DESCRIPTION: Flag specifying if the mesh was decomposed
-%DECOMPOSED
-%
-% DESCRIPTION: Number of zones of the problem
-%NZONES= 1