Merge branch 'develop' into fix_legacy_deformation

Author: Nicola-Fonzi

AUTHORS.md

@@ -43,6 +43,7 @@ Copyright holders might be the individual person or their respective employer. I
 ```
 Akshay.K.R
 Alejandro
+Alessandro Gastaldi
 Aman uz zaman Baig
 Amit Sachdeva
 Ana Lourenco
@@ -53,19 +54,23 @@ Antonio Rubino
 Arne Bachmann
 Beckett Y. Zhou
 Benjamin S. Kirk
-Brandon Tracey
+Brendan Tracey
+Brian Munguía
 Carsten Othmer
+Catarina Garbacz
+Charanya Venkatesan-Crome
 Clark Pederson
 Daumantas Kavolis
 Dave Taflin
 Eduardo Molina
 Ethan Alan Hereth
-FlorianDm
+Florian Dittmann
 Francisco D. Palacios
 Gaurav Bansal
 Giulio Gori
 Guillaume Bâty
 Harichand M V
+HL Kline
 IndianaStokes
 J. Sinsay
 JSmith36
@@ -75,13 +80,19 @@ Jayant Mukhopadhaya
 Jeffrey van Oostrom
 Jessie Lauzon
 João Loureiro
+Johannes Blühdorn
+JonathanSmith1936
 Kedar Naik
 LaSerpe
+Lennaert Tol
 Matteo Pini
+Max Aehle
 Max Le
 Max Sagebaum
 Michele Gaffuri
 Mickael Philit
+Mladen Banovic
+Nicola Fonzi
 Ole Burghardt
 Patrick Mischke
 Paul Urbanczyk
@@ -91,6 +102,7 @@ Pete Bachant
 RaulFeijo55
 Ruben Sanchez
 Ryan Barrett
+SaettaE
 Salvatore Vitale
 Samet Cakmakcioglu
 Scott Imlay
@@ -104,25 +116,26 @@ Trent Lukaczyk
 VivaanKhatri
 Wally Maier
 aaronyicongfu
+aeroamit
 anilvar
+band-a-prend
+bigfootedrockmidget
 bmunguia
 chamsolli
 costat
-cr109
-cvencro
 daniel-linton
 demanosalvas
 dmudiger
 erangit
 flo
-hlkline
+fmpmorgado
+garcgutierrez
+jtneedels
 juliendm
 jvanoostrom
-koodlyakshay
 mcolonno
 minkwankim
 padronas
-sametcaka
 sravya91
 srcopela
 tobadavid

SU2_CFD/include/numerics/turbulent/turb_sources.hpp

@@ -305,8 +305,10 @@ class CSourcePieceWise_TurbSST final : public CNumerics {
   alfa_2,
   beta_1,
   beta_2,
-  sigma_omega_1,
-  sigma_omega_2,
+  sigma_k_1,
+  sigma_k_2,
+  sigma_w_1,
+  sigma_w_2,
   beta_star,
   a1;
 
@@ -320,12 +322,49 @@ class CSourcePieceWise_TurbSST final : public CNumerics {
 
   bool incompressible;
   bool sustaining_terms;
+  bool axisymmetric;
 
   /*!
    * \brief A virtual member. Get strain magnitude based on perturbed reynolds stress matrix
    * \param[in] turb_ke: turbulent kinetic energy of the node
    */
   void SetPerturbedStrainMag(su2double turb_ke);
+  
+  /*!
+   * \brief Add contribution due to axisymmetric formulation to 2D residual
+   */
+  inline void ResidualAxisymmetric(su2double alfa_blended, su2double zeta){
+
+    if (Coord_i[1] < EPS) return;
+
+    su2double yinv, rhov, k, w;
+    su2double sigma_k_i, sigma_w_i;
+    su2double pk_axi, pw_axi, cdk_axi, cdw_axi;
+
+    AD::SetPreaccIn(Coord_i[1]);
+
+    yinv = 1.0/Coord_i[1];
+    rhov = Density_i*V_i[2];
+    k = TurbVar_i[0];
+    w = TurbVar_i[1];
+
+    /*--- Compute blended constants ---*/
+    sigma_k_i = F1_i*sigma_k_1+(1.0-F1_i)*sigma_k_2;
+    sigma_w_i = F1_i*sigma_w_1+(1.0-F1_i)*sigma_w_2;
+
+    /*--- Production ---*/
+    pk_axi = max(0.0,2.0/3.0*rhov*k*(2.0/zeta*(yinv*V_i[2]-PrimVar_Grad_i[2][1]-PrimVar_Grad_i[1][0])-1.0));
+    pw_axi = alfa_blended*zeta/k*pk_axi;
+
+    /*--- Convection-Diffusion ---*/
+    cdk_axi = rhov*k-(Laminar_Viscosity_i+sigma_k_i*Eddy_Viscosity_i)*TurbVar_Grad_i[0][1];
+    cdw_axi = rhov*w-(Laminar_Viscosity_i+sigma_w_i*Eddy_Viscosity_i)*TurbVar_Grad_i[1][1];
+
+    /*--- Add terms to the residuals ---*/
+    Residual[0] += yinv*Volume*(pk_axi-cdk_axi);
+    Residual[1] += yinv*Volume*(pw_axi-cdw_axi);
+
+  }
 
 public:
   /*!

SU2_CFD/src/numerics/turbulent/turb_sources.cpp

@@ -760,16 +760,19 @@ CSourcePieceWise_TurbSST::CSourcePieceWise_TurbSST(unsigned short val_nDim,
 
   incompressible = (config->GetKind_Regime() == INCOMPRESSIBLE);
   sustaining_terms = (config->GetKind_Turb_Model() == SST_SUST);
+  axisymmetric = config->GetAxisymmetric();
 
   /*--- Closure constants ---*/
-  beta_star     = constants[6];
-  sigma_omega_1 = constants[2];
-  sigma_omega_2 = constants[3];
+  sigma_k_1     = constants[0];
+  sigma_k_2     = constants[1];
+  sigma_w_1     = constants[2];
+  sigma_w_2     = constants[3];
   beta_1        = constants[4];
   beta_2        = constants[5];
+  beta_star     = constants[6];
+  a1            = constants[7];
   alfa_1        = constants[8];
   alfa_2        = constants[9];
-  a1            = constants[7];
 
   /*--- Set the ambient values of k and omega to the free stream values. ---*/
   kAmb     = val_kine_Inf;
@@ -845,7 +848,6 @@ CNumerics::ResidualType<> CSourcePieceWise_TurbSST::ComputeResidual(const CConfi
      pk = Eddy_Viscosity_i*StrainMag_i*StrainMag_i - 2.0/3.0*Density_i*TurbVar_i[0]*diverg;
    }
 
-
    pk = min(pk,20.0*beta_star*Density_i*TurbVar_i[1]*TurbVar_i[0]);
    pk = max(pk,0.0);
 
@@ -889,6 +891,10 @@ CNumerics::ResidualType<> CSourcePieceWise_TurbSST::ComputeResidual(const CConfi
    /*--- Cross diffusion ---*/
 
    Residual[1] += (1.0 - F1_i)*CDkw_i*Volume;
+   
+   /*--- Contribution due to 2D axisymmetric formulation ---*/
+  
+   if (axisymmetric) ResidualAxisymmetric(alfa_blended,zeta);
 
    /*--- Implicit part ---*/
 

SU2_CFD/src/solvers/CMeshSolver.cpp

@@ -298,7 +298,7 @@ void CMeshSolver::SetWallDistance(CGeometry *geometry, CConfig *config) {
 
   unsigned long nVertex_SolidWall = 0;
   for(auto iMarker=0u; iMarker<config->GetnMarker_All(); ++iMarker) {
-    if(config->GetSolid_Wall(iMarker)) {
+    if(config->GetSolid_Wall(iMarker) && !config->GetMarker_All_Deform_Mesh_Sym_Plane(iMarker)) {
       nVertex_SolidWall += geometry->GetnVertex(iMarker);
     }
   }
@@ -315,7 +315,7 @@ void CMeshSolver::SetWallDistance(CGeometry *geometry, CConfig *config) {
 
   for (unsigned long iMarker=0, ii=0, jj=0; iMarker<config->GetnMarker_All(); ++iMarker) {
 
-    if (!config->GetSolid_Wall(iMarker)) continue;
+    if (!config->GetSolid_Wall(iMarker) || config->GetMarker_All_Deform_Mesh_Sym_Plane(iMarker)) continue;
 
     for (auto iVertex=0u; iVertex<geometry->GetnVertex(iMarker); ++iVertex) {
       auto iPoint = geometry->vertex[iMarker][iVertex]->GetNode();

SU2_CFD/src/solvers/CTurbSSTSolver.cpp

@@ -322,6 +322,8 @@ void CTurbSSTSolver::Postprocessing(CGeometry *geometry, CSolver **solver_contai
 
 void CTurbSSTSolver::Source_Residual(CGeometry *geometry, CSolver **solver_container,
                                      CNumerics **numerics_container, CConfig *config, unsigned short iMesh) {
+                                       
+  bool axisymmetric = config->GetAxisymmetric();
 
   CVariable* flowNodes = solver_container[FLOW_SOL]->GetNodes();
 
@@ -372,6 +374,11 @@ void CTurbSSTSolver::Source_Residual(CGeometry *geometry, CSolver **solver_conta
 
     numerics->SetCrossDiff(nodes->GetCrossDiff(iPoint),0.0);
 
+    if (axisymmetric){
+      /*--- Set y coordinate ---*/
+      numerics->SetCoord(geometry->nodes->GetCoord(iPoint), geometry->nodes->GetCoord(iPoint));
+    }
+    
     /*--- Compute the source term ---*/
 
     auto residual = numerics->ComputeResidual(config);