Singlezone working with validated gradients and turbo obj funcs. Need to run in quasi-MZ approach. (NEEDS CLEANING)

Joshua Kelly · Joshua Kelly · commit d43fef58dbcf · 2025-06-09T05:40:45.000+01:00
diff --git a/SU2_CFD/include/iteration/CIteration.hpp b/SU2_CFD/include/iteration/CIteration.hpp
@@ -302,10 +302,10 @@ class CIteration {
   /*!
    * \brief Computes turboperformance.
    */
-  virtual void ComputeTurboPerformance(CSolver***** solver, CGeometry**** geometry_container, CConfig** config_container){}
+  void ComputeTurboPerformance(CSolver***** solver, CGeometry**** geometry_container, CConfig** config_container);
 
   /*!
    * \brief Initialises turboperformance classes.
    */
-  virtual void InitTurboPerformance(CGeometry *geometry, CConfig** config, CFluidModel *fluid){};
+   void InitTurboPerformance(CGeometry *geometry, CConfig** config, CFluidModel *fluid);
 };
diff --git a/SU2_CFD/include/iteration/CTurboIteration.hpp b/SU2_CFD/include/iteration/CTurboIteration.hpp
@@ -63,14 +63,4 @@ 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) override;
-
-  /*!
-   * \brief Computes turboperformance.
-   */
-  void ComputeTurboPerformance(CSolver***** solver, CGeometry**** geometry_container, CConfig** config_container) override;
 };
