Adress PR comments. Part 2.

Author: TobiKattmann

Common/include/CConfig.hpp

@@ -5766,12 +5766,6 @@ class CConfig {
    * \return Delta Pressure for body force computation.
    */
   su2double GetStreamwise_Periodic_PressureDrop(void) const { return Streamwise_Periodic_PressureDrop; }
-  
-  /*!
-   * \brief Set the value of the pressure delta from which body force vector is computed.
-   * \param[in] delta_p - pressure difference between in- and outlet.
-   */
-  void SetStreamwise_Periodic_PressureDrop(su2double delta_p) { Streamwise_Periodic_PressureDrop = delta_p; }
 
   /*!
    * \brief Get the value of the massflow from which body force vector is computed.

Common/include/option_structure.hpp

@@ -2270,6 +2270,16 @@ static const MapType<string, ENUM_STREAMWISE_PERIODIC> Streamwise_Periodic_Map =
   MakePair("MASSFLOW",      STREAMWISE_MASSFLOW)
 };
 
+/*!
+ * \brief Container to hold Variables for streamwise Periodic flow as they are often used together in places.
+ */
+struct StreamwisePeriodicValues {
+  su2double Streamwise_Periodic_PressureDrop;       /*!< \brief Value of prescribed pressure drop [Pa] which results in an artificial body force vector. */
+  su2double Streamwise_Periodic_MassFlow;           /*!< \brief Value of current massflow [kg/s] which results in a delta p and therefore an artificial body force vector. */
+  su2double Streamwise_Periodic_IntegratedHeatFlow; /*!< \brief Value of of the net sum of heatflow [W] into the domain. */
+  su2double Streamwise_Periodic_InletTemperature;   /*!< \brief Area avg static Temp [K] at the periodic inlet. Used for adaptive outlet heatsink. */
+};
+
 #undef MakePair
 /* END_CONFIG_ENUMS */
 

Common/src/geometry/CPhysicalGeometry.cpp

@@ -7473,10 +7473,12 @@ void CPhysicalGeometry::FindUniqueNode_PeriodicBound(const CConfig *config) {
   /*-------------------------------------------------------------------------------------------*/
 
   /*--- Initialize/Allocate variables. ---*/
-  su2double min_norm = 0.0;
+  su2double min_norm = numeric_limits<su2double>::max();
 
-  vector<su2double> Buffer_Send_RefNode(nDim, 1e300),
-                    Buffer_Recv_RefNode(static_cast<size_t>(size)*nDim);
+  /*--- Communicate Coordinates plus the minimum distance, therefor the nDim+1 ---*/
+  vector<su2double> Buffer_Send_RefNode(nDim+1, numeric_limits<su2double>::max());
+  su2activematrix Buffer_Recv_RefNode(size,nDim+1);
+  unsigned long iPointMin;
 
   /*-------------------------------------------------------------------------------------------*/
   /*--- Step 1: Find a unique reference node on each rank and communicate them such that    ---*/
@@ -7496,14 +7498,13 @@ void CPhysicalGeometry::FindUniqueNode_PeriodicBound(const CConfig *config) {
 
           auto iPoint = vertex[iMarker][iVertex]->GetNode();
 
-          /*--- Get the squared norm of the current point. ---*/
+          /*--- Get the squared norm of the current point. sqrt is a monotonic function in [0,R+) so for comparison we dont need Norm. ---*/
           auto norm = GeometryToolbox::SquaredNorm(nDim, nodes->GetCoord(iPoint));
 
-          /*--- Check if new unique reference node is found. ---*/
-          if (norm < min_norm || iVertex == 0) {
+          /*--- Check if new unique reference node is found and store Point ID. ---*/
+          if (norm < min_norm) {
             min_norm = norm;
-            for (unsigned short iDim = 0; iDim < nDim; iDim++)
-              Buffer_Send_RefNode[iDim] = nodes->GetCoord(iPoint,iDim);
+            iPointMin = iPoint;
           }
           /*--- The theoretical case, that multiple inlet points with the same distance to the origin exists, remains. ---*/
         }
@@ -7512,26 +7513,32 @@ void CPhysicalGeometry::FindUniqueNode_PeriodicBound(const CConfig *config) {
     } // periodic conditional
   } // marker loop
 
+  /*--- Copy the Coordinates and norm into send buffer. ---*/
+  for (unsigned short iDim = 0; iDim < nDim; iDim++)
+    Buffer_Send_RefNode[iDim] = nodes->GetCoord(iPointMin,iDim);
+  Buffer_Send_RefNode[nDim] = min_norm;
+
   /*--- Communicate unique nodes to all processes. In case of serial mode nothing happens. ---*/
-  SU2_MPI::Allgather(Buffer_Send_RefNode.data(), nDim, MPI_DOUBLE,
-                     Buffer_Recv_RefNode.data(), nDim, MPI_DOUBLE, SU2_MPI::GetComm());
+  SU2_MPI::Allgather(Buffer_Send_RefNode.data(), nDim+1, MPI_DOUBLE,
+                     Buffer_Recv_RefNode.data(), nDim+1, MPI_DOUBLE, SU2_MPI::GetComm());
 
   /*-------------------------------------------------------------------------------------------*/
   /*--- Step 2: Amongst all local nodes with the smallest distance to the origin, find the  ---*/
   /*---         globally closest to the origin. Store the found node coordinates in the     ---*/
   /*---         geometry container.                                                         ---*/
   /*-------------------------------------------------------------------------------------------*/
 
+  min_norm = numeric_limits<su2double>::max();
+
   for (int iRank = 0; iRank < size; iRank++) {
 
-    /*--- Get the norm of the current Point. ---*/
-    auto norm = GeometryToolbox::SquaredNorm(nDim, &Buffer_Recv_RefNode[static_cast<size_t>(iRank)*nDim]);
+    auto norm = Buffer_Recv_RefNode(iRank,nDim);
 
     /*--- Check if new unique reference node is found. ---*/
-    if (norm < min_norm || iRank == 0) {
+    if (norm < min_norm) {
       min_norm = norm;
       for (unsigned short iDim = 0; iDim < nDim; iDim++)
-        Streamwise_Periodic_RefNode[iDim] = Buffer_Recv_RefNode[iRank*nDim + iDim];
+        Streamwise_Periodic_RefNode[iDim] = Buffer_Recv_RefNode(iRank,iDim);
     }
   }
 

SU2_CFD/include/numerics/CNumerics.hpp

@@ -1610,9 +1610,10 @@ class CNumerics {
    * \param[in] integratedHeat - integrated heatflow over heatflux boundaries [W].
    * \param[in] inletTemp - massflow averaged periodic inlet temperature [K].
    */
-  virtual inline void SetStreamwise_Periodic_Values(const su2double massflow,
-                                                    const su2double integratedHeat,
-                                                    const su2double inletTemp) { }
+  virtual void SetStreamwisePeriodicValues(const su2double pressureDrop, const su2double massflow,
+                                           const su2double integratedHeat, const su2double inletTemp) {
+
+  }
 };
 
 /*!

SU2_CFD/include/numerics/flow/flow_sources.hpp

@@ -40,10 +40,7 @@ class CSourceBase_Flow : public CNumerics {
 protected:
   su2double* residual = nullptr;
   su2double** jacobian = nullptr;
-  su2double
-  Streamwise_Periodic_MassFlow,           /*!< \brief Value of current massflow [kg/s] which results in a delta p and therefore an artificial body force vector. */
-  Streamwise_Periodic_IntegratedHeatFlow, /*!< \brief Value of of the net sum of heatflow [W] into the domain. */
-  Streamwise_Periodic_InletTemperature;   /*!< \brief Area avg static Temp [K] at the periodic inlet. Used for adaptive outlet heatsink. */
+  struct StreamwisePeriodicValues SPvals;
 
   /*!
    * \brief Constructor of the class.
@@ -65,10 +62,11 @@ class CSourceBase_Flow : public CNumerics {
    * \param[in] integratedHeat - integrated heatflow over heatflux boundaries [W].
    * \param[in] inletTemp - massflow averaged periodic inlet temperature [K].
    */
-  void SetStreamwise_Periodic_Values(const su2double massflow, const su2double integratedHeat, const su2double inletTemp) {
-    Streamwise_Periodic_MassFlow = massflow;
-    Streamwise_Periodic_IntegratedHeatFlow = integratedHeat;
-    Streamwise_Periodic_InletTemperature = inletTemp;
+  void SetStreamwisePeriodicValues(const su2double pressureDrop, const su2double massflow, const su2double integratedHeat, const su2double inletTemp) {
+    SPvals.Streamwise_Periodic_PressureDrop = pressureDrop;
+    SPvals.Streamwise_Periodic_MassFlow = massflow;
+    SPvals.Streamwise_Periodic_IntegratedHeatFlow = integratedHeat;
+    SPvals.Streamwise_Periodic_InletTemperature = inletTemp;
   }
 
 };

SU2_CFD/include/solvers/CIncEulerSolver.hpp

@@ -39,10 +39,10 @@
 class CIncEulerSolver : public CFVMFlowSolverBase<CIncEulerVariable, INCOMPRESSIBLE> {
 protected:
   vector<CFluidModel*> FluidModel;   /*!< \brief fluid model used in the solver. */
-  su2double
-  Streamwise_Periodic_MassFlow,           /*!< \brief Value of current massflow [kg/s] which results in a delta p and therefore an artificial body force vector. */
-  Streamwise_Periodic_IntegratedHeatFlow, /*!< \brief Value of of the net sum of heatflow [W] into the domain. */
-  Streamwise_Periodic_InletTemperature;   /*!< \brief Area avg static Temp [K] at the periodic inlet. Used for adaptive outlet heatsink. */
+  su2double Streamwise_Periodic_PressureDrop;       /*!< \brief Value of prescribed pressure drop [Pa] which results in an artificial body force vector. */
+  su2double Streamwise_Periodic_MassFlow;           /*!< \brief Value of current massflow [kg/s] which results in a delta p and therefore an artificial body force vector. */
+  su2double Streamwise_Periodic_IntegratedHeatFlow; /*!< \brief Value of of the net sum of heatflow [W] into the domain. */
+  su2double Streamwise_Periodic_InletTemperature;   /*!< \brief Area avg static Temp [K] at the periodic inlet. Used for adaptive outlet heatsink. */
 
   /*!
    * \brief Preprocessing actions common to the Euler and NS solvers.
@@ -400,6 +400,12 @@ class CIncEulerSolver : public CFVMFlowSolverBase<CIncEulerVariable, INCOMPRESSI
    */
   inline bool GetHasHybridParallel() const final { return true; }
 
+  /*!
+   * \brief Get the massflow of the streamwise periodic donor/outlet boundary.
+   * \return The streamwise periodic donor/outlet massflow.
+   */
+  su2double GetStreamwise_Periodic_PressureDrop() const { return Streamwise_Periodic_PressureDrop; }
+
   /*!
    * \brief Get the massflow of the streamwise periodic donor/outlet boundary.
    * \return The streamwise periodic donor/outlet massflow.

SU2_CFD/include/solvers/CSolver.hpp

@@ -4411,6 +4411,12 @@ class CSolver {
    */
   inline virtual bool GetHasHybridParallel() const { return false; }
 
+  /*!
+   * \brief Get the massflow of the streamwise periodic donor/outlet boundary.
+   * \return The streamwise periodic donor/outlet massflow.
+   */
+  virtual su2double GetStreamwise_Periodic_PressureDrop() const { return 0.0; }
+
   /*!
    * \brief Get the massflow of the streamwise periodic donor/outlet boundary.
    * \return The streamwise periodic donor/outlet massflow.

SU2_CFD/src/numerics/flow/flow_sources.cpp

@@ -693,7 +693,7 @@ CSourceIncStreamwise_Periodic::CSourceIncStreamwise_Periodic(unsigned short val_
 CNumerics::ResidualType<> CSourceIncStreamwise_Periodic::ComputeResidual(const CConfig *config) {
 
   /* Value of prescribed pressure drop which results in an artificial body force vector. */
-  const su2double delta_p = config->GetStreamwise_Periodic_PressureDrop() / config->GetPressure_Ref();
+  const su2double delta_p = SPvals.Streamwise_Periodic_PressureDrop;
 
   for (unsigned short iVar = 0; iVar < nVar; iVar++) residual[iVar] = 0.0;
 
@@ -706,7 +706,7 @@ CNumerics::ResidualType<> CSourceIncStreamwise_Periodic::ComputeResidual(const C
   /*--- Compute the periodic temperature contribution to the energy equation, if energy equation is considered ---*/
   if (energy && streamwisePeriodic_temperature) {
 
-    scalar_factor = Streamwise_Periodic_IntegratedHeatFlow * DensityInc_i / (Streamwise_Periodic_MassFlow * norm2_translation);
+    scalar_factor = SPvals.Streamwise_Periodic_IntegratedHeatFlow * DensityInc_i / (SPvals.Streamwise_Periodic_MassFlow * norm2_translation);
 
     /*--- Compute scalar-product dot_prod(v*t) ---*/
     dot_product = GeometryToolbox::DotProduct(nDim, Streamwise_Coord_Vector, &V_i[1]);
@@ -717,7 +717,7 @@ CNumerics::ResidualType<> CSourceIncStreamwise_Periodic::ComputeResidual(const C
     if(turbulent) {
 
       /*--- Compute a scalar factor ---*/
-      scalar_factor = Streamwise_Periodic_IntegratedHeatFlow / (Streamwise_Periodic_MassFlow * sqrt(norm2_translation) * Prandtl_Turb);
+      scalar_factor = SPvals.Streamwise_Periodic_IntegratedHeatFlow / (SPvals.Streamwise_Periodic_MassFlow * sqrt(norm2_translation) * Prandtl_Turb);
 
       /*--- Compute scalar product between periodic translation vector and eddy viscosity gradient. ---*/
       dot_product = GeometryToolbox::DotProduct(nDim, Streamwise_Coord_Vector, PrimVar_Grad_i[nDim+5]);
@@ -746,14 +746,14 @@ CNumerics::ResidualType<> CSourceIncStreamwisePeriodic_Outlet::ComputeResidual(c
   // b) a user provided quantity, especially the case for CHT cases
   su2double factor;
   if (config->GetStreamwise_Periodic_OutletHeat() == 0.0)
-    factor = Streamwise_Periodic_IntegratedHeatFlow;
+    factor = SPvals.Streamwise_Periodic_IntegratedHeatFlow;
   else
     factor = config->GetStreamwise_Periodic_OutletHeat() / config->GetHeat_Flux_Ref();
 
-  residual[nDim+1] -= abs(local_Massflow/Streamwise_Periodic_MassFlow) * factor;
+  residual[nDim+1] -= abs(local_Massflow/SPvals.Streamwise_Periodic_MassFlow) * factor;
 
   /*--- Force the area avg inlet Temp to match the Inc_Temperature_Init with additional residual contribution ---*/
-  const su2double delta_T = Streamwise_Periodic_InletTemperature - config->GetInc_Temperature_Init()/config->GetTemperature_Ref();
+  const su2double delta_T = SPvals.Streamwise_Periodic_InletTemperature - config->GetInc_Temperature_Init()/config->GetTemperature_Ref();
   residual[nDim+1] += 0.5 * abs(local_Massflow) * SpecificHeat_i * delta_T;
 
   return ResidualType<>(residual, jacobian, nullptr);

SU2_CFD/src/output/CFlowIncOutput.cpp

@@ -343,7 +343,7 @@ void CFlowIncOutput::LoadHistoryData(CConfig *config, CGeometry *geometry, CSolv
 
   if(streamwisePeriodic) {
     SetHistoryOutputValue("STREAMWISE_MASSFLOW", flow_solver->GetStreamwise_Periodic_MassFlow());
-    SetHistoryOutputValue("STREAMWISE_DP", config->GetStreamwise_Periodic_PressureDrop());
+    SetHistoryOutputValue("STREAMWISE_DP", flow_solver->GetStreamwise_Periodic_PressureDrop());
     SetHistoryOutputValue("STREAMWISE_HEAT", flow_solver->GetStreamwise_Periodic_IntegratedHeatFlow());
   }