Move vars from config to solver and geometry.

Author: TobiKattmann

Common/include/CConfig.hpp

@@ -998,11 +998,7 @@ class CConfig {
   bool Streamwise_Periodic_Temperature;             /*!< \brief Use real periodicity for Energy equation or oterwise 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_MassFlow,           /*!< \brief Value of current massflow [kg/s] which results in an 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_OutletHeat,         /*!< /brief Heatflux boundary [W/m^2] imposed at streamwise periodic outlet. */
-            Streamwise_Periodic_InletTemperature;   /*!< /brief Area avg static Temp [K] at the periodic inlet. Used for adaptive outlet heatsink. */
-  vector<su2double> Streamwise_Periodic_RefNode;    /*!< \brief Coordinates of the reference node [m] on the receiving periodic marker, for recovered pressure computation only. Size nDim.*/
+            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). */
@@ -5754,18 +5750,6 @@ class CConfig {
    */
   su2double GetStreamwise_Periodic_OutletHeat(void) const { return Streamwise_Periodic_OutletHeat; }
 
-  /*!
-   * \brief Set the value of the area avg periodic inlet Temperature.
-   * \param[in] Temp - area avg periodic inlet Temperature.
-   */
-  void SetStreamwise_Periodic_InletTemperature(su2double Temp) { Streamwise_Periodic_InletTemperature = Temp; }
-
-  /*!
-   * \brief Get the value of the area avg periodic inlet Temperature.
-   * \return Temperature value.
-   */
-  su2double GetStreamwise_Periodic_InletTemperature(void) const { return Streamwise_Periodic_InletTemperature; }
-
   /*!
    * \brief Get the value of the pressure delta from which body force vector is computed.
    * \return Delta Pressure for body force computation.
@@ -5784,42 +5768,6 @@ class CConfig {
    */
   su2double GetStreamwise_Periodic_TargetMassFlow(void) const { return Streamwise_Periodic_TargetMassFlow; }
 
-  /*!
-   * \brief Get a pointer to the reference node coordinate vector.
-   * \return A pointer to the reference node coordinate vector.
-   */
-  vector<su2double> GetStreamwise_Periodic_RefNode(void) { return Streamwise_Periodic_RefNode; }
-
-  /*!
-   * \brief Get a pointer to the reference node coordinate vector.
-   * \return A pointer to the reference node coordinate vector.
-   */
-  void SetStreamwise_Periodic_RefNode(vector<su2double> RefNode) { Streamwise_Periodic_RefNode = RefNode; }
-
-  /*!
-   * \brief Get the massflow of the streamwise periodic donor/outlet boundary.
-   * \return The streamwise periodic donor/outlet massflow.
-   */
-  su2double GetStreamwise_Periodic_MassFlow() const { return Streamwise_Periodic_MassFlow; }
-  
-  /*!
-   * \brief Set the massflow at the streamwise periodic donor/outlet boundary.
-   * \param[in] val_massflow - Massflow at the streamwise periodic donor marker.
-   */
-  void SetStreamwise_Periodic_MassFlow(su2double val_massflow) { Streamwise_Periodic_MassFlow = val_massflow; }
-
-  /*!
-   * \brief Get the net sum of the heatflow into the domain.
-   * \return The net sum of the heatflow into the domain.
-   */
-  su2double GetStreamwise_Periodic_IntegratedHeatFlow() const { return Streamwise_Periodic_IntegratedHeatFlow; }
-  
-  /*!
-   * \brief Set the net sum of the heatflow into the domain.
-   * \param[in] val_heatflow - Net sum of the heatflow into the domain.
-   */
-  void SetStreamwise_Periodic_IntegratedHeatFlow(su2double val_heatflow) { Streamwise_Periodic_IntegratedHeatFlow = val_heatflow; }
-
   /*!
    * \brief Get information about the volumetric heat source.
    * \return <code>TRUE</code> if it uses a volumetric heat source; otherwise <code>FALSE</code>.

Common/include/geometry/CGeometry.hpp

@@ -1717,5 +1717,11 @@ class CGeometry {
    * \param[out] nNonconvexElements- amount of nonconvex elements in the mesh
    */
   unsigned long GetnNonconvexElements() const {return nNonconvexElements;}
+
+  /*!
+   * \brief Get a pointer to the reference node coordinate vector.
+   * \return A pointer to the reference node coordinate vector.
+   */
+  inline virtual const su2double* GetStreamwise_Periodic_RefNode(void) const { return nullptr; }
 };
 