diff --git a/SU2_CFD/include/output/CFlowCompOutput.hpp b/SU2_CFD/include/output/CFlowCompOutput.hpp
@@ -74,6 +74,8 @@ class CFlowCompOutput final: public CFlowOutput {
    */
   void SetHistoryOutputFields(CConfig *config) override;
 
+  void SetTurbomachineryObjectiveFunctions(CSolver *solver, CConfig *config);
+
   /*!
    * \brief Check whether the base values for relative residuals should be initialized
    * \param[in] config - Definition of the particular problem.
diff --git a/SU2_CFD/include/output/CTurboOutput.hpp b/SU2_CFD/include/output/CTurboOutput.hpp
@@ -96,6 +96,11 @@ class CTurbomachineryState {
 
   CTurbomachineryState(unsigned short nDim, su2double area, su2double radius);
 
+  inline void SetZeroValues() {
+    Density = Pressure = Entropy = Enthalpy = Temperature = TotalTemperature = TotalPressure = TotalEnthalpy = 0.0;
+    AbsFlowAngle = FlowAngle = MassFlow = Rothalpy = TotalRelPressure = 0.0;
+  };
+
   void ComputeState(CFluidModel& fluidModel, const CTurbomachineryPrimitiveState& primitiveState);
 
   const su2double& GetDensity() const { return Density; }
diff --git a/SU2_CFD/include/solvers/CDiscAdjSolver.hpp b/SU2_CFD/include/solvers/CDiscAdjSolver.hpp
@@ -106,6 +106,15 @@ class CDiscAdjSolver final : public CSolver {
    */
   void RegisterOutput(CGeometry *geometry, CConfig *config) override;
 
+  /*!
+   * \brief performs the preprocessing of the adjoint AD-based solver.
+   *        Registers the normals at turbomachinery boundaries of interest on the tape
+   *        Called while tape is active.
+   * \param[in] geometry - the geometrical definition of the problem
+   * \param[in] config - the particular config
+  */
+  void Register_VertexNormals(CGeometry *geometry, CConfig *config, bool input) override;
+
   /*!
    * \brief Sets the adjoint values of the output of the flow (+turb.) iteration
    *        before evaluation of the tape.
diff --git a/SU2_CFD/include/solvers/CSolver.hpp b/SU2_CFD/include/solvers/CSolver.hpp
@@ -3517,6 +3517,14 @@ class CSolver {
    */
   inline virtual void RegisterOutput(CGeometry *geometry_container, CConfig *config) { }
 
+  /*!
+   * \brief A vritual member
+   * \param[in] geometry - the geometrical definition of the problem
+   * \param[in] config - the particular config
+   * \param[in] input - Boolean whether In- or Output should be registered
+  */
+  inline virtual void Register_VertexNormals(CGeometry *geometry, CConfig *config, bool input) { };
+
   /*!
    * \brief A virtual member.
    * \param[in] input - Boolean whether In- or Output should be registered.
diff --git a/SU2_CFD/src/drivers/CDiscAdjMultizoneDriver.cpp b/SU2_CFD/src/drivers/CDiscAdjMultizoneDriver.cpp
@@ -690,6 +690,11 @@ 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) {
@@ -718,13 +723,6 @@ void CDiscAdjMultizoneDriver::SetObjFunction(RECORDING kind_recording) {
         }
 
         direct_output[iZone]->SetHistoryOutput(geometry, solvers, config);
-        // Need to evaluate turbomachinery objective functions here as they are only calculated in the final zone
-        if (config->GetBoolTurbomachinery() && iZone == config->GetnZone()-1){
-          direct_iteration[iZone][INST_0]->InitTurboPerformance(geometry, config_container, solvers[FLOW_SOL]->GetFluidModel());
-          direct_iteration[iZone][INST_0]->ComputeTurboPerformance(solver_container, geometry_container, config_container);
-          const auto weight = config->GetWeight_ObjFunc(0);
-          ObjFunc += weight * solvers[FLOW_SOL]->GetTurboObjectiveFunction(config->GetKind_ObjFunc(), config_container[ZONE_0]->GetnMarker_Turbomachinery());
-        }
         ObjFunc += solvers[FLOW_SOL]->GetTotal_ComboObj();
         break;
 
diff --git a/SU2_CFD/src/drivers/CDiscAdjSinglezoneDriver.cpp b/SU2_CFD/src/drivers/CDiscAdjSinglezoneDriver.cpp
@@ -285,7 +285,7 @@ void CDiscAdjSinglezoneDriver::SetRecording(RECORDING kind_recording){
 
   /*--- Set the dependencies of the iteration ---*/
 
-  iteration->SetDependencies(solver_container, geometry_container, numerics_container, config_container, ZONE_0,
+  iteration->SetDependencies(solver_container, geometry_container, numerics_container, config_container, nullptr, ZONE_0,
                              INST_0, kind_recording);
 
   /*--- Do one iteration of the direct solver ---*/
diff --git a/SU2_CFD/src/drivers/CDriver.cpp b/SU2_CFD/src/drivers/CDriver.cpp
@@ -243,7 +243,7 @@ CDriverBase(confFile, val_nZone, MPICommunicator), StopCalc(false), fsi(false),
     }
   }
 
