Revert "Change current SST-1994 to SST-2003. Directly reverted."

mheimgartner · mheimgartner · commit 8208c9e9d130 · 2021-10-20T17:56:57.000+02:00
This reverts commit 33f9591.
diff --git a/SU2_CFD/include/solvers/CFVMFlowSolverBase.hpp b/SU2_CFD/include/solvers/CFVMFlowSolverBase.hpp
@@ -1049,7 +1049,6 @@ class CFVMFlowSolverBase : public CSolver {
 
       for (unsigned long iDim = 0; iDim < nDim; iDim++) {
         StrainMag(iPoint) += pow(VelocityGradient(iDim, iDim) - Div, 2);
-        // StrainMag(iPoint) += pow(VelocityGradient(iDim, iDim), 2); // MH:: Fluent neglects divergence term which might be wrong for incompressible flow with Mach = 0.28
       }
       if (nDim == 2) {
         StrainMag(iPoint) += pow(Div, 2);
diff --git a/SU2_CFD/src/numerics/turbulent/turb_sources.cpp b/SU2_CFD/src/numerics/turbulent/turb_sources.cpp
@@ -799,10 +799,9 @@ CNumerics::ResidualType<> CSourcePieceWise_TurbSST::ComputeResidual(const CConfi
   unsigned short iDim;
   su2double alfa_blended, beta_blended;
   su2double diverg, pk, pw, zeta;
-  // Not necessary in SST-2003 version, StrainMag used instead
-  // su2double VorticityMag = sqrt(Vorticity_i[0]*Vorticity_i[0] +
-  //                               Vorticity_i[1]*Vorticity_i[1] +
-  //                               Vorticity_i[2]*Vorticity_i[2]);
+  su2double VorticityMag = sqrt(Vorticity_i[0]*Vorticity_i[0] +
+                                Vorticity_i[1]*Vorticity_i[1] +
+                                Vorticity_i[2]*Vorticity_i[2]);
 
   if (incompressible) {
     AD::SetPreaccIn(V_i, nDim+6);
@@ -849,14 +848,11 @@ CNumerics::ResidualType<> CSourcePieceWise_TurbSST::ComputeResidual(const CConfi
    else {
      pk = Eddy_Viscosity_i*StrainMag_i*StrainMag_i - 2.0/3.0*Density_i*ScalarVar_i[0]*diverg;
    }
-  // Production term difference between SST-1994 and SST-2003 version
-  //  pk = min(pk,20.0*beta_star*Density_i*ScalarVar_i[1]*ScalarVar_i[0]);
-   pk = min(pk,10.0*beta_star*Density_i*ScalarVar_i[1]*ScalarVar_i[0]);
+
+   pk = min(pk,20.0*beta_star*Density_i*ScalarVar_i[1]*ScalarVar_i[0]);
    pk = max(pk,0.0);
 
-  // Change to StrainMag definition in SST-2003 version
-  //  zeta = max(ScalarVar_i[1], VorticityMag*F2_i/a1);
-   zeta = max(ScalarVar_i[1], StrainMag_i*F2_i/a1);
+   zeta = max(ScalarVar_i[1], VorticityMag*F2_i/a1);
 
    /* if using UQ methodolgy, calculate production using perturbed Reynolds stress matrix */
 
diff --git a/SU2_CFD/src/solvers/CTurbSSTSolver.cpp b/SU2_CFD/src/solvers/CTurbSSTSolver.cpp
@@ -253,24 +253,18 @@ void CTurbSSTSolver::Postprocessing(CGeometry *geometry, CSolver **solver_contai
     su2double mu  = flowNodes->GetLaminarViscosity(iPoint);
 
     su2double dist = geometry->nodes->GetWall_Distance(iPoint);
-    // Vorticity not needed in SST-2003 version, StrainMag used instead
-    // const su2double *Vorticity = solver_container[FLOW_SOL]->GetNodes()->GetVorticity(iPoint);
-    // su2double VorticityMag = sqrt(Vorticity[0]*Vorticity[0] +
-    //                               Vorticity[1]*Vorticity[1] +
-    //                               Vorticity[2]*Vorticity[2]);
+
+    su2double VorticityMag = GeometryToolbox::Norm(3, flowNodes->GetVorticity(iPoint));
 
     nodes->SetBlendingFunc(iPoint, mu, dist, rho);
 
     su2double F2 = nodes->GetF2blending(iPoint);
 
-    const su2double S = solver_container[FLOW_SOL]->GetNodes()->GetStrainMag(iPoint);
-
     /*--- Compute the eddy viscosity ---*/
 
     su2double kine  = nodes->GetSolution(iPoint,0);
     su2double omega = nodes->GetSolution(iPoint,1);
-    // su2double zeta  = min(1.0/omega, a1/(VorticityMag*F2)); // VorticityMag not used in SST-2003, StrainMag used instead
-    su2double zeta  = min(1.0/omega, a1/(S*F2));
+    su2double zeta  = min(1.0/omega, a1/(VorticityMag*F2));
     su2double muT   = max(rho*kine*zeta,0.0);
 
     nodes->SetmuT(iPoint,muT);
diff --git a/SU2_CFD/src/variables/CTurbSSTVariable.cpp b/SU2_CFD/src/variables/CTurbSSTVariable.cpp
@@ -66,8 +66,7 @@ void CTurbSSTVariable::SetBlendingFunc(unsigned long iPoint, su2double val_visco
   for (unsigned long iDim = 0; iDim < nDim; iDim++)
     CDkw(iPoint) += Gradient(iPoint,0,iDim)*Gradient(iPoint,1,iDim);
   CDkw(iPoint) *= 2.0*val_density*sigma_om2/Solution(iPoint,1);
-  // CDkw(iPoint) = max(CDkw(iPoint), pow(10.0, -20.0)); // In SST-2003 version -10 instead of -20
-  CDkw(iPoint) = max(CDkw(iPoint), pow(10.0, -10.0));
+  CDkw(iPoint) = max(CDkw(iPoint), pow(10.0, -20.0));
 
   /*--- F1 ---*/
 

Original file line number	Diff line number	Diff line change
`@@ -1049,7 +1049,6 @@ class CFVMFlowSolverBase : public CSolver {`
`1049`	`1049`
`1050`	`1050`	`for (unsigned long iDim = 0; iDim < nDim; iDim++) {`
`1051`	`1051`	`StrainMag(iPoint) += pow(VelocityGradient(iDim, iDim) - Div, 2);`
`1052`		`- // StrainMag(iPoint) += pow(VelocityGradient(iDim, iDim), 2); // MH:: Fluent neglects divergence term which might be wrong for incompressible flow with Mach = 0.28`
`1053`	`1052`	`}`
`1054`	`1053`	`if (nDim == 2) {`
`1055`	`1054`	`StrainMag(iPoint) += pow(Div, 2);`