Common/include/geometry/CPhysicalGeometry.hpp

@@ -107,6 +107,8 @@ class CPhysicalGeometry final : public CGeometry {
   vector<int> GlobalMarkerStorageDispl;
   vector<su2double> GlobalRoughness_Height;
 
+  su2double Streamwise_Periodic_RefNode[MAXNDIM] = {0}; /*!< \brief Coordinates of the reference node [m] on the receiving periodic marker, for recovered pressure computation only. Size nDim.*/
+
 public:
   /*--- This is to suppress Woverloaded-virtual, omitting it has no negative impact. ---*/
   using CGeometry::SetVertex;
@@ -790,4 +792,9 @@ class CPhysicalGeometry final : public CGeometry {
    */
   void SetGlobalMarkerRoughness(const CConfig* config);
 
+  /*!
+   * \brief Get a pointer to the reference node coordinate vector.
+   * \return A pointer to the reference node coordinate vector.
+   */
+  inline const su2double* GetStreamwise_Periodic_RefNode(void) const final { return Streamwise_Periodic_RefNode;}
 };

Common/src/CConfig.cpp

@@ -4602,9 +4602,6 @@ void CConfig::SetPostprocessing(unsigned short val_software, unsigned short val_
       SU2_MPI::Error("Streamwise Periodicity only works with \"INC_NONDIM= DIMENSIONAL\"", CURRENT_FUNCTION);
     if (Axisymmetric)
       SU2_MPI::Error("Streamwise Periodicity terms does not not have axisymmetric corrections.", CURRENT_FUNCTION);
-
-    /*--- Allocate Memory for Reference Node for recovered pressure computation ---*/
-    Streamwise_Periodic_RefNode.resize(val_nDim);
   } else {
     /*--- Safety measure ---*/
     Streamwise_Periodic_Temperature = false;

Common/src/geometry/CPhysicalGeometry.cpp

@@ -7531,19 +7531,16 @@ void CPhysicalGeometry::FindUniqueNode_PeriodicBound(CConfig *config) {
     if (norm < min_norm || iRank == 0) {
       min_norm = norm;
       for (unsigned short iDim = 0; iDim < nDim; iDim++)
-        Buffer_Send_RefNode[iDim] = Buffer_Recv_RefNode[iRank*nDim + iDim];
+        Streamwise_Periodic_RefNode[iDim] = Buffer_Recv_RefNode[iRank*nDim + iDim];
     }
     /*--- The theoretical case, that multiple inlet points with the same distance to the origin exists, remains. ---*/
   }
 
-  /*--- Store the final reference node. ---*/
-  config->SetStreamwise_Periodic_RefNode(Buffer_Send_RefNode);
-
   /*--- Print the reference node to screen. ---*/
   if (rank == MASTER_NODE) {
     cout << "Streamwise Periodic Reference Node: [";
     for (unsigned short iDim = 0; iDim < nDim; iDim++)
-      cout <<  " " << Buffer_Send_RefNode[iDim];
+      cout <<  " " << Streamwise_Periodic_RefNode[iDim];
     cout << " ]" << endl;
   }
 

SU2_CFD/include/numerics/CNumerics.hpp

@@ -1604,6 +1604,7 @@ class CNumerics {
    */
   virtual inline void SetGamma(su2double val_Gamma_i, su2double val_Gamma_j)       { }
 
+  virtual inline void SetStreamwise_Periodic_Values(const su2double massflow, const su2double integratedHeat, const su2double inletTemp) { }
 };
 
 /*!

SU2_CFD/include/numerics/flow/flow_sources.hpp

@@ -40,6 +40,10 @@ 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 an 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. */
 
   /*!
    * \brief Constructor of the class.
@@ -55,6 +59,18 @@ class CSourceBase_Flow : public CNumerics {
    */
   ~CSourceBase_Flow() override;
 
+  /*!
+   * \brief Constructor of the class.
+   * \param[in] val_nDim - Number of dimensions of the problem.
+   * \param[in] val_nVar - Number of variables of the problem.
+   * \param[in] config - Definition of the particular problem.
+   */
+  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;
+  }
+
 };
 
 /*!

SU2_CFD/include/solvers/CIncEulerSolver.hpp

@@ -39,6 +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 an 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. */
 
   /*!
    * \brief Preprocessing actions common to the Euler and NS solvers.
@@ -392,4 +396,22 @@ 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_MassFlow() const { return Streamwise_Periodic_MassFlow; }
+
+  /*!
+   * \brief Get the net sum of the heatflow into the domain.
+   * \return The net sum of the heatflow into the domain.
+   */
+  su2double GetStreamwise_Periodic_IntegratedHeatFlow() const { return Streamwise_Periodic_IntegratedHeatFlow; }
+
+  /*!
+   * \brief Get the value of the area avg periodic inlet Temperature.
+   * \return Temperature value.
+   */
+  su2double GetStreamwise_Periodic_InletTemperature(void) const { return Streamwise_Periodic_InletTemperature; }
+
 };

