Address PR comments. Part 1.

Author: TobiKattmann

Common/include/CConfig.hpp

@@ -998,9 +998,9 @@ class CConfig {
 
   unsigned short Kind_Streamwise_Periodic;          /*!< \brief Kind of Streamwise periodic flow (pressure drop or massflow) */
   bool Streamwise_Periodic_Temperature;             /*!< \brief Use real periodicity for Energy equation or otherwise outlet source term. */
-  su2double Streamwise_Periodic_PressureDrop,       /*!< \brief Value of prescribed pressure drop [Pa] which results in an artificial body force vector. */
-            Streamwise_Periodic_TargetMassFlow,     /*!< \brief Value of prescribed massflow [kg/s] which results in an delta p and therefore an artificial body force vector. */
-            Streamwise_Periodic_OutletHeat;         /*!< /brief Heatflux boundary [W/m^2] imposed at streamwise periodic outlet. */
+  su2double Streamwise_Periodic_PressureDrop;       /*!< \brief Value of prescribed pressure drop [Pa] which results in an artificial body force vector. */
+  su2double Streamwise_Periodic_TargetMassFlow;     /*!< \brief Value of prescribed massflow [kg/s] which results in an delta p and therefore an artificial body force vector. */
+  su2double Streamwise_Periodic_OutletHeat;         /*!< /brief Heatflux boundary [W/m^2] imposed at streamwise periodic outlet. */
 
   su2double *FreeStreamTurboNormal;     /*!< \brief Direction to initialize the flow in turbomachinery computation */
   su2double Restart_Bandwidth_Agg;      /*!< \brief The aggregate of the bandwidth for writing binary restarts (to be averaged later). */

Common/include/geometry/CGeometry.hpp

@@ -1716,7 +1716,7 @@ class CGeometry {
    * \brief For streamwise periodicity, find & store a unique reference node on the designated periodic inlet.
    * \param[in] config - Definition of the particular problem.
    */
-  inline virtual void FindUniqueNode_PeriodicBound(CConfig *config) {}
+  inline virtual void FindUniqueNode_PeriodicBound(const CConfig *config) {}
 
   /*!
    * \brief Get a pointer to the reference node coordinate vector.

Common/include/geometry/CPhysicalGeometry.hpp

@@ -790,7 +790,7 @@ class CPhysicalGeometry final : public CGeometry {
    * \brief For streamwise periodicity, find & store a unique reference node on the designated periodic inlet.
    * \param[in] config - Definition of the particular problem.
    */
-  void FindUniqueNode_PeriodicBound(CConfig *config) final;
+  void FindUniqueNode_PeriodicBound(const CConfig *config) final;
 
   /*!
    * \brief Get a pointer to the reference node coordinate vector.

Common/src/CConfig.cpp

@@ -1937,7 +1937,7 @@ void CConfig::SetConfig_Options() {
   /*!\brief OUTPUT_FORMAT \n DESCRIPTION: I/O format for output plots. \n OPTIONS: see \link TabOutput_Map \endlink \n DEFAULT: TECPLOT \ingroup Config */
   addEnumOption("TABULAR_FORMAT", Tab_FileFormat, TabOutput_Map, TAB_CSV);
   /*!\brief OUTPUT_PRECISION \n DESCRIPTION: Set <ofstream>.precision(value) to specified value for SU2_DOT and HISTORY output. Useful for exact gradient validation. \n DEFAULT: 6 \ingroup Config */
-  addUnsignedShortOption("OUTPUT_PRECISION", output_precision, 6);
+  addUnsignedShortOption("OUTPUT_PRECISION", output_precision, 10);
   /*!\brief ACTDISK_JUMP \n DESCRIPTION: The jump is given by the difference in values or a ratio */
   addEnumOption("ACTDISK_JUMP", ActDisk_Jump, Jump_Map, DIFFERENCE);
   /*!\brief MESH_FORMAT \n DESCRIPTION: Mesh input file format \n OPTIONS: see \link Input_Map \endlink \n DEFAULT: SU2 \ingroup Config*/

Common/src/geometry/CPhysicalGeometry.cpp

@@ -7458,15 +7458,15 @@ void CPhysicalGeometry::MatchPeriodic(CConfig        *config,
   delete [] Buffer_Recv_Marker;
 }
 
-void CPhysicalGeometry::FindUniqueNode_PeriodicBound(CConfig *config) {
+void CPhysicalGeometry::FindUniqueNode_PeriodicBound(const CConfig *config) {
 
   /*-------------------------------------------------------------------------------------------*/
   /*--- Find reference node on the 'inlet' streamwise periodic marker for the computation   ---*/
   /*--- of recovered pressure/temperature, such that this found node is independent of the  ---*/
   /*--- number of ranks. This does not affect the 'correctness' of the solution as the      ---*/
   /*--- absolute value is arbitrary anyway, but it assures that the solution does not change---*/
   /*--- with a higher number of ranks. If the periodic markers are a line\plane and the     ---*/
-  /*--- streamwise coordiante vector is perpendicular to that |--->|, the choice of the     ---*/
+  /*--- streamwise coordinate vector is perpendicular to that |--->|, the choice of the     ---*/
   /*--- reference node is not relevant at all. This is probably true for most streamwise    ---*/
   /*--- periodic cases. Other cases where it is relevant could look like this (--->( or     ---*/
   /*--- \--->\ . The chosen metric is the minimal distance to the origin.                   ---*/

SU2_CFD/include/solvers/CIncNSSolver.hpp

@@ -65,6 +65,15 @@ class CIncNSSolver final : public CIncEulerSolver {
   void Viscous_Residual(unsigned long iEdge, CGeometry *geometry, CSolver **solver_container,
                         CNumerics *numerics, CConfig *config) override;
 
+  /*!
+   * \brief Compute recovered pressure/temperature for streamwise periodic flow and store in CVariable.
+   * \param[in] config - Definition of the particular problem.
+   * \param[in] geometry - Geometrical definition of the problem.
+   * \param[in] iMesh - current mesh level for the multigrid.
+   */
+  void Compute_Streamwise_Periodic_Recovered_Values(CConfig *config, const CGeometry *geometry,
+                                                    const unsigned short iMesh);
+
 public:
   /*!
    * \brief Constructor of the class.

SU2_CFD/src/output/COutput.cpp

@@ -1253,7 +1253,7 @@ void COutput::PrepareHistoryFile(CConfig *config){
   historyFileTable->SetAlign(PrintingToolbox::CTablePrinter::CENTER);
   historyFileTable->SetPrintHeaderTopLine(false);
   historyFileTable->SetPrintHeaderBottomLine(false);
-  historyFileTable->SetPrecision(config->OptionIsSet("OUTPUT_PRECISION") ? config->GetOutput_Precision() : 10);
+  historyFileTable->SetPrecision(config->GetOutput_Precision());
 
   /*--- Add the header to the history file. ---*/
 

SU2_CFD/src/solvers/CIncEulerSolver.cpp

@@ -1528,7 +1528,7 @@ void CIncEulerSolver::Source_Residual(CGeometry *geometry, CSolver **solver_cont
     }// for iPoint
 
     if(!streamwise_periodic_temperature && energy) {
-      CNumerics* second_numerics = numerics_container[SOURCE_SECOND_TERM];
+      CNumerics* second_numerics = numerics_container[SOURCE_SECOND_TERM + omp_get_thread_num()*MAX_TERMS];
       second_numerics->SetStreamwise_Periodic_Values(Streamwise_Periodic_MassFlow, Streamwise_Periodic_IntegratedHeatFlow,
                                                      Streamwise_Periodic_InletTemperature);
 
@@ -1539,6 +1539,7 @@ void CIncEulerSolver::Source_Residual(CGeometry *geometry, CSolver **solver_cont
         if (config->GetMarker_All_KindBC(iMarker) == PERIODIC_BOUNDARY &&
             config->GetMarker_All_PerBound(iMarker) == 1) {
 
+          SU2_OMP_FOR_STAT(omp_chunk_size)
           for (auto iVertex = 0ul; iVertex < geometry->nVertex[iMarker]; iVertex++) {
 
             iPoint = geometry->vertex[iMarker][iVertex]->GetNode();
@@ -2904,7 +2905,7 @@ void CIncEulerSolver::GetStreamwise_Periodic_Properties(const CGeometry      *ge
 
           // One could add a CVariable method to return a pointer to the first Vel element to directly plug into GeomToolbox
           su2double Velocity[MAXNDIM] = {0.0};
-          for (auto iDim = 0; iDim < nDim; iDim++) { Velocity[iDim] = nodes->GetVelocity(iPoint, iDim); }
+          for (unsigned short iDim = 0; iDim < nDim; iDim++) { Velocity[iDim] = nodes->GetVelocity(iPoint, iDim); }
           /*--- m_dot = dot_prod(n*v) * A * rho, with n beeing unit normal. ---*/
           MassFlow_Local += GeometryToolbox::DotProduct(nDim, AreaNormal, Velocity) * nodes->GetDensity(iPoint);
 
@@ -2982,8 +2983,9 @@ void CIncEulerSolver::GetStreamwise_Periodic_Properties(const CGeometry      *ge
 
       if (config->GetMarker_All_KindBC(iMarker) == HEAT_FLUX) {
 
-        /*--- Identify the boundary by string name ---*/
-        auto Marker_StringTag = config->GetMarker_All_TagBound(iMarker);
+        /*--- Identify the boundary by string name and retrive heatflux from config ---*/
+        const auto Marker_StringTag = config->GetMarker_All_TagBound(iMarker);
+        const auto Wall_HeatFlux = config->GetWall_HeatFlux(Marker_StringTag);
 
         for (auto iVertex = 0ul; iVertex < geometry->nVertex[iMarker]; iVertex++) {
 
@@ -2995,7 +2997,7 @@ void CIncEulerSolver::GetStreamwise_Periodic_Properties(const CGeometry      *ge
 
           auto FaceArea = GeometryToolbox::Norm(nDim, AreaNormal);
 
-          HeatFlow_Local += FaceArea * (-1.0) * config->GetWall_HeatFlux(Marker_StringTag)/config->GetHeat_Flux_Ref();;
+          HeatFlow_Local += FaceArea * (-1.0) * Wall_HeatFlux/config->GetHeat_Flux_Ref();;
         } // loop Vertices
       } // loop Heatflux marker
     } // loop AllMarker

SU2_CFD/src/solvers/CIncNSSolver.cpp

@@ -62,7 +62,6 @@ void CIncNSSolver::Preprocessing(CGeometry *geometry, CSolver **solver_container
   const bool center = (config->GetKind_ConvNumScheme_Flow() == SPACE_CENTERED);
   const bool limiter = (config->GetKind_SlopeLimit_Flow() != NO_LIMITER) && (InnerIter <= config->GetLimiterIter());
   const bool van_albada = (config->GetKind_SlopeLimit_Flow() == VAN_ALBADA_EDGE);
-  const bool energy = config->GetEnergy_Equation();
 
   /*--- Common preprocessing steps (implemented by CEulerSolver) ---*/
 
@@ -99,42 +98,49 @@ void CIncNSSolver::Preprocessing(CGeometry *geometry, CSolver **solver_container
   ComputeVorticityAndStrainMag<1>(*config, iMesh);
 
   /*--- Compute recovered pressure and temperature for streamwise periodic flow ---*/
-  if (config->GetKind_Streamwise_Periodic() != NONE) {
+  if (config->GetKind_Streamwise_Periodic() != NONE)
+    Compute_Streamwise_Periodic_Recovered_Values(config, geometry, iMesh);
+}
 
-    /*--- Define and initialize helping variables ---*/
-    su2double dot_product, Pressure_Recovered, Temperature_Recovered;
+void CIncNSSolver::Compute_Streamwise_Periodic_Recovered_Values(CConfig *config, const CGeometry *geometry,
+                                                                const unsigned short iMesh) {
 
-    const su2double delta_p  = config->GetStreamwise_Periodic_PressureDrop() / config->GetPressure_Ref();
+  const bool energy = (config->GetEnergy_Equation() && config->GetStreamwise_Periodic_Temperature());
+  const auto InnerIter = config->GetInnerIter();
 
-    /*--- Reference node on inlet periodic marker to compute relative distance along periodic translation vector. ---*/
-    const su2double* ReferenceNode = geometry->GetStreamwise_Periodic_RefNode();
+  const su2double delta_p  = config->GetStreamwise_Periodic_PressureDrop() / config->GetPressure_Ref();
 
-    /*--- Compute square of the distance between the 2 periodic surfaces. ---*/
-    const su2double norm2_translation = GeometryToolbox::SquaredNorm(nDim, config->GetPeriodic_Translation(0));
+  /*--- Reference node on inlet periodic marker to compute relative distance along periodic translation vector. ---*/
+  const su2double* ReferenceNode = geometry->GetStreamwise_Periodic_RefNode();
 
-    /*--- Compute recoverd pressure and temperature for all points ---*/
-    for (auto iPoint = 0ul; iPoint < nPoint; iPoint++) {
+  /*--- Compute square of the distance between the 2 periodic surfaces. ---*/
+  const su2double norm2_translation = GeometryToolbox::SquaredNorm(nDim, config->GetPeriodic_Translation(0));
 
-      /*--- First, compute helping terms based on relative distance (0,l) between periodic markers ---*/
-      dot_product = 0.0;
-      for (unsigned short iDim = 0; iDim < nDim; iDim++)
-        dot_product += fabs( (geometry->nodes->GetCoord(iPoint,iDim) - ReferenceNode[iDim]) * config->GetPeriodic_Translation(0)[iDim]);
+  /*--- Compute recoverd pressure and temperature for all points ---*/
+  SU2_OMP_FOR_STAT(omp_chunk_size)
+  for (auto iPoint = 0ul; iPoint < nPoint; iPoint++) {
 
-      /*--- Second, substract/add correction from reduced pressure/temperature to get recoverd pressure/temperature ---*/
-      Pressure_Recovered = nodes->GetSolution(iPoint, 0) - delta_p / norm2_translation * dot_product;
-      nodes->SetStreamwise_Periodic_RecoveredPressure(iPoint, Pressure_Recovered);
+    /*--- First, compute helping terms based on relative distance (0,l) between periodic markers ---*/
+    su2double dot_product = 0.0;
+    for (unsigned short iDim = 0; iDim < nDim; iDim++)
+      dot_product += fabs( (geometry->nodes->GetCoord(iPoint,iDim) - ReferenceNode[iDim]) * config->GetPeriodic_Translation(0)[iDim]);
 
-      /*--- InnerIter > 0 as otherwise MassFlow in the denominator would be zero ---*/
-      if (energy && InnerIter > 0) {
-        Temperature_Recovered  = nodes->GetSolution(iPoint, nDim+1);
-        Temperature_Recovered += Streamwise_Periodic_IntegratedHeatFlow / (Streamwise_Periodic_MassFlow * nodes->GetSpecificHeatCp(iPoint) * norm2_translation) * dot_product;
-        nodes->SetStreamwise_Periodic_RecoveredTemperature(iPoint, Temperature_Recovered);
-      }
+    /*--- Second, substract/add correction from reduced pressure/temperature to get recoverd pressure/temperature ---*/
+    const su2double Pressure_Recovered = nodes->GetPressure(iPoint) - delta_p / norm2_translation * dot_product;
+    nodes->SetStreamwise_Periodic_RecoveredPressure(iPoint, Pressure_Recovered);
+
+    /*--- InnerIter > 0 as otherwise MassFlow in the denominator would be zero ---*/
+    if (energy && InnerIter > 0) {
+      su2double Temperature_Recovered = nodes->GetTemperature(iPoint);
+      Temperature_Recovered += Streamwise_Periodic_IntegratedHeatFlow / (Streamwise_Periodic_MassFlow * nodes->GetSpecificHeatCp(iPoint) * norm2_translation) * dot_product;
+      nodes->SetStreamwise_Periodic_RecoveredTemperature(iPoint, Temperature_Recovered);
     }
+  } // for iPoint
 
-    /*--- Compute the integrated Heatflux Q into the domain, and massflow over periodic markers ---*/
-    GetStreamwise_Periodic_Properties(geometry, config, iMesh);
-  } // if streamwise periodic  
+  /*--- Compute the integrated Heatflux Q into the domain, and massflow over periodic markers ---*/
+  SU2_OMP_MASTER
+  GetStreamwise_Periodic_Properties(geometry, config, iMesh);
+  SU2_OMP_BARRIER
 }
 
 void CIncNSSolver::Viscous_Residual(unsigned long iEdge, CGeometry *geometry, CSolver **solver_container,
@@ -265,20 +271,20 @@ void CIncNSSolver::BC_Wall_Generic(const CGeometry *geometry, const CConfig *con
       LinSysRes(iPoint, nDim+1) -= Wall_HeatFlux*Area;
 
       /*--- With streamwise periodic flow and heatflux walls an additional term is introduced in the boundary formulation ---*/
-        if (streamwise_periodic && streamwise_periodic_temperature) {
+      if (streamwise_periodic && streamwise_periodic_temperature) {
 
-          Cp = nodes->GetSpecificHeatCp(iPoint);
-          thermal_conductivity = nodes->GetThermalConductivity(iPoint);
+        Cp = nodes->GetSpecificHeatCp(iPoint);
+        thermal_conductivity = nodes->GetThermalConductivity(iPoint);
 
-          /*--- Scalar factor of the residual contribution ---*/
-          const su2double norm2_translation = GeometryToolbox::SquaredNorm(nDim, config->GetPeriodic_Translation(0));
-          scalar_factor = Streamwise_Periodic_IntegratedHeatFlow*thermal_conductivity / (Streamwise_Periodic_MassFlow * Cp * norm2_translation);
+        /*--- Scalar factor of the residual contribution ---*/
+        const su2double norm2_translation = GeometryToolbox::SquaredNorm(nDim, config->GetPeriodic_Translation(0));
+        scalar_factor = Streamwise_Periodic_IntegratedHeatFlow*thermal_conductivity / (Streamwise_Periodic_MassFlow * Cp * norm2_translation);
 
-          /*--- Dot product ---*/
-          dot_product = GeometryToolbox::DotProduct(nDim, config->GetPeriodic_Translation(0), Normal);
+        /*--- Dot product ---*/
+        dot_product = GeometryToolbox::DotProduct(nDim, config->GetPeriodic_Translation(0), Normal);
 
-          LinSysRes(iPoint, nDim+1) += scalar_factor*dot_product;
-        } // if streamwise_periodic
+        LinSysRes(iPoint, nDim+1) += scalar_factor*dot_product;
+      } // if streamwise_periodic
     }
     else { // ISOTHERMAL
 

SU2_CFD/src/variables/CIncEulerVariable.cpp

@@ -114,8 +114,12 @@ CIncEulerVariable::CIncEulerVariable(su2double pressure, const su2double *veloci
   Delta_Time.resize(nPoint) = su2double(0.0);
   Lambda.resize(nPoint) = su2double(0.0);
   Sensor.resize(nPoint) = su2double(0.0);
-  Streamwise_Periodic_RecoveredPressure.resize(nPoint)    = su2double(0.0);
-  Streamwise_Periodic_RecoveredTemperature.resize(nPoint) = su2double(0.0);
+
+  if (config->GetKind_Streamwise_Periodic() != NONE) {
+    Streamwise_Periodic_RecoveredPressure.resize(nPoint) = su2double(0.0);
+    if (config->GetStreamwise_Periodic_Temperature())
+      Streamwise_Periodic_RecoveredTemperature.resize(nPoint) = su2double(0.0);
+  }
 
   /* Under-relaxation parameter. */
   UnderRelaxation.resize(nPoint) = su2double(1.0);