Cleaned up branch + Euler MZ working / Issues with RANS remain + Init MZ turbo testcase

Author: joshkellyjak

Common/include/CConfig.hpp

@@ -8396,24 +8396,6 @@ class CConfig {
    */
   su2double GetSurface_Species_Variance(unsigned short val_marker) const { return Surface_Species_Variance[val_marker]; }
 
-    /*!
-   * \brief Get entropy generation for a turbomachine at a boundary
-   * \param[in] val_iZone - zone index
-   */
-  su2double GetEntropyGeneration(unsigned short val_iZone) const { return EntropyGeneration[val_iZone]; }
-
-  /*!
-   * \brief Get total pressure loss for a turbomachinery zone
-   * \param[in] val_iZone - zone index
-   */
-  su2double GetTotalPressureLoss(unsigned short val_iZone) const { return TotalPressureLoss[val_iZone]; }
-
-  /*!
-   * \brief Get kinetic energy loss for a turbomachinery zone
-   * \param[in] val_iZone - zone index
-   */
-  su2double GetKineticEnergyLoss(unsigned short val_iZone) const { return KineticEnergyLoss[val_iZone]; }
-
   /*!
    * \brief Get the back pressure (static) at an outlet boundary.
    * \param[in] val_index - Index corresponding to the outlet boundary.

Common/include/geometry/CGeometry.hpp

@@ -62,7 +62,6 @@ extern "C" {
 #include "../CConfig.hpp"
 #include "../toolboxes/graph_toolbox.hpp"
 #include "../adt/CADTElemClass.hpp"
-#include "../../../SU2_CFD/include/interfaces/CInterface.hpp"
 
 using namespace std;
 
@@ -1353,10 +1352,6 @@ class CGeometry {
    */
   static void UpdateGeometry(CGeometry** geometry_container, CConfig* config);
 
-  static void UpdateTurboGeometry(CGeometry**** geometry, CInterface*** interface, CConfig** config_container, unsigned short iZone);
-
-  static void InitTurboVertexAdj(CGeometry**** geometry, CConfig** config, unsigned short iZone);
-
   /*!
    * \brief Update the multi-grid structure for the customized boundary conditions
    * \param geometry_container - Geometrical definition.

Common/src/geometry/CGeometry.cpp

@@ -33,8 +33,6 @@
 #include "../../include/toolboxes/geometry_toolbox.hpp"
 #include "../../include/toolboxes/ndflattener.hpp"
 
-#include "../../../SU2_CFD/include/interfaces/CInterface.hpp"
-
 CGeometry::CGeometry() : size(SU2_MPI::GetSize()), rank(SU2_MPI::GetRank()) {}
 
 CGeometry::~CGeometry() {
@@ -2362,52 +2360,6 @@ void CGeometry::UpdateGeometry(CGeometry** geometry_container, CConfig* config)
   geometry_container[MESH_0]->ComputeSurfaceAreaCfgFile(config);
 }
 
-void CGeometry::InitTurboVertexAdj(CGeometry**** geometry, CConfig** config, unsigned short iZone){
-  auto nSpanMax = 0u; 
-  auto nZone = config[ZONE_0]->GetnZone();
-
-  /*--- Create turbovertex ---*/
-  geometry[iZone][INST_0][MESH_0]->ComputeNSpan(config[iZone], iZone, INFLOW, true);
-  geometry[iZone][INST_0][MESH_0]->ComputeNSpan(config[iZone], iZone, OUTFLOW, true);
-  if (config[iZone]->GetnSpanWiseSections() > nSpanMax){
-    nSpanMax = config[iZone]->GetnSpanWiseSections();
-  }
-
-  config[nZone-1]->SetnSpan_iZones(config[iZone]->GetnSpanWiseSections(), iZone);
-
-  geometry[iZone][INST_0][MESH_0]->SetTurboVertex(config[iZone], iZone, INFLOW, true);
-  geometry[iZone][INST_0][MESH_0]->SetTurboVertex(config[iZone], iZone, OUTFLOW, true);
-
-  /*--- Set max span in all zones ---*/
-  if (config[iZone]->GetBoolTurbomachinery()) {
-    config[iZone]->SetnSpanMaxAllZones(nSpanMax);
-  }
-}
-
-void CGeometry::UpdateTurboGeometry(CGeometry**** geometry, CInterface*** interface, CConfig** config, unsigned short iZone){
-  auto nZone = config[ZONE_0]->GetnZone();
-
-  geometry[iZone][INST_0][MESH_0]->SetAvgTurboValue(config[iZone], iZone, INFLOW, true);
-  geometry[iZone][INST_0][MESH_0]->SetAvgTurboValue(config[iZone],iZone, OUTFLOW, true);
-  geometry[iZone][INST_0][MESH_0]->GatherInOutAverageValues(config[iZone], true);
-
-  // if(config[ZONE_0]->GetBoolMixingPlaneInterface()){
-  //   for (auto donorZone = 0u; donorZone < nZone; donorZone++) {
-  //     for (auto targetZone = 0u; targetZone < nZone; targetZone++) {
-  //       if (interface[donorZone][targetZone] != nullptr){
-  //         interface[iZone][targetZone]->SetSpanWiseLevels(config[donorZone], config[targetZone]);
-  //       }
-  //     }
-  //   }
-  // }
-
-  geometry[nZone-1][INST_0][MESH_0]->SetAvgTurboGeoValues(config[iZone],geometry[iZone][INST_0][MESH_0], iZone);
-
-  /*--- Transfer number of blade to ZONE_0 to correctly compute turbo performance---*/
-  auto nBlades = config[iZone]->GetnBlades(iZone);
-  config[ZONE_0]->SetnBlades(iZone, nBlades);
-}
-
 void CGeometry::SetCustomBoundary(CConfig* config) {
   unsigned short iMarker;
   unsigned long iVertex;

Common/src/geometry/CPhysicalGeometry.cpp

@@ -6329,7 +6329,6 @@ void CPhysicalGeometry::GatherInOutAverageValues(CConfig* config, bool allocate)
 void CPhysicalGeometry::SetAvgTurboGeoValues(const CConfig* donor_config, CGeometry* donor_geometry,
                                              unsigned short donorZone) {
 
-  SU2_ZONE_SCOPED_N("SetAvgTurboGeoValues");
   unsigned short iSpan;
   unsigned short nSpanMaxAllZones = donor_config->GetnSpanMaxAllZones();
 

SU2_CFD/include/drivers/CDriver.hpp

@@ -284,11 +284,6 @@ class CDriver : public CDriverBase {
    */
   void PreprocessStaticMesh(const CConfig* config, CGeometry** geometry);
 
-  /*!
-   * \brief Initiate value for static mesh movement such as the gridVel for the ROTATING frame.
-   */
-  void InitStaticMeshMovement(unsigned short iZone, bool print);
-
   /*!
    * \brief Initiate value for static mesh movement such as the gridVel for the ROTATING frame.
    * \param[in] config - Definition of the particular problem.

SU2_CFD/include/integration/CMultiGridIntegration.hpp

@@ -119,7 +119,7 @@ class CMultiGridIntegration final : public CIntegration {
    */
   void NonDimensional_Parameters(CGeometry **geometry, CSolver ***solver_container, CNumerics ****numerics_container,
                                  CConfig *config, unsigned short FinestMesh, unsigned short RunTime_EqSystem,
-                                 su2double *monitor, unsigned short iZone);
+                                 su2double *monitor);
 
   /*!
    * \brief Compute the fine solution from a coarse solution.

SU2_CFD/include/iteration/CDiscAdjFluidIteration.hpp

@@ -157,7 +157,7 @@ class CDiscAdjFluidIteration final : public CIteration {
    * \param[in] iInst - Index of the zone.
    * \param[in] kind_recording - The kind of recording (geometry or flow).
    */
-  void SetDependencies(CSolver***** solver, CGeometry**** geometry, CNumerics****** numerics, CConfig** config, CInterface*** interface,
+  void SetDependencies(CSolver***** solver, CGeometry**** geometry, CNumerics****** numerics, CConfig** config,
                        unsigned short iZone, unsigned short iInst, RECORDING kind_recording) override;
 
 };

SU2_CFD/include/iteration/CFluidIteration.hpp

@@ -114,7 +114,7 @@ class CFluidIteration : public CIteration {
    * \param[in] ExtIter - The current iteration of the problem
    * \param[in] iZone - The current zone
    */
-  void TurboMonitor(CGeometry**** geometry_container, CConfig** config_container, unsigned long ExtIter, unsigned short iZone);
+  void UpdateRamps(CGeometry**** geometry_container, CConfig** config_container, unsigned long ExtIter, unsigned short iZone);
 
   /*!
    * \brief Postprocesses the fluid system before heading to another physics system or the next iteration.

SU2_CFD/include/iteration/CIteration.hpp

@@ -60,9 +60,7 @@ 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. */
   std::shared_ptr<CTurbomachineryStagePerformance> TurbomachineryStagePerformance;  /*!< \brief turbo stage performance calculator. */
-  //std::vector<std::shared_ptr<CTurboOutput>> TurbomachineryBladePerformances; /*!< \brief Vector of turboperformances */
  public:
   /*!
    * \brief Constructor of the class.
@@ -293,15 +291,9 @@ class CIteration {
   virtual void SetDependencies(CSolver***** solver, CGeometry**** geometry, CNumerics****** numerics, CConfig** config,
                                unsigned short iZone, unsigned short iInst, RECORDING kind_recording) {}
 
-  virtual void SetDependencies(CSolver***** solver, CGeometry**** geometry, CNumerics****** numerics, CConfig** config, CInterface*** interface,
-                                unsigned short iZone, unsigned short iInst, RECORDING kind_recording) {} 
-
   virtual void RegisterOutput(CSolver***** solver, CGeometry**** geometry, CConfig** config,
                               unsigned short iZone, unsigned short iInst) {}
 
-
-    // void ComputeTurboBladePerformance(CSolver***** solver, CGeometry**** geometry_container, CConfig** config_container, unsigned short iBlade);
-
   /*!
    * \brief Computes turboperformance.
    */

SU2_CFD/src/drivers/CDiscAdjMultizoneDriver.cpp

@@ -31,8 +31,6 @@
 #include "../../include/output/COutput.hpp"
 #include "../../include/iteration/CIterationFactory.hpp"
 
-#include "../../../Common/include/tracy_structure.hpp"
-
 CDiscAdjMultizoneDriver::CDiscAdjMultizoneDriver(char* confFile,
                                                  unsigned short val_nZone,
                                                  SU2_Comm MPICommunicator)
@@ -687,8 +685,6 @@ void CDiscAdjMultizoneDriver::EvaluateSensitivities(unsigned long Iter, bool for
 
 void CDiscAdjMultizoneDriver::SetRecording(RECORDING kind_recording, Kind_Tape tape_type, unsigned short record_zone) {
 
-  SU2_ZONE_SCOPED_N("SetRecording_driver");
-
   AD::Reset();
 
   /*--- Prepare for recording by resetting the solution to the initial converged solution. ---*/
@@ -747,7 +743,7 @@ void CDiscAdjMultizoneDriver::SetRecording(RECORDING kind_recording, Kind_Tape t
 
   for (iZone = 0; iZone < nZone; iZone++) {
     iteration_container[iZone][INST_0]->SetDependencies(solver_container, geometry_container, numerics_container,
-                                                        config_container, interface_container, iZone, INST_0, kind_recording);
+                                                        config_container, iZone, INST_0, kind_recording);
   }
 
   AD::Push_TapePosition(); /// DEPENDENCIES
@@ -761,7 +757,7 @@ void CDiscAdjMultizoneDriver::SetRecording(RECORDING kind_recording, Kind_Tape t
     for (iZone = 0; iZone < nZone; iZone++) {
       if (Has_Deformation(iZone)) {
         iteration_container[iZone][INST_0]->SetDependencies(solver_container, geometry_container, numerics_container,
-                                                            config_container, interface_container, iZone, INST_0, kind_recording);
+                                                            config_container, iZone, INST_0, kind_recording);
       }
     }
     SetObjFunction(kind_recording);
@@ -805,12 +801,6 @@ void CDiscAdjMultizoneDriver::SetRecording(RECORDING kind_recording, Kind_Tape t
 
 void CDiscAdjMultizoneDriver::DirectIteration(unsigned short iZone, RECORDING kind_recording) {
 
-  SU2_ZONE_SCOPED_N("DirectIteration");
-
-  // if (config_container[iZone]->GetBoolTurbomachinery()) {
-  //   InitStaticMeshMovement(iZone, false);
-  // }
-
   /*--- Do one iteration of the direct solver ---*/
   direct_iteration[iZone][INST_0]->Preprocess(output_container[iZone], integration_container, geometry_container,
                                               solver_container, numerics_container, config_container,
@@ -821,11 +811,6 @@ void CDiscAdjMultizoneDriver::DirectIteration(unsigned short iZone, RECORDING ki
                                            solver_container, numerics_container, config_container,
                                            surface_movement, grid_movement, FFDBox, iZone, INST_0);
 
-  /*--- Turbo Specific Post-Procesisng ---*/
-  // if (config_container[iZone]->GetBoolTurbomachinery()){    
-  //   direct_iteration[iZone][INST_0]->Postprocess(output_container[iZone], integration_container, geometry_container, solver_container, numerics_container, config_container, surface_movement, grid_movement, FFDBox, iZone, INST_0);
-  // }
-
 }
 
 void CDiscAdjMultizoneDriver::SetObjFunction(RECORDING kind_recording) {
@@ -858,11 +843,7 @@ void CDiscAdjMultizoneDriver::SetObjFunction(RECORDING kind_recording) {
           solvers[FLOW_SOL]->TurboAverageProcess(solvers, geometry, config, OUTFLOW);
 
           /*--- Gather Inflow and Outflow quantities on the Master Node to compute performance ---*/
-
           solvers[FLOW_SOL]->GatherInOutAverageValues(config, geometry);
-
-          /*--- Compute the turboperformance ---*/
-
           solvers[FLOW_SOL]->ComputeTurboBladePerformance(geometry, config, iZone);
         }
 
@@ -992,8 +973,6 @@ void CDiscAdjMultizoneDriver::InitializeCrossTerms() {
 
 void CDiscAdjMultizoneDriver::HandleDataTransfer() {
 
-  SU2_ZONE_SCOPED_N("HandleDataTransfer");
-
   for(iZone = 0; iZone < nZone; iZone++) {
 
     /*--- In principle, the mesh does not need to be updated ---*/