Merge branch 'feature_SST-Vm' into sa_options

pcarruscag · pcarruscag · commit cfd172115a3a · 2022-05-19T13:17:40.000+01:00
diff --git a/Common/include/CConfig.hpp b/Common/include/CConfig.hpp
@@ -2697,7 +2697,12 @@ class CConfig {
    * \brief Set the number of multigrid levels.
    * \param[in] val_nMGLevels - Index of the mesh were the CFL is applied
    */
-  void SetMGLevels(unsigned short val_nMGLevels) { nMGLevels = val_nMGLevels; }
+  void SetMGLevels(unsigned short val_nMGLevels) {
+    nMGLevels = val_nMGLevels;
+    if (MGCycle == FULLMG_CYCLE) {
+      SetFinestMesh(val_nMGLevels);
+    }
+  }
 
   /*!
    * \brief Get the index of the finest grid.
diff --git a/Common/include/geometry/dual_grid/CPoint.hpp b/Common/include/geometry/dual_grid/CPoint.hpp
@@ -70,6 +70,7 @@ class CPoint {
   su2vector<bool> Boundary;               /*!< \brief To see if a point belong to the boundary (including MPI). */
   su2vector<bool> PhysicalBoundary;       /*!< \brief To see if a point belong to the physical boundary (without includin MPI). */
   su2vector<bool> SolidBoundary;          /*!< \brief To see if a point belong to the physical boundary (without includin MPI). */
+  su2vector<bool> ViscousBoundary;        /*!< \brief To see if a point belong to the physical boundary (without includin MPI). */
   su2vector<bool> PeriodicBoundary;       /*!< \brief To see if a point belongs to a periodic boundary (without including MPI). */
 
   su2activematrix Coord;                  /*!< \brief vector with the coordinates of the node. */
@@ -351,6 +352,20 @@ class CPoint {
    */
   inline bool GetSolidBoundary(unsigned long iPoint) const { return SolidBoundary(iPoint); }
 
+  /*!
+   * \brief Set if a point belong to the boundary.
+   * \param[in] iPoint - Index of the point.
+   * \param[in] boundary - <code>TRUE</code> if the point belong to the physical boundary; otherwise <code>FALSE</code>.
+   */
+  inline void SetViscousBoundary(unsigned long iPoint, bool boundary) { ViscousBoundary(iPoint) = boundary; }
+
+  /*!
+   * \brief Provides information about if a point belong to the physical boundaries (without MPI).
+   * \param[in] iPoint - Index of the point.
+   * \return <code>TRUE</code> if the point belong to the boundary; otherwise <code>FALSE</code>.
+   */
+  inline bool GetViscousBoundary(unsigned long iPoint) const { return ViscousBoundary(iPoint); }
+
   /*!
    * \brief Set if a point belongs to a periodic boundary.
    * \param[in] iPoint - Index of the point.
diff --git a/Common/src/geometry/CPhysicalGeometry.cpp b/Common/src/geometry/CPhysicalGeometry.cpp
@@ -3660,6 +3660,9 @@ void CPhysicalGeometry::SetBoundaries(CConfig *config) {
         if (config->GetSolid_Wall(iMarker))
           nodes->SetSolidBoundary(Point_Surface, true);
 
+        if (config->GetViscous_Wall(iMarker))
+          nodes->SetViscousBoundary(Point_Surface, true);
+
         if (config->GetMarker_All_KindBC(iMarker) == PERIODIC_BOUNDARY)
           nodes->SetPeriodicBoundary(Point_Surface, true);
       }
@@ -4853,6 +4856,7 @@ void CPhysicalGeometry::SetRCM_Ordering(CConfig *config) {
     nodes->ResetBoundary(iPoint);
     nodes->SetPhysicalBoundary(iPoint, false);
     nodes->SetSolidBoundary(iPoint, false);
+    nodes->SetViscousBoundary(iPoint, false);
     nodes->SetPeriodicBoundary(iPoint, false);
     nodes->SetDomain(iPoint, true);
   }
@@ -4909,6 +4913,9 @@ void CPhysicalGeometry::SetRCM_Ordering(CConfig *config) {
         if (config->GetSolid_Wall(iMarker))
           nodes->SetSolidBoundary(InvResult[iPoint], true);
 
+        if (config->GetViscous_Wall(iMarker) )
+          nodes->SetViscousBoundary(InvResult[iPoint], true);
+
         if (config->GetMarker_All_KindBC(iMarker) == PERIODIC_BOUNDARY)
           nodes->SetPeriodicBoundary(InvResult[iPoint], true);
       }
diff --git a/Common/src/geometry/dual_grid/CPoint.cpp b/Common/src/geometry/dual_grid/CPoint.cpp
@@ -95,6 +95,7 @@ void CPoint::FullAllocation(unsigned short imesh, const CConfig *config) {
   Domain.resize(npoint) = true;
   Boundary.resize(npoint) = false;
   SolidBoundary.resize(npoint) = false;
+  ViscousBoundary.resize(npoint) = false;
   PhysicalBoundary.resize(npoint) = false;
   PeriodicBoundary.resize(npoint) = false;
 
diff --git a/SU2_CFD/include/integration/CIntegration.hpp b/SU2_CFD/include/integration/CIntegration.hpp
@@ -49,7 +49,7 @@ class CIntegration {
   size;          /*!< \brief MPI Size. */
   bool Convergence,   /*!< \brief To indicate if the flow solver (direct, adjoint, or linearized) has converged or not. */
   Convergence_FSI,    /*!< \brief To indicate if the FSI problem has converged or not. */
-  Convergence_FullMG;  /*!< \brief Initial value of the residual to evaluate the convergence level. */
+  Convergence_FullMG;  /*!< \brief To indicate if the full multigrid has converged or not. */
 
   /*!
    * \brief Do the space integration of the numerical system.
diff --git a/SU2_CFD/include/numerics/CNumerics.hpp b/SU2_CFD/include/numerics/CNumerics.hpp
@@ -1,6 +1,6 @@
 ﻿/*!
  * \file CNumerics.hpp
- * \brief Delaration of the base numerics class, the
+ * \brief Declaration of the base numerics class, the
  *        implementation is in the CNumerics.cpp file.
  * \author F. Palacios, T. Economon
  * \version 7.3.1 "Blackbird"
diff --git a/SU2_CFD/include/numerics/NEMO/NEMO_sources.hpp b/SU2_CFD/include/numerics/NEMO/NEMO_sources.hpp
@@ -1,6 +1,6 @@
 /*!
  * \file NEMO_sources.hpp
- * \brief Delarations of numerics classes for source-term integration.
+ * \brief Declarations of numerics classes for source-term integration.
  * \author C. Garbacz, W. Maier, S. Copeland.
  * \version 7.3.1 "Blackbird"
  *
diff --git a/SU2_CFD/include/numerics/NEMO/convection/roe.hpp b/SU2_CFD/include/numerics/NEMO/convection/roe.hpp
@@ -1,6 +1,6 @@
 /*!
  * \file roe.hpp
- * \brief Delarations of numerics classes for Roe-type schemes in NEMO.
+ * \brief Declarations of numerics classes for Roe-type schemes in NEMO.
  * \author S.R. Copeland, W. Maier, C. Garbacz
  * \version 7.3.1 "Blackbird"
  *
diff --git a/SU2_CFD/include/numerics/continuous_adjoint/adj_convection.hpp b/SU2_CFD/include/numerics/continuous_adjoint/adj_convection.hpp
@@ -1,6 +1,6 @@
 ﻿/*!
  * \file adj_convection.hpp
- * \brief Delarations of numerics classes for continuous adjoint
+ * \brief Declarations of numerics classes for continuous adjoint
  *        convective discretization. Implemented in adj_convection.cpp.
  * \author F. Palacios, T. Economon
  * \version 7.3.1 "Blackbird"
diff --git a/SU2_CFD/include/numerics/continuous_adjoint/adj_diffusion.hpp b/SU2_CFD/include/numerics/continuous_adjoint/adj_diffusion.hpp
@@ -1,6 +1,6 @@
 ﻿/*!
  * \file adj_diffusion.hpp
- * \brief Delarations of numerics classes for continuous adjoint
+ * \brief Declarations of numerics classes for continuous adjoint
  *        diffusion discretization. Implemented in adj_diffusion.cpp.
  * \author F. Palacios, T. Economon
  * \version 7.3.1 "Blackbird"
diff --git a/SU2_CFD/include/numerics/continuous_adjoint/adj_sources.hpp b/SU2_CFD/include/numerics/continuous_adjoint/adj_sources.hpp
@@ -1,6 +1,6 @@
 ﻿/*!
  * \file adj_sources.hpp
- * \brief Delarations of numerics classes for continuous adjoint
+ * \brief Declarations of numerics classes for continuous adjoint
  *        source term integration. Implemented in adj_sources.cpp.
  * \author F. Palacios, T. Economon
  * \version 7.3.1 "Blackbird"
diff --git a/SU2_CFD/include/numerics/flow/convection/centered.hpp b/SU2_CFD/include/numerics/flow/convection/centered.hpp
@@ -1,6 +1,6 @@
 ﻿/*!
  * \file centered.hpp
- * \brief Delaration of numerics classes for centered schemes,
+ * \brief Declaration of numerics classes for centered schemes,
  *        the implementation is in centered.cpp.
  * \author F. Palacios, T. Economon
  * \version 7.3.1 "Blackbird"
diff --git a/SU2_CFD/include/numerics/flow/convection/fvs.hpp b/SU2_CFD/include/numerics/flow/convection/fvs.hpp
@@ -1,6 +1,6 @@
 ﻿/*!
  * \file fvs.hpp
- * \brief Delarations of classes for Flux-Vector-Spliting schemes,
+ * \brief Declarations of classes for Flux-Vector-Spliting schemes,
  *        the implementations are in fvs.cpp.
  * \author F. Palacios, T. Economon
  * \version 7.3.1 "Blackbird"
diff --git a/SU2_CFD/include/numerics/flow/convection/roe.hpp b/SU2_CFD/include/numerics/flow/convection/roe.hpp
@@ -1,6 +1,6 @@
 ﻿/*!
  * \file roe.hpp
- * \brief Delarations of numerics classes for Roe-type schemes,
+ * \brief Declarations of numerics classes for Roe-type schemes,
  *        implemented in roe.cpp.
  * \author F. Palacios, T. Economon
  * \version 7.3.1 "Blackbird"
diff --git a/SU2_CFD/include/numerics/flow/flow_diffusion.hpp b/SU2_CFD/include/numerics/flow/flow_diffusion.hpp
@@ -1,6 +1,6 @@
 ﻿/*!
  * \file flow_diffusion.hpp
- * \brief Delarations of numerics classes for viscous flux computation.
+ * \brief Declarations of numerics classes for viscous flux computation.
  * \author F. Palacios, T. Economon
  * \version 7.3.1 "Blackbird"
  *
diff --git a/SU2_CFD/include/numerics/flow/flow_sources.hpp b/SU2_CFD/include/numerics/flow/flow_sources.hpp
@@ -1,6 +1,6 @@
 ﻿/*!
  * \file flow_sources.hpp
- * \brief Delarations of numerics classes for source-term integration.
+ * \brief Declarations of numerics classes for source-term integration.
  * \author F. Palacios, T. Economon
  * \version 7.3.1 "Blackbird"
  *
diff --git a/SU2_CFD/include/numerics/heat.hpp b/SU2_CFD/include/numerics/heat.hpp
@@ -1,6 +1,6 @@
 ﻿/*!
  * \file heat.hpp
- * \brief Delarations of numerics classes for heat transfer problems.
+ * \brief Declarations of numerics classes for heat transfer problems.
  * \author F. Palacios, T. Economon
  * \version 7.3.1 "Blackbird"
  *
diff --git a/SU2_CFD/include/numerics/scalar/scalar_convection.hpp b/SU2_CFD/include/numerics/scalar/scalar_convection.hpp
@@ -1,6 +1,6 @@
 ﻿/*!
  * \file scalar_convection.hpp
- * \brief Delarations of numerics classes for discretization of
+ * \brief Declarations of numerics classes for discretization of
  *        convective fluxes in scalar problems.
  * \author F. Palacios, T. Economon
  * \version 7.3.1 "Blackbird"
diff --git a/SU2_CFD/include/numerics/scalar/scalar_sources.hpp b/SU2_CFD/include/numerics/scalar/scalar_sources.hpp
@@ -1,6 +1,6 @@
 ﻿/*!
  * \file scalar_sources.hpp
- * \brief Delarations of numerics classes for integration of source terms in scalar problems.
+ * \brief Declarations of numerics classes for integration of source terms in scalar problems.
  * \version 7.3.1 "Blackbird"
  *
  * SU2 Project Website: https://su2code.github.io
diff --git a/SU2_CFD/include/numerics/species/species_convection.hpp b/SU2_CFD/include/numerics/species/species_convection.hpp
@@ -1,6 +1,6 @@
 ﻿/*!
  * \file species_convection.hpp
- * \brief Delarations of numerics classes for discretization of
+ * \brief Declarations of numerics classes for discretization of
  *        convective fluxes in species problems.
  * \author T. Kattmann
  * \version 7.3.1 "Blackbird"
diff --git a/SU2_CFD/include/numerics/species/species_sources.hpp b/SU2_CFD/include/numerics/species/species_sources.hpp
@@ -1,6 +1,6 @@
 ﻿/*!
  * \file species_sources.hpp
- * \brief Delarations of numerics classes for integration of source
+ * \brief Declarations of numerics classes for integration of source
  *        terms in species problems.
  * \author T. Kattmann
  * \version 7.3.1 "Blackbird"
diff --git a/SU2_CFD/include/numerics/transition.hpp b/SU2_CFD/include/numerics/transition.hpp
@@ -1,6 +1,6 @@
 ﻿/*!
  * \file transition.hpp
- * \brief Delarations of numerics classes for transition problems.
+ * \brief Declarations of numerics classes for transition problems.
  * \author F. Palacios, T. Economon
  * \version 7.3.1 "Blackbird"
  *
diff --git a/SU2_CFD/include/numerics/turbulent/turb_convection.hpp b/SU2_CFD/include/numerics/turbulent/turb_convection.hpp
@@ -1,6 +1,6 @@
 ﻿/*!
  * \file turb_convection.hpp
- * \brief Delarations of numerics classes for discretization of
+ * \brief Declarations of numerics classes for discretization of
  *        convective fluxes in turbulence problems.
  * \author F. Palacios, T. Economon
  * \version 7.3.1 "Blackbird"
diff --git a/SU2_CFD/include/solvers/CFVMFlowSolverBase.inl b/SU2_CFD/include/solvers/CFVMFlowSolverBase.inl
@@ -2515,10 +2515,8 @@ void CFVMFlowSolverBase<V, FlowRegime>::Friction_Forces(const CGeometry* geometr
 
     for (iVertex = 0; iVertex < geometry->nVertex[iMarker]; iVertex++) {
       iPoint = geometry->vertex[iMarker][iVertex]->GetNode();
-      iPointNormal = geometry->vertex[iMarker][iVertex]->GetNormal_Neighbor();
 
       Coord = geometry->nodes->GetCoord(iPoint);
-      Coord_Normal = geometry->nodes->GetCoord(iPointNormal);
 
       Normal = geometry->vertex[iMarker][iVertex]->GetNormal();
 
@@ -2584,13 +2582,15 @@ void CFVMFlowSolverBase<V, FlowRegime>::Friction_Forces(const CGeometry* geometr
         CSkinFriction[iMarker](iVertex,iDim) = TauTangent[iDim] * factorFric;
       }
 
-      WallDistMod = GeometryToolbox::Distance(nDim, Coord, Coord_Normal);
-
       /*--- Compute non-dimensional velocity and y+ ---*/
 
       FrictionVel = sqrt(fabs(WallShearStress[iMarker][iVertex]) / Density);
-
-      if (!wallfunctions) {
+      
+      if (!wallfunctions && (MGLevel == MESH_0 || geometry->nodes->GetDomain(iPoint))) {
+        // for CMultiGridGeometry, the normal neighbor of halo nodes in not set
+        iPointNormal = geometry->vertex[iMarker][iVertex]->GetNormal_Neighbor();
+        Coord_Normal = geometry->nodes->GetCoord(iPointNormal);
+        WallDistMod = GeometryToolbox::Distance(nDim, Coord, Coord_Normal);
         YPlus[iMarker][iVertex] = WallDistMod * FrictionVel / (Viscosity / Density);
       }
 
@@ -2627,7 +2627,7 @@ void CFVMFlowSolverBase<V, FlowRegime>::Friction_Forces(const CGeometry* geometr
         HeatFlux[iMarker][iVertex] = thermal_conductivity_tr*dTn + thermal_conductivity_ve*dTven;
       }
 
-      /*--- Note that y+, and heat are computed at the
+      /*--- Note that heat is computed at the
        halo cells (for visualization purposes), but not the forces ---*/
 
       if ((geometry->nodes->GetDomain(iPoint)) && (Monitoring == YES)) {
diff --git a/SU2_CFD/src/iteration/CDiscAdjFluidIteration.cpp b/SU2_CFD/src/iteration/CDiscAdjFluidIteration.cpp
@@ -116,7 +116,7 @@ void CDiscAdjFluidIteration::Preprocess(COutput* output, CIntegration**** integr
 
       /*--- Load solution timestep n ---*/
 
-      LoadUnsteady_Solution(geometry, solver, config, iInst, iZone, Direct_Iter);
+      LoadUnsteady_Solution(geometry, solver, config, iZone, iInst, Direct_Iter);
 
       if (config[iZone]->GetDeform_Mesh()) {
         solvers0[MESH_SOL]->LoadRestart(geometries, solver[iZone][iInst], config[iZone], Direct_Iter, true);
@@ -147,9 +147,9 @@ void CDiscAdjFluidIteration::Preprocess(COutput* output, CIntegration**** integr
 
       /*--- Load solution timestep n-1 | n-2 for DualTimestepping 1st | 2nd order ---*/
       if (dual_time_1st) {
-        LoadUnsteady_Solution(geometry, solver, config, iInst, iZone, Direct_Iter - 1);
+        LoadUnsteady_Solution(geometry, solver, config, iZone, iInst, Direct_Iter - 1);
       } else {
-        LoadUnsteady_Solution(geometry, solver, config, iInst, iZone, Direct_Iter - 2);
+        LoadUnsteady_Solution(geometry, solver, config, iZone, iInst, Direct_Iter - 2);
 
         /*--- Set volumes into correct containers ---*/
         if (config[iZone]->GetDynamic_Grid()) {
diff --git a/SU2_CFD/src/output/COutput.cpp b/SU2_CFD/src/output/COutput.cpp
@@ -1039,7 +1039,12 @@ bool COutput::Convergence_Monitoring(CConfig *config, unsigned long Iteration) {
 
         oldFunc[iField_Conv] = newFunc[iField_Conv];
         newFunc[iField_Conv] = monitor;
-        cauchyFunc = fabs(newFunc[iField_Conv] - oldFunc[iField_Conv]) / fabs(monitor);
+        /*--- Automatically modify the scaling factor of relative Cauchy convergence for 
+        * coefficients that are close to zero. Example: For the clean aircraft, the rolling 
+        * moment coefficient MOMENT_X is close to zero and thus will never reach a relative 
+        * cauchy convergence ->> dividing tiny numbers is not a good idea. Using absolute 
+        * cauchy convergence is more robust in this case. ---*/
+        cauchyFunc = fabs(newFunc[iField_Conv] - oldFunc[iField_Conv]) / fmax(fabs(monitor), 0.1);
 
         cauchySerie[iField_Conv][Iteration % nCauchy_Elems] = cauchyFunc;
         cauchyValue = 0.0;
diff --git a/SU2_CFD/src/solvers/CIncEulerSolver.cpp b/SU2_CFD/src/solvers/CIncEulerSolver.cpp
@@ -2310,6 +2310,15 @@ void CIncEulerSolver::BC_Inlet(CGeometry *geometry, CSolver **solver_container,
         break;
     }
 
+    /*--- check if the inlet node is shared with a viscous wall ---*/
+    if (geometry->nodes->GetViscousBoundary(iPoint)) {
+      /*--- match the velocity and pressure for the viscous wall---*/
+      for (iDim = 0; iDim < nDim; iDim++)
+        V_inlet[iDim+prim_idx.Velocity()] = nodes->GetVelocity(iPoint,iDim);
+      /* pressure obtained from interior */
+      V_inlet[prim_idx.Pressure()] = nodes->GetPressure(iPoint);
+    } 
+
     /*--- Access density at the node. This is either constant by
       construction, or will be set fixed implicitly by the temperature
       and equation of state. ---*/
diff --git a/SU2_CFD/src/solvers/CTurbSSTSolver.cpp b/SU2_CFD/src/solvers/CTurbSSTSolver.cpp
@@ -1,6 +1,6 @@
 /*!
  * \file CTurbSSTSolver.cpp
- * \brief Main subrotuines of CTurbSSTSolver class
+ * \brief Main subroutines of CTurbSSTSolver class
  * \author F. Palacios, A. Bueno
  * \version 7.3.1 "Blackbird"
  *
@@ -59,7 +59,7 @@ CTurbSSTSolver::CTurbSSTSolver(CGeometry *geometry, CConfig *config, unsigned sh
 
   /*--- Single grid simulation ---*/
 
-  if (iMesh == MESH_0) {
+  if (iMesh == MESH_0 || config->GetMGCycle() == FULLMG_CYCLE) {
 
     /*--- Define some auxiliary vector related with the residual ---*/
 
diff --git a/TestCases/hybrid_regression.py b/TestCases/hybrid_regression.py
@@ -384,7 +384,7 @@ def main():
     inc_lam_bend.cfg_dir   = "incomp_navierstokes/bend"
     inc_lam_bend.cfg_file  = "lam_bend.cfg"
     inc_lam_bend.test_iter = 10
-    inc_lam_bend.test_vals = [-3.436191, -3.098014, -0.017338, -0.193981]
+    inc_lam_bend.test_vals = [-3.437996, -3.086189, -0.015600, 1.142212]
     test_list.append(inc_lam_bend)
 
     ############################
@@ -633,7 +633,7 @@ def main():
     slinc_steady.cfg_dir   = "sliding_interface/incompressible_steady"
     slinc_steady.cfg_file  = "config.cfg"
     slinc_steady.test_iter = 19
-    slinc_steady.test_vals = [19.000000, -1.800401, -2.114687]
+    slinc_steady.test_vals = [19.000000, -1.799803, -2.128200]
     slinc_steady.multizone = True
     test_list.append(slinc_steady)
 
diff --git a/TestCases/parallel_regression.py b/TestCases/parallel_regression.py
diff --git a/TestCases/serial_regression.py b/TestCases/serial_regression.py
diff --git a/TestCases/tutorials.py b/TestCases/tutorials.py
diff --git a/TestCases/vandv.py b/TestCases/vandv.py
diff --git a/TestCases/vandv/rans/bump_in_channel/turb_bump_sst.cfg b/TestCases/vandv/rans/bump_in_channel/turb_bump_sst.cfg
diff --git a/TestCases/vandv/rans/flatplate/turb_flatplate_sst.cfg b/TestCases/vandv/rans/flatplate/turb_flatplate_sst.cfg

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`/*!`
`2`	`2`	`* \file NEMO_sources.hpp`
`3`		`- * \brief Delarations of numerics classes for source-term integration.`
	`3`	`+ * \brief Declarations of numerics classes for source-term integration.`
`4`	`4`	`* \author C. Garbacz, W. Maier, S. Copeland.`
`5`	`5`	`* \version 7.3.1 "Blackbird"`
`6`	`6`	`*`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`/*!`
`2`	`2`	`* \file roe.hpp`
`3`		`- * \brief Delarations of numerics classes for Roe-type schemes in NEMO.`
	`3`	`+ * \brief Declarations of numerics classes for Roe-type schemes in NEMO.`
`4`	`4`	`* \author S.R. Copeland, W. Maier, C. Garbacz`
`5`	`5`	`* \version 7.3.1 "Blackbird"`
`6`	`6`	`*`