SU2_CFD/include/solvers/CSolver.hpp

@@ -4398,6 +4398,24 @@ 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_MassFlow() const { return 0.0; }
+
+  /*!
+   * \brief Get the net sum of the heatflow into the domain.
+   * \return The net sum of the heatflow into the domain.
+   */
+  virtual su2double GetStreamwise_Periodic_IntegratedHeatFlow() const { return 0.0; }
+
+  /*!
+   * \brief Get the value of the area avg periodic inlet Temperature.
+   * \return Temperature value.
+   */
+  virtual su2double GetStreamwise_Periodic_InletTemperature(void) const { return 0.0; }
+
 protected:
   /*!
    * \brief Allocate the memory for the verification solution, if necessary.

SU2_CFD/src/numerics/flow/flow_sources.cpp

@@ -693,8 +693,6 @@ CSourceIncStreamwise_Periodic::CSourceIncStreamwise_Periodic(unsigned short val_
 CNumerics::ResidualType<> CSourceIncStreamwise_Periodic::ComputeResidual(const CConfig *config) {
 
   const su2double delta_p             = config->GetStreamwise_Periodic_PressureDrop() / config->GetPressure_Ref(); /*!< \brief Value of prescribed pressure drop which results in an artificial body force vector. */
-  const su2double massflow            = config->GetStreamwise_Periodic_MassFlow(); /*!< \brief Massflow through streamwise periodic 'outlet' marker. */
-  const su2double integrated_heatflow = config->GetStreamwise_Periodic_IntegratedHeatFlow(); /*!< \brief Total heat added into the domain via heatflux marker. */
 
   for (unsigned short iVar = 0; iVar < nVar; iVar++) residual[iVar] = 0.0;
 
@@ -707,7 +705,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 = integrated_heatflow * DensityInc_i / (massflow * norm2_translation);
+    scalar_factor = Streamwise_Periodic_IntegratedHeatFlow * DensityInc_i / (Streamwise_Periodic_MassFlow * norm2_translation);
 
     /*--- Compute scalar-product dot_prod(v*t) ---*/
     dot_product = GeometryToolbox::DotProduct(nDim, Streamwise_Coord_Vector, &V_i[1]);
@@ -719,7 +717,7 @@ CNumerics::ResidualType<> CSourceIncStreamwise_Periodic::ComputeResidual(const C
     if(turbulent) {
 
       /*--- Compute the scalar factor ---*/
-      scalar_factor = integrated_heatflow / (massflow * sqrt(norm2_translation) * Prandtl_Turb);
+      scalar_factor = Streamwise_Periodic_IntegratedHeatFlow / (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]);
@@ -749,14 +747,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 = config->GetStreamwise_Periodic_IntegratedHeatFlow();
+    factor = Streamwise_Periodic_IntegratedHeatFlow;
   else
     factor = config->GetStreamwise_Periodic_OutletHeat() / config->GetHeat_Flux_Ref();
 
-  residual[nDim+1] -= abs(local_Massflow/config->GetStreamwise_Periodic_MassFlow()) * factor;
+  residual[nDim+1] -= abs(local_Massflow/Streamwise_Periodic_MassFlow) * factor;
 
   /*--- Force the area avg inlet Temp to match the Inc_Temperature_Init with additional residual condtribution ---*/
-  const su2double delta_T = config->GetStreamwise_Periodic_InletTemperature() - config->GetInc_Temperature_Init()/config->GetTemperature_Ref();
+  const su2double delta_T = 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);