Merge pull request #1527 from su2code/massflow_flowmeta

Streamwise Periodic restarts using flow.meta + Multizone PerSurface output

Author: TobiKattmann

Common/include/CConfig.hpp

@@ -5989,6 +5989,11 @@ class CConfig {
    */
   su2double GetStreamwise_Periodic_PressureDrop(void) const { return Streamwise_Periodic_PressureDrop; }
 
+  /*!
+   * \brief Set the value of the pressure delta from which body force vector is computed. Necessary for Restart metadata.
+   */
+  void SetStreamwise_Periodic_PressureDrop(su2double Streamwise_Periodic_PressureDrop_) { Streamwise_Periodic_PressureDrop = Streamwise_Periodic_PressureDrop_; }
+
   /*!
    * \brief Get the value of the massflow from which body force vector is computed.
    * \return Massflow for body force computation.

Common/src/CConfig.cpp

@@ -4788,8 +4788,8 @@ void CConfig::SetPostprocessing(SU2_COMPONENT val_software, unsigned short val_i
    pressure drop objective function is selected. ---*/
 
   for (unsigned short iObj = 0; iObj < nObj; iObj++) {
-    if ((Kind_ObjFunc[iObj] == SURFACE_PRESSURE_DROP) && (nMarker_Analyze != 2)) {
-      SU2_MPI::Error("Must list two markers for the pressure drop objective function.\n Expected format: MARKER_ANALYZE= (outlet_name, inlet_name).", CURRENT_FUNCTION);
+    if ((Kind_ObjFunc[iObj] == SURFACE_PRESSURE_DROP) && (nMarker_Analyze < 2)) {
+      SU2_MPI::Error("Must list the first two markers for the pressure drop objective function.\n Expected format: MARKER_ANALYZE= (outlet_name, inlet_name, ...).", CURRENT_FUNCTION);
     }
   }
 
@@ -5733,8 +5733,16 @@ void CConfig::SetMarkers(SU2_COMPONENT val_software) {
         break;
       }
     }
+    
     if(!found) {
-      SU2_MPI::Error("DV_MARKER contains marker names that do not exist in the lists of BCs in the config file.", CURRENT_FUNCTION);
+      if (nZone==1)
+        SU2_MPI::Error("DV_MARKER contains marker names that do not exist in the lists of BCs in the config file.", CURRENT_FUNCTION);
+      // In case of multiple zones, the markers might appear only in zonal config and not in the Master.
+      // A loop over all zones would need to be included which is not straight forward as this can only be
+      // checked once all zonal configs are read.
+      else if (rank == MASTER_NODE)
+        cout << "Warning: DV_MARKER contains marker names that do not exist in the lists of BCs of the master config file.\n"
+                "Make sure the marker names exist in the zonal config files" << endl;
     }
   }
 

SU2_CFD/include/output/CMultizoneOutput.hpp

