Rename new enums for tape debug mode and make them enum classes.

Author: oleburghardt

Common/include/CConfig.hpp

@@ -598,8 +598,8 @@ class CConfig {
 
   bool AD_Mode;                         /*!< \brief Algorithmic Differentiation support. */
   bool AD_Preaccumulation;              /*!< \brief Enable or disable preaccumulation in the AD mode. */
-  unsigned short AD_CheckTapeType;      /*!< \brief Type of tape that is checked in a tape debug run. */
-  unsigned short AD_CheckTapeVariables; /*!< \brief Type of variables that are checked in a tape debug run. */
+  CHECK_TAPE_TYPE AD_CheckTapeType;           /*!< \brief Type of tape that is checked in a tape debug run. */
+  CHECK_TAPE_VARIABLES AD_CheckTapeVariables; /*!< \brief Type of variables that are checked in a tape debug run. */
   STRUCT_COMPRESS Kind_Material_Compress;  /*!< \brief Determines if the material is compressible or incompressible (structural analysis). */
   STRUCT_MODEL Kind_Material;              /*!< \brief Determines the material model to be used (structural analysis). */
   STRUCT_DEFORMATION Kind_Struct_Solver;   /*!< \brief Determines the geometric condition (small or large deformations) for structural analysis. */
@@ -9233,12 +9233,12 @@ class CConfig {
   /*!
    * \brief Get the type of tape that will be checked in a tape debug run.
    */
-  unsigned short GetAD_CheckTapeType(void) const { return AD_CheckTapeType; }
+  CHECK_TAPE_TYPE GetAD_CheckTapeType(void) const { return AD_CheckTapeType; }
 
   /*!
    * \brief Get the type of variables that will be checked for in a tape debug run.
    */
-  unsigned short GetAD_CheckTapeVariables(void) const { return AD_CheckTapeVariables; }
+  CHECK_TAPE_VARIABLES GetAD_CheckTapeVariables(void) const { return AD_CheckTapeVariables; }
 
   /*!
    * \brief Get if AD preaccumulation should be performed.

Common/include/option_structure.hpp

@@ -2546,25 +2546,25 @@ static const MapType<std::string, ENUM_DIRECTDIFF_VAR> DirectDiff_Var_Map = {
 /*!
  * \brief Types of tapes that can be checked in a tape debug run.
  */
-enum ENUM_CHECK_TAPE_TYPE {
-  OBJECTIVE_FUNCTION = 0,    /*!< \brief Tape that only includes dependencies and objective function calculation. */
-  FULL_SOLVER = 1            /*!< \brief Tape that includes dependencies and all solvers. */
+enum class CHECK_TAPE_TYPE {
+  OBJECTIVE_FUNCTION,    /*!< \brief Tape that only includes dependencies and objective function calculation. */
+  FULL_SOLVER            /*!< \brief Tape that includes dependencies and all solvers. */
 };
-static const MapType<std::string, ENUM_CHECK_TAPE_TYPE> CheckTapeType_Map = {
-    MakePair("OBJECTIVE_FUNCTION_TAPE", OBJECTIVE_FUNCTION)
-    MakePair("FULL_SOLVER_TAPE", FULL_SOLVER)
+static const MapType<std::string, CHECK_TAPE_TYPE> CheckTapeType_Map = {
+    MakePair("OBJECTIVE_FUNCTION_TAPE", CHECK_TAPE_TYPE::OBJECTIVE_FUNCTION)
+    MakePair("FULL_SOLVER_TAPE", CHECK_TAPE_TYPE::FULL_SOLVER)
 };
 
 /*!
  * \brief Types of variables that can be checked for in a tape debug run.
  */
-enum ENUM_CHECK_TAPE_VARIABLES {
-  SOLVER_VARIABLES = 0,     /*!< \brief A (debug) tag will be assigned to solver/conservative variables. */
-  MESH_COORDINATES = 1      /*!< \brief A (debug) tag will be assigned to solver/conservative variables and mesh coordinates. */
+enum class CHECK_TAPE_VARIABLES {
+  SOLVER_VARIABLES,     /*!< \brief A (debug) tag will be assigned to solver/conservative variables. */
+  MESH_COORDINATES      /*!< \brief A (debug) tag will be assigned to solver/conservative variables and mesh coordinates. */
 };
-static const MapType<std::string, ENUM_CHECK_TAPE_VARIABLES> CheckTapeVariables_Map = {
-    MakePair("SOLVER_VARIABLES", SOLVER_VARIABLES)
-    MakePair("SOLVER_VARIABLES_AND_MESH_COORDINATES", MESH_COORDINATES)
+static const MapType<std::string, CHECK_TAPE_VARIABLES> CheckTapeVariables_Map = {
+    MakePair("SOLVER_VARIABLES", CHECK_TAPE_VARIABLES::SOLVER_VARIABLES)
+    MakePair("SOLVER_VARIABLES_AND_MESH_COORDINATES", CHECK_TAPE_VARIABLES::MESH_COORDINATES)
 };
 
 enum class RECORDING {

Common/src/CConfig.cpp

@@ -2798,10 +2798,10 @@ void CConfig::SetConfig_Options() {
   addBoolOption("PREACC", AD_Preaccumulation, YES);
 
   /* DESCRIPTION: Specify the tape which is checked in a tape debug run. */
-  addEnumOption("CHECK_TAPE_TYPE", AD_CheckTapeType, CheckTapeType_Map, FULL_SOLVER);
+  addEnumOption("CHECK_TAPE_TYPE", AD_CheckTapeType, CheckTapeType_Map, CHECK_TAPE_TYPE::FULL_SOLVER);
 
   /* DESCRIPTION: Specify the tape which is checked in a tape debug run. */
-  addEnumOption("CHECK_TAPE_VARIABLES", AD_CheckTapeVariables, CheckTapeVariables_Map, SOLVER_VARIABLES);
+  addEnumOption("CHECK_TAPE_VARIABLES", AD_CheckTapeVariables, CheckTapeVariables_Map, CHECK_TAPE_VARIABLES::SOLVER_VARIABLES);
 
   /*--- options that are used in the python optimization scripts. These have no effect on the c++ toolsuite ---*/
   /*!\par CONFIG_CATEGORY:Python Options\ingroup Config*/

SU2_CFD/src/drivers/CDiscAdjMultizoneDriver.cpp

@@ -246,8 +246,8 @@ void CDiscAdjMultizoneDriver::DebugRun() {
   /*--- This recording will assign the initial (same) tag to each registered variable.
    *    During the recording, each dependent variable will be assigned the same tag. ---*/
 
-  if(driver_config->GetAD_CheckTapeType() == OBJECTIVE_FUNCTION) {
-    if(driver_config->GetAD_CheckTapeVariables() == MESH_COORDINATES) {
+  if(driver_config->GetAD_CheckTapeType() == CHECK_TAPE_TYPE::OBJECTIVE_FUNCTION) {
+    if(driver_config->GetAD_CheckTapeVariables() == CHECK_TAPE_VARIABLES::MESH_COORDINATES) {
       if (rank == MASTER_NODE) cout << "\nChecking OBJECTIVE_FUNCTION_TAPE for SOLVER_VARIABLES_AND_MESH_COORDINATES." << endl;
       SetRecording(RECORDING::TAG_INIT_SOLVER_AND_MESH, Kind_Tape::OBJECTIVE_FUNCTION_TAPE, ZONE_0);
     }
@@ -257,7 +257,7 @@ void CDiscAdjMultizoneDriver::DebugRun() {
     }
   }
   else {
-    if(driver_config->GetAD_CheckTapeVariables() == MESH_COORDINATES) {
+    if(driver_config->GetAD_CheckTapeVariables() == CHECK_TAPE_VARIABLES::MESH_COORDINATES) {
       if (rank == MASTER_NODE) cout << "\nChecking FULL_SOLVER_TAPE for SOLVER_VARIABLES_AND_MESH_COORDINATES." << endl;
       SetRecording(RECORDING::TAG_INIT_SOLVER_AND_MESH, Kind_Tape::FULL_SOLVER_TAPE, ZONE_0);
     }
@@ -277,14 +277,14 @@ void CDiscAdjMultizoneDriver::DebugRun() {
    *    In such a case, a possible reason could be that such a variable is set by a post-processing routine while
    *    for a mathematically correct recording this dependency must be included earlier. ---*/
 
-  if(driver_config->GetAD_CheckTapeType() == OBJECTIVE_FUNCTION) {
-    if(driver_config->GetAD_CheckTapeVariables() == MESH_COORDINATES)
+  if(driver_config->GetAD_CheckTapeType() == CHECK_TAPE_TYPE::OBJECTIVE_FUNCTION) {
+    if(driver_config->GetAD_CheckTapeVariables() == CHECK_TAPE_VARIABLES::MESH_COORDINATES)
       SetRecording(RECORDING::TAG_CHECK_SOLVER_AND_MESH, Kind_Tape::OBJECTIVE_FUNCTION_TAPE, ZONE_0);
     else
       SetRecording(RECORDING::TAG_CHECK_SOLVER_VARIABLES, Kind_Tape::OBJECTIVE_FUNCTION_TAPE, ZONE_0);
   }
   else {
-    if(driver_config->GetAD_CheckTapeVariables() == MESH_COORDINATES)
+    if(driver_config->GetAD_CheckTapeVariables() == CHECK_TAPE_VARIABLES::MESH_COORDINATES)
       SetRecording(RECORDING::TAG_CHECK_SOLVER_AND_MESH, Kind_Tape::FULL_SOLVER_TAPE, ZONE_0);
     else
       SetRecording(RECORDING::TAG_CHECK_SOLVER_VARIABLES, Kind_Tape::FULL_SOLVER_TAPE, ZONE_0);