first release of the turbomachinery capabilities

.gitmodules

@@ -4,5 +4,5 @@
         ignore = dirty
 [submodule "externals/codi"]
 	path = externals/codi
-	url = https://github.com/scicompkl/CoDiPack.git
+	url = https://github.com/scicompkl/CoDiPack
 	ignore = dirty

Common/include/config_structure.inl

@@ -727,6 +727,10 @@ inline su2double CConfig::GetRotation_Rate_Y(unsigned short val_iZone) { return
 
 inline su2double CConfig::GetRotation_Rate_Z(unsigned short val_iZone) { return  Rotation_Rate_Z[val_iZone]; }
 
+inline su2double CConfig::GetFinalRotation_Rate_Z(unsigned short val_iZone) { return  FinalRotation_Rate_Z[val_iZone]; }
+
+inline void CConfig::SetRotation_Rate_Z(su2double newRotation_Rate_Z, unsigned short val_iZone) { Rotation_Rate_Z[val_iZone] = newRotation_Rate_Z; }
+
 inline su2double CConfig::GetPitching_Omega_X(unsigned short val_iZone) { return  Pitching_Omega_X[val_iZone]; }
 
 inline su2double CConfig::GetPitching_Omega_Y(unsigned short val_iZone) { return  Pitching_Omega_Y[val_iZone]; }
@@ -927,25 +931,87 @@ inline unsigned short CConfig::GetKind_Engine_Inflow(void) { return Kind_Engine_
 
 inline unsigned short CConfig::GetKind_ActDisk(void) { return Kind_ActDisk; }
 
-inline unsigned short CConfig::GetKind_MixingProcess(void) { return Kind_MixingProcess; }
+inline su2double* CConfig::GetFreeStreamTurboNormal(void){return FreeStreamTurboNormal;}
+
+inline unsigned short CConfig::GetKind_AverageProcess(void) { return Kind_AverageProcess; }
+
+inline unsigned short CConfig::GetKind_PerformanceAverageProcess(void) { return Kind_PerformanceAverageProcess; }
+
+inline void CConfig::SetKind_AverageProcess(unsigned short new_AverageProcess) {Kind_AverageProcess = new_AverageProcess; }
+
+inline void CConfig::SetKind_PerformanceAverageProcess(unsigned short new_AverageProcess) {Kind_PerformanceAverageProcess = new_AverageProcess; }
+
+inline su2double CConfig::GetRampRotatingFrame_Coeff(unsigned short iCoeff) { return RampRotatingFrame_Coeff[iCoeff];}
+
+inline bool CConfig::GetRampRotatingFrame(void) { return RampRotatingFrame;}
+
+inline su2double CConfig::GetRampOutletPressure_Coeff(unsigned short iCoeff) { return RampOutletPressure_Coeff[iCoeff];}
+
+inline su2double CConfig::GetFinalOutletPressure(void) { return  FinalOutletPressure; }
+
+inline su2double CConfig::GetMonitorOutletPressure(void) { return MonitorOutletPressure; }
+
+inline void CConfig::SetMonitotOutletPressure(su2double newMonPres) {MonitorOutletPressure = newMonPres;}
+
+inline bool CConfig::GetRampOutletPressure(void) { return RampOutletPressure;}
+
+inline su2double CConfig::GetMixedout_Coeff(unsigned short iCoeff) { return Mixedout_Coeff[iCoeff];}
+
+inline su2double CConfig::GetExtraRelFacGiles(unsigned short iCoeff) { return ExtraRelFacGiles[iCoeff];}
+
+inline su2double CConfig::GetAverageMachLimit(void) { return AverageMachLimit;}
+
+inline unsigned short CConfig::GetKind_MixingPlaneInterface(void) { return Kind_MixingPlaneInterface;}
+
+inline unsigned short CConfig::GetKind_TurboMachinery(unsigned short val_iZone) { return Kind_TurboMachinery[val_iZone]; }
+
+inline unsigned short CConfig::GetKind_SpanWise(void) { return Kind_SpanWise; }
+
+inline bool CConfig::GetBoolMixingPlaneInterface(void) { return (nMarker_MixingPlaneInterface !=0);}
 
-inline bool CConfig::GetBoolMixingPlane(void) { return (nMarker_MixBound !=0);}
+inline bool CConfig::GetBoolTurbomachinery(void) { return (nMarker_Turbomachinery !=0);}
 
-inline bool CConfig::GetBoolTurboPerf(void) { return (nMarker_TurboPerf !=0);}
+inline bool CConfig::GetBoolTurbMixingPlane(void) { return turbMixingPlane;}
 
-inline string CConfig::GetMarker_MixingPlane_Bound(unsigned short index) { return Marker_MixBound[index];}
+inline bool CConfig::GetSpatialFourier(void){return SpatialFourier;}
 
-inline string CConfig::GetMarker_MixingPlane_Donor(unsigned short index) { return Marker_MixDonor[index];}
+inline su2double CConfig::GetnBlades(unsigned short val_iZone) { return nBlades[val_iZone];}
 
-inline unsigned short CConfig::Get_nMarkerMixingPlane(void) { return nMarker_MixBound;}
+inline void CConfig::SetnBlades(unsigned short val_iZone, su2double nblades) { nBlades[val_iZone] = nblades;}
 
-inline unsigned short CConfig::Get_nMarkerTurboPerf(void) { return nMarker_TurboPerf;}
+inline bool CConfig::GetBoolGiles(void) { return (nMarker_Giles!=0);}
+
+inline bool CConfig::GetBoolRiemann(void) { return (nMarker_Riemann!=0);}
+
+inline unsigned short CConfig::GetnMarker_MixingPlaneInterface(void) { return nMarker_MixingPlaneInterface;}
+
+inline unsigned short CConfig::GetnMarker_Turbomachinery(void) { return nMarker_Turbomachinery;}
+
+inline unsigned short CConfig::GetnMarker_Shroud(void) { return nMarker_Shroud;}
+
+inline string CConfig::GetMarker_Shroud(unsigned short val_marker){return Marker_Shroud[val_marker];}
+
+inline unsigned short CConfig::GetnMarker_TurboPerformance(void) { return nMarker_TurboPerformance;}
+
+inline unsigned short CConfig::Get_nSpanWiseSections_User(void) { return nSpanWiseSections_User;}
+
+inline unsigned short CConfig::GetnSpanWiseSections(void) { return nSpanWiseSections;}
+
+inline void CConfig::SetnSpanWiseSections(unsigned short nSpan) {nSpanWiseSections = nSpan;}
+
+inline void CConfig::SetnSpanMaxAllZones(unsigned short val_nSpna_max) { nSpanMaxAllZones = val_nSpna_max;}
+
+inline unsigned short CConfig::GetnSpanMaxAllZones(void) { return nSpanMaxAllZones;}
+
+inline void CConfig::SetnSpan_iZones(unsigned short nSpan, unsigned short iZone) {nSpan_iZones[iZone] = nSpan;}
+
+inline unsigned short CConfig::GetnSpan_iZones(unsigned short iZone) { return nSpan_iZones[iZone];}
 
 inline string CConfig::GetMarker_TurboPerf_BoundIn(unsigned short index) { return Marker_TurboBoundIn[index];}
 
 inline string CConfig::GetMarker_TurboPerf_BoundOut(unsigned short index) { return Marker_TurboBoundOut[index];}
 
-inline unsigned short CConfig::GetKind_TurboPerf(unsigned short index) { return Kind_TurboPerformance[index];}
+inline string CConfig::GetMarker_PerBound(unsigned short val_marker){return Marker_PerBound[val_marker];}
 
 inline unsigned short CConfig::GetnLocationStations(void) { return nLocationStations; }
 
@@ -1024,6 +1090,12 @@ inline void CConfig::SetMarker_All_Analyze(unsigned short val_marker, unsigned s
 
 inline void CConfig::SetMarker_All_ZoneInterface(unsigned short val_marker, unsigned short val_fsiinterface) { Marker_All_ZoneInterface[val_marker] = val_fsiinterface; }
 
+inline void CConfig::SetMarker_All_Turbomachinery(unsigned short val_marker, unsigned short val_turbo) { Marker_All_Turbomachinery[val_marker] = val_turbo; }
+
+inline void CConfig::SetMarker_All_TurbomachineryFlag(unsigned short val_marker, unsigned short val_turboflag) { Marker_All_TurbomachineryFlag[val_marker] = val_turboflag; }
+
+inline void CConfig::SetMarker_All_MixingPlaneInterface(unsigned short val_marker, unsigned short val_mixpla_interface) { Marker_All_MixingPlaneInterface[val_marker] = val_mixpla_interface; }
+
 inline void CConfig::SetMarker_All_DV(unsigned short val_marker, unsigned short val_DV) { Marker_All_DV[val_marker] = val_DV; }
 
 inline void CConfig::SetMarker_All_Moving(unsigned short val_marker, unsigned short val_moving) { Marker_All_Moving[val_marker] = val_moving; }
@@ -1054,6 +1126,12 @@ inline unsigned short CConfig::GetMarker_All_ZoneInterface(unsigned short val_ma
 
 inline unsigned short CConfig::GetMarker_n_ZoneInterface(void) { return nMarker_ZoneInterface; }
 
+inline unsigned short CConfig::GetMarker_All_Turbomachinery(unsigned short val_marker) { return Marker_All_Turbomachinery[val_marker]; }
+
+inline unsigned short CConfig::GetMarker_All_TurbomachineryFlag(unsigned short val_marker) { return Marker_All_TurbomachineryFlag[val_marker]; }
+
+inline unsigned short CConfig::GetMarker_All_MixingPlaneInterface(unsigned short val_marker) { return Marker_All_MixingPlaneInterface[val_marker]; }
+
 inline unsigned short CConfig::GetMarker_All_DV(unsigned short val_marker) { return Marker_All_DV[val_marker]; }
 
 inline unsigned short CConfig::GetMarker_All_Moving(unsigned short val_marker) { return Marker_All_Moving[val_marker]; }

Common/include/dual_grid_structure.hpp

@@ -882,7 +882,7 @@ class CEdge : public CDualGrid {
  * \version 5.0.0 "Raven"
  */
 class CVertex : public CDualGrid {
-private:
+protected:
 	unsigned long *Nodes;	/*!< \brief Vector to store the global nodes of an element. */
 	su2double *Normal;			/*!< \brief Normal coordinates of the element and its center of gravity. */
 	su2double Aux_Var;			/*!< \brief Auxiliar variable defined only on the surface. */
@@ -1245,4 +1245,118 @@ class CVertex : public CDualGrid {
 
 };
 
+/*!
+ * \class CTurboVertex
+ * \brief Class for vertex definition for turbomachinery (equivalent to edges, but for the boundaries).
+ * \author S. Vitale
+ * \version 5.0.0 "Raven"
+ */
+class CTurboVertex : public CVertex {
+private:
+  su2double *TurboNormal;			/*!< \brief Normal for computing correct turbomachinery quantities. */
+  su2double Area;							/*!< \brief Value of the face area associated to the vertex */
+  //	su2double PitchCoord;       /*!< \brief Value of the abscissa pitch wise */
+  su2double AngularCoord;     /*!< \brief Value of the angular coordinate  */
+  su2double DeltaAngularCoord;     /*!< \brief Value of the angular coordinate w.r.t. the minimum pitch point  */
+  su2double RelAngularCoord; /*!< \brief Value of the angular coordinate w.r.t. the minimum pitch point  */
+
+  unsigned long OldVertex;    /*!< \brief Value of the vertex numeration before the ordering */
+  int GlobalIndex;						/*!< \brief Value of the vertex numeration after the ordering and global with respect to MPI partinioning */
+
+public:
+
+  /*!
+   * \brief Constructor of the class.
+   * \param[in] val_point - Node of the vertex.
+   * \param[in] val_nDim - Number of dimensions of the problem.
+   */
+  CTurboVertex(unsigned long val_point, unsigned short val_nDim);
+
+  /*!
+   * \brief Destructor of the class.
+   */
+  ~CTurboVertex(void);
+
+  /*!
+   * \brief set Normal in the turbomachinery frame of reference.
+   * \param[in] val_normal - normal vector.
+   */
+  void SetTurboNormal(su2double *val_normal);
+
+  /*!
+   * \brief set face Area.
+   * \param[in] val_area - value of the face area.
+   */
+  void SetArea(su2double val_area);
+
+  /*!
+   * \brief get face Area associate to the vertex.
+   */
+  su2double GetArea(void);
+
+  /*!
+   * \brief Copy the the turbo normal vector of a face.
+   * \param[in] val_normal - Vector where the subroutine is goint to copy the normal (dimensionaless).
+   */
+  void GetTurboNormal(su2double *val_normal);
+
+  /*!
+   * \brief Get the turbo normal to a face where turboperformance are computed .
+   * \return Dimensionaless normal vector, the modulus is the area of the face.
+   */
+  su2double *GetTurboNormal(void);
+
+  /*!
+   * \brief set vertex value not ordered.
+   * \param[in] val_vertex - value of the vertex before ordering.
+   */
+  void SetOldVertex(unsigned long val_vertex);
+
+  /*!
+   * \brief retrieve vertex value not ordered.
+   */
+  unsigned long GetOldVertex(void);
+
+  /*!
+   * \brief set global index for ordered span-wise turbovertex.
+   */
+  void SetGlobalVertexIndex(int globalindex);
+
+  /*!
+   * \brief get global index for ordered span-wise turbovertex.
+   */
+  int GetGlobalVertexIndex(void);
+
+  /*!
+   * \brief set angular coord.
+   */
+  void SetAngularCoord(su2double angCoord);
+
+  /*!
+   * \brief get angular coord.
+   */
+  su2double GetAngularCoord(void);
+
+  /*!
+   * \brief set angular coord.
+   */
+  void SetDeltaAngularCoord(su2double deltaAngCoord);
+
+  /*!
+   * \brief get angular coord.
+   */
+  su2double GetDeltaAngularCoord(void);
+
+  /*!
+   * \brief set angular coord.
+   */
+  void SetRelAngularCoord(su2double minAngCoord);
+
+  /*!
+   * \brief get angular coord.
+   */
+  su2double GetRelAngularCoord(void);
+
+};
+
 #include "dual_grid_structure.inl"

Common/include/dual_grid_structure.inl

@@ -403,3 +403,45 @@ inline void CVertex::SetVarRot(su2double* val) {
   for (unsigned short iDim = 0; iDim < nDim; iDim++)
     VarRot[iDim] = val[iDim];
 }
+
+inline void CTurboVertex::SetTurboNormal(su2double *val_normal ){
+	unsigned short iDim;
+	for(iDim= 0; iDim < nDim; iDim++)
+		TurboNormal[iDim] = val_normal[iDim];
+}
+
+inline void CTurboVertex::GetTurboNormal(su2double *val_normal) {
+	for (unsigned short iDim = 0; iDim < nDim; iDim++)
+		val_normal[iDim] = TurboNormal[iDim];
+}
+
+inline void CTurboVertex::SetGlobalVertexIndex(int globalindex){ GlobalIndex = globalindex;}
+
+inline int CTurboVertex::GetGlobalVertexIndex(void){return GlobalIndex;}
+
+inline su2double *CTurboVertex::GetTurboNormal(void) { return TurboNormal; }
+
+inline void CTurboVertex::SetArea(su2double val_area){Area = val_area;}
+
+inline su2double CTurboVertex::GetArea(void) { return Area; }
+
+inline void CTurboVertex::SetOldVertex(unsigned long val_vertex){OldVertex = val_vertex;}
+
+inline unsigned long CTurboVertex::GetOldVertex(void) { return OldVertex; }
+
+//inline void CTurboVertex::SetPitchCoord(su2double pitchCoord){PitchCoord = pitchCoord;}
+//
+//inline su2double CTurboVertex::GetPitchCoord(void) { return PitchCoord; }
+
+inline void CTurboVertex::SetAngularCoord(su2double angCoord){AngularCoord = angCoord;}
+
+inline su2double CTurboVertex::GetAngularCoord(void) { return AngularCoord; }
+
+inline void CTurboVertex::SetDeltaAngularCoord(su2double deltaAngCoord){DeltaAngularCoord = deltaAngCoord;}
+
+inline su2double CTurboVertex::GetDeltaAngularCoord(void) { return DeltaAngularCoord; }
+
+inline void CTurboVertex::SetRelAngularCoord(su2double minAngCoord) {RelAngularCoord = AngularCoord - minAngCoord;}
+
+inline su2double CTurboVertex::GetRelAngularCoord(void){return RelAngularCoord;}
+