-  if (config_container[ZONE_0]->GetBoolTurbomachinery() && !config_container[ZONE_0]->GetDiscrete_Adjoint()){
+  if (config_container[ZONE_0]->GetBoolTurbomachinery()){
     if (rank == MASTER_NODE)
       cout << endl <<"---------------------- Turbomachinery Preprocessing ---------------------" << endl;
 
diff --git a/SU2_CFD/src/integration/CIntegration.cpp b/SU2_CFD/src/integration/CIntegration.cpp
@@ -89,14 +89,14 @@ void CIntegration::Space_Integration(CGeometry *geometry,
     solver_container[MainSolver]->PreprocessBC_Giles(geometry, config, conv_bound_numerics, OUTFLOW);
   }
 
-  BEGIN_SU2_OMP_SAFE_GLOBAL_ACCESS {
-    if (config->GetBoolTurbomachinery()){
-        /*--- Average quantities at the inflow and outflow boundaries ---*/
-      solver_container[MainSolver]->TurboAverageProcess(solver_container, geometry,config,INFLOW);
-      solver_container[MainSolver]->TurboAverageProcess(solver_container, geometry, config, OUTFLOW);
-    }
-  }
-  END_SU2_OMP_SAFE_GLOBAL_ACCESS
+  // BEGIN_SU2_OMP_SAFE_GLOBAL_ACCESS {
+  //   if (config->GetBoolTurbomachinery()){
+  //       /*--- Average quantities at the inflow and outflow boundaries ---*/
+  //     solver_container[MainSolver]->TurboAverageProcess(solver_container, geometry,config,INFLOW);
+  //     solver_container[MainSolver]->TurboAverageProcess(solver_container, geometry, config, OUTFLOW);
+  //   }
+  // }
+  // END_SU2_OMP_SAFE_GLOBAL_ACCESS
 
   /*--- Weak boundary conditions ---*/
 
diff --git a/SU2_CFD/src/iteration/CDiscAdjFluidIteration.cpp b/SU2_CFD/src/iteration/CDiscAdjFluidIteration.cpp
@@ -416,6 +416,10 @@ void CDiscAdjFluidIteration::RegisterInput(CSolver***** solver, CGeometry**** ge
     if (turbulent && !config[iZone]->GetFrozen_Visc_Disc()) {
       solvers0[ADJTURB_SOL]->RegisterSolution(geometry0, config[iZone]);
     }
+    if (config[iZone]->GetBoolTurbomachinery()) {
+      geometry0->RegisterCoordinates();
+      solvers0[ADJFLOW_SOL]->Register_VertexNormals(geometry0, config[iZone], true);
+    }
     if (config[iZone]->GetKind_Species_Model() != SPECIES_MODEL::NONE) {
       solvers0[ADJSPECIES_SOL]->RegisterSolution(geometry0, config[iZone]);
     }
@@ -482,16 +486,16 @@ void CDiscAdjFluidIteration::SetDependencies(CSolver***** solver, CGeometry****
       // Defines geometric dependency in turbo simulations, this is done in ZONE_0 as it requires a loop over all zones first
       // This step is very similar to the turbo preprocessing in CDriver but it is not recorded to the tape their, hence repeated here
       // Do this in two parts as solver step is necessary in the middle
-      for (auto jZone = 0u; jZone < nZone; jZone++){
-        SU2_OMP_PARALLEL
-        CGeometry::UpdateGeometry(geometry[jZone][iInst], config[jZone]);
-        END_SU2_OMP_PARALLEL
+      // for (auto jZone = 0u; jZone < nZone; jZone++){
+      //   SU2_OMP_PARALLEL
+      //   CGeometry::UpdateGeometry(geometry[jZone][iInst], config[jZone]);
+      //   END_SU2_OMP_PARALLEL
 
-        CGeometry::ComputeWallDistance(config, geometry);
-      }
+      //   CGeometry::ComputeWallDistance(config, geometry);
+      // }
       geometry[iZone][MESH_0][INST_0]->InitTurboVertexAdj(geometry, config);
-      for (auto iZone = 0u; iZone < nZone; iZone++) {
-        solver[iZone][INST_0][MESH_0][FLOW_SOL]->InitTurboContainers(geometry[iZone][INST_0][MESH_0],config[iZone]);
+      for (auto jZone = 0u; jZone < nZone; jZone++) {
+        solver[jZone][INST_0][MESH_0][FLOW_SOL]->InitTurboContainers(geometry[jZone][INST_0][MESH_0],config[jZone]);
       }
       geometry[iZone][MESH_0][INST_0]->UpdateTurboGeometry(geometry, interface, config);
     }
@@ -504,7 +508,9 @@ void CDiscAdjFluidIteration::SetDependencies(CSolver***** solver, CGeometry****
     solvers0[FLOW_SOL]->PreprocessAverage(solvers0, geometry0, config[iZone], OUTFLOW);
     solvers0[FLOW_SOL]->TurboAverageProcess(solvers0, geometry0, config[iZone], INFLOW);
     solvers0[FLOW_SOL]->TurboAverageProcess(solvers0, geometry0, config[iZone], OUTFLOW);
+    InitTurboPerformance(geometry0, config, solvers0[FLOW_SOL]->GetFluidModel());
     solvers0[FLOW_SOL]->GatherInOutAverageValues(config[iZone], geometry0);
+    if (iZone == nZone-1) ComputeTurboPerformance(solver, geometry, config);
   }
   if (config[iZone]->GetKind_Species_Model() != SPECIES_MODEL::NONE) {
     solvers0[SPECIES_SOL]->Preprocessing(geometry0, solvers0, config[iZone], MESH_0, NO_RK_ITER, RUNTIME_FLOW_SYS, true);
@@ -544,6 +550,9 @@ void CDiscAdjFluidIteration::RegisterOutput(CSolver***** solver, CGeometry**** g
   if (turbulent && !config[iZone]->GetFrozen_Visc_Disc()) {
     solvers0[ADJTURB_SOL]->RegisterOutput(geometry0, config[iZone]);
   }
+  if (config[iZone]->GetBoolTurbomachinery()) {
+    solvers0[ADJFLOW_SOL]->Register_VertexNormals(geometry0, config[iZone], false);
+  }
   if (config[iZone]->GetKind_Species_Model() != SPECIES_MODEL::NONE) {
     solvers0[ADJSPECIES_SOL]->RegisterOutput(geometry0, config[iZone]);
   }
diff --git a/SU2_CFD/src/iteration/CFluidIteration.cpp b/SU2_CFD/src/iteration/CFluidIteration.cpp
@@ -365,6 +365,9 @@ void CFluidIteration::Solve(COutput* output, CIntegration**** integration, CGeom
     Iterate(output, integration, geometry, solver, numerics, config, surface_movement, grid_movement, FFDBox, val_iZone,
             INST_0);
 
+    /*--- Postprocessing Step ---*/
+    Postprocess(output, integration, geometry, solver, numerics, config, surface_movement, grid_movement, FFDBox, val_iZone, val_iInst);
+
     /*--- Monitor the pseudo-time ---*/
     StopCalc = Monitor(output, integration, geometry, solver, numerics, config, surface_movement, grid_movement, FFDBox,
                        val_iZone, INST_0);
diff --git a/SU2_CFD/src/iteration/CIteration.cpp b/SU2_CFD/src/iteration/CIteration.cpp
@@ -209,3 +209,56 @@ void CIteration::Output(COutput* output, CGeometry**** geometry, CSolver***** so
   output->SetResultFiles(geometry[val_iZone][INST_0][MESH_0], config[val_iZone], solver[val_iZone][INST_0][MESH_0],
                           InnerIter);
 }
+
+void CIteration::InitTurboPerformance(CGeometry* geometry, CConfig** config, CFluidModel* fluid) {
+  TurbomachineryPerformance = std::make_shared<CTurboOutput>(config, *geometry, *fluid);
+  TurbomachineryStagePerformance = std::make_shared<CTurbomachineryStagePerformance>(*fluid);
+}
+
+void CIteration::ComputeTurboPerformance(CSolver***** solver, CGeometry**** geometry_container, CConfig** config_container) {
+  const auto nDim = geometry_container[ZONE_0][INST_0][MESH_0]->GetnDim();
+  const auto nBladesRow = config_container[ZONE_0]->GetnMarker_Turbomachinery();
+  const auto nZone = config_container[ZONE_0]->GetnZone();
+  vector<su2double> TurboPrimitiveIn, TurboPrimitiveOut;
+  std::vector<std::vector<CTurbomachineryCombinedPrimitiveStates>> bladesPrimitives;
+
+  if (rank == MASTER_NODE) {
+      for (auto iBlade = 0u; iBlade < nBladesRow; iBlade++){
+      /* Blade Primitive initialized per blade */
+      std::vector<CTurbomachineryCombinedPrimitiveStates> bladePrimitives;
+      auto nSpan = config_container[iBlade]->GetnSpanWiseSections();
+      for (auto iSpan = 0; iSpan < nSpan + 1; iSpan++) {
+        TurboPrimitiveIn= solver[iBlade][INST_0][MESH_0][FLOW_SOL]->GetTurboPrimitive(iBlade, iSpan, true);
+        TurboPrimitiveOut= solver[iBlade][INST_0][MESH_0][FLOW_SOL]->GetTurboPrimitive(iBlade, iSpan, false);
+        auto spanInletPrimitive = CTurbomachineryPrimitiveState(TurboPrimitiveIn, nDim, geometry_container[iBlade][INST_0][MESH_0]->GetTangGridVelIn(iBlade, iSpan));
+        auto spanOutletPrimitive = CTurbomachineryPrimitiveState(TurboPrimitiveOut, nDim, geometry_container[iBlade][INST_0][MESH_0]->GetTangGridVelOut(iBlade, iSpan));
+        auto spanCombinedPrimitive = CTurbomachineryCombinedPrimitiveStates(spanInletPrimitive, spanOutletPrimitive);
+        bladePrimitives.push_back(spanCombinedPrimitive);
+      }
+      bladesPrimitives.push_back(bladePrimitives);
+    }
+    TurbomachineryPerformance->ComputeTurbomachineryPerformance(bladesPrimitives);
+    
+    auto nSpan = config_container[ZONE_0]->GetnSpanWiseSections();
+    auto InState = TurbomachineryPerformance->GetBladesPerformances().at(ZONE_0).at(nSpan)->GetInletState();
+    nSpan = config_container[nZone-1]->GetnSpanWiseSections();
+    auto OutState =  TurbomachineryPerformance->GetBladesPerformances().at(nZone-1).at(nSpan)->GetOutletState();
+    
+    TurbomachineryStagePerformance->ComputePerformanceStage(InState, OutState, config_container[nZone-1]);
+
+    /*--- Set turbomachinery objective function value in each zone ---*/
+    for (auto iBlade = 0u; iBlade < nBladesRow; iBlade++) {
+      // Should we set in ZONE_0 or nZone-1?
+      auto iBladePerf = TurbomachineryPerformance->GetBladesPerformances().at(iBlade).at(nSpan);
+      InState = iBladePerf->GetInletState();
+      OutState = iBladePerf->GetOutletState();
+      solver[iBlade][INST_0][MESH_0][FLOW_SOL]->SetTurboObjectiveFunction(ENUM_OBJECTIVE::ENTROPY_GENERATION, iBlade, TurbomachineryStagePerformance->GetNormEntropyGen()*100);
+      solver[iBlade][INST_0][MESH_0][FLOW_SOL]->SetTurboObjectiveFunction(ENUM_OBJECTIVE::TOTAL_PRESSURE_LOSS, iBlade, iBladePerf->GetTotalPressureLoss());
+      solver[iBlade][INST_0][MESH_0][FLOW_SOL]->SetTurboObjectiveFunction(ENUM_OBJECTIVE::KINETIC_ENERGY_LOSS, iBlade, iBladePerf->GetKineticEnergyLoss());
+    }
+    /*--- Set global turbomachinery objective function (evaluated in final zone as dependent on values from all previous zones ) ---*/
+    solver[nBladesRow-1][INST_0][MESH_0][FLOW_SOL]->SetTurboObjectiveFunction(ENUM_OBJECTIVE::ENTROPY_GENERATION, nBladesRow, TurbomachineryStagePerformance->GetNormEntropyGen()*100);
+    solver[nBladesRow-1][INST_0][MESH_0][FLOW_SOL]->SetTurboObjectiveFunction(ENUM_OBJECTIVE::TOTAL_PRESSURE_LOSS, nBladesRow, TurbomachineryStagePerformance->GetTotalPressureLoss());
+    solver[nBladesRow-1][INST_0][MESH_0][FLOW_SOL]->SetTurboObjectiveFunction(ENUM_OBJECTIVE::KINETIC_ENERGY_LOSS, nBladesRow, TurbomachineryStagePerformance->GetKineticEnergyLoss());
+  }
+}
diff --git a/SU2_CFD/src/iteration/CTurboIteration.cpp b/SU2_CFD/src/iteration/CTurboIteration.cpp
@@ -59,57 +59,3 @@ void CTurboIteration::Postprocess(COutput* output, CIntegration**** integration,
   solver[val_iZone][val_iInst][MESH_0][FLOW_SOL]->GatherInOutAverageValues(config[val_iZone],
                                                                            geometry[val_iZone][val_iInst][MESH_0]);
 }
-
-void CTurboIteration::InitTurboPerformance(CGeometry* geometry, CConfig** config, CFluidModel* fluid) {
-  TurbomachineryPerformance = std::make_shared<CTurboOutput>(config, *geometry, *fluid);
-  TurbomachineryStagePerformance = std::make_shared<CTurbomachineryStagePerformance>(*fluid);
-}
-
-void CTurboIteration::ComputeTurboPerformance(CSolver***** solver, CGeometry**** geometry_container, CConfig** config_container) {
-  unsigned short nDim = geometry_container[ZONE_0][INST_0][MESH_0]->GetnDim();
-  unsigned short nBladesRow = config_container[ZONE_0]->GetnMarker_Turbomachinery();
-  unsigned short nZone = config_container[ZONE_0]->GetnZone();
-  unsigned short iBlade=0, iSpan;
-  vector<su2double> TurboPrimitiveIn, TurboPrimitiveOut;
-  std::vector<std::vector<CTurbomachineryCombinedPrimitiveStates>> bladesPrimitives;
-
-  if (rank == MASTER_NODE) {
-      for (iBlade = 0; iBlade < nBladesRow; iBlade++){
-      /* Blade Primitive initialized per blade */
-      std::vector<CTurbomachineryCombinedPrimitiveStates> bladePrimitives;
-      auto nSpan = config_container[iBlade]->GetnSpanWiseSections();
-      for (iSpan = 0; iSpan < nSpan + 1; iSpan++) {
-        TurboPrimitiveIn= solver[iBlade][INST_0][MESH_0][FLOW_SOL]->GetTurboPrimitive(iBlade, iSpan, true);
-        TurboPrimitiveOut= solver[iBlade][INST_0][MESH_0][FLOW_SOL]->GetTurboPrimitive(iBlade, iSpan, false);
-        auto spanInletPrimitive = CTurbomachineryPrimitiveState(TurboPrimitiveIn, nDim, geometry_container[iBlade][INST_0][MESH_0]->GetTangGridVelIn(iBlade, iSpan));
-        auto spanOutletPrimitive = CTurbomachineryPrimitiveState(TurboPrimitiveOut, nDim, geometry_container[iBlade][INST_0][MESH_0]->GetTangGridVelOut(iBlade, iSpan));
-        auto spanCombinedPrimitive = CTurbomachineryCombinedPrimitiveStates(spanInletPrimitive, spanOutletPrimitive);
-        bladePrimitives.push_back(spanCombinedPrimitive);
-      }
-      bladesPrimitives.push_back(bladePrimitives);
-    }
-    TurbomachineryPerformance->ComputeTurbomachineryPerformance(bladesPrimitives);
-    
-    auto nSpan = config_container[ZONE_0]->GetnSpanWiseSections();
-    auto InState = TurbomachineryPerformance->GetBladesPerformances().at(ZONE_0).at(nSpan)->GetInletState();
-    nSpan = config_container[nZone-1]->GetnSpanWiseSections();
-    auto OutState =  TurbomachineryPerformance->GetBladesPerformances().at(nZone-1).at(nSpan)->GetOutletState();
-    
-    TurbomachineryStagePerformance->ComputePerformanceStage(InState, OutState, config_container[nZone-1]);
-
-    /*--- Set turbomachinery objective function value in each zone ---*/
-    for (auto iBlade = 0u; iBlade < nBladesRow; iBlade++) {
-      // Should we set in ZONE_0 or nZone-1?
-      auto iBladePerf = TurbomachineryPerformance->GetBladesPerformances().at(iBlade).at(nSpan);
-      InState = iBladePerf->GetInletState();
-      OutState = iBladePerf->GetOutletState();
-      solver[iBlade][INST_0][MESH_0][FLOW_SOL]->SetTurboObjectiveFunction(ENUM_OBJECTIVE::ENTROPY_GENERATION, iBlade, TurbomachineryStagePerformance->GetNormEntropyGen()*100);
-      solver[iBlade][INST_0][MESH_0][FLOW_SOL]->SetTurboObjectiveFunction(ENUM_OBJECTIVE::TOTAL_PRESSURE_LOSS, iBlade, iBladePerf->GetTotalPressureLoss());
-      solver[iBlade][INST_0][MESH_0][FLOW_SOL]->SetTurboObjectiveFunction(ENUM_OBJECTIVE::KINETIC_ENERGY_LOSS, iBlade, iBladePerf->GetKineticEnergyLoss());
-    }
-    /*--- Set global turbomachinery objective function (evaluated in final zone as dependent on values from all previous zones ) ---*/
-    solver[nBladesRow-1][INST_0][MESH_0][FLOW_SOL]->SetTurboObjectiveFunction(ENUM_OBJECTIVE::ENTROPY_GENERATION, nBladesRow, TurbomachineryStagePerformance->GetNormEntropyGen()*100);
-    solver[nBladesRow-1][INST_0][MESH_0][FLOW_SOL]->SetTurboObjectiveFunction(ENUM_OBJECTIVE::TOTAL_PRESSURE_LOSS, nBladesRow, TurbomachineryStagePerformance->GetTotalPressureLoss());
-    solver[nBladesRow-1][INST_0][MESH_0][FLOW_SOL]->SetTurboObjectiveFunction(ENUM_OBJECTIVE::KINETIC_ENERGY_LOSS, nBladesRow, TurbomachineryStagePerformance->GetKineticEnergyLoss());
-  }
-}
diff --git a/SU2_CFD/src/output/CFlowCompOutput.cpp b/SU2_CFD/src/output/CFlowCompOutput.cpp
diff --git a/SU2_CFD/src/output/CTurboOutput.cpp b/SU2_CFD/src/output/CTurboOutput.cpp
diff --git a/SU2_CFD/src/solvers/CDiscAdjSolver.cpp b/SU2_CFD/src/solvers/CDiscAdjSolver.cpp
diff --git a/SU2_CFD/src/solvers/CEulerSolver.cpp b/SU2_CFD/src/solvers/CEulerSolver.cpp

Original file line number	Diff line number	Diff line change
`@@ -243,7 +243,7 @@ CDriverBase(confFile, val_nZone, MPICommunicator), StopCalc(false), fsi(false),`
`243`	`243`	`}`
`244`	`244`	`}`
`245`	`245`
`246`		`- if (config_container[ZONE_0]->GetBoolTurbomachinery() && !config_container[ZONE_0]->GetDiscrete_Adjoint()){`
	`246`	`+ if (config_container[ZONE_0]->GetBoolTurbomachinery()){`
`247`	`247`	`if (rank == MASTER_NODE)`
`248`	`248`	`cout << endl <<"---------------------- Turbomachinery Preprocessing ---------------------" << endl;`
`249`	`249`