Revert SST Limiter Output changes

Author: marcosch27

SU2_CFD/include/variables/CTurbSSTVariable.hpp

@@ -41,11 +41,9 @@ class CTurbSSTVariable final : public CTurbVariable {
   su2double sigma_om2;
   su2double beta_star;
   su2double prod_lim_const;
-  su2double a1;
   VectorType F1;
   VectorType F2;    /*!< \brief Menter blending function for blending of k-w and k-eps. */
   VectorType CDkw;  /*!< \brief Cross-diffusion. */
-  VectorType SST_Limiter; 
   SST_ParsedOptions sstParsedOptions;
 public:
   /*!
@@ -73,7 +71,7 @@ class CTurbSSTVariable final : public CTurbVariable {
    * \param[in] val_dist - Value of the distance to the wall.
    * \param[in] val_density - Value of the density.
    */
-  void SetBlendingFunc(unsigned long iPoint, su2double val_viscosity, su2double val_dist, su2double val_density, su2double vorticity_mag, TURB_TRANS_MODEL trans_model) override;
+  void SetBlendingFunc(unsigned long iPoint, su2double val_viscosity, su2double val_dist, su2double val_density, TURB_TRANS_MODEL trans_model) override;
 
   /*!
    * \brief Get the first blending function.
@@ -89,9 +87,4 @@ class CTurbSSTVariable final : public CTurbVariable {
    * \brief Get the value of the cross diffusion of tke and omega.
    */
   inline su2double GetCrossDiff(unsigned long iPoint) const override { return CDkw(iPoint); }
-  /*!
-   * \brief Get the value of the SST Limiter.
-   */
-  inline su2double GetSSTLimiter(unsigned long iPoint) const { return SST_Limiter[iPoint]; }
-
 };

SU2_CFD/include/variables/CVariable.hpp

@@ -1656,7 +1656,7 @@ class CVariable {
    * \param[in] val_density - Value of the density.
    * \param[in] val_dist - Value of the distance to the wall.
    */
-  inline virtual void SetBlendingFunc(unsigned long iPoint, su2double val_viscosity, su2double val_dist, su2double val_density, su2double vorticity_mag, TURB_TRANS_MODEL trans_model) {}
+  inline virtual void SetBlendingFunc(unsigned long iPoint, su2double val_viscosity, su2double val_dist, su2double val_density, TURB_TRANS_MODEL trans_model) {}
 
   /*!
    * \brief Get the first blending function of the SST model.
@@ -1673,17 +1673,6 @@ class CVariable {
    */
   inline virtual su2double GetCrossDiff(unsigned long iPoint) const { return 0.0; }
 
-  /*!
-   * \brief Get the value of the SST Limiter.
-   */
-  inline virtual su2double GetSSTLimiter(unsigned long iPoint) const { return 0.0; }
-
-  
-  /*!
-   * \brief Set the value of the SST Limiter.
-   */
-  inline virtual su2double SetSSTLimiter(unsigned long iPoint) const { return 0.0; }
-
   /*!
    * \brief Get the value of the eddy viscosity.
    * \return the value of the eddy viscosity.

SU2_CFD/src/output/CFlowOutput.cpp

@@ -1422,10 +1422,6 @@ void CFlowOutput::SetVolumeOutputFieldsScalarPrimitive(const CConfig* config) {
 
   if (config->GetKind_Turb_Model() != TURB_MODEL::NONE) {
     AddVolumeOutput("EDDY_VISCOSITY", "Eddy_Viscosity", "PRIMITIVE", "Turbulent eddy viscosity");
-    /*--- SST Limiter ---*/
-    if (config->GetKind_Turb_Model() == TURB_MODEL::SST) {
-      AddVolumeOutput("SST_LIMITER", "SST_Limiter", "PRIMITIVE", "SST viscosity limiter");
-    }
   }
 
 }
@@ -1563,11 +1559,6 @@ void CFlowOutput::LoadVolumeDataScalar(const CConfig* config, const CSolver* con
     SetVolumeOutputValue("EDDY_VISCOSITY", iPoint, Node_Flow->GetEddyViscosity(iPoint));
     SetVolumeOutputValue("TURB_DELTA_TIME", iPoint, Node_Turb->GetDelta_Time(iPoint));
     SetVolumeOutputValue("TURB_CFL", iPoint, Node_Turb->GetLocalCFL(iPoint));
-    /*--- SST Limiter ---*/
-    if (config->GetKind_Turb_Model() == TURB_MODEL::SST) {
-        SetVolumeOutputValue("SST_LIMITER", iPoint, Node_Turb->GetSSTLimiter(iPoint));
-        su2double sst_lim = Node_Turb->GetSSTLimiter(iPoint);
-  }
   }
 
   if (config->GetSAParsedOptions().bc) {

SU2_CFD/src/solvers/CTurbSSTSolver.cpp

@@ -233,7 +233,7 @@ void CTurbSSTSolver::Postprocessing(CGeometry *geometry, CSolver **solver_contai
 
     const su2double VorticityMag = max(GeometryToolbox::Norm(3, flowNodes->GetVorticity(iPoint)), 1e-12);
     const su2double StrainMag = max(flowNodes->GetStrainMag(iPoint), 1e-12);
-    nodes->SetBlendingFunc(iPoint, mu, dist, rho, VorticityMag, config->GetKind_Trans_Model());
+    nodes->SetBlendingFunc(iPoint, mu, dist, rho, config->GetKind_Trans_Model());
 
     const su2double F2 = nodes->GetF2blending(iPoint);
 

SU2_CFD/src/variables/CTurbSSTVariable.cpp

@@ -45,18 +45,16 @@ CTurbSSTVariable::CTurbSSTVariable(su2double kine, su2double omega, su2double mu
   sigma_om2 = constants[3];
   beta_star = constants[6];
   prod_lim_const = constants[10];
-  a1 = constants[7];
 
   F1.resize(nPoint) = su2double(1.0);
   F2.resize(nPoint) = su2double(0.0);
   CDkw.resize(nPoint) = su2double(0.0);
-  SST_Limiter.resize(nPoint, 1.0);
 
   muT.resize(nPoint) = mut;
 }
 
 void CTurbSSTVariable::SetBlendingFunc(unsigned long iPoint, su2double val_viscosity,
-                                       su2double val_dist, su2double val_density, su2double vorticity_mag, TURB_TRANS_MODEL trans_model) {
+                                       su2double val_dist, su2double val_density, TURB_TRANS_MODEL trans_model) {
   su2double arg2, arg2A, arg2B, arg1;
 
   AD::StartPreacc();
@@ -93,13 +91,7 @@ void CTurbSSTVariable::SetBlendingFunc(unsigned long iPoint, su2double val_visco
     F1(iPoint) = max(F1(iPoint), F3);
   }
 
-  /*--- SST Limiter ---*/ 
-  
-  su2double limiter = a1*Solution(iPoint,1) / (F2(iPoint)*vorticity_mag + EPS);
-  limiter = min(1.0, limiter);
-  SST_Limiter(iPoint) = limiter;
-
-  AD::SetPreaccOut(F1(iPoint)); AD::SetPreaccOut(F2(iPoint)); AD::SetPreaccOut(CDkw(iPoint)); AD::SetPreaccOut(SST_Limiter(iPoint));
+  AD::SetPreaccOut(F1(iPoint)); AD::SetPreaccOut(F2(iPoint)); AD::SetPreaccOut(CDkw(iPoint));
   AD::EndPreacc();
 
 }