Merge pull request #1341 from su2code/fix_per_surf_output

Fix "per-surface" outputs

Author: pcarruscag

Common/include/toolboxes/printing_toolbox.hpp

@@ -71,7 +71,6 @@ namespace PrintingToolbox {
 class CTablePrinter{
 public:
   CTablePrinter(std::ostream * output, const std::string & separator = "|");
-  ~CTablePrinter();
 
   enum alignment {
     CENTER,

Common/src/toolboxes/printing_toolbox.cpp

@@ -43,10 +43,6 @@ PrintingToolbox::CTablePrinter::CTablePrinter(std::ostream * output, const std::
   precision_ = 6;
 }
 
-PrintingToolbox::CTablePrinter::~CTablePrinter(){
-
-}
-
 int PrintingToolbox::CTablePrinter::GetNumColumns() const {
   return (int)column_headers_.size();
 }
@@ -102,8 +98,6 @@ void PrintingToolbox::CTablePrinter::PrintHorizontalLine() {
 
 void PrintingToolbox::CTablePrinter::PrintHeader(){
 
-
-
   if (print_header_top_line_) PrintHorizontalLine();
   *out_stream_ << separator_;
   int indent = 0;
@@ -140,4 +134,3 @@ void PrintingToolbox::CTablePrinter::PrintHeader(){
 void PrintingToolbox::CTablePrinter::PrintFooter(){
   PrintHorizontalLine();
 }
-

SU2_CFD/include/output/CFVMOutput.hpp

@@ -34,12 +34,7 @@ class CFVMOutput : public COutput{
   /*!
    * \brief Constructor of the class
    */
-  CFVMOutput(CConfig *config, unsigned short nDim, bool femOutput);
-
-  /*!
-   * \brief Destructor of the class.
-   */
-  ~CFVMOutput(void) = default;
+  CFVMOutput(const CConfig *config, unsigned short nDim, bool femOutput);
 
   /*!
    * \brief Add Coordinates to output.

SU2_CFD/include/output/CFlowCompOutput.hpp

@@ -47,7 +47,7 @@ class CFlowCompOutput final: public CFlowOutput {
    * \brief Constructor of the class
    * \param[in] config - Definition of the particular problem.
    */
-  CFlowCompOutput(CConfig *config, unsigned short nDim);
+  CFlowCompOutput(const CConfig *config, unsigned short nDim);
 
   /*!
    * \brief Load the history output field values

SU2_CFD/include/output/CFlowOutput.hpp

@@ -38,22 +38,22 @@ class CFlowOutput : public CFVMOutput{
    * \brief Constructor of the class
    * \param[in] config - Definition of the particular problem.
    */
-  CFlowOutput(CConfig *config, unsigned short nDim, bool femOutput);
+  CFlowOutput(const CConfig *config, unsigned short nDim, bool femOutput);
 
   /*!
    * \brief Add flow surface output fields
    * \param[in] config - Definition of the particular problem.
    */
-  void AddAnalyzeSurfaceOutput(CConfig *config);
+  void AddAnalyzeSurfaceOutput(const CConfig *config);
 
   /*!
    * \brief Set flow surface output field values
    * \param[in] solver - The container holding all solution data.
    * \param[in] geometry - Geometrical definition of the problem.
-   * \param[in] config - Definition of the particular problem.
+   * \param[in,out] config - Definition of the particular problem.
    * \param[in] output - Boolean indicating whether information should be written to screen
    */
-  void SetAnalyzeSurface(CSolver *solver, CGeometry *geometry, CConfig *config, bool output);
+  void SetAnalyzeSurface(const CSolver *solver, const CGeometry *geometry, CConfig *config, bool output);
 
   /*!
    * \brief Add aerodynamic coefficients as output fields
@@ -152,10 +152,9 @@ class CFlowOutput : public CFVMOutput{
   /*!
    * \brief Write the forces breakdown file
    * \param[in] config - Definition of the particular problem per zone.
-   * \param[in] geometry - Geometrical definition of the problem.
-   * \param[in] solver_container - The container holding all solution data.
+   * \param[in] flow_solver - The container holding all solution data.
    */
-  void WriteForcesBreakdown(CConfig *config, CGeometry *geometry, CSolver **solver_container);
+  void WriteForcesBreakdown(const CConfig *config, const CSolver *flow_solver) const;
 
   /*!
    * \brief Set the time averaged output fields.

SU2_CFD/include/output/CMultizoneOutput.hpp

@@ -61,12 +61,7 @@ class CMultizoneOutput final: public COutput {
   /*!
    * \brief Constructor of the class.
    */
-  CMultizoneOutput(CConfig *driver_config, CConfig** config, unsigned short nDim);
-
-  /*!
-   * \brief Destructor of the class.
-   */
-  ~CMultizoneOutput(void) override;
+  CMultizoneOutput(const CConfig *driver_config, const CConfig* const* config, unsigned short nDim);
 
   /*!
    * \brief Load the multizone history output field values

SU2_CFD/include/output/COutput.hpp

@@ -57,19 +57,21 @@ class COutput {
 
   /*----------------------------- General ----------------------------*/
 
-  int rank,     /*!< \brief MPI Rank. */
-  size;         /*!< \brief MPI Size. */
+  const int rank;     /*!< \brief MPI Rank. */
+  const int size;     /*!< \brief MPI Size. */
 
-  unsigned short nDim;   /*!< \brief Physical Dimension */
+  const unsigned short nDim;   /*!< \brief Physical Dimension */
 
-  bool multiZone,       /*!< \brief Boolean to store whether we are running a multizone problem */
-  gridMovement,         /*!< \brief Boolean to store whether we have grid movement enabled */
-  femOutput;            /*!< \brief Boolean to store whether we should use the FEM routines */
+  const bool multiZone;     /*!< \brief Boolean to store whether we are running a multizone problem */
+  const bool gridMovement;  /*!< \brief Boolean to store whether we have grid movement enabled */
+  const bool femOutput;     /*!< \brief Boolean to store whether we should use the FEM routines */
+  const bool si_units;
+  const bool us_units;
 
   /*----------------------------- Screen and history output ----------------------------*/
 
+  const unsigned short fieldWidth = 12; /*!< \brief Width of each column for the screen output (hardcoded for now) */
   string historySep;              /*!< \brief Character which separates values in the history file */
-  unsigned short fieldWidth;      /*!< \brief Width of each column for the screen output (hardcoded for now) */
   bool noWriting;                 /*!< \brief Boolean indicating whether a screen/history output should be written */
   unsigned long curTimeIter,      /*!< \brief Current value of the time iteration index */
   curAbsTimeIter,                 /*!< \brief Current value of the time iteration index */
@@ -250,7 +252,7 @@ class COutput {
   /*!
    * \brief Constructor of the class.
    */
-  COutput(CConfig *config, unsigned short nDim, bool femOutput);
+  COutput(const CConfig *config, unsigned short nDim, bool femOutput);
 
   /*!
    * \brief Preprocess the volume output by setting the requested volume output fields.
@@ -532,8 +534,9 @@ class COutput {
    * \param[in] value - The new value of this field.
    */
   inline void SetHistoryOutputValue(string name, su2double value){
-    if (historyOutput_Map.count(name) > 0){
-      historyOutput_Map[name].value = value;
+    auto it = historyOutput_Map.find(name);
+    if (it != historyOutput_Map.end()){
+      it->second.value = value;
     } else {
       SU2_MPI::Error(string("Cannot find output field with name ") + name, CURRENT_FUNCTION);
     }
@@ -549,13 +552,16 @@ class COutput {
    * \param[in] field_type - The type of the field (::HistoryFieldType).
    */
   inline void AddHistoryOutputPerSurface(string name, string field_name, ScreenOutputFormat format,
-                                         string groupname, vector<string> marker_names,
-                                         HistoryFieldType field_type = HistoryFieldType::DEFAULT){
-    if (marker_names.size() != 0){
+                                         string groupname, const vector<string>& marker_names,
+                                         HistoryFieldType field_type = HistoryFieldType::DEFAULT) {
+    if (!marker_names.empty()) {
       historyOutputPerSurface_List.push_back(name);
-      for (unsigned short i = 0; i < marker_names.size(); i++){
-        historyOutputPerSurface_Map[name].push_back(HistoryOutputField(field_name+"("+marker_names[i]+")", format, groupname, field_type, ""));
+      vector<HistoryOutputField> fields;
+      fields.reserve(marker_names.size());
+      for (const auto& marker : marker_names) {
+        fields.push_back(HistoryOutputField(field_name+"("+marker+")", format, groupname, field_type, ""));
       }
+      historyOutputPerSurface_Map[name] = std::move(fields);
     }
   }
 
@@ -565,9 +571,10 @@ class COutput {
    * \param[in] value - The new value of this field.
    * \param[in] iMarker - The index of the marker.
    */
-  inline void SetHistoryOutputPerSurfaceValue(string name, su2double value, unsigned short iMarker){
-    if (historyOutputPerSurface_Map.count(name) > 0){
-      historyOutputPerSurface_Map[name][iMarker].value = value;
+  inline void SetHistoryOutputPerSurfaceValue(string name, su2double value, unsigned short iMarker) {
+    auto it = historyOutputPerSurface_Map.find(name);
+    if (it != historyOutputPerSurface_Map.end()) {
+      it->second[iMarker].value = value;
     } else {
       SU2_MPI::Error(string("Cannot find output field with name ") + name, CURRENT_FUNCTION);
     }

SU2_CFD/include/variables/CNEMOEulerVariable.hpp

@@ -29,7 +29,7 @@
 
 #include "CVariable.hpp"
 #include "../fluid/CNEMOGas.hpp"
-#include "../../Common/include/toolboxes/geometry_toolbox.hpp"
+#include "../../../Common/include/toolboxes/geometry_toolbox.hpp"
 
 /*!
  * \class CNEMOEulerVariable

SU2_CFD/src/output/CFVMOutput.cpp

@@ -29,7 +29,7 @@
 #include "../../../Common/include/geometry/CGeometry.hpp"
 
 
-CFVMOutput::CFVMOutput(CConfig *config, unsigned short nDim, bool fem_output) : COutput (config, nDim, fem_output){ }
+CFVMOutput::CFVMOutput(const CConfig *config, unsigned short nDim, bool fem_output) : COutput (config, nDim, fem_output){ }
 
 void CFVMOutput::AddCoordinates() {
 

SU2_CFD/src/output/CFlowCompFEMOutput.cpp

@@ -35,8 +35,6 @@ CFlowCompFEMOutput::CFlowCompFEMOutput(CConfig *config, unsigned short nDim) : C
 
   turb_model = config->GetKind_Turb_Model();
 
-  gridMovement = config->GetGrid_Movement();
-
   /*--- Set the default history fields if nothing is set in the config file ---*/
 
   if (nRequestedHistoryFields == 0){