New turbo ouputs

.clang-format

@@ -2,4 +2,4 @@ BasedOnStyle: Google
 PointerAlignment: Left
 DerivePointerAlignment: false
 ColumnLimit: 120
-SortIncludes: Never
+SortIncludes: false

Common/include/CConfig.hpp

@@ -71,7 +71,6 @@ class CConfig {
   unsigned short Kind_PerformanceAverageProcess; /*!< \brief Kind of mixing process.*/
   unsigned short Kind_MixingPlaneInterface;      /*!< \brief Kind of mixing process.*/
   unsigned short Kind_SpanWise;                  /*!< \brief Kind of span-wise section computation.*/
-  unsigned short *Kind_TurboMachinery;           /*!< \brief Kind of turbomachynery architecture.*/
   unsigned short iZone, nZone;    /*!< \brief Number of zones in the mesh. */
   unsigned short nZoneSpecified;  /*!< \brief Number of zones that are specified in config file. */
   su2double Highlite_Area;        /*!< \brief Highlite area. */
@@ -435,6 +434,9 @@ class CConfig {
   Max_DeltaTime,               /*!< \brief Max delta time. */
   Unst_CFL;                    /*!< \brief Unsteady CFL number. */
 
+  TURBO_PERF_KIND *Kind_TurboPerf;           /*!< \brief Kind of turbomachynery architecture.*/
+  TURBOMACHINERY_TYPE *Kind_TurboMachinery;
+
   /* Gradient smoothing options */
   su2double SmoothingEps1;          /*!< \brief Parameter for the identity part in gradient smoothing. */
   su2double SmoothingEps2;          /*!< \brief Parameter for the Laplace part in gradient smoothing. */
@@ -5118,7 +5120,7 @@ class CConfig {
    * \brief Get the kind of turbomachinery architecture.
    * \return Kind of turbomachinery architecture.
    */
-  unsigned short GetKind_TurboMachinery(unsigned short val_iZone) const { return Kind_TurboMachinery[val_iZone]; }
+  TURBOMACHINERY_TYPE GetKind_TurboMachinery(unsigned short val_iZone) const { return Kind_TurboMachinery[val_iZone]; }
 
   /*!
    * \brief Get the kind of turbomachinery architecture.
@@ -5233,7 +5235,7 @@ class CConfig {
   void SetnSpanWiseSections(unsigned short nSpan) { nSpanWiseSections = nSpan;}
 
   /*!
-   * \brief set number span-wise sections to compute 3D BC and performance for turbomachinery.
+   * \brief get number span-wise sections to compute 3D BC and performance for turbomachinery.
    */
   unsigned short GetnSpan_iZones(unsigned short iZone) const { return nSpan_iZones[iZone];}
 
@@ -5258,7 +5260,7 @@ class CConfig {
    * \brief get marker kind for Turbomachinery performance calculation.
    * \return kind index.
    */
-  unsigned short GetKind_TurboPerf(unsigned short index);
+  TURBO_PERF_KIND GetKind_TurboPerf(unsigned short val_iZone) const { return Kind_TurboPerf[val_iZone]; };
 
   /*!
    * \brief get outlet bounds name for Turbomachinery performance calculation.

Common/include/geometry/CGeometry.hpp

@@ -772,6 +772,15 @@ class CGeometry {
    */
   inline virtual void GatherInOutAverageValues(CConfig* config, bool allocate) {}
 
+  /*!
+   * \brief Store all the turboperformance in the solver in ZONE_0.
+   * \param[in] donor_geometry  - Solution from the donor mesh.
+   * \param[in] target_geometry - Solution from the target mesh.
+   * \param[in] donorZone       - counter of the donor solution
+   */
+  inline virtual void SetAvgTurboGeoValues(const CConfig* donor_config, CGeometry* donor_geometry,
+                                           unsigned short donorZone){};
+
   /*!
    * \brief Set max length.
    * \param[in] config - Definition of the particular problem.

Common/include/geometry/CPhysicalGeometry.hpp

@@ -408,6 +408,14 @@ class CPhysicalGeometry final : public CGeometry {
    */
   void GatherInOutAverageValues(CConfig* config, bool allocate) override;
 
+  /*!
+   * \brief Store all the turboperformance in the solver in ZONE_0.
+   * \param[in] donor_geometry  - Solution from the donor mesh.
+   * \param[in] target_geometry - Solution from the target mesh.
+   * \param[in] donorZone       - counter of the donor solution
+   */
+  void SetAvgTurboGeoValues(const CConfig* donor_config, CGeometry* donor_geometry, unsigned short donorZone) override;
+
   /*!
    * \brief Set the edge structure of the control volume.
    * \param[in] config - Definition of the particular problem.

Common/include/option_structure.hpp

@@ -1788,11 +1788,25 @@ enum TURBOMACHINERY_TYPE {
   AXIAL_CENTRIFUGAL = 5   /*!< \brief mixed flow turbine. */
 };
 static const MapType<std::string, TURBOMACHINERY_TYPE> TurboMachinery_Map = {
-  MakePair("AXIAL", AXIAL)
-  MakePair("CENTRIFUGAL", CENTRIFUGAL)
-  MakePair("CENTRIPETAL",  CENTRIPETAL)
-  MakePair("CENTRIPETAL_AXIAL",  CENTRIPETAL_AXIAL)
-  MakePair("AXIAL_CENTRIFUGAL",  AXIAL_CENTRIFUGAL)
+  MakePair("AXIAL", TURBOMACHINERY_TYPE::AXIAL)
+  MakePair("CENTRIFUGAL", TURBOMACHINERY_TYPE::CENTRIFUGAL)
+  MakePair("CENTRIPETAL",  TURBOMACHINERY_TYPE::CENTRIPETAL)
+  MakePair("CENTRIPETAL_AXIAL",  TURBOMACHINERY_TYPE::CENTRIPETAL_AXIAL)
+  MakePair("AXIAL_CENTRIFUGAL",  TURBOMACHINERY_TYPE::AXIAL_CENTRIFUGAL)
+};
+
+/*!
+ * \brief Types of Turbomachinery performance Type.
+ */
+enum class TURBO_PERF_KIND{
+  TURBINE,            /*!< \brief Turbine Performance. */
+  COMPRESSOR,         /*!< \brief Compressor Performance. */
+  PROPELLOR           /*!< \brief Propellor Performance. */
+};
+static const MapType<std::string, TURBO_PERF_KIND> TurboPerfKind_Map = {
+  MakePair("TURBINE",  TURBO_PERF_KIND::TURBINE)
+  MakePair("COMPRESSOR",  TURBO_PERF_KIND::COMPRESSOR)
+  MakePair("PROPELLOR",  TURBO_PERF_KIND::PROPELLOR)
 };
 
 /*!

Common/src/CConfig.cpp

@@ -1627,6 +1627,9 @@ void CConfig::SetConfig_Options() {
   /*!\brief TURBOMACHINERY_KIND \n DESCRIPTION: types of turbomachinery architecture.
       \n OPTIONS: see \link TurboMachinery_Map \endlink \n Default: AXIAL */
   addEnumListOption("TURBOMACHINERY_KIND",nTurboMachineryKind, Kind_TurboMachinery, TurboMachinery_Map);
+  /*!\brief TURBOMACHINERY_KIND \n DESCRIPTION: types of turbomachynery Performance Calculations.
+    \n OPTIONS: see \link TurboPerfKind_Map \endlink \n Default: TURBINE */
+  addEnumListOption("TURBO_PERF_KIND", nTurboMachineryKind, Kind_TurboPerf, TurboPerfKind_Map);
   /*!\brief MARKER_SHROUD \n DESCRIPTION: markers in which velocity is forced to 0.0.
    * \n Format: (shroud1, shroud2, ...)*/
   addStringListOption("MARKER_SHROUD", nMarker_Shroud, Marker_Shroud);
@@ -6906,8 +6909,8 @@ void CConfig::SetOutput(SU2_COMPONENT val_software, unsigned short val_izone) {
 
       default:
         break;
+      }
     }
-  }
   else {
     if (Time_Domain) {
       cout << "Dynamic structural analysis."<< endl;

Common/src/geometry/CPhysicalGeometry.cpp

@@ -6311,6 +6311,21 @@ void CPhysicalGeometry::GatherInOutAverageValues(CConfig* config, bool allocate)
   delete[] turboNormal;
 }
 
+void CPhysicalGeometry::SetAvgTurboGeoValues(const CConfig* donor_config, CGeometry* donor_geometry,
+                                             unsigned short donorZone) {
+  unsigned short iSpan;
+  unsigned short nSpanMaxAllZones = donor_config->GetnSpanMaxAllZones();
+
+  for (iSpan = 0; iSpan < nSpanMaxAllZones + 1; iSpan++) {
+    SetTurboRadiusIn(donor_geometry->GetTurboRadiusIn(donorZone, iSpan), donorZone, iSpan);
+    SetSpanAreaIn(donor_geometry->GetSpanAreaIn(donorZone, iSpan), donorZone, iSpan);
+    SetTangGridVelIn(donor_geometry->GetTangGridVelIn(donorZone, iSpan), donorZone, iSpan);
+    SetTurboRadiusOut(donor_geometry->GetTurboRadiusOut(donorZone, iSpan), donorZone, iSpan);
+    SetSpanAreaOut(donor_geometry->GetSpanAreaOut(donorZone, iSpan), donorZone, iSpan);
+    SetTangGridVelOut(donor_geometry->GetTangGridVelOut(donorZone, iSpan), donorZone, iSpan);
+  }
+}
+
 void CPhysicalGeometry::SetMaxLength(CConfig* config) {
   SU2_OMP_FOR_STAT(roundUpDiv(nPointDomain, omp_get_max_threads()))
   for (unsigned long iPoint = 0; iPoint < nPointDomain; iPoint++) {

SU2_CFD/include/drivers/CDriver.hpp

@@ -290,9 +290,10 @@ class CDriver : public CDriverBase {
    * \param[in] geometry - Geometrical definition of the problem.
    * \param[in] solver - Container vector with all the solutions.
    * \param[in] interface - Class defining the physical transfer of information.
+   * \param[in] dummy - Definition of dummy driver
    */
   void PreprocessTurbomachinery(CConfig** config, CGeometry**** geometry, CSolver***** solver,
-                                    CInterface*** interface);
+                                    CInterface*** interface, bool dummy);
 
   /*!
    * \brief Ramp some simulation settings for turbomachinery problems.

SU2_CFD/include/drivers/CMultizoneDriver.hpp

@@ -83,10 +83,6 @@ class CMultizoneDriver : public CDriver {
    */
   bool TransferData(unsigned short donorZone, unsigned short targetZone);
 
-  /*!
-   * \brief Set Mixing Plane interface within multiple zones.
-   */
-  void SetMixingPlane(unsigned short donorZone);
 
   /*!
    * \brief Transfer the local turboperfomance quantities (for each blade row) from all the donorZones to the

SU2_CFD/include/interfaces/CInterface.hpp

@@ -219,13 +219,4 @@ class CInterface {
    */
   void GatherAverageValues(CSolver *donor_solution, CSolver *target_solution, unsigned short donorZone);
 
-  /*!
-   * \brief Exchange Average geometrical value beteween zones .
-   * \param[in] donor_geometry - Geometry of the donor mesh.
-   * \param[in] target_geometry - Geometry of the target mesh.
-   * \param[in] donor_config - Definition of the problem at the donor mesh.
-   * \param[in] target_config - Definition of the problem at the target mesh.
-   */
-  void GatherAverageTurboGeoValues(CGeometry *donor_geometry, CGeometry *target_geometry, unsigned short donorZone);
-
 };

SU2_CFD/include/interfaces/cfd/CMixingPlaneInterface.hpp

@@ -81,14 +81,6 @@ class CMixingPlaneInterface : public CInterface {
    */
   void SetAverageValues(CSolver *donor_solution, CSolver *target_solution, unsigned short donorZone) override;
 
-  /*!
-   * \brief Store all the turboperformance in the solver in ZONE_0.
-   * \param[in] donor_geometry  - Solution from the donor mesh.
-   * \param[in] target_geometry - Solution from the target mesh.
-   * \param[in] donorZone       - counter of the donor solution
-   */
-  void SetAverageTurboGeoValues(CGeometry *donor_geometry, CGeometry *target_geometry, unsigned short donorZone) override;
-
 
 
 };

SU2_CFD/include/iteration/CFluidIteration.hpp

@@ -107,6 +107,16 @@ class CFluidIteration : public CIteration {
                CVolumetricMovement*** grid_movement, CFreeFormDefBox*** FFDBox, unsigned short val_iZone,
                unsigned short val_iInst) override;
 
+  /*!
+   * \brief Monitors turbo computation (pressure and turbo ramps).
+   */
+  void TurboMonitor(CGeometry**** geometry_container, CConfig** config_container, unsigned long ExtIter);
+
+  /*!
+   * \brief Computes turboperformance.
+   */
+  void ComputeTurboPerformance(CSolver***** solver, CGeometry**** geometry_container, CConfig** config_container, unsigned long ExtIter);
+
   /*!
    * \brief Postprocesses the fluid system before heading to another physics system or the next iteration.
    * \param[in] solver - Container vector with all the solutions.

SU2_CFD/include/iteration/CIteration.hpp

@@ -35,6 +35,7 @@
 #include "../../../Common/include/grid_movement/CFreeFormDefBox.hpp"
 #include "../../../Common/include/parallelization/mpi_structure.hpp"
 #include "../integration/CIntegration.hpp"
+#include "../output/CTurboOutput.hpp"
 
 using namespace std;
 
@@ -59,6 +60,9 @@ class CIteration {
   su2double StartTime{0.0}, /*!< \brief Tracking wall time. */
       StopTime{0.0}, UsedTime{0.0};
 
+  std::shared_ptr<CTurboOutput> TurbomachineryPerformance;  /*!< \brief turbo performance calculator. */
+  CTurbomachineryStagePerformance* TurbomachineryStagePerformance;  /*!< \brief turbo stage performance calculator. */
+
  public:
   /*!
    * \brief Constructor of the class.
@@ -247,7 +251,7 @@ class CIteration {
                        unsigned short val_iInst) {
     return false;
   }
-
+  
   /*!
    * \brief A virtual member.
    * \param[in] output - Pointer to the COutput class.

SU2_CFD/include/iteration/CTurboIteration.hpp

@@ -63,4 +63,9 @@ class CTurboIteration : public CFluidIteration {
                    CNumerics****** numerics, CConfig** config, CSurfaceMovement** surface_movement,
                    CVolumetricMovement*** grid_movement, CFreeFormDefBox*** FFDBox, unsigned short val_iZone,
                    unsigned short val_iInst) override;
+
+  /*!
+   * \brief Initialises turboperformance classes.
+   */
+  void InitTurboPerformance(CGeometry *geometry, CConfig** config, CFluidModel *fluid);
 };

SU2_CFD/include/output/CFlowCompOutput.hpp

@@ -92,4 +92,40 @@ class CFlowCompOutput final: public CFlowOutput {
    * \param[in] config - Definition of the particular problem.
    */
   bool WriteHistoryFileOutput(const CConfig *config) override ;
+
+  /*!
+   * \brief Sets the turboperformance screen output
+   * \param[in] TurboPerf - Turboperformance class 
+   * \param[in] config - Definition of the particular problem
+   * \param[in] TimeIter - Index of the current time-step
+   * \param[in] OuterIter - Index of current outer iteration
+   * \param[in] InnerIter - Index of current inner iteration
+   */
+  void SetTurboPerformance_Output(std::shared_ptr<CTurboOutput> TurboPerf, CConfig *config, unsigned long TimeIter, unsigned long OuterIter, unsigned long InnerIter) override;
+
+  /*!
+   * \brief Sets the multizone turboperformacne screen output
+   * \param[in] TurboStagePerf - Stage turboperformance class
+   * \param[in] TurboPerf - Turboperformance class
+   * \param[in] config - Definition of the particular problem
+   */
+  void SetTurboMultiZonePerformance_Output(CTurbomachineryStagePerformance* TurboStagePerf, std::shared_ptr<CTurboOutput> TurboPerf, CConfig *config) override;
+
+  /*!
+   * \brief Loads the turboperformacne history data
+   * \param[in] TurboStagePerf - Stage turboperformance class
+   * \param[in] TurboPerf - Turboperformance class
+   * \param[in] config - Definition of the particular problem
+   */
+  void LoadTurboHistoryData(CTurbomachineryStagePerformance* TurboStagePerf, std::shared_ptr<CTurboOutput> TurboPerf, CConfig *config) override;
+
+  /*!
+   * \brief Write the kinematic and thermodynamic variables at each spanwise division
+   * \param[in] TurboPerf - Turboperformance class
+   * \param[in] geometry - Geometrical definiton of the problem
+   * \param[in] config - Descripiton of the particular problem
+   * \param[in] val_iZone - Idientifier of current zone
+  */
+  void WriteTurboSpanwisePerformance(std::shared_ptr<CTurboOutput> TurboPerf, CGeometry *geometry, CConfig **config,
+                                       unsigned short val_iZone) override;
 };

SU2_CFD/include/output/CFlowOutput.hpp

@@ -44,6 +44,12 @@ class CFlowOutput : public CFVMOutput{
    */
   CFlowOutput(const CConfig *config, unsigned short nDim, bool femOutput);
 
+  /*
+   * \brief Add turboperformance outputs as history field
+   * \param[in] nZone - Number of zones in problem
+  */
+  void AddTurboOutput(unsigned short nZone);
+
   /*!
    * \brief Set the values of the volume output fields for a surface point.
    * \param[in] config - Definition of the particular problem.
@@ -346,5 +352,4 @@ class CFlowOutput : public CFVMOutput{
    * \param[in] config - Definition of the particular problem per zone.
    */
   void SetFixedCLScreenOutput(const CConfig *config);
-
 };