code review

Author: PENGYAN777

SU2_CFD/include/fluid/CCoolProp.hpp

@@ -47,23 +47,19 @@ class CCoolProp final : public CFluidModel {
   su2double Pressure_Critical{0.0};    /*!< \brief critical pressure */
   su2double Temperature_Critical{0.0}; /*!< \brief critical temperature */
   su2double acentric_factor{0.0};      /*!< \brief acentric factor */
-  su2double dp{0.01};             /*!< threshold for pressure */
+  const su2double dp{0.01};            /*!< threshold for pressure */
 #ifdef USE_COOLPROP
   std::unique_ptr<CoolProp::AbstractState> fluid_entity; /*!< \brief fluid entity */
 #endif
   /*!
    * \brief Avoid critical pressure
-   * \return .
+   * \param[in,out] Pressure: Modified so that it is not too close to critical pressure to avoid issues in CoolProp.
    */
-  void Check_Pressure(su2double Pressure) {
-    if (abs(Pressure / Pressure_Critical - 1) < dp) {
-      if (Pressure >= Pressure_Critical) {
-        Pressure = Pressure_Critical * (1 + dp);
-      }
-      else {
-        Pressure = Pressure_Critical * (1 - dp);
-      }
-    }
+  void CheckPressure(su2double& Pressure) const {
+    if (Pressure > Pressure_Critical)
+      Pressure = fmax(Pressure, (1 + dp) * Pressure_Critical);
+    else
+      Pressure = fmin(Pressure, (1 - dp) * Pressure_Critical);
   }
 
  public:

SU2_CFD/src/fluid/CCoolProp.cpp

@@ -58,7 +58,7 @@ void CCoolProp::SetTDState_rhoe(su2double rho, su2double e) {
   if (fluid_entity->phase() == CoolProp::iphase_twophase) {
     // assume it is pure gas
     fluid_entity->specify_phase(CoolProp::iphase_gas);
-    Check_Pressure(Pressure);
+    CheckPressure(Pressure);
     fluid_entity->update(CoolProp::PT_INPUTS, Pressure, Temperature);
     if (abs(fluid_entity->rhomass() / Density - 1) < dp) {
       // origial phase is near saturation gas, then just compute sound speed
@@ -74,22 +74,22 @@ void CCoolProp::SetTDState_rhoe(su2double rho, su2double e) {
 }
 
 void CCoolProp::SetTDState_PT(su2double P, su2double T) {
-  Check_Pressure(P);
+  CheckPressure(P);
   fluid_entity->update(CoolProp::PT_INPUTS, P, T);
   su2double rho = fluid_entity->rhomass();
   su2double e = fluid_entity->umass();
   SetTDState_rhoe(rho, e);
 }
 
 void CCoolProp::SetTDState_Prho(su2double P, su2double rho) {
-  Check_Pressure(P);
+  CheckPressure(P);
   fluid_entity->update(CoolProp::DmassP_INPUTS, rho, P);
   su2double e = fluid_entity->umass();
   SetTDState_rhoe(rho, e);
 }
 
 void CCoolProp::SetEnergy_Prho(su2double P, su2double rho) {
-  Check_Pressure(P);
+  CheckPressure(P);
   fluid_entity->update(CoolProp::DmassP_INPUTS, rho, P);
   StaticEnergy = fluid_entity->umass();
 }
@@ -102,7 +102,7 @@ void CCoolProp::SetTDState_hs(su2double h, su2double s) {
 }
 
 void CCoolProp::SetTDState_Ps(su2double P, su2double s) {
-  Check_Pressure(P);
+  CheckPressure(P);
   fluid_entity->update(CoolProp::PSmass_INPUTS, P, s);
   su2double rho = fluid_entity->rhomass();
   su2double e = fluid_entity->umass();