@@ -66,14 +66,15 @@ class CMultizoneOutput final: public COutput {
   /*!
    * \brief Load the multizone history output field values
    * \param[in] output - Container holding the output instances per zone.
+   * \param[in] config - Definition of the particular problem.
    */
-  void LoadMultizoneHistoryData(const COutput* const* output) override;
+  void LoadMultizoneHistoryData(const COutput* const* output, const CConfig* const* config) override;
 
   /*!
    * \brief Set the available multizone history output fields
    * \param[in] output - Container holding the output instances per zone.
    */
-  void SetMultizoneHistoryOutputFields(const COutput* const* output) override;
+  void SetMultizoneHistoryOutputFields(const COutput* const* output, const CConfig* const* config) override;
 
   /*!
    * \brief Determines if the history file output.

SU2_CFD/include/output/COutput.hpp

@@ -432,6 +432,14 @@ class COutput {
     return historyOutput_List;
   }
 
+  /*!
+   * \brief Get the list of all per-surface fields
+   * \return Vector container all output per-surface fields
+   */
+  const vector<string>& GetHistoryOutputPerSurface_List() const {
+    return historyOutputPerSurface_List;
+  }
+
   /*!
    * \brief Get the map containing all output fields
    * \return Map containing all output fields
@@ -440,6 +448,14 @@ class COutput {
     return historyOutput_Map;
   }
 
+  /*!
+   * \brief Get the map containing all output per-surface fields
+   * \return Map containing all output per-surface fields
+   */
+  const map<string, vector<HistoryOutputField>>& GetHistoryPerSurfaceFields() const {
+    return historyOutputPerSurface_Map;
+  }
+
   /*!
    * \brief Monitor the convergence of an output field
    * \param[in] config - Definition of the particular problem.
@@ -824,8 +840,9 @@ class COutput {
   /*!
    * \brief Load the multizone history output field values
    * \param[in] output - Container holding the output instances per zone.
+   * \param[in] config - Definition of the particular problem.
    */
-  inline virtual void LoadMultizoneHistoryData(const COutput* const* output) {}
+  inline virtual void LoadMultizoneHistoryData(const COutput* const* output, const CConfig* const* config) {}
 
   /*!
    * \brief Set the available history output fields
@@ -837,7 +854,7 @@ class COutput {
    * \brief Set the available multizone history output fields
    * \param[in] output - Container holding the output instances per zone.
    */
-  inline virtual void SetMultizoneHistoryOutputFields(const COutput* const* output) {}
+  inline virtual void SetMultizoneHistoryOutputFields(const COutput* const* output, const CConfig* const* config) {}
 
   /*!
    * \brief Write any additional files defined for the current solver.

SU2_CFD/include/solvers/CHeatSolver.hpp

@@ -313,15 +313,17 @@ class CHeatSolver final : public CSolver {
    * \param[in] solver - Container vector with all the solutions.
    */
   void Evaluate_ObjFunc(const CConfig *config, CSolver**) override {
+    const auto weight = config->GetWeight_ObjFunc(0);
+
     switch (config->GetKind_ObjFunc()) {
       case TOTAL_HEATFLUX:
-        Total_ComboObj = Total_HeatFlux;
+        Total_ComboObj = weight * Total_HeatFlux;
         break;
       case AVG_TEMPERATURE:
-        Total_ComboObj = Total_AverageT;
+        Total_ComboObj = weight * Total_AverageT;
         break;
       case CUSTOM_OBJFUNC:
-        Total_ComboObj = Total_Custom_ObjFunc;
+        Total_ComboObj = weight * Total_Custom_ObjFunc;
         break;
       default:
         Total_ComboObj = 0.0;

SU2_CFD/src/output/CFlowOutput.cpp

@@ -67,10 +67,10 @@ void CFlowOutput::AddAnalyzeSurfaceOutput(const CConfig *config){
   /// DESCRIPTION: Average total pressure
   AddHistoryOutput("SURFACE_TOTAL_PRESSURE",   "Avg_TotalPress",            ScreenOutputFormat::SCIENTIFIC, "FLOW_COEFF", "Total average total pressure on all markers set in MARKER_ANALYZE", HistoryFieldType::COEFFICIENT);
   /// DESCRIPTION: Pressure drop
-  if (config->GetnMarker_Analyze() == 2) {
+  if (config->GetnMarker_Analyze() >= 2) {
     AddHistoryOutput("SURFACE_PRESSURE_DROP",    "Pressure_Drop",             ScreenOutputFormat::SCIENTIFIC, "FLOW_COEFF", "Total pressure drop on all markers set in MARKER_ANALYZE", HistoryFieldType::COEFFICIENT);
   } else if (rank == MASTER_NODE) {
-    cout << "\nWARNING: SURFACE_PRESSURE_DROP can only be computed for 2 surfaces (outlet, inlet)\n" << endl;
+    cout << "\nWARNING: SURFACE_PRESSURE_DROP can only be computed for at least 2 surfaces (outlet, inlet, ...)\n" << endl;
   }
   if (config->GetKind_Species_Model() != SPECIES_MODEL::NONE) {
     /// DESCRIPTION: Average Species
@@ -530,7 +530,7 @@ void CFlowOutput::SetAnalyzeSurface(const CSolver* const*solver, const CGeometry
    which require the outlet to be listed first. This is a simple first version
    that could be generalized to a different orders/lists/etc. ---*/
 
-  if (nMarker_Analyze == 2) {
+  if (nMarker_Analyze >= 2) {
     su2double PressureDrop = (Surface_Pressure_Total[1] - Surface_Pressure_Total[0]) * config->GetPressure_Ref();
     for (iMarker_Analyze = 0; iMarker_Analyze < nMarker_Analyze; iMarker_Analyze++) {
       config->SetSurface_PressureDrop(iMarker_Analyze, PressureDrop);
@@ -1736,7 +1736,8 @@ void CFlowOutput::Set_NearfieldInverseDesign(CSolver *solver, const CGeometry *g
 
 void CFlowOutput::WriteAdditionalFiles(CConfig *config, CGeometry *geometry, CSolver **solver_container){
 
-  if (config->GetFixed_CL_Mode()){
+  if (config->GetFixed_CL_Mode() ||
+      (config->GetKind_Streamwise_Periodic() == ENUM_STREAMWISE_PERIODIC::MASSFLOW)){
     WriteMetaData(config);
   }
 
@@ -1757,6 +1758,8 @@ void CFlowOutput::WriteMetaData(const CConfig *config){
   /*--- All processors open the file. ---*/
 
   if (rank == MASTER_NODE) {
+    cout << "Writing Flow Meta-Data file: " << filename << endl;
+
     meta_file.open(filename.c_str(), ios::out);
     meta_file.precision(15);
 
@@ -1783,6 +1786,10 @@ void CFlowOutput::WriteMetaData(const CConfig *config){
           config->GetKind_Solver() == MAIN_SOLVER::DISC_ADJ_RANS )) {
       meta_file << "SENS_AOA=" << GetHistoryFieldValue("SENS_AOA") * PI_NUMBER / 180.0 << endl;
     }
+
+    if(config->GetKind_Streamwise_Periodic() == ENUM_STREAMWISE_PERIODIC::MASSFLOW) {
+      meta_file << "STREAMWISE_PERIODIC_PRESSURE_DROP=" << GetHistoryFieldValue("STREAMWISE_DP") << endl;
+    }
   }
 
   meta_file.close();

SU2_CFD/src/output/CMultizoneOutput.cpp

@@ -78,7 +78,7 @@ CMultizoneOutput::CMultizoneOutput(const CConfig* driver_config, const CConfig*
 
 }
 
-void CMultizoneOutput::LoadMultizoneHistoryData(const COutput* const* output) {
+void CMultizoneOutput::LoadMultizoneHistoryData(const COutput* const* output, const CConfig* const* config) {
 
   string nameMultizone, zoneIndex;
   su2double comboValue = 0;
@@ -97,11 +97,31 @@ void CMultizoneOutput::LoadMultizoneHistoryData(const COutput* const* output) {
         comboValue += item.second.value;
       }
     }
+
+    /*-- Load the PerSurface values.- ---*/
+    for (const auto& item : output[iZone]->GetHistoryPerSurfaceFields()) {
+      const auto& name = item.first;
+      nameMultizone = name + zoneIndex;
+
+      /*--- Determine whether nMaker_Analyze/Monitoring has to be looped. ---*/
+      const auto& group = item.second[0].outputGroup;
+      unsigned short nMarker = 0;
+      if (group == "FLOW_COEFF_SURF")
+        nMarker = config[iZone]->GetnMarker_Analyze();
+      else if (group == "AERO_COEFF_SURF")
+        nMarker = config[iZone]->GetnMarker_Monitoring();
+      else
+        SU2_MPI::Error("Per Surface output group unknown: " + group, CURRENT_FUNCTION);
+
+      for (unsigned short iMarker = 0; iMarker < nMarker; iMarker++) {
+        SetHistoryOutputPerSurfaceValue(nameMultizone, item.second[iMarker].value, iMarker);
+      }// for iMarker
+    }// for HistPerSurfFields
   }
   SetHistoryOutputValue("COMBO", comboValue);
 }
 
-void CMultizoneOutput::SetMultizoneHistoryOutputFields(const COutput* const* output) {
+void CMultizoneOutput::SetMultizoneHistoryOutputFields(const COutput* const* output, const CConfig* const* config) {
 
   string name, header, group, zoneIndex;
 
@@ -125,6 +145,56 @@ void CMultizoneOutput::SetMultizoneHistoryOutputFields(const COutput* const* out
         AddHistoryOutput(name, header, field.screenFormat, group, "", field.fieldType );
       }
     }
+
+    /*--- Prepare Marker lists that are passed to 'AddHistoryOutputPerSurface'. ---*/
+    vector<string> Marker_Analyze;
+    for (unsigned short iMarker_Analyze = 0; iMarker_Analyze < config[iZone]->GetnMarker_Analyze(); iMarker_Analyze++) {
+      Marker_Analyze.push_back(config[iZone]->GetMarker_Analyze_TagBound(iMarker_Analyze));
+    }
+
+    vector<string> Marker_Monitoring;
+    for (unsigned short iMarker_Monitoring = 0; iMarker_Monitoring < config[iZone]->GetnMarker_Monitoring(); iMarker_Monitoring++) {
+      Marker_Monitoring.push_back(config[iZone]->GetMarker_Monitoring_TagBound(iMarker_Monitoring));
+    }
+
+    /*--- Add the PerSurface outputs. ---*/
+    const auto& ZoneHistoryPerSurfaceFields = output[iZone]->GetHistoryPerSurfaceFields();
+
+    for (const auto& nameSinglezone : output[iZone]->GetHistoryOutputPerSurface_List()) {
+
+      const auto& field = ZoneHistoryPerSurfaceFields.at(nameSinglezone);
+
+      name = nameSinglezone + zoneIndex;
+
+      /*--- Remove the unnecessary Marker name from the fieldName, i.e. "Avg_Massflow(inlet)"->"Avg_Massflow". ---*/
+      /*--- Note that index zero in 'field[0]' refers to a specific Marker. Some attributes remain constant over the markers
+            like the first part of the name, the screenFormat and the fieldType. ---*/
+      string baseheader;
+      const auto pos = field[0].fieldName.find('(');
+      if (pos != std::string::npos)
+        baseheader = field[0].fieldName.substr(0, pos);
+      else
+        SU2_MPI::Error("Cannot process PerSurface *_SURF history output: " + baseheader, CURRENT_FUNCTION);
+
+      header = baseheader + zoneIndex;
+      /*--- Attach zone-index to the group after determining which group it is. ---*/
+      group = field[0].outputGroup;
+
+      /*--- Determine whether Maker_Analyze/Monitoring has to be used. ---*/
+      vector<string>* Marker;
+      if (group == "FLOW_COEFF_SURF")
+        Marker = &Marker_Analyze;
+      else if (group == "AERO_COEFF_SURF")
+        Marker = &Marker_Monitoring;
+      else {
+        Marker = &Marker_Analyze;  // dummy to suppress maybe-uninitialized warning
+        SU2_MPI::Error("Per Surface output group unknown: " + group, CURRENT_FUNCTION);
+      }
+
+      group += zoneIndex;
+
+      AddHistoryOutputPerSurface(name, header, field[0].screenFormat, group, *Marker, field[0].fieldType );
+    }
   }
   AddHistoryOutput("COMBO", "ComboObj", ScreenOutputFormat::SCIENTIFIC, "COMBO", "Combined obj. function value.", HistoryFieldType::COEFFICIENT);
 }

SU2_CFD/src/output/COutput.cpp

@@ -236,7 +236,7 @@ void COutput::SetMultizoneHistory_Output(COutput **output, CConfig **config, CCo
 
   LoadCommonHistoryData(driver_config);
 
-  LoadMultizoneHistoryData(output);
+  LoadMultizoneHistoryData(output, config);
 
   Convergence_Monitoring(driver_config, curOuterIter);
 
@@ -1365,7 +1365,7 @@ void COutput::PreprocessMultizoneHistoryOutput(COutput **output, CConfig **confi
 
   /*--- Set the History output fields using a virtual function call to the child implementation ---*/
 
-  SetMultizoneHistoryOutputFields(output);
+  SetMultizoneHistoryOutputFields(output, config);
 
   /*--- Postprocess the history fields. Creates new fields based on the ones set in the child classes ---*/
 

SU2_CFD/src/solvers/CEulerSolver.cpp

@@ -94,11 +94,10 @@ CEulerSolver::CEulerSolver(CGeometry *geometry, CConfig *config,
       else Unst_RestartIter = SU2_TYPE::Int(config->GetRestart_Iter())-1;
     }
 
-    string filename_ = "flow";
-    filename_ = config->GetFilename(filename_, ".meta", Unst_RestartIter);
-
     /*--- Read and store the restart metadata. ---*/
 
+    string filename_ = "flow";
+    filename_ = config->GetFilename(filename_, ".meta", Unst_RestartIter);
     Read_SU2_Restart_Metadata(geometry, config, adjoint, filename_);
 
   }

SU2_CFD/src/solvers/CIncEulerSolver.cpp

@@ -47,7 +47,7 @@ CIncEulerSolver::CIncEulerSolver(CGeometry *geometry, CConfig *config, unsigned
   ifstream restart_file;
   unsigned short nZone = geometry->GetnZone();
   bool restart = (config->GetRestart() || config->GetRestart_Flow());
-  int Unst_RestartIter;
+  int Unst_RestartIter = 0;
   unsigned short iZone = config->GetiZone();
   bool dual_time = ((config->GetTime_Marching() == TIME_MARCHING::DT_STEPPING_1ST) ||
                     (config->GetTime_Marching() == TIME_MARCHING::DT_STEPPING_2ND));
@@ -91,9 +91,16 @@ CIncEulerSolver::CIncEulerSolver(CGeometry *geometry, CConfig *config, unsigned
 
     /*--- Read and store the restart metadata. ---*/
 
-//    Read_SU2_Restart_Metadata(geometry, config, false, filename_);
+    filename_ = "flow";
+    filename_ = config->GetFilename(filename_, ".meta", Unst_RestartIter);
+    Read_SU2_Restart_Metadata(geometry, config, adjoint, filename_);
 
   }
+  if (restart && (config->GetKind_Streamwise_Periodic() == ENUM_STREAMWISE_PERIODIC::MASSFLOW)) {
+    string filename_ = "flow";
+    filename_ = config->GetFilename(filename_, ".meta", Unst_RestartIter);
+    Read_SU2_Restart_Metadata(geometry, config, adjoint, filename_);
+  }
 
   /*--- Set the gamma value ---*/