Skip to content

Commit f956724

Browse files
committed
fix #1202
1 parent 9d78c06 commit f956724

3 files changed

Lines changed: 4 additions & 14 deletions

File tree

SU2_CFD/src/output/CFlowCompOutput.cpp

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -279,9 +279,6 @@ void CFlowCompOutput::SetHistoryOutputFields(CConfig *config){
279279

280280
Add_CpInverseDesignOutput(config);
281281

282-
/*--- Add combo obj value --- */
283-
284-
AddHistoryOutput("COMBO", "ComboObj", ScreenOutputFormat::SCIENTIFIC, "COMBO", "Combined obj. function value.", HistoryFieldType::COEFFICIENT);
285282
}
286283

287284
void CFlowCompOutput::SetVolumeOutputFields(CConfig *config){
@@ -718,10 +715,6 @@ void CFlowCompOutput::LoadHistoryData(CConfig *config, CGeometry *geometry, CSol
718715

719716
Set_CpInverseDesign(flow_solver, geometry, config);
720717

721-
/*--- Set combo obj value --- */
722-
723-
SetHistoryOutputValue("COMBO", flow_solver->GetTotal_ComboObj());
724-
725718
}
726719

727720
bool CFlowCompOutput::SetInit_Residuals(CConfig *config){

SU2_CFD/src/output/CFlowOutput.cpp

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -638,6 +638,8 @@ void CFlowOutput::AddAerodynamicCoefficients(CConfig *config){
638638

639639
/// DESCRIPTION: Angle of attack
640640
AddHistoryOutput("AOA", "AoA", ScreenOutputFormat::FIXED, "AOA", "Angle of attack");
641+
642+
AddHistoryOutput("COMBO", "ComboObj", ScreenOutputFormat::SCIENTIFIC, "COMBO", "Combined obj. function value.", HistoryFieldType::COEFFICIENT);
641643
}
642644

643645
void CFlowOutput::SetAerodynamicCoefficients(CConfig *config, CSolver *flow_solver){
@@ -680,6 +682,8 @@ void CFlowOutput::SetAerodynamicCoefficients(CConfig *config, CSolver *flow_solv
680682
}
681683

682684
SetHistoryOutputValue("AOA", config->GetAoA());
685+
686+
SetHistoryOutputValue("COMBO", flow_solver->GetTotal_ComboObj());
683687
}
684688

685689
void CFlowOutput::SetRotatingFrameCoefficients(CConfig *config, CSolver *flow_solver) {

SU2_CFD/src/output/CNEMOCompOutput.cpp

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -279,9 +279,6 @@ void CNEMOCompOutput::SetHistoryOutputFields(CConfig *config){
279279

280280
Add_CpInverseDesignOutput(config);
281281

282-
/*--- Add combo obj value --- */
283-
284-
AddHistoryOutput("COMBO", "ComboObj", ScreenOutputFormat::SCIENTIFIC, "COMBO", "Combined obj. function value.", HistoryFieldType::COEFFICIENT);
285282
}
286283

287284
void CNEMOCompOutput::SetVolumeOutputFields(CConfig *config){
@@ -686,10 +683,6 @@ void CNEMOCompOutput::LoadHistoryData(CConfig *config, CGeometry *geometry, CSol
686683

687684
Set_CpInverseDesign(NEMO_solver, geometry, config);
688685

689-
/*--- Set combo obj value --- */
690-
691-
SetHistoryOutputValue("COMBO", NEMO_solver->GetTotal_ComboObj());
692-
693686
}
694687

695688
bool CNEMOCompOutput::SetInit_Residuals(CConfig *config){

0 commit comments

Comments
 (0)