Skip to content

Commit 2388374

Browse files
joshkellyjakjoshkellyjak
committed
indentation and reorganising of output function called for improved stack
1 parent c9c8449 commit 2388374

4 files changed

Lines changed: 78 additions & 85 deletions

File tree

‎Common/src/CConfig.cpp‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6916,14 +6916,14 @@ void CConfig::SetOutput(SU2_COMPONENT val_software, unsigned short val_izone) {
69166916
break;
69176917
}
69186918
}
6919-
else {
6920-
if (Time_Domain) {
6921-
cout << "Dynamic structural analysis."<< endl;
6922-
cout << "Time step provided by the user for the dynamic analysis(s): "<< Time_Step << "." << endl;
6923-
} else {
6924-
cout << "Static structural analysis." << endl;
6919+
else {
6920+
if (Time_Domain) {
6921+
cout << "Dynamic structural analysis."<< endl;
6922+
cout << "Time step provided by the user for the dynamic analysis(s): "<< Time_Step << "." << endl;
6923+
} else {
6924+
cout << "Static structural analysis." << endl;
6925+
}
69256926
}
6926-
}
69276927

69286928
if ((Kind_Solver == MAIN_SOLVER::EULER) || (Kind_Solver == MAIN_SOLVER::NAVIER_STOKES) || (Kind_Solver == MAIN_SOLVER::RANS) ||
69296929
(Kind_Solver == MAIN_SOLVER::INC_EULER) || (Kind_Solver == MAIN_SOLVER::INC_NAVIER_STOKES) || (Kind_Solver == MAIN_SOLVER::INC_RANS) ||

‎SU2_CFD/src/iteration/CFluidIteration.cpp‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -227,7 +227,6 @@ bool CFluidIteration::Monitor(COutput* output, CIntegration**** integration, CGe
227227

228228
TurboMonitor(geometry, config, config[val_iZone]->GetInnerIter());
229229
}
230-
// should this be in an else statement?
231230
output->SetHistoryOutput(geometry[val_iZone][val_iInst][MESH_0], solver[val_iZone][val_iInst][MESH_0],
232231
config[val_iZone], config[val_iZone]->GetTimeIter(), config[val_iZone]->GetOuterIter(),
233232
config[val_iZone]->GetInnerIter());

‎SU2_CFD/src/output/CFlowCompOutput.cpp‎

Lines changed: 63 additions & 72 deletions
Original file line numberDiff line numberDiff line change
@@ -513,40 +513,38 @@ void CFlowCompOutput::SetTurboPerformance_Output(std::shared_ptr<CTurboOutput> T
513513
curInnerIter = InnerIter;
514514
stringstream TurboInOutTable, TurboPerfTable;
515515

516-
if(rank == MASTER_NODE) {
517-
auto BladePerformance = TurboPerf->GetBladesPerformances();
516+
auto BladePerformance = TurboPerf->GetBladesPerformances();
518517

519518
/*-- Table for Turbomachinery Performance Values --*/
520519
PrintingToolbox::CTablePrinter TurboInOut(&TurboInOutTable);
521520

522-
TurboInOutTable<<"-- Turbomachinery inlet and outlet property Summary:"<<endl;
523-
TurboInOut.AddColumn("Properties", 25);
524-
TurboInOut.AddColumn("Inlet", 25);
525-
TurboInOut.AddColumn("Outlet", 25);
526-
TurboInOut.SetAlign(PrintingToolbox::CTablePrinter::RIGHT);
527-
TurboInOut.PrintHeader();
528-
529-
for (unsigned short iZone = 0; iZone <= config->GetnZone()-1; iZone++) {
530-
auto nSpan = config->GetnSpan_iZones(iZone);
531-
const auto& BladePerf = BladePerformance.at(iZone).at(nSpan);
532-
533-
TurboInOut<<" BLADE ROW INDEX "<<iZone <<"";
534-
TurboInOut.PrintFooter();
535-
// TODO: Blade Wise Printing
536-
TurboInOut << "Entropy " << BladePerf->GetInletState().GetEntropy() << BladePerf->GetOutletState().GetEntropy();
537-
TurboInOut << "Total Enthalpy " << BladePerf->GetInletState().GetTotalEnthalpy() << BladePerf->GetOutletState().GetTotalEnthalpy();
538-
TurboInOut << "Total Pressure " << BladePerf->GetInletState().GetTotalPressure() << BladePerf->GetOutletState().GetTotalPressure();
539-
TurboInOut << "Pressure " << BladePerf->GetInletState().GetPressure() << BladePerf->GetOutletState().GetPressure();
540-
TurboInOut << "Density " << BladePerf->GetInletState().GetDensity() << BladePerf->GetOutletState().GetDensity();
541-
TurboInOut << "Normal Velocity " << BladePerf->GetInletState().GetVelocity()[0] << BladePerf->GetOutletState().GetVelocity()[0];
542-
TurboInOut << "Tangential Velocity " << BladePerf->GetInletState().GetVelocity()[1] << BladePerf->GetOutletState().GetVelocity()[1];
543-
TurboInOut << "Mass Flow " << BladePerf->GetInletState().GetMassFlow() << BladePerf->GetOutletState().GetMassFlow();
544-
TurboInOut << "Mach " << BladePerf->GetInletState().GetMachValue() << BladePerf->GetOutletState().GetMachValue();
545-
TurboInOut << "Abs Flow Angle " << BladePerf->GetInletState().GetAbsFlowAngle()*180/PI_NUMBER << BladePerf->GetOutletState().GetAbsFlowAngle()*180/PI_NUMBER;
546-
TurboInOut.PrintFooter();
547-
}
548-
cout<<TurboInOutTable.str();
549-
}
521+
TurboInOutTable<<"-- Turbomachinery inlet and outlet property Summary:"<<endl;
522+
TurboInOut.AddColumn("Properties", 25);
523+
TurboInOut.AddColumn("Inlet", 25);
524+
TurboInOut.AddColumn("Outlet", 25);
525+
TurboInOut.SetAlign(PrintingToolbox::CTablePrinter::RIGHT);
526+
TurboInOut.PrintHeader();
527+
528+
for (unsigned short iZone = 0; iZone <= config->GetnZone()-1; iZone++) {
529+
auto nSpan = config->GetnSpan_iZones(iZone);
530+
const auto& BladePerf = BladePerformance.at(iZone).at(nSpan);
531+
532+
TurboInOut<<" BLADE ROW INDEX "<<iZone <<"";
533+
TurboInOut.PrintFooter();
534+
// TODO: Blade Wise Printing
535+
TurboInOut << "Entropy " << BladePerf->GetInletState().GetEntropy() << BladePerf->GetOutletState().GetEntropy();
536+
TurboInOut << "Total Enthalpy " << BladePerf->GetInletState().GetTotalEnthalpy() << BladePerf->GetOutletState().GetTotalEnthalpy();
537+
TurboInOut << "Total Pressure " << BladePerf->GetInletState().GetTotalPressure() << BladePerf->GetOutletState().GetTotalPressure();
538+
TurboInOut << "Pressure " << BladePerf->GetInletState().GetPressure() << BladePerf->GetOutletState().GetPressure();
539+
TurboInOut << "Density " << BladePerf->GetInletState().GetDensity() << BladePerf->GetOutletState().GetDensity();
540+
TurboInOut << "Normal Velocity " << BladePerf->GetInletState().GetVelocity()[0] << BladePerf->GetOutletState().GetVelocity()[0];
541+
TurboInOut << "Tangential Velocity " << BladePerf->GetInletState().GetVelocity()[1] << BladePerf->GetOutletState().GetVelocity()[1];
542+
TurboInOut << "Mass Flow " << BladePerf->GetInletState().GetMassFlow() << BladePerf->GetOutletState().GetMassFlow();
543+
TurboInOut << "Mach " << BladePerf->GetInletState().GetMachValue() << BladePerf->GetOutletState().GetMachValue();
544+
TurboInOut << "Abs Flow Angle " << BladePerf->GetInletState().GetAbsFlowAngle()*180/PI_NUMBER << BladePerf->GetOutletState().GetAbsFlowAngle()*180/PI_NUMBER;
545+
TurboInOut.PrintFooter();
546+
}
547+
cout<<TurboInOutTable.str();
550548
}
551549

552550
void CFlowCompOutput::SetTurboMultiZonePerformance_Output(CTurbomachineryStagePerformance* TurboStagePerf, std::shared_ptr<CTurboOutput> TurboPerf, CConfig *config) {
@@ -580,44 +578,41 @@ void CFlowCompOutput::SetTurboMultiZonePerformance_Output(CTurbomachineryStagePe
580578
}
581579

582580
void CFlowCompOutput::LoadTurboHistoryData(CTurbomachineryStagePerformance* TurboStagePerf, std::shared_ptr<CTurboOutput> TurboPerf, CConfig *config) {
583-
584-
if (rank == MASTER_NODE){
585-
auto BladePerformance = TurboPerf->GetBladesPerformances();
586-
for (unsigned short iZone = 0; iZone <= config->GetnZone()-1; iZone++) {
587-
auto nSpan = config->GetnSpan_iZones(iZone);
588-
const auto& BladePerf = BladePerformance.at(iZone).at(nSpan);
589-
590-
stringstream tag;
591-
tag << iZone + 1;
592-
593-
SetHistoryOutputValue("EntropyIn_" + tag.str(), BladePerf->GetInletState().GetEntropy());
594-
SetHistoryOutputValue("EntropyOut_" + tag.str(), BladePerf->GetOutletState().GetEntropy());
595-
SetHistoryOutputValue("TotalEntahalpyIn_" + tag.str(), BladePerf->GetInletState().GetTotalEnthalpy());
596-
SetHistoryOutputValue("TotalEnthalpyOut_" + tag.str(), BladePerf->GetOutletState().GetTotalEnthalpy());
597-
SetHistoryOutputValue("TotalPressureIn_" + tag.str(), BladePerf->GetInletState().GetTotalPressure());
598-
SetHistoryOutputValue("TotalPressureOut_" + tag.str(), BladePerf->GetOutletState().GetTotalPressure());
599-
SetHistoryOutputValue("PressureIn_" + tag.str(), BladePerf->GetInletState().GetPressure());
600-
SetHistoryOutputValue("PressureOut_" + tag.str(), BladePerf->GetOutletState().GetPressure());
601-
SetHistoryOutputValue("DensityIn_" + tag.str(), BladePerf->GetInletState().GetDensity());
602-
SetHistoryOutputValue("DensityOut_" + tag.str(), BladePerf->GetOutletState().GetDensity());
603-
SetHistoryOutputValue("NormalVelocityIn_" + tag.str(), BladePerf->GetInletState().GetVelocity()[0]);
604-
SetHistoryOutputValue("NormalVelocityOut_" + tag.str(), BladePerf->GetOutletState().GetVelocity()[0]);
605-
SetHistoryOutputValue("TangentialVelocityIn_" + tag.str(), BladePerf->GetInletState().GetVelocity()[1]);
606-
SetHistoryOutputValue("TangentialVelocityOut_" + tag.str(), BladePerf->GetOutletState().GetVelocity()[1]);
607-
SetHistoryOutputValue("MassFlowIn_" + tag.str(), BladePerf->GetInletState().GetMassFlow());
608-
SetHistoryOutputValue("MassFlowOut_" + tag.str(), BladePerf->GetOutletState().GetMassFlow());
609-
SetHistoryOutputValue("MachIn_" + tag.str(), BladePerf->GetInletState().GetMachValue());
610-
SetHistoryOutputValue("MachOut_" + tag.str(), BladePerf->GetOutletState().GetMachValue());
611-
SetHistoryOutputValue("AbsFlowAngleIn_" + tag.str(), BladePerf->GetInletState().GetAbsFlowAngle()*180/PI_NUMBER);
612-
SetHistoryOutputValue("AbsFlowAngleOut_" + tag.str(), BladePerf->GetOutletState().GetAbsFlowAngle()*180/PI_NUMBER);
613-
}
614-
SetHistoryOutputValue("EntropyGeneration", TurboStagePerf->GetNormEntropyGen()*100);
615-
SetHistoryOutputValue("EulerianWork", TurboStagePerf->GetEulerianWork());
616-
SetHistoryOutputValue("TotalStaticEfficiency", TurboStagePerf->GetTotalStaticEfficiency()*100);
617-
SetHistoryOutputValue("TotalTotalEfficiency", TurboStagePerf->GetTotalTotalEfficiency()*100);
618-
SetHistoryOutputValue("PressureRatioTS", TurboStagePerf->GetTotalStaticPressureRatio());
619-
SetHistoryOutputValue("PressureRatioTT", TurboStagePerf->GetTotalTotalPressureRatio());
620-
}
581+
auto BladePerformance = TurboPerf->GetBladesPerformances();
582+
for (unsigned short iZone = 0; iZone <= config->GetnZone()-1; iZone++) {
583+
auto nSpan = config->GetnSpan_iZones(iZone);
584+
const auto& BladePerf = BladePerformance.at(iZone).at(nSpan);
585+
586+
stringstream tag;
587+
tag << iZone + 1;
588+
589+
SetHistoryOutputValue("EntropyIn_" + tag.str(), BladePerf->GetInletState().GetEntropy());
590+
SetHistoryOutputValue("EntropyOut_" + tag.str(), BladePerf->GetOutletState().GetEntropy());
591+
SetHistoryOutputValue("TotalEntahalpyIn_" + tag.str(), BladePerf->GetInletState().GetTotalEnthalpy());
592+
SetHistoryOutputValue("TotalEnthalpyOut_" + tag.str(), BladePerf->GetOutletState().GetTotalEnthalpy());
593+
SetHistoryOutputValue("TotalPressureIn_" + tag.str(), BladePerf->GetInletState().GetTotalPressure());
594+
SetHistoryOutputValue("TotalPressureOut_" + tag.str(), BladePerf->GetOutletState().GetTotalPressure());
595+
SetHistoryOutputValue("PressureIn_" + tag.str(), BladePerf->GetInletState().GetPressure());
596+
SetHistoryOutputValue("PressureOut_" + tag.str(), BladePerf->GetOutletState().GetPressure());
597+
SetHistoryOutputValue("DensityIn_" + tag.str(), BladePerf->GetInletState().GetDensity());
598+
SetHistoryOutputValue("DensityOut_" + tag.str(), BladePerf->GetOutletState().GetDensity());
599+
SetHistoryOutputValue("NormalVelocityIn_" + tag.str(), BladePerf->GetInletState().GetVelocity()[0]);
600+
SetHistoryOutputValue("NormalVelocityOut_" + tag.str(), BladePerf->GetOutletState().GetVelocity()[0]);
601+
SetHistoryOutputValue("TangentialVelocityIn_" + tag.str(), BladePerf->GetInletState().GetVelocity()[1]);
602+
SetHistoryOutputValue("TangentialVelocityOut_" + tag.str(), BladePerf->GetOutletState().GetVelocity()[1]);
603+
SetHistoryOutputValue("MassFlowIn_" + tag.str(), BladePerf->GetInletState().GetMassFlow());
604+
SetHistoryOutputValue("MassFlowOut_" + tag.str(), BladePerf->GetOutletState().GetMassFlow());
605+
SetHistoryOutputValue("MachIn_" + tag.str(), BladePerf->GetInletState().GetMachValue());
606+
SetHistoryOutputValue("MachOut_" + tag.str(), BladePerf->GetOutletState().GetMachValue());
607+
SetHistoryOutputValue("AbsFlowAngleIn_" + tag.str(), BladePerf->GetInletState().GetAbsFlowAngle()*180/PI_NUMBER);
608+
SetHistoryOutputValue("AbsFlowAngleOut_" + tag.str(), BladePerf->GetOutletState().GetAbsFlowAngle()*180/PI_NUMBER);
609+
}
610+
SetHistoryOutputValue("EntropyGeneration", TurboStagePerf->GetNormEntropyGen()*100);
611+
SetHistoryOutputValue("EulerianWork", TurboStagePerf->GetEulerianWork());
612+
SetHistoryOutputValue("TotalStaticEfficiency", TurboStagePerf->GetTotalStaticEfficiency()*100);
613+
SetHistoryOutputValue("TotalTotalEfficiency", TurboStagePerf->GetTotalTotalEfficiency()*100);
614+
SetHistoryOutputValue("PressureRatioTS", TurboStagePerf->GetTotalStaticPressureRatio());
615+
SetHistoryOutputValue("PressureRatioTT", TurboStagePerf->GetTotalTotalPressureRatio());
621616
}
622617

623618
void CFlowCompOutput::WriteTurboSpanwisePerformance(std::shared_ptr<CTurboOutput> TurboPerf, CGeometry *geometry, CConfig **config, unsigned short val_iZone) {
@@ -632,10 +627,6 @@ void CFlowCompOutput::WriteTurboSpanwisePerformance(std::shared_ptr<CTurboOutput
632627
ofstream file;
633628
string spanwise_performance_filename;
634629

635-
if (rank != MASTER_NODE){
636-
return;
637-
}
638-
639630
auto BladePerformance = TurboPerf->GetBladesPerformances();
640631

641632
/*--- Start of write file turboperformance spanwise ---*/

‎SU2_CFD/src/output/COutput.cpp‎

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -235,18 +235,21 @@ void COutput::SetHistoryOutput(CGeometry ****geometry, CSolver *****solver, CCon
235235
Iter = OuterIter;
236236

237237
/*--- Turbomachinery Performance Screen summary output---*/
238-
if (Iter%100 == 0) {
238+
if (Iter%100 == 0 && rank == MASTER_NODE) {
239239
SetTurboPerformance_Output(TurboPerf, config[val_iZone], TimeIter, OuterIter, InnerIter);
240-
if (rank == MASTER_NODE) SetTurboMultiZonePerformance_Output(TurboStagePerf, TurboPerf, config[val_iZone]);
240+
SetTurboMultiZonePerformance_Output(TurboStagePerf, TurboPerf, config[val_iZone]);
241241
}
242242

243243
for (int iZone = 0; iZone < config[ZONE_0]->GetnZone(); iZone ++){
244-
WriteTurboSpanwisePerformance(TurboPerf, geometry[iZone][val_iInst][MESH_0], config, iZone);
244+
if (rank == MASTER_NODE) {
245+
WriteTurboSpanwisePerformance(TurboPerf, geometry[iZone][val_iInst][MESH_0], config, iZone);
246+
}
245247
}
246248

247249
/*--- Update turboperformance history file*/
248-
LoadTurboHistoryData(TurboStagePerf, TurboPerf, config[val_iZone]);
249-
250+
if (rank == MASTER_NODE){
251+
LoadTurboHistoryData(TurboStagePerf, TurboPerf, config[val_iZone]);
252+
}
250253
SetHistoryOutput(geometry[val_iZone][val_iInst][MESH_0], solver[val_iZone][val_iInst][MESH_0], config[val_iZone], TimeIter, OuterIter,InnerIter);
251254

252255
}

0 commit comments

Comments
 (0)