Change to ramp muscl paramater structure

Author: joshkellyjak

Common/include/CConfig.hpp

@@ -1114,10 +1114,12 @@ class CConfig {
   array<su2double, N_POLY_COEFFS> kt_polycoeffs{{0.0}};  /*!< \brief Array for thermal conductivity polynomial coefficients. */
   bool Body_Force;                      /*!< \brief Flag to know if a body force is included in the formulation. */
 
+  struct CMUSCLRampParam {
+    su2double RampMUSCLPower; /*!< \brief Exponent by which to raise the MUSCL ramp to the power of */
+    MUSCL_RAMP_TYPE Kind_MUSCLRamp; /*!< \brief The kind of MUSCL ramp */
+    unsigned long rampMUSCLCoeff[3];     /*!< \brief ramp MUSCL value coefficients for the COption class. */
+  } RampMUSCLParam;
   su2double rampMUSCLValue; /*!< \brief Current value of the MUSCL ramp */
-  su2double RampMUSCLPower; /*!< \brief Exponent by which to raise the MUSCL ramp to the power of */
-  MUSCL_RAMP_TYPE Kind_MUSCLRamp;
-  unsigned long rampMUSCLCoeff[3];     /*!< \brief ramp MUSCL value coefficients for the COption class. */
 
   ENUM_STREAMWISE_PERIODIC Kind_Streamwise_Periodic; /*!< \brief Kind of Streamwise periodic flow (pressure drop or massflow) */
   bool Streamwise_Periodic_Temperature;              /*!< \brief Use real periodicity for Energy equation or otherwise outlet source term. */
@@ -5203,14 +5205,6 @@ class CConfig {
     else return 0;
   };
 
-  /*!
-   * \brief Interface for accessing MUSCL ramp coefficient information
-   * \return coeff for ramps
-  */
-  unsigned long GetMUSCLRampCoeff(RAMP_COEFF val_coeff) const {
-    return rampMUSCLCoeff[val_coeff];
-  }
-
   /*!
    * \brief Set MUSCL ramp value.
   */
@@ -5223,16 +5217,10 @@ class CConfig {
   su2double GetMUSCLRampValue(void) const { return rampMUSCLValue; }
 
   /*!
-   * \brief Get MUSCL ramp power.
-   * \return Ramp MUSCL power
-  */
-  su2double GetMUSCLRampPower(void) const { return RampMUSCLPower; }
-
-  /*!
-   * \brief Get MUSCL ramp kind.
+   * \brief Get MUSCL ramp paramaters.
    * \return Ramp MUSCL kind
   */
-  MUSCL_RAMP_TYPE GetKindMUSCLRamp(void) const { return Kind_MUSCLRamp; }
+  const CMUSCLRampParam& GetMUSCLRampParam(void) const { return RampMUSCLParam; }
 
   /*!
    * \brief Generic interface for setting monitor outlet values for the ramp.

Common/src/CConfig.cpp

@@ -1997,12 +1997,12 @@ void CConfig::SetConfig_Options() {
   addBoolOption("RAMP_MUSCL", RampMUSCL, false);
   /*! brief RAMP_OUTLET_COEFF \n DESCRIPTION: the 1st coeff is the ramp start iteration,
    * the 2nd coeff is the iteration update frequenct, 3rd coeff is the total number of iterations */
-  rampMUSCLCoeff[0] = 0.0; rampMUSCLCoeff[1] = 1.0; rampMUSCLCoeff[2] = 500.0;
-  addULongArrayOption("RAMP_MUSCL_COEFF", 3, false, rampMUSCLCoeff);
+  RampMUSCLParam.rampMUSCLCoeff[0] = 0.0; RampMUSCLParam.rampMUSCLCoeff[1] = 1.0; RampMUSCLParam.rampMUSCLCoeff[2] = 500.0;
+  addULongArrayOption("RAMP_MUSCL_COEFF", 3, false, RampMUSCLParam.rampMUSCLCoeff);
   /*!\brief RAMP_MUSCL_POWER \n DESRCIPTION: Exponent of the MUSCL ramp formulation */
-  addDoubleOption("RAMP_MUSCL_POWER", RampMUSCLPower, 1.0);
+  addDoubleOption("RAMP_MUSCL_POWER", RampMUSCLParam.RampMUSCLPower, 1.0);
   /*!\brief KIND_MUSCL_RAMP \n DESCRIPTION: The kind of MUSCL Ramp to be applied */
-  addEnumOption("KIND_MUSCL_RAMP", Kind_MUSCLRamp, MUSCLRamp_Map, MUSCL_RAMP_TYPE::ITERATION);
+  addEnumOption("KIND_MUSCL_RAMP", RampMUSCLParam.Kind_MUSCLRamp, MUSCLRamp_Map, MUSCL_RAMP_TYPE::ITERATION);
   /*!\brief SLOPE_LIMITER_FLOW
    * DESCRIPTION: Slope limiter for the direct solution. \n OPTIONS: See \link Limiter_Map \endlink \n DEFAULT VENKATAKRISHNAN \ingroup Config*/
   addEnumOption("SLOPE_LIMITER_FLOW", Kind_SlopeLimit_Flow, Limiter_Map, LIMITER::VENKATAKRISHNAN);
@@ -4497,7 +4497,7 @@ void CConfig::SetPostprocessing(SU2_COMPONENT val_software, unsigned short val_i
   }
 
   if(RampMUSCL && !DiscreteAdjoint){
-    if (RampMUSCLPower <= 0.0) SU2_MPI::Error("RAMP_MUSCL_POWER cannot be less than or equal to zero!");
+    if (RampMUSCLParam.RampMUSCLPower <= 0.0) SU2_MPI::Error("RAMP_MUSCL_POWER cannot be less than or equal to zero!", CURRENT_FUNCTION);
     rampMUSCLValue = 0.0;
   } else {
     rampMUSCLValue = 1.0;

SU2_CFD/src/iteration/CFluidIteration.cpp

@@ -335,20 +335,20 @@ void CFluidIteration::UpdateRamp(CGeometry**** geometry_container, CConfig** con
   }
 
   if (ramp_flag == RAMP_TYPE::MUSCL) {
-    const long unsigned startIter = config->GetMUSCLRampCoeff(RAMP_COEFF::INITIAL_VALUE);
-    const long unsigned updateFreq = config->GetMUSCLRampCoeff(RAMP_COEFF::UPDATE_FREQ);
-    const long unsigned finalIter = config->GetMUSCLRampCoeff(RAMP_COEFF::FINAL_ITER);
-    const auto power = config->GetMUSCLRampPower();
+    const auto RampMUSCLParam = config->GetMUSCLRampParam();
+    const long unsigned startIter = RampMUSCLParam.rampMUSCLCoeff[RAMP_COEFF::INITIAL_VALUE];
+    const long unsigned updateFreq = RampMUSCLParam.rampMUSCLCoeff[RAMP_COEFF::UPDATE_FREQ];
+    const long unsigned finalIter = RampMUSCLParam.rampMUSCLCoeff[RAMP_COEFF::FINAL_ITER];
     auto iterFrac = (static_cast<double>(iter - startIter)/static_cast<double>(finalIter - startIter));
     if (iter < startIter) return;
     if ((iter == startIter) && (rank == MASTER_NODE)) cout << "Beginning to ramp MUSCL scheme..." << endl;
     if ((iter % updateFreq == 0 && iter < finalIter) || (iter == finalIter)) {
-      switch (config->GetKindMUSCLRamp()) {
+      switch (RampMUSCLParam.Kind_MUSCLRamp) {
         case MUSCL_RAMP_TYPE::ITERATION:
-          config->SetMUSCLRampValue(std::pow(std::min<double>(1.0, iterFrac), power));
+          config->SetMUSCLRampValue(std::pow(std::min<double>(1.0, iterFrac), RampMUSCLParam.RampMUSCLPower));
           break;
         case MUSCL_RAMP_TYPE::SMOOTH_FUNCTION:
-          config->SetMUSCLRampValue(std::pow((0.5 * (1 -  cos(M_PI * std::min(1.0, iterFrac)))), power));
+          config->SetMUSCLRampValue(std::pow((0.5 * (1 -  cos(M_PI * std::min(1.0, iterFrac)))), RampMUSCLParam.RampMUSCLPower));
           break;
         default:
           break;