New turbo ouputs #2011

joshkellyjak · 2023-04-14T17:10:54Z

Proposed Changes

Implemented updated turboperformance methods and adds improved history ouput of turboperformance variables to match screen output

Related Work

Follows on from removal of legacy output - #2003

Implements improved turboperformance calculations used in feature_turbomachinery_restruct_singlezone - #1316

PR Checklist

I am submitting my contribution to the develop branch.
My contribution generates no new compiler warnings (try with --warnlevel=3 when using meson).
My contribution is commented and consistent with SU2 style (https://su2code.github.io/docs_v7/Style-Guide/).
I used the pre-commit hook to prevent dirty commits and used pre-commit run --all to format old commits.
I have added a test case that demonstrates my contribution, if necessary.
I have updated appropriate documentation (Tutorials, Docs Page, config_template.cpp), if necessary.

…into remove_legacy_output

github-advanced-security

CodeQL found more than 10 potential problems in the proposed changes. Check the Files changed tab for more details.

SU2_CFD/include/iteration/CFluidIteration.hpp

SU2_CFD/include/iteration/CTurboIteration.hpp

SU2_CFD/include/output/COutput.hpp

SU2_CFD/include/output/CTurboOutput.hpp

SU2_CFD/src/iteration/CFluidIteration.cpp

SU2_CFD/src/output/CFlowCompOutput.cpp

SU2_CFD/src/output/COutput.cpp

…to new_turbo_outputs

pcarruscag

Code looks good, just trying to trim down the interface if possible

Common/src/CConfig.cpp

SU2_CFD/include/output/CFlowCompOutput.hpp

SU2_CFD/include/output/CTurboOutput.hpp

SU2_CFD/include/iteration/CIteration.hpp

SU2_CFD/src/drivers/CMultizoneDriver.cpp

SU2_CFD/src/output/CTurboOutput.cpp

SU2_CFD/src/output/CFlowCompOutput.cpp

SU2_CFD/include/output/CTurboOutput.hpp

SU2_CFD/src/output/CFlowCompOutput.cpp

SU2_CFD/include/output/CTurboOutput.hpp

SU2_CFD/src/output/CFlowCompOutput.cpp

+void CFlowCompOutput::WriteTurboSpanwisePerformance(std::shared_ptr<CTurboOutput> TurboPerf, CGeometry *geometry, CConfig **config, unsigned short val_iZone) {
+
+  string inMarker_Tag, outMarker_Tag, inMarkerTag_Mix;
+  unsigned short nZone       = config[val_iZone]->GetnZone();
+
+  unsigned short iDim, iSpan;
+
+  unsigned long iExtIter = config[val_iZone]->GetOuterIter();
+  const su2double* SpanWiseValuesIn, *SpanWiseValuesOut;
+  ofstream file;
+  string spanwise_performance_filename;
+
+  if (rank != MASTER_NODE){
+    return;
+  }
+
+  auto BladePerformance = TurboPerf->GetBladesPerformances();
+
+  /*--- Start of write file turboperformance spanwise ---*/
+  SpanWiseValuesIn = geometry->GetSpanWiseValue(INFLOW);
+  SpanWiseValuesOut = geometry->GetSpanWiseValue(OUTFLOW);
+
+  /*--- Writing Span wise inflow thermodynamic quantities. ---*/
+  spanwise_performance_filename = "TURBOMACHINERY/inflow_spanwise_thermodynamic_values.dat";
+  char buffer[50];
+  if (nZone > 1){
+    unsigned short lastindex      =  spanwise_performance_filename.find_last_of(".");
+    spanwise_performance_filename =  spanwise_performance_filename.substr(0, lastindex);
+    SPRINTF (buffer, "_%d.dat", SU2_TYPE::Int(val_iZone));
+    spanwise_performance_filename.append(string(buffer));
+  }
+
+
+  file.open (spanwise_performance_filename.data(), ios::out | ios::trunc);
+  file.setf(ios::scientific);
+  file.precision(12);
+
+  file << "TITLE = \"Inflow Spanwise Thermodynamic Values. iOuterIter = " << iExtIter << " \"" << endl;
+  file << "VARIABLES =" << endl;
+
+  file.width(30); file << "\"SpanWise Value[m]\"";
+  file.width(15); file << "\"iSpan\"";
+  file.width(30); file << "\"Pressure[Pa]\"";
+  file.width(30); file << "\"TotalPressure[Pa]\"";
+  file.width(30); file << "\"Temperature[K]\"";
+  file.width(30); file << "\"TotalTemperature[K]\"";
+  file.width(30); file << "\"Enthalpy[J]\"";
+  file.width(30); file << "\"TotalEnthalpy[J]\"";
+  file.width(30); file << "\"Density[kg/m3]\"";
+  file.width(30); file << "\"Entropy[J/K]\"";
+  file << endl;
+
+  for(iSpan = 0; iSpan < config[val_iZone]->GetnSpanWiseSections(); iSpan++){
+    const auto& BladePerf = BladePerformance.at(val_iZone).at(iSpan);
+
+    file.width(30); file << SpanWiseValuesIn[iSpan];
+    file.width(15); file << iSpan;
+    file.width(30); file << BladePerf->GetInletState().GetPressure()*config[ZONE_0]->GetPressure_Ref();
+    file.width(30); file << BladePerf->GetInletState().GetTotalPressure()*config[ZONE_0]->GetPressure_Ref();
+    file.width(30); file << BladePerf->GetInletState().GetTemperature()*config[ZONE_0]->GetTemperature_Ref();
+    file.width(30); file << BladePerf->GetInletState().GetTotalTemperature()*config[ZONE_0]->GetTemperature_Ref();
+    file.width(30); file << BladePerf->GetInletState().GetEnthalpy()*config[ZONE_0]->GetEnergy_Ref();
+    file.width(30); file << BladePerf->GetInletState().GetTotalEnthalpy()*config[ZONE_0]->GetEnergy_Ref();
+    file.width(30); file << BladePerf->GetInletState().GetDensity()*config[ZONE_0]->GetDensity_Ref();
+    file.width(30); file << BladePerf->GetInletState().GetEntropy()*config[ZONE_0]->GetEnergy_Ref()/config[ZONE_0]->GetTemperature_Ref();
+  }
+
+  file.close();
+
+  /*--- Writing Span wise outflow thermodynamic quantities. ---*/
+  spanwise_performance_filename = "TURBOMACHINERY/outflow_spanwise_thermodynamic_values.dat";
+  if (nZone > 1){
+    unsigned short lastindex      =  spanwise_performance_filename.find_last_of(".");
+    spanwise_performance_filename =  spanwise_performance_filename.substr(0, lastindex);
+    SPRINTF (buffer, "_%d.dat", SU2_TYPE::Int(val_iZone));
+    spanwise_performance_filename.append(string(buffer));
+  }
+
+  file.open (spanwise_performance_filename.data(), ios::out | ios::trunc);
+  file.setf(ios::scientific);
+  file.precision(12);
+
+  file << "TITLE = \"Outflow Span-wise Thermodynamic Values. iOuterIter = " << iExtIter << " \"" << endl;
+  file << "VARIABLES =" << endl;
+
+  file.width(30); file << "\"SpanWise Value[m]\"";
+  file.width(15); file << "\"iSpan\"";
+  file.width(30); file << "\"Pressure[Pa]\"";
+  file.width(30); file << "\"TotalPressure[Pa]\"";
+  file.width(30); file << "\"Temperature[K]\"";
+  file.width(30); file << "\"TotalTemperature[K]\"";
+  file.width(30); file << "\"Enthalpy[J]\"";
+  file.width(30); file << "\"TotalEnthalpy[J]\"";
+  file.width(30); file << "\"Density[kg/m3]\"";
+  file.width(30); file << "\"Entropy[J/K]\"";
+  file << endl;
+
+
+  for(iSpan = 0; iSpan < config[val_iZone]->GetnSpanWiseSections(); iSpan++){
+    const auto& BladePerf = BladePerformance.at(val_iZone).at(iSpan);
+
+    file.width(30); file << SpanWiseValuesOut[iSpan];
+    file.width(15); file << iSpan;
+    file.width(30); file << BladePerf->GetOutletState().GetPressure()*config[ZONE_0]->GetPressure_Ref();
+    file.width(30); file << BladePerf->GetOutletState().GetTotalPressure()*config[ZONE_0]->GetPressure_Ref();
+    file.width(30); file << BladePerf->GetOutletState().GetTemperature()*config[ZONE_0]->GetTemperature_Ref();
+    file.width(30); file << BladePerf->GetOutletState().GetTotalTemperature()*config[ZONE_0]->GetTemperature_Ref();
+    file.width(30); file << BladePerf->GetOutletState().GetEnthalpy()*config[ZONE_0]->GetEnergy_Ref();
+    file.width(30); file << BladePerf->GetOutletState().GetTotalEnthalpy()*config[ZONE_0]->GetEnergy_Ref();
+    file.width(30); file << BladePerf->GetOutletState().GetDensity()*config[ZONE_0]->GetDensity_Ref();
+    file.width(30); file << BladePerf->GetOutletState().GetEntropy()*config[ZONE_0]->GetEnergy_Ref()/config[ZONE_0]->GetTemperature_Ref();
+  }
+
+  file.close();
+
+  /*--- Writing Span wise inflow kinematic quantities. ---*/
+  spanwise_performance_filename = "TURBOMACHINERY/inflow_spanwise_kinematic_values.dat";
+  if (nZone > 1){
+    unsigned short lastindex      =  spanwise_performance_filename.find_last_of(".");
+    spanwise_performance_filename =  spanwise_performance_filename.substr(0, lastindex);
+    SPRINTF (buffer, "_%d.dat", SU2_TYPE::Int(val_iZone));
+    spanwise_performance_filename.append(string(buffer));
+  }
+
+  file.open (spanwise_performance_filename.data(), ios::out | ios::trunc);
+  file.setf(ios::scientific);
+  file.precision(12);
+
+  file << "TITLE = \"Inflow Span-wise Kinematic Values. iOuterIter = " << iExtIter << " \"" << endl;
+  file << "VARIABLES =" << endl;
+
+  file.width(30); file << "\"SpanWise Value[m]\"";
+  file.width(15); file << "\"iSpan\"";
+  file.width(30); file << "\"Normal Mach[-]\"";
+  file.width(30); file << "\"Tangential Mach[-]\"";
+  if (geometry->GetnDim() == 3) {
+    file.width(30); file << "\"3rd Component Mach[-]\"";
+  };
+  file.width(30); file << "\"Mach Module[-]\"";
+  file.width(30); file << "\"Normal Velocity[m/s]\"";
+  file.width(30); file << "\"Tangential Velocity[m/s]\"";
+  if (geometry->GetnDim() == 3) {
+    file.width(30); file << "\"3rd Component Velocity[m/s]\"";
+  };
+  file.width(30); file << "\"Velocity Module[m/s]\"";
+  file.width(30); file << "\"Absolute Flow Angle[deg]\"";
+  file.width(30); file << "\"Relative Flow Angle[deg]\"";
+  file << endl;
+
+
+  for(iSpan = 0; iSpan < config[val_iZone]->GetnSpanWiseSections(); iSpan++){
+    const auto& BladePerf = BladePerformance.at(val_iZone).at(iSpan);
+
+    file.width(30); file << SpanWiseValuesIn[iSpan];
+    file.width(15); file << iSpan;
+    for (iDim = 0; iDim < geometry->GetnDim(); iDim++){
+      file.width(30); file << BladePerf->GetInletState().GetMach()[iDim];
+    }
+    file.width(30); file << BladePerf->GetInletState().GetMachValue();
+    for (iDim = 0; iDim < geometry->GetnDim(); iDim++){
+      file.width(30); file << BladePerf->GetInletState().GetVelocity()[iDim]*config[ZONE_0]->GetVelocity_Ref();
+    }
+    file.width(30); file << BladePerf->GetInletState().GetVelocityValue()*config[ZONE_0]->GetVelocity_Ref();
+    // This captures NaNs 
+    if(isnan(BladePerf->GetInletState().GetAbsFlowAngle())){
+      file.width(30); file << "0.0000";
+    }
+    else {
+      file.width(30); file << BladePerf->GetInletState().GetAbsFlowAngle()*180.0/PI_NUMBER;
+    }
+    if(isnan(BladePerf->GetInletState().GetFlowAngle())){
+      file.width(30); file << "0.0000";
+    }
+    else{
+      file.width(30); file << BladePerf->GetInletState().GetFlowAngle()*180.0/PI_NUMBER;
+    }
+    file << endl;
+  }
+
+  file.close();
+
+  /*--- Writing Span wise outflow thermodynamic quantities. ---*/
+  spanwise_performance_filename = "TURBOMACHINERY/outflow_spanwise_kinematic_values.dat";
+  if (nZone > 1){
+    unsigned short lastindex      =  spanwise_performance_filename.find_last_of(".");
+    spanwise_performance_filename =  spanwise_performance_filename.substr(0, lastindex);
+    SPRINTF (buffer, "_%d.dat", SU2_TYPE::Int(val_iZone));
+    spanwise_performance_filename.append(string(buffer));
+  }
+
+  file.open (spanwise_performance_filename.data(), ios::out | ios::trunc);
+  file.setf(ios::scientific);
+  file.precision(12);
+
+  file << "TITLE = \"Outflow Span-wise Kinematic Values. iOuterIter = " << iExtIter << " \"" << endl;
+  file << "VARIABLES =" << endl;
+
+  file.width(30); file << "\"SpanWise Value[m]\"";
+  file.width(15); file << "\"iSpan\"";
+  file.width(30); file << "\"Normal Mach[-]\"";
+  file.width(30); file << "\"Tangential Mach[-]\"";
+  if (geometry->GetnDim() == 3) {
+    file.width(30); file << "\"3rd Component Mach[-]\"";
+  };
+  file.width(30); file << "\"Mach Module[-]\"";
+  file.width(30); file << "\"Normal Velocity[m/s]\"";
+  file.width(30); file << "\"Tangential Velocity[m/s]\"";
+  if (geometry->GetnDim() == 3) {
+    file.width(30); file << "\"3rd Component Velocity[m/s]\"";
+  };
+  file.width(30); file << "\"Velocity Module[m/s]\"";
+  file.width(30); file << "\"Absolute Flow Angle[deg]\"";
+  file.width(30); file << "\"Relative Flow Angle[deg]\"";
+  file << endl;
+
+
+  for(iSpan = 0; iSpan < config[val_iZone]->GetnSpanWiseSections(); iSpan++){
+    const auto& BladePerf = BladePerformance.at(val_iZone).at(iSpan);
+
+    file.width(30); file << SpanWiseValuesOut[iSpan];
+    file.width(15); file << iSpan;
+    for (iDim = 0; iDim < geometry->GetnDim(); iDim++){
+      file.width(30); file << BladePerf->GetOutletState().GetMach()[iDim];
+    }
+    file.width(30); file << BladePerf->GetInletState().GetMachValue();
+    for (iDim = 0; iDim < geometry->GetnDim(); iDim++){
+      file.width(30); file << BladePerf->GetOutletState().GetVelocity()[iDim]*config[ZONE_0]->GetVelocity_Ref();
+    }
+    file.width(30); file << BladePerf->GetInletState().GetVelocityValue()*config[ZONE_0]->GetVelocity_Ref();
+    if(isnan(BladePerf->GetInletState().GetAbsFlowAngle())){
+      file.width(30); file << "0.0000";
+    }
+    else {
+      file.width(30); file << BladePerf->GetOutletState().GetAbsFlowAngle()*180.0/PI_NUMBER;
+    }
+    if(isnan(BladePerf->GetInletState().GetAbsFlowAngle())){
+      file.width(30); file << "0.0000";
+    }
+    else{
+      file.width(30); file << BladePerf->GetOutletState().GetFlowAngle()*180.0/PI_NUMBER;
+    }
+    file << endl;
+  }
+
+  file.close();
+}


…to new_turbo_outputs

…tack

Common/include/option_structure.hpp

TestCases/serial_regression.py

TestCases/parallel_regression.py

SU2_CFD/src/output/CFlowCompOutput.cpp

SU2_CFD/src/drivers/CMultizoneDriver.cpp

SU2_CFD/include/output/CTurboOutput.hpp

SU2_CFD/include/iteration/CIteration.hpp

Tushma added 3 commits April 6, 2023 16:21

Reimplemented turboperformance calculations

8e9b705

Merge branch 'remove_legacy_output' of https://github.com/su2code/SU2 …

fc34fdf

…into remove_legacy_output

Updated turboperformance methods & history output

4744927

pr-triage bot added the PR: draft label Apr 14, 2023

joshkellyjak changed the title ~~[WIP] New turbo ouputs~~ New turbo ouputs Apr 14, 2023

pcarruscag changed the title ~~New turbo ouputs~~ [WIP] New turbo ouputs Apr 14, 2023

pcarruscag added the changelog:feature label Apr 14, 2023

Merge branch 'develop' into new_turbo_outputs

d742e5d

github-advanced-security bot found potential problems Apr 14, 2023

View reviewed changes

pcarruscag reviewed Apr 14, 2023

View reviewed changes

Tushma and others added 20 commits April 17, 2023 16:57

Changes to address comments

7e6619c

Merge branch 'new_turbo_outputs' of https://github.com/su2code/SU2 in…

c8a8089

…to new_turbo_outputs

typo

1d5c4fc

Fixed mass flow rate computation

f60220d

Some tidying and build warning fixes

6f1e09b

format changes

b38da56

SU2_OMP_PARALLEL formatting in CTurboOutput

9e02f88

Removed vscode auto addition

42f05a1

Updated transonic stator test case to fix reg test

b94ada3

updated all turbo cases

0fa99f3

Fixed calculation bug for uneven blade spanwisediv

71b6283

Merge branch 'develop' into new_turbo_outputs

1652112

Running AD cases

f36f430

Merge branch 'new_turbo_outputs' of https://github.com/su2code/SU2 in…

9cbb710

…to new_turbo_outputs

Update reg tests, fix threading bug

01dc39e

Further reg test and formatting updates

979b08d

Updated screen output, addressed some comments

a8b948a

Removed unused var

84f4617

Merge branch 'develop' into new_turbo_outputs

ed2f39c

Fixed TURBOMACHINERY special folder output

61fe58a

joshkellyjak and others added 2 commits October 26, 2023 17:49

Fixing what I broke

4bfcf7b

Merge branch 'develop' into new_turbo_outputs

69ac587

pcarruscag reviewed Nov 1, 2023

View reviewed changes

joshkellyjak added 4 commits November 8, 2023 15:33

Changes to address comments

f5b9698

Merge branch 'develop' into new_turbo_outputs

bd700dd

Fix merge error

b9334b1

submodule update

9ea23be

joshkellyjak mentioned this pull request Nov 10, 2023

Update turbomachinery testcases and regression tests #2158

Merged

6 tasks

bigfooted and others added 3 commits November 12, 2023 11:28

Merge branch 'develop' into new_turbo_outputs

70756d9

Merge branch 'develop' into new_turbo_outputs

a1bb719

Merge remote-tracking branch 'origin/develop' into new_turbo_outputs

244b51c

github-advanced-security bot found potential problems Jan 10, 2024

View reviewed changes

github-adv-security comments

e0e61c6

pcarruscag reviewed Jan 16, 2024

View reviewed changes

SU2_CFD/src/output/CFlowCompOutput.cpp Show resolved Hide resolved

SU2_CFD/src/output/CFlowCompOutput.cpp Outdated Show resolved Hide resolved

joshkellyjak added 3 commits January 16, 2024 18:17

codeql check & singlezone bugfix

efeabbd

typo

36c730f

better way

463d001

github-advanced-security bot found potential problems Jan 16, 2024

View reviewed changes

joshkellyjak added 8 commits January 22, 2024 11:52

Merge branch 'new_turbo_outputs' of https://github.com/su2code/SU2 in…

b7e6cd4

…to new_turbo_outputs

Added catch to prevent segfault when not including TURBO_PERF_KIND

00bd823

bug fix and update reg tests

7eb2d36

unused var

10f814f

semi-colon

f844493

update regtest values

89d410c

too many zeros

c9c8449

indentation and reorganising of output function called for improved s…

2388374

…tack

pcarruscag approved these changes Feb 5, 2024

View reviewed changes

changes to address comments

9629bb2

joshkellyjak merged commit e554994 into develop Feb 7, 2024

joshkellyjak deleted the new_turbo_outputs branch February 7, 2024 15:14

New turbo ouputs #2011

New turbo ouputs #2011

Uh oh!

Conversation

joshkellyjak commented Apr 14, 2023

Proposed Changes

Related Work

PR Checklist

Uh oh!

github-advanced-security bot left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

pcarruscag left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Check notice

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants