Some stylistic changes.

Author: TobiKattmann

Common/include/CConfig.hpp

@@ -992,7 +992,6 @@ class CConfig {
   array<su2double, N_POLY_COEFFS> mu_polycoeffs{{0.0}};  /*!< \brief Array for viscosity polynomial coefficients. */
   array<su2double, N_POLY_COEFFS> kt_polycoeffs{{0.0}};  /*!< \brief Array for thermal conductivity polynomial coefficients. */
   bool Body_Force;                      /*!< \brief Flag to know if a body force is included in the formulation. */
-  su2double *Body_Force_Vector;         /*!< \brief Values of the prescribed body force vector. */
 
   unsigned short Kind_Streamwise_Periodic;          /*!< \brief Flag to know if a body force is included in the formulation, used for periodic BC as inlet & outlet. */
   bool Streamwise_Periodic_Temperature;             /*!< \brief Use real periodicity for Energy equation or oterwise outlet source term. */
@@ -3091,14 +3090,6 @@ class CConfig {
    *         has the marker <i>val_marker</i>.
    */
   string GetMarker_Outlet_TagBound(unsigned short val_marker) const { return Marker_Outlet[val_marker]; }
-
-  /*!
-   * \brief Get the index of the periodic surface defined in the geometry file.
-   * \param[in] val_marker - Value of the marker in which we are interested.
-   * \return Value of the index that is in the geometry file for the surface that
-   *         has the marker <i>val_marker</i>.
-   */
-  string GetMarker_Periodic_TagBound(unsigned short val_marker);
 
   /*!
    * \brief Get the index of the surface defined in the geometry file.
@@ -6191,8 +6182,7 @@ class CConfig {
   const su2double *GetPeriodicTranslation(string val_marker) const;
 
   /*!
-   * \brief Get the translation vector for a periodic transformation. In streamwise periodic flow we currently only
-   *        allow for one periodic boundary (pair) and there always acces val_index=0.
+   * \brief Get the translation vector for a periodic transformation.
    * \param[in] val_index - Index corresponding to the periodic transformation.
    * \return The translation vector.
    */

Common/include/geometry/CPhysicalGeometry.hpp

@@ -107,7 +107,7 @@ 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.*/
+  su2double Streamwise_Periodic_RefNode[MAXNDIM] = {0}; /*!< \brief Coordinates of the reference node [m] on the receiving periodic marker, for recovered pressure/temperature computation only. Size nDim.*/
 
 public:
   /*--- This is to suppress Woverloaded-virtual, omitting it has no negative impact. ---*/
@@ -471,7 +471,7 @@ class CPhysicalGeometry final : public CGeometry {
    * \brief For streamwise periodicity, find a unique reference node on the designated inlet.
    * \param[in] config - Definition of the particular problem.
    */
-  void FindUniqueNode_PeriodicBound(CConfig *config) override;
+  void FindUniqueNode_PeriodicBound(CConfig *config) final;
 
   /*!
    * \brief Set boundary vertex structure of the control volume.

Common/src/CConfig.cpp

@@ -4598,8 +4598,8 @@ void CConfig::SetPostprocessing(unsigned short val_software, unsigned short val_
       SU2_MPI::Error("No MARKER_ISOTHERMAL marker allowed with STREAMWISE_PERIODIC_TEMPERATURE= YES, only MARKER_HEATFLUX & MARKER_SYM.", CURRENT_FUNCTION);
     if (DiscreteAdjoint && Kind_Streamwise_Periodic == MASSFLOW)
       SU2_MPI::Error("Discrete Adjoint currently not validated for prescribed MASSFLOW.", CURRENT_FUNCTION);
-    if (Ref_Inc_NonDim != DIMENSIONAL && false)
-      SU2_MPI::Error("Streamwise Periodicity only works with \"INC_NONDIM= DIMENSIONAL\"", CURRENT_FUNCTION);
+    if (Ref_Inc_NonDim != DIMENSIONAL)
+      SU2_MPI::Error("Streamwise Periodicity only works with \"INC_NONDIM= DIMENSIONAL\", the nondimensionalization with source terms doesn;t work in general.", CURRENT_FUNCTION);
     if (Axisymmetric)
       SU2_MPI::Error("Streamwise Periodicity terms does not not have axisymmetric corrections.", CURRENT_FUNCTION);
   } else {

Common/src/geometry/CPhysicalGeometry.cpp

@@ -7522,7 +7522,7 @@ void CPhysicalGeometry::FindUniqueNode_PeriodicBound(CConfig *config) {
   /*---         config container.                                                           ---*/
   /*-------------------------------------------------------------------------------------------*/
 
-  for (int iRank = 0; iRank < size; iRank++) { // loop over all vertices on that marker and fi
+  for (int iRank = 0; iRank < size; iRank++) {
 
     /*--- Get the norm of the current Point. ---*/
     auto norm = GeometryToolbox::SquaredNorm(nDim, &Buffer_Recv_RefNode[iRank*nDim]);

SU2_CFD/include/numerics/CNumerics.hpp

@@ -1604,7 +1604,15 @@ 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) { }
+  /*!
+   * \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].
+   */
+  virtual inline void SetStreamwise_Periodic_Values(const su2double massflow,
+                                                    const su2double integratedHeat,
+                                                    const su2double inletTemp) { }
 };
 
 /*!

SU2_CFD/include/numerics/flow/flow_sources.hpp

@@ -60,10 +60,10 @@ 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.
+   * \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].
    */
   void SetStreamwise_Periodic_Values(const su2double massflow, const su2double integratedHeat, const su2double inletTemp) {
     Streamwise_Periodic_MassFlow = massflow;

SU2_CFD/src/numerics/flow/flow_sources.cpp

@@ -692,7 +692,8 @@ 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. */
+  /*!< \brief Value of prescribed pressure drop which results in an artificial body force vector. */
+  const su2double delta_p = config->GetStreamwise_Periodic_PressureDrop() / config->GetPressure_Ref();
 
   for (unsigned short iVar = 0; iVar < nVar; iVar++) residual[iVar] = 0.0;
 

SU2_CFD/src/solvers/CIncEulerSolver.cpp

@@ -1272,28 +1272,26 @@ void CIncEulerSolver::Source_Residual(CGeometry *geometry, CSolver **solver_cont
 
 
   if (streamwise_periodic) {
-    numerics->SetStreamwise_Periodic_Values(Streamwise_Periodic_MassFlow, Streamwise_Periodic_IntegratedHeatFlow, Streamwise_Periodic_InletTemperature);
+    numerics->SetStreamwise_Periodic_Values(Streamwise_Periodic_MassFlow, Streamwise_Periodic_IntegratedHeatFlow,
+                                            Streamwise_Periodic_InletTemperature);
 
     /*--- Loop over all points ---*/
     SU2_OMP_FOR_STAT(omp_chunk_size)
     for (iPoint = 0; iPoint < nPointDomain; iPoint++) {
 
       /*--- Load the primitve variables ---*/
-      numerics->SetPrimitive(nodes->GetPrimitive(iPoint), 
-                             NULL);
+      numerics->SetPrimitive(nodes->GetPrimitive(iPoint), nullptr);
 
       /*--- Set incompressible density ---*/
-      numerics->SetDensity(nodes->GetDensity(iPoint), 
-                           0.0);
+      numerics->SetDensity(nodes->GetDensity(iPoint), 0.0);
 
       /*--- Load the volume of the dual mesh cell ---*/
       numerics->SetVolume(geometry->nodes->GetVolume(iPoint));
 
       /*--- If viscous, we need gradients for extra terms. ---*/
       if (viscous) {
         /*--- Gradient of the primitive variables ---*/
-        numerics->SetPrimVarGradient(nodes->GetGradient_Primitive(iPoint), 
-                                     NULL);
+        numerics->SetPrimVarGradient(nodes->GetGradient_Primitive(iPoint), nullptr);
       }
 
       /*--- Compute the streamwise periodic source residual and add to the total ---*/
@@ -1307,13 +1305,14 @@ void CIncEulerSolver::Source_Residual(CGeometry *geometry, CSolver **solver_cont
 
     if(!streamwise_periodic_temperature && energy) {
       CNumerics* second_numerics = numerics_container[SOURCE_SECOND_TERM];
-      second_numerics->SetStreamwise_Periodic_Values(Streamwise_Periodic_MassFlow, Streamwise_Periodic_IntegratedHeatFlow, Streamwise_Periodic_InletTemperature);
+      second_numerics->SetStreamwise_Periodic_Values(Streamwise_Periodic_MassFlow, Streamwise_Periodic_IntegratedHeatFlow,
+                                                     Streamwise_Periodic_InletTemperature);
 
       for (iMarker = 0; iMarker < config->GetnMarker_All(); iMarker++) {
 
         /*--- Only "inlet"/donor periodic marker ---*/
         if (config->GetMarker_All_KindBC(iMarker) == PERIODIC_BOUNDARY &&
-            config->GetMarker_All_PerBound(iMarker) == 1) { // here it doesnt matter whether 1 or 2
+            config->GetMarker_All_PerBound(iMarker) == 1) {
 
           for (iVertex = 0; iVertex < geometry->nVertex[iMarker]; iVertex++) {
 
@@ -1322,13 +1321,13 @@ void CIncEulerSolver::Source_Residual(CGeometry *geometry, CSolver **solver_cont
             if (geometry->nodes->GetDomain(iPoint)) {
 
               /*--- Load the primitive variables ---*/
-              second_numerics->SetPrimitive(nodes->GetPrimitive(iPoint), NULL);
+              second_numerics->SetPrimitive(nodes->GetPrimitive(iPoint), nullptr);
 
               /*--- Set the specific heat ---*/
               second_numerics->SetSpecificHeat(nodes->GetSpecificHeatCp(iPoint), 0.0);
 
               /*--- Set the Point coordinates ---*/
-              second_numerics->SetCoord(geometry->nodes->GetCoord(iPoint),NULL);
+              second_numerics->SetCoord(geometry->nodes->GetCoord(iPoint), nullptr);
 
               /*--- Set the area normal ---*/
               second_numerics->SetNormal(geometry->vertex[iMarker][iVertex]->GetNormal());
@@ -2938,9 +2937,6 @@ void CIncEulerSolver::GetStreamwise_Periodic_Properties(const CGeometry      *ge
   Streamwise_Periodic_InletTemperature = Temperature_Global;
   Streamwise_Periodic_MassFlow = MassFlow_Global;
 
-  if (rank == MASTER_NODE && false) { cout << "MassFlow_Global: " << fabs(MassFlow_Global) * config->GetDensity_Ref() * config->GetVelocity_Ref() << endl; }
-  if (rank == MASTER_NODE && false) { cout << "Average_Density_Global: " << Average_Density_Global << endl; }
-
   if (config->GetKind_Streamwise_Periodic() == STREAMWISE_MASSFLOW) {
     /*------------------------------------------------------------------------------------------------*/
     /*--- 2. Update the Pressure Drop [Pa] for the Momentum source term if Massflow is prescribed. ---*/ 
@@ -2956,7 +2952,7 @@ void CIncEulerSolver::GetStreamwise_Periodic_Properties(const CGeometry      *ge
 
     /*--- Compute update to Delta p based on massflow-difference ---*/
     ddP = 0.5 / ( Average_Density_Global * pow(Area_Global, 2)) * (pow(TargetMassFlow, 2) - pow(MassFlow_Global, 2));
-    
+
     /*--- Store updated pressure difference ---*/
     Pressure_Drop_new = Pressure_Drop + damping_factor*ddP;
     /*--- During restarts, this routine GetStreamwise_Periodic_Properties can get called multiple times 
@@ -2973,21 +2969,9 @@ void CIncEulerSolver::GetStreamwise_Periodic_Properties(const CGeometry      *ge
     if((nZone==1 && InnerIter > 0) ||
        (nZone>1  && OuterIter > 0))
       config->SetStreamwise_Periodic_PressureDrop(Pressure_Drop_new);
-    
-    /*--- Output the new value of Delta P and ddp ---*/
-    if ((rank == MASTER_NODE) && (iMesh == MESH_0)  && false) { //TK:: Move whole computation up in front of output
-    
-      cout.precision(5);
-      cout.setf(ios::fixed, ios::floatfield);
-      
-      cout << "Delta Delta P: " << ddP * config->GetPressure_Ref() << endl;
-      cout << "New Delta P: " << Pressure_Drop_new * config->GetPressure_Ref() << endl;
-      
-      cout.unsetf(ios_base::floatfield);
-      
-    } // output
+
   } // if massflow
-  
+
   if (config->GetEnergy_Equation()) {
     /*---------------------------------------------------------------------------------------------*/
     /*--- 3. Compute the integrated Heatflow [W] for the energy equation source term, heatflux  ---*/
@@ -3031,8 +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 Integrated Heatflux ---*/
-    if (iMesh == MESH_0)
-      Streamwise_Periodic_IntegratedHeatFlow = HeatFlow_Global;
+    Streamwise_Periodic_IntegratedHeatFlow = HeatFlow_Global;
   } // if energy
 }