Merge pull request #2047 from su2code/fix_time_average_custom_outputs

Small fixes for time average outputs

Author: pcarruscag

SU2_CFD/include/output/COutput.hpp

@@ -629,7 +629,7 @@ class COutput {
    */
   inline void AddHistoryOutput(string name, string field_name, ScreenOutputFormat format,
                                string groupname, string description,
-                               HistoryFieldType field_type = HistoryFieldType::DEFAULT ){
+                               HistoryFieldType field_type = HistoryFieldType::DEFAULT) {
     historyOutput_Map[name] = HistoryOutputField(field_name, format, groupname, field_type, description);
     historyOutput_List.push_back(name);
   }

SU2_CFD/src/output/CFlowCompOutput.cpp

@@ -280,7 +280,7 @@ void CFlowCompOutput::SetVolumeOutputFields(CConfig *config){
 
   AddCommonFVMOutputs(config);
 
-  if (config->GetTime_Domain()){
+  if (config->GetTime_Domain()) {
     SetTimeAveragedFields();
   }
 }
@@ -349,7 +349,7 @@ void CFlowCompOutput::LoadVolumeData(CConfig *config, CGeometry *geometry, CSolv
 
   LoadCommonFVMOutputs(config, geometry, iPoint);
 
-  if (config->GetTime_Domain()){
+  if (config->GetTime_Domain()) {
     LoadTimeAveragedData(iPoint, Node_Flow);
   }
 }

SU2_CFD/src/output/CFlowIncOutput.cpp

@@ -366,6 +366,10 @@ void CFlowIncOutput::SetVolumeOutputFields(CConfig *config){
   }
 
   AddCommonFVMOutputs(config);
+
+  if (config->GetTime_Domain()) {
+    SetTimeAveragedFields();
+  }
 }
 
 void CFlowIncOutput::LoadVolumeData(CConfig *config, CGeometry *geometry, CSolver **solver, unsigned long iPoint){
@@ -435,13 +439,17 @@ void CFlowIncOutput::LoadVolumeData(CConfig *config, CGeometry *geometry, CSolve
   LoadVolumeDataScalar(config, solver, geometry, iPoint);
 
   // Streamwise Periodicity
-  if(streamwisePeriodic) {
+  if (streamwisePeriodic) {
     SetVolumeOutputValue("RECOVERED_PRESSURE", iPoint, Node_Flow->GetStreamwise_Periodic_RecoveredPressure(iPoint));
     if (heat && streamwisePeriodic_temperature)
       SetVolumeOutputValue("RECOVERED_TEMPERATURE", iPoint, Node_Flow->GetStreamwise_Periodic_RecoveredTemperature(iPoint));
   }
 
   LoadCommonFVMOutputs(config, geometry, iPoint);
+
+  if (config->GetTime_Domain()) {
+    LoadTimeAveragedData(iPoint, Node_Flow);
+  }
 }
 
 bool CFlowIncOutput::SetInitResiduals(const CConfig *config){

SU2_CFD/src/output/CFlowOutput.cpp

@@ -3653,7 +3653,7 @@ bool CFlowOutput::WriteVolumeOutput(CConfig *config, unsigned long Iter, bool fo
   return force_writing;
 }
 
-void CFlowOutput::SetTimeAveragedFields(){
+void CFlowOutput::SetTimeAveragedFields() {
   AddVolumeOutput("MEAN_DENSITY", "MeanDensity", "TIME_AVERAGE", "Mean density");
   AddVolumeOutput("MEAN_VELOCITY-X", "MeanVelocity_x", "TIME_AVERAGE", "Mean velocity x-component");
   AddVolumeOutput("MEAN_VELOCITY-Y", "MeanVelocity_y", "TIME_AVERAGE", "Mean velocity y-component");

SU2_CFD/src/output/CNEMOCompOutput.cpp

@@ -287,7 +287,7 @@ void CNEMOCompOutput::SetVolumeOutputFields(CConfig *config){
 
   AddCommonFVMOutputs(config);
 
-  if (config->GetTime_Domain()){
+  if (config->GetTime_Domain()) {
     SetTimeAveragedFields();
   }
 }

SU2_CFD/src/output/COutput.cpp

@@ -2120,7 +2120,7 @@ void COutput::SetCustomOutputs(const CConfig* config) {
 #endif
 
       if (type == OperationType::FUNCTION) {
-        AddHistoryOutput(output.name, output.name, ScreenOutputFormat::SCIENTIFIC, "CUSTOM", "Custom output");
+        AddHistoryOutput(output.name, output.name, ScreenOutputFormat::SCIENTIFIC, "CUSTOM", "Custom output", HistoryFieldType::COEFFICIENT);
         break;
       }
 
@@ -2137,7 +2137,7 @@ void COutput::SetCustomOutputs(const CConfig* config) {
       /*--- Skip the terminating "]". ---*/
       if (it != last) ++it;
 
-      AddHistoryOutput(output.name, output.name, ScreenOutputFormat::SCIENTIFIC, "CUSTOM", "Custom output");
+      AddHistoryOutput(output.name, output.name, ScreenOutputFormat::SCIENTIFIC, "CUSTOM", "Custom output", HistoryFieldType::COEFFICIENT);
     }
   }