check pressure

Author: PENGYAN777

SU2_CFD/include/fluid/CCoolProp.hpp

@@ -30,28 +30,40 @@
 #if defined(HAVE_COOLPROP) && !defined(CODI_FORWARD_TYPE) && !defined(CODI_REVERSE_TYPE)
 #define USE_COOLPROP
 namespace CoolProp {
-  class AbstractState;
+class AbstractState;
 }
 #endif
 #include <memory>
 
-
 /*!
  * \class CCoolProp
  * \brief Child class for defining fluid model from CoolProp library.
  * \author: P.Yan
  */
 class CCoolProp final : public CFluidModel {
  private:
-  su2double Gamma{1.4};           /*!< \brief Ratio of Specific Heats. */
-  su2double Gas_Constant{297};    /*!< \brief specific Gas Constant. */
-  su2double Pressure_Critical{0.0};   /*!< \brief critical pressure */
-  su2double Temperature_Critical{0.0};    /*!< \brief critical temperature */
+  su2double Gamma{1.4};                /*!< \brief Ratio of Specific Heats. */
+  su2double Gas_Constant{297};         /*!< \brief specific Gas Constant. */
+  su2double Pressure_Critical{0.0};    /*!< \brief critical pressure */
+  su2double Temperature_Critical{0.0}; /*!< \brief critical temperature */
   su2double acentric_factor{0.0};      /*!< \brief acentric factor */
 #ifdef USE_COOLPROP
-  std::unique_ptr<CoolProp::AbstractState> fluid_entity;   /*!< \brief fluid entity */
-  su2double epsilon{0.01};  /*!< threshold for pressure */
+  std::unique_ptr<CoolProp::AbstractState> fluid_entity; /*!< \brief fluid entity */
+  su2double epsilon{0.01};                               /*!< threshold for pressure */
 #endif
+  /*!
+   * \brief Avoid critical pressure
+   * \return .
+   */
+  void Check_Pressure(su2double Pressure) {
+    if (abs(Pressure / Pressure_Critical - 1) < epsilon) {
+      if (Pressure >= Pressure_Critical) {
+        Pressure = Pressure_Critical * (1 + epsilon);
+      } else {
+        Pressure = Pressure_Critical * (1 - epsilon);
+      }
+    }
+  }
 
  public:
   /*!
@@ -146,5 +158,4 @@ class CCoolProp final : public CFluidModel {
    * \return Value of the constant: Gamma
    */
   su2double GetGamma(void) const { return Gamma; }
-
 };

SU2_CFD/src/fluid/CCoolProp.cpp

@@ -58,68 +58,38 @@ 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);
-    if (abs(Pressure / Pressure_Critical - 1) < epsilon) {
-      if (Pressure >= Pressure_Critical){
-        Pressure = Pressure_Critical * (1 + epsilon);
-      }
-      else {
-        Pressure = Pressure_Critical * (1 - epsilon);
-      }
-    }
+    Check_Pressure(Pressure);
     fluid_entity->update(CoolProp::PT_INPUTS, Pressure, Temperature);
     if (abs(fluid_entity->rhomass() / Density - 1) < epsilon) {
       // origial phase is near saturation gas, then just compute sound speed
       SoundSpeed2 = pow(fluid_entity->speed_sound(), 2);
-    }
-    else {
+    } else {
       // original phase is not near saturation gas, then specify the phase as gas phase
       fluid_entity->specify_phase(CoolProp::iphase_gas);
       SetTDState_PT(Pressure, Temperature);
     }
-  }
-  else {
+  } else {
     SoundSpeed2 = pow(fluid_entity->speed_sound(), 2);
   }
 }
 
 void CCoolProp::SetTDState_PT(su2double P, su2double T) {
-  if (abs(P / Pressure_Critical - 1) < epsilon) {
-    if (P >= Pressure_Critical){
-      P = Pressure_Critical * (1 + epsilon);
-    }
-    else {
-      P = Pressure_Critical * (1 - epsilon);
-    }
-  }
+  Check_Pressure(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) {
-  if (abs(P / Pressure_Critical - 1) < epsilon) {
-    if (P >= Pressure_Critical){
-      P = Pressure_Critical * (1 + epsilon);
-    }
-    else {
-      P = Pressure_Critical * (1 - epsilon);
-    }
-  }
+  Check_Pressure(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) {
-  if (abs(P / Pressure_Critical - 1) < epsilon) {
-    if (P >= Pressure_Critical){
-      P = Pressure_Critical * (1 + epsilon);
-    }
-    else {
-      P = Pressure_Critical * (1 - epsilon);
-    }
-  }
+  Check_Pressure(P);
   fluid_entity->update(CoolProp::DmassP_INPUTS, rho, P);
   StaticEnergy = fluid_entity->umass();
 }
@@ -132,14 +102,7 @@ void CCoolProp::SetTDState_hs(su2double h, su2double s) {
 }
 
 void CCoolProp::SetTDState_Ps(su2double P, su2double s) {
-  if (abs(P / Pressure_Critical - 1) < epsilon) {
-    if (P >= Pressure_Critical){
-      P = Pressure_Critical * (1 + epsilon);
-    }
-    else {
-      P = Pressure_Critical * (1 - epsilon);
-    }
-  }
+  Check_Pressure(P);
   fluid_entity->update(CoolProp::PSmass_INPUTS, P, s);
   su2double rho = fluid_entity->rhomass();
   su2double e = fluid_entity->umass();