cleanup the config a "bit"

Author: pcarruscag

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,7 +38,7 @@ 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
@@ -50,10 +50,10 @@ class CFlowOutput : public CFVMOutput{
    * \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.

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){

SU2_CFD/src/output/CFlowCompOutput.cpp

@@ -25,16 +25,14 @@
  * License along with SU2. If not, see <http://www.gnu.org/licenses/>.
  */
 
-
 #include "../../include/output/CFlowCompOutput.hpp"
 
 #include "../../../Common/include/geometry/CGeometry.hpp"
 #include "../../include/solvers/CSolver.hpp"
 
-CFlowCompOutput::CFlowCompOutput(CConfig *config, unsigned short nDim) : CFlowOutput(config, nDim, false) {
+CFlowCompOutput::CFlowCompOutput(const CConfig *config, unsigned short nDim) : CFlowOutput(config, nDim, false) {
 
   turb_model = config->GetKind_Turb_Model();
-  gridMovement = config->GetDynamic_Grid();
 
   /*--- Set the default history fields if nothing is set in the config file ---*/
 

SU2_CFD/src/output/CFlowIncOutput.cpp

@@ -39,8 +39,7 @@ CFlowIncOutput::CFlowIncOutput(CConfig *config, unsigned short nDim) : CFlowOutp
 
   weakly_coupled_heat = config->GetWeakly_Coupled_Heat();
 
-  gridMovement = config->GetDynamic_Grid();
-  streamwisePeriodic             = (config->GetKind_Streamwise_Periodic() != ENUM_STREAMWISE_PERIODIC::NONE);
+  streamwisePeriodic = (config->GetKind_Streamwise_Periodic() != ENUM_STREAMWISE_PERIODIC::NONE);
   streamwisePeriodic_temperature = config->GetStreamwise_Periodic_Temperature();
 
   /*--- Set the default history fields if nothing is set in the config file ---*/
@@ -93,8 +92,7 @@ CFlowIncOutput::CFlowIncOutput(CConfig *config, unsigned short nDim) : CFlowOutp
 
   /*--- Set the default convergence field --- */
 
-  if (convFields.empty() ) convFields.emplace_back("RMS_PRESSURE");
-
+  if (convFields.empty()) convFields.emplace_back("RMS_PRESSURE");
 
 }