Put streamwise periodic solver vars in struct.

Author: TobiKattmann

SU2_CFD/include/numerics/CNumerics.hpp

@@ -1606,14 +1606,9 @@ class CNumerics {
 
   /*!
    * \brief Set massflow, heatflow & inlet temperature for streamwise periodic flow.
-   * \param[in] massflow - massflow through periodic marker [kg/s].
-   * \param[in] integratedHeat - integrated heatflow over heatflux boundaries [W].
-   * \param[in] inletTemp - massflow averaged periodic inlet temperature [K].
+   * \param[in] SolverSPvals - Struct holding the values.
    */
-  virtual void SetStreamwisePeriodicValues(const su2double pressureDrop, const su2double massflow,
-                                           const su2double integratedHeat, const su2double inletTemp) {
-
-  }
+  virtual void SetStreamwisePeriodicValues(const StreamwisePeriodicValues SolverSPvals) { }
 };
 
 /*!

SU2_CFD/include/numerics/flow/flow_sources.hpp

@@ -58,16 +58,9 @@ class CSourceBase_Flow : public CNumerics {
 
   /*!
    * \brief Set massflow, heatflow & inlet temperature for streamwise periodic flow.
-   * \param[in] massflow - massflow through periodic marker [kg/s].
-   * \param[in] integratedHeat - integrated heatflow over heatflux boundaries [W].
-   * \param[in] inletTemp - massflow averaged periodic inlet temperature [K].
+   * \param[in] SolverSPvals - Struct holding the values.
    */
-  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;
-  }
+  void SetStreamwisePeriodicValues(const StreamwisePeriodicValues SolverSPvals) final { SPvals = SolverSPvals; }
 
 };
 

SU2_CFD/include/solvers/CIncEulerSolver.hpp

@@ -39,10 +39,7 @@
 class CIncEulerSolver : public CFVMFlowSolverBase<CIncEulerVariable, INCOMPRESSIBLE> {
 protected:
   vector<CFluidModel*> FluidModel;   /*!< \brief fluid model used in the solver. */
-  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. */
+  StreamwisePeriodicValues SPvals;
 
   /*!
    * \brief Preprocessing actions common to the Euler and NS solvers.
@@ -401,27 +398,8 @@ 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.
+   * \brief Get values for streamwise periodic flow: delta P, m_dot, inlet T, integrated heat.
+   * \return Struct holding 4 su2doubles.
    */
-  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.
-   */
-  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; }
-
+  StreamwisePeriodicValues GetStreamwisePeriodicValues() const final { return SPvals; }
 };

SU2_CFD/include/solvers/CSolver.hpp

@@ -4412,28 +4412,11 @@ 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.
+   * \brief Get values for streamwise periodc flow: delta P, m_dot, inlet T, integrated heat.
+   * \return Struct holding 4 su2doubles.
    */
-  virtual su2double GetStreamwise_Periodic_PressureDrop() const { return 0.0; }
+  virtual StreamwisePeriodicValues GetStreamwisePeriodicValues() const { StreamwisePeriodicValues SPvals; return SPvals; }
 
-  /*!
-   * \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:
   /*!

SU2_CFD/src/output/CFlowIncOutput.cpp

@@ -342,9 +342,9 @@ void CFlowIncOutput::LoadHistoryData(CConfig *config, CGeometry *geometry, CSolv
   SetHistoryOutputValue("AVG_CFL", flow_solver->GetAvg_CFL_Local());
 
   if(streamwisePeriodic) {
-    SetHistoryOutputValue("STREAMWISE_MASSFLOW", flow_solver->GetStreamwise_Periodic_MassFlow());
-    SetHistoryOutputValue("STREAMWISE_DP", flow_solver->GetStreamwise_Periodic_PressureDrop());
-    SetHistoryOutputValue("STREAMWISE_HEAT", flow_solver->GetStreamwise_Periodic_IntegratedHeatFlow());
+    SetHistoryOutputValue("STREAMWISE_MASSFLOW", flow_solver->GetStreamwisePeriodicValues().Streamwise_Periodic_MassFlow);
+    SetHistoryOutputValue("STREAMWISE_DP", flow_solver->GetStreamwisePeriodicValues().Streamwise_Periodic_PressureDrop);
+    SetHistoryOutputValue("STREAMWISE_HEAT", flow_solver->GetStreamwisePeriodicValues().Streamwise_Periodic_IntegratedHeatFlow);
   }
 
   /*--- Set the analyse surface history values --- */

