change from code review

PENGYAN777 · PENGYAN777 · commit d3fd9e166106 · 2022-11-26T10:29:01.000+01:00
diff --git a/Common/include/option_structure.hpp b/Common/include/option_structure.hpp
@@ -706,7 +706,7 @@ static const MapType<std::string, CONDUCTIVITYMODEL> ConductivityModel_Map = {
   MakePair("CONSTANT_CONDUCTIVITY", CONDUCTIVITYMODEL::CONSTANT)
   MakePair("CONSTANT_PRANDTL", CONDUCTIVITYMODEL::CONSTANT_PRANDTL)
   MakePair("POLYNOMIAL_CONDUCTIVITY", CONDUCTIVITYMODEL::POLYNOMIAL)
-  MakePair("CONSTANT_COOLPROP", CONDUCTIVITYMODEL::COOLPROP)
+  MakePair("COOLPROP", CONDUCTIVITYMODEL::COOLPROP)
 };
 
 /*!
diff --git a/SU2_CFD/include/fluid/CCoolPropConductivity.hpp b/SU2_CFD/include/fluid/CCoolPropConductivity.hpp
@@ -45,7 +45,7 @@ class CCoolPropConductivity final : public CConductivityModel {
   std::unique_ptr<CoolProp::AbstractState> fluid_entity; /*!< \brief fluid entity */
 #endif
   /*!< \brief list of fluids whose conductivity model is available in CoolProp */
-  vector<string> fluidNameList = {
+  const vector<string> fluidNameList = {
       "Air",      "Ammonia",  "Argon",      "Benzene",   "CarbonDioxide", "Cyclopentane", "EthylBenzene",
       "Ethane",   "Ethanol",  "HeavyWater", "Helium",    "Hydrogen",      "IsoButane",    "Isopentane",
       "Methane",  "Methanol", "Nitrogen",   "Oxygen",    "Propylene",     "ParaHydrogen", "R11",
@@ -60,7 +60,7 @@ class CCoolPropConductivity final : public CConductivityModel {
   /*!
    * \brief Constructor of the class.
    */
-  CCoolPropConductivity(const string &fluidname) {
+  CCoolPropConductivity(const string& fluidname) {
 #ifdef USE_COOLPROP
     fluid_entity = std::unique_ptr<CoolProp::AbstractState>(CoolProp::AbstractState::factory("HEOS", fluidname));
     if (std::find(fluidNameList.begin(), fluidNameList.end(), fluidname) == fluidNameList.end()) {
diff --git a/SU2_CFD/include/fluid/CCoolPropViscosity.hpp b/SU2_CFD/include/fluid/CCoolPropViscosity.hpp
@@ -42,80 +42,80 @@
 class CCoolPropViscosity final : public CViscosityModel {
  private:
 #ifdef USE_COOLPROP
-  std::unique_ptr<CoolProp::AbstractState> fluid_entity; /* \brief fluid entity */
+  std::unique_ptr<CoolProp::AbstractState> fluid_entity; /*!< \brief fluid entity */
 #endif
-  /* \brief list of fluids whose viscosity model is available in CoolProp */
-  vector<string> fluidNameList = {"Air",
-                                  "Ammonia",
-                                  "Argon",
-                                  "Benzene",
-                                  "CarbonDioxide",
-                                  "CycloHexane",
-                                  "Cyclopentane",
-                                  "DimethylEther",
-                                  "Ethane",
-                                  "Ethanol",
-                                  "HeavyWater",
-                                  "Helium",
-                                  "Hydrogen",
-                                  "HydrogenSulfide",
-                                  "IsoButane",
-                                  "Isopentane",
-                                  "Methane",
-                                  "Methanol",
-                                  "Nitrogen",
-                                  "Oxygen",
-                                  "Propylene",
-                                  "R11",
-                                  "R116",
-                                  "R12",
-                                  "R123",
-                                  "R1233zd(E)",
-                                  "R1234yf",
-                                  "R1234ze(E)",
-                                  "R124",
-                                  "R125",
-                                  "R13",
-                                  "R134a",
-                                  "R14",
-                                  "R141b",
-                                  "R142b",
-                                  "R143a",
-                                  "R152A",
-                                  "R218",
-                                  "R22",
-                                  "R227EA",
-                                  "R23",
-                                  "R236EA",
-                                  "R236FA",
-                                  "R245fa",
-                                  "R32",
-                                  "R404A",
-                                  "R407C",
-                                  "R410A",
-                                  "R507A",
-                                  "RC318",
-                                  "SulfurHexafluoride",
-                                  "Toluene",
-                                  "Water",
-                                  "m-Xylene",
-                                  "n-Butane",
-                                  "n-Decane",
-                                  "n-Dodecane",
-                                  "n-Heptane",
-                                  "n-Hexane",
-                                  "n-Nonane",
-                                  "n-Octane",
-                                  "n-Pentane",
-                                  "n-Propane",
-                                  "o-Xylene",
-                                  "p-Xylene"};
+  /*!< \brief list of fluids whose viscosity model is available in CoolProp */
+  const vector<string> fluidNameList = {"Air",
+                                        "Ammonia",
+                                        "Argon",
+                                        "Benzene",
+                                        "CarbonDioxide",
+                                        "CycloHexane",
+                                        "Cyclopentane",
+                                        "DimethylEther",
+                                        "Ethane",
+                                        "Ethanol",
+                                        "HeavyWater",
+                                        "Helium",
+                                        "Hydrogen",
+                                        "HydrogenSulfide",
+                                        "IsoButane",
+                                        "Isopentane",
+                                        "Methane",
+                                        "Methanol",
+                                        "Nitrogen",
+                                        "Oxygen",
+                                        "Propylene",
+                                        "R11",
+                                        "R116",
+                                        "R12",
+                                        "R123",
+                                        "R1233zd(E)",
+                                        "R1234yf",
+                                        "R1234ze(E)",
+                                        "R124",
+                                        "R125",
+                                        "R13",
+                                        "R134a",
+                                        "R14",
+                                        "R141b",
+                                        "R142b",
+                                        "R143a",
+                                        "R152A",
+                                        "R218",
+                                        "R22",
+                                        "R227EA",
+                                        "R23",
+                                        "R236EA",
+                                        "R236FA",
+                                        "R245fa",
+                                        "R32",
+                                        "R404A",
+                                        "R407C",
+                                        "R410A",
+                                        "R507A",
+                                        "RC318",
+                                        "SulfurHexafluoride",
+                                        "Toluene",
+                                        "Water",
+                                        "m-Xylene",
+                                        "n-Butane",
+                                        "n-Decane",
+                                        "n-Dodecane",
+                                        "n-Heptane",
+                                        "n-Hexane",
+                                        "n-Nonane",
+                                        "n-Octane",
+                                        "n-Pentane",
+                                        "n-Propane",
+                                        "o-Xylene",
+                                        "p-Xylene"};
 
  public:
   /*!
    * \brief Constructor of the class.
    */
-  CCoolPropViscosity(const string &fluidname) {
+  CCoolPropViscosity(const string& fluidname) {
 #ifdef USE_COOLPROP
     fluid_entity = std::unique_ptr<CoolProp::AbstractState>(CoolProp::AbstractState::factory("HEOS", fluidname));
     if (std::find(fluidNameList.begin(), fluidNameList.end(), fluidname) == fluidNameList.end()) {
diff --git a/SU2_CFD/src/output/CFlowOutput.cpp b/SU2_CFD/src/output/CFlowOutput.cpp
@@ -2438,8 +2438,6 @@ void CFlowOutput::WriteForcesBreakdown(const CConfig* config, const CSolver* flo
           break;
         case CONDUCTIVITYMODEL::COOLPROP:
           file << "Conductivity Model: COOLPROP \n";
-          file << "Molecular Conductivity: " << config->GetThermal_Conductivity_Constant() << " W/m^2.K.\n";
-          file << "Molecular Conductivity (non-dim): " << config->GetThermal_Conductivity_ConstantND() << "\n";
           break;
         default:
           break;
@@ -2734,10 +2732,6 @@ void CFlowOutput::WriteForcesBreakdown(const CConfig* config, const CSolver* flo
 
         case VISCOSITYMODEL::COOLPROP:
           file << "Viscosity Model: CoolProp \n";
-          file << "Constant Laminar Viscosity: " << config->GetMu_Constant();
-          if (si_units) file << " N.s/m^2.\n";
-          else file << " lbf.s/ft^2.\n";
-          file << "Laminar Viscosity (non-dim): " << config->GetMu_ConstantND() << "\n";
           break;
 
         case VISCOSITYMODEL::SUTHERLAND:
@@ -2787,8 +2781,6 @@ void CFlowOutput::WriteForcesBreakdown(const CConfig* config, const CSolver* flo
             break;
           case CONDUCTIVITYMODEL::COOLPROP:
             file << "Conductivity Model: COOLPROP \n";
-            file << "Molecular Conductivity: " << config->GetThermal_Conductivity_Constant() << " W/m^2.K.\n";
-            file << "Molecular Conductivity (non-dim): " << config->GetThermal_Conductivity_ConstantND() << "\n";
             break;
 
           case CONDUCTIVITYMODEL::POLYNOMIAL:
diff --git a/SU2_CFD/src/output/output_structure_legacy.cpp b/SU2_CFD/src/output/output_structure_legacy.cpp
@@ -2979,10 +2979,6 @@ void COutputLegacy::SpecialOutput_ForcesBreakdown(CSolver *****solver, CGeometry
 
           case VISCOSITYMODEL::COOLPROP:
             Breakdown_file << "Viscosity Model: CoolProp"<< "\n";
-            Breakdown_file << "Laminar Viscosity: " << config[val_iZone]->GetMu_Constant();
-            if (config[val_iZone]->GetSystemMeasurements() == SI) Breakdown_file << " N.s/m^2." << "\n";
-            else if (config[val_iZone]->GetSystemMeasurements() == US) Breakdown_file << " lbf.s/ft^2." << "\n";
-            Breakdown_file << "Laminar Viscosity (non-dim): " << config[val_iZone]->GetMu_ConstantND()<< "\n";
             break;
 
           default:
@@ -3004,8 +3000,6 @@ void COutputLegacy::SpecialOutput_ForcesBreakdown(CSolver *****solver, CGeometry
 
           case CONDUCTIVITYMODEL::COOLPROP:
             Breakdown_file << "Conductivity Model: COOLPROP "<< "\n";
-            Breakdown_file << "Molecular Conductivity: " << config[val_iZone]->GetThermal_Conductivity_Constant()<< " W/m^2.K." << "\n";
-            Breakdown_file << "Molecular Conductivity (non-dim): " << config[val_iZone]->GetThermal_Conductivity_ConstantND()<< "\n";
             break;
 
           default:
@@ -3359,10 +3353,6 @@ void COutputLegacy::SpecialOutput_ForcesBreakdown(CSolver *****solver, CGeometry
 
           case VISCOSITYMODEL::COOLPROP:
             Breakdown_file << "Viscosity Model: CoolProp"<< "\n";
-            Breakdown_file << "Laminar Viscosity: " << config[val_iZone]->GetMu_Constant();
-            if (config[val_iZone]->GetSystemMeasurements() == SI) Breakdown_file << " N.s/m^2." << "\n";
-            else if (config[val_iZone]->GetSystemMeasurements() == US) Breakdown_file << " lbf.s/ft^2." << "\n";
-            Breakdown_file << "Laminar Viscosity (non-dim): " << config[val_iZone]->GetMu_ConstantND()<< "\n";
             break;
 
         }
@@ -3383,8 +3373,6 @@ void COutputLegacy::SpecialOutput_ForcesBreakdown(CSolver *****solver, CGeometry
 
             case CONDUCTIVITYMODEL::COOLPROP:
               Breakdown_file << "Conductivity Model: COOLPROP "<< "\n";
-              Breakdown_file << "Molecular Conductivity: " << config[val_iZone]->GetThermal_Conductivity_Constant()<< " W/m^2.K." << "\n";
-              Breakdown_file << "Molecular Conductivity (non-dim): " << config[val_iZone]->GetThermal_Conductivity_ConstantND()<< "\n";
               break;
 
             case CONDUCTIVITYMODEL::POLYNOMIAL:
diff --git a/SU2_CFD/src/solvers/CEulerSolver.cpp b/SU2_CFD/src/solvers/CEulerSolver.cpp
@@ -1174,7 +1174,7 @@ void CEulerSolver::SetNondimensionalization(CConfig *config, unsigned short iMes
         ModelTable << "COOLPROP";
         if      (config->GetSystemMeasurements() == SI) Unit << "N.s/m^2";
         else if (config->GetSystemMeasurements() == US) Unit << "lbf.s/ft^2";
-        NonDimTable << "Viscosity" << config->GetMu_Constant() << config->GetMu_Constant()/config->GetMu_ConstantND() << Unit.str() << config->GetMu_ConstantND();
+        NonDimTable << "Viscosity" << "--" << "--" << Unit.str() << config->GetMu_ConstantND();
         Unit.str("");
         NonDimTable.PrintFooter();
         break;
@@ -1221,7 +1221,7 @@ void CEulerSolver::SetNondimensionalization(CConfig *config, unsigned short iMes
       case CONDUCTIVITYMODEL::COOLPROP:
         ModelTable << "COOLPROP";
         Unit << "W/m^2.K";
-        NonDimTable << "Molecular Cond." << config->GetThermal_Conductivity_Constant() << config->GetThermal_Conductivity_Constant()/config->GetThermal_Conductivity_ConstantND() << Unit.str() << config->GetThermal_Conductivity_ConstantND();
+        NonDimTable << "Molecular Cond." << "--" << "--" << Unit.str() << config->GetThermal_Conductivity_ConstantND();
         Unit.str("");
         NonDimTable.PrintFooter();
         break;
diff --git a/SU2_CFD/src/solvers/CFEM_DG_EulerSolver.cpp b/SU2_CFD/src/solvers/CFEM_DG_EulerSolver.cpp
@@ -1158,7 +1158,7 @@ void CFEM_DG_EulerSolver::SetNondimensionalization(CConfig        *config,
         ModelTable << "COOLPROP";
         if      (config->GetSystemMeasurements() == SI) Unit << "N.s/m^2";
         else if (config->GetSystemMeasurements() == US) Unit << "lbf.s/ft^2";
-        NonDimTable << "Viscosity" << config->GetMu_Constant() << config->GetMu_Constant()/config->GetMu_ConstantND() << Unit.str() << config->GetMu_ConstantND();
+        NonDimTable << "Viscosity" << "--" << "--" << Unit.str() << config->GetMu_ConstantND();
         Unit.str("");
         NonDimTable.PrintFooter();
         break;
@@ -1205,7 +1205,7 @@ void CFEM_DG_EulerSolver::SetNondimensionalization(CConfig        *config,
       case CONDUCTIVITYMODEL::COOLPROP:
         ModelTable << "COOLPROP";
         Unit << "W/m^2.K";
-        NonDimTable << "Molecular Cond." << config->GetThermal_Conductivity_Constant() << config->GetThermal_Conductivity_Constant()/config->GetThermal_Conductivity_ConstantND() << Unit.str() << config->GetThermal_Conductivity_ConstantND();
+        NonDimTable << "Molecular Cond." << "--" << "--" << Unit.str() << config->GetThermal_Conductivity_ConstantND();
         Unit.str("");
         NonDimTable.PrintFooter();
         break;
diff --git a/SU2_CFD/src/solvers/CIncEulerSolver.cpp b/SU2_CFD/src/solvers/CIncEulerSolver.cpp
@@ -631,7 +631,7 @@ void CIncEulerSolver::SetNondimensionalization(CConfig *config, unsigned short i
         ModelTable << "COOLPROP_VISCOSITY";
         if      (config->GetSystemMeasurements() == SI) Unit << "N.s/m^2";
         else if (config->GetSystemMeasurements() == US) Unit << "lbf.s/ft^2";
-        NonDimTable << "Viscosity" << config->GetMu_Constant() << config->GetMu_Constant()/config->GetMu_ConstantND() << Unit.str() << config->GetMu_ConstantND();
+        NonDimTable << "Viscosity" << "--" << "--" << Unit.str() << config->GetMu_ConstantND();
         Unit.str("");
         NonDimTable.PrintFooter();
         break;
@@ -687,7 +687,7 @@ void CIncEulerSolver::SetNondimensionalization(CConfig *config, unsigned short i
       case CONDUCTIVITYMODEL::COOLPROP:
         ModelTable << "COOLPROP";
         Unit << "W/m^2.K";
-        NonDimTable << "Molecular Cond." << config->GetThermal_Conductivity_Constant() << config->GetThermal_Conductivity_Constant()/config->GetThermal_Conductivity_ConstantND() << Unit.str() << config->GetThermal_Conductivity_ConstantND();
+        NonDimTable << "Molecular Cond." << "--" << "--" << Unit.str() << config->GetThermal_Conductivity_ConstantND();
         Unit.str("");
         NonDimTable.PrintFooter();
         break;
diff --git a/TestCases/nicf/coolprop/coolprop.cfg b/TestCases/nicf/coolprop/coolprop.cfg
diff --git a/TestCases/nicf/coolprop/fluidModel.cfg b/TestCases/nicf/coolprop/fluidModel.cfg
diff --git a/TestCases/nicf/coolprop/transportModel.cfg b/TestCases/nicf/coolprop/transportModel.cfg
diff --git a/TestCases/parallel_regression.py b/TestCases/parallel_regression.py