SU2_CFD/src/solvers/CIncEulerSolver.cpp

@@ -1496,8 +1496,9 @@ void CIncEulerSolver::Source_Residual(CGeometry *geometry, CSolver **solver_cont
   }
 
   if (streamwise_periodic) {
-    numerics->SetStreamwisePeriodicValues(Streamwise_Periodic_PressureDrop, Streamwise_Periodic_MassFlow,
-                                          Streamwise_Periodic_IntegratedHeatFlow, Streamwise_Periodic_InletTemperature);
+
+    /*--- Set delta_p, m_dot, inlet_T, integrated_heat ---*/
+    numerics->SetStreamwisePeriodicValues(SPvals);
 
     /*--- Loop over all points ---*/
     SU2_OMP_FOR_STAT(omp_chunk_size)
@@ -1529,8 +1530,9 @@ void CIncEulerSolver::Source_Residual(CGeometry *geometry, CSolver **solver_cont
 
     if(!streamwise_periodic_temperature && energy) {
       CNumerics* second_numerics = numerics_container[SOURCE_SECOND_TERM + omp_get_thread_num()*MAX_TERMS];
-      second_numerics->SetStreamwisePeriodicValues(Streamwise_Periodic_PressureDrop, Streamwise_Periodic_MassFlow,
-                                                   Streamwise_Periodic_IntegratedHeatFlow, Streamwise_Periodic_InletTemperature);
+
+      /*--- Set delta_p, m_dot, inlet_T, integrated_heat ---*/
+      second_numerics->SetStreamwisePeriodicValues(SPvals);
 
       /*--- This bit acts as a boundary condition rather than a source term. But logically it fits better here. ---*/
       for (auto iMarker = 0ul; iMarker < config->GetnMarker_All(); iMarker++) {
@@ -2916,7 +2918,7 @@ void CIncEulerSolver::GetStreamwise_Periodic_Properties(const CGeometry      *ge
 
           Average_Density_Local += FaceArea * nodes->GetDensity(iPoint);
 
-          /*--- Due to periodicty temperature are euqual one the inlet(1) and outlet(2) ---*/
+          /*--- Due to periodicty, temperatures are equal one the inlet(1) and outlet(2) ---*/
           Temperature_Local += FaceArea * nodes->GetTemperature(iPoint);
 
         } // if domain
@@ -2935,13 +2937,13 @@ void CIncEulerSolver::GetStreamwise_Periodic_Properties(const CGeometry      *ge
   Temperature_Global /= Area_Global;
 
   /*--- Set solver variables ---*/
-  Streamwise_Periodic_MassFlow = MassFlow_Global;
-  Streamwise_Periodic_InletTemperature = Temperature_Global;
+  SPvals.Streamwise_Periodic_MassFlow = MassFlow_Global;
+  SPvals.Streamwise_Periodic_InletTemperature = Temperature_Global;
 
   /*--- As deltaP changes with prescribed massflow the const config value should only be used once. ---*/
   if((nZone==1 && InnerIter==0) ||
      (nZone>1  && OuterIter==0 && InnerIter==0)) {
-    Streamwise_Periodic_PressureDrop = config->GetStreamwise_Periodic_PressureDrop() / config->GetPressure_Ref();
+    SPvals.Streamwise_Periodic_PressureDrop = config->GetStreamwise_Periodic_PressureDrop() / config->GetPressure_Ref();
   }
 
   if (config->GetKind_Streamwise_Periodic() == STREAMWISE_MASSFLOW) {
@@ -2959,7 +2961,7 @@ void CIncEulerSolver::GetStreamwise_Periodic_Properties(const CGeometry      *ge
     ddP = 0.5 / ( Average_Density_Global * pow(Area_Global, 2)) * (pow(TargetMassFlow, 2) - pow(MassFlow_Global, 2));
 
     /*--- Store updated pressure difference ---*/
-    Pressure_Drop_new = Streamwise_Periodic_PressureDrop + damping_factor*ddP;
+    Pressure_Drop_new = SPvals.Streamwise_Periodic_PressureDrop + damping_factor*ddP;
     /*--- During restarts, this routine GetStreamwise_Periodic_Properties can get called multiple times 
           (e.g. 4x for INC_RANS restart). Each time, the pressure drop gets updated. For INC_RANS restarts 
           it gets called 2x before the restart files are read such that the current massflow is 
@@ -2970,7 +2972,7 @@ void CIncEulerSolver::GetStreamwise_Periodic_Properties(const CGeometry      *ge
           best ---*/
     if((nZone==1 && InnerIter>0) ||
        (nZone>1  && OuterIter>0)) {
-      Streamwise_Periodic_PressureDrop = Pressure_Drop_new;
+      SPvals.Streamwise_Periodic_PressureDrop = Pressure_Drop_new;
     }
 
   } // if massflow
@@ -3013,7 +3015,7 @@ void CIncEulerSolver::GetStreamwise_Periodic_Properties(const CGeometry      *ge
     SU2_MPI::Allreduce(&HeatFlow_Local, &HeatFlow_Global, 1, MPI_DOUBLE, MPI_SUM, SU2_MPI::GetComm());
 
     /*--- Set the solver variable Integrated Heatflux ---*/
-    Streamwise_Periodic_IntegratedHeatFlow = HeatFlow_Global;
+    SPvals.Streamwise_Periodic_IntegratedHeatFlow = HeatFlow_Global;
   } // if energy
 }
 

SU2_CFD/src/solvers/CIncNSSolver.cpp

@@ -124,13 +124,15 @@ void CIncNSSolver::Compute_Streamwise_Periodic_Recovered_Values(CConfig *config,
       dot_product += fabs( (geometry->nodes->GetCoord(iPoint,iDim) - ReferenceNode[iDim]) * config->GetPeriodic_Translation(0)[iDim]);
 
     /*--- Second, substract/add correction from reduced pressure/temperature to get recoverd pressure/temperature ---*/
-    const su2double Pressure_Recovered = nodes->GetPressure(iPoint) - Streamwise_Periodic_PressureDrop / norm2_translation * dot_product;
+    const su2double Pressure_Recovered = nodes->GetPressure(iPoint) - SPvals.Streamwise_Periodic_PressureDrop / 
+                                         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;
+      Temperature_Recovered += SPvals.Streamwise_Periodic_IntegratedHeatFlow / 
+                              (SPvals.Streamwise_Periodic_MassFlow * nodes->GetSpecificHeatCp(iPoint) * norm2_translation) * dot_product;
       nodes->SetStreamwise_Periodic_RecoveredTemperature(iPoint, Temperature_Recovered);
     }
   } // for iPoint
@@ -276,7 +278,7 @@ void CIncNSSolver::BC_Wall_Generic(const CGeometry *geometry, const CConfig *con
 
         /*--- 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 = SPvals.Streamwise_Periodic_IntegratedHeatFlow*thermal_conductivity / (SPvals.Streamwise_Periodic_MassFlow * Cp * norm2_translation);
 
         /*--- Dot product ---*/
         dot_product = GeometryToolbox::DotProduct(nDim, config->GetPeriodic_Translation(0), Normal);