Changes for comments

Author: joshkellyjak

Common/include/CConfig.hpp

@@ -6091,12 +6091,6 @@ class CConfig {
     MarkerRotation_Rate[3 * iMarkerMoving + iDim] = val;
   }
 
-  /*!
-   * \brief Get the final translation velocity of the mesh in the y-direction
-   * \return Velocity of the mesh in the y-direction
-   */
-  su2double GetFinalTranslation_Rate_Y() const { return FinalTranslation_Rate_Y;}
-
   /*!
    * \brief Get the pitching rate of the mesh.
    * \param[in] iDim - spatial component
@@ -6173,17 +6167,9 @@ class CConfig {
   su2double GetMarkerPlunging_Ampl(unsigned short iMarkerMoving, unsigned short iDim) const { return MarkerPlunging_Ampl[3*iMarkerMoving + iDim];}
 
   /*!
-   * \brief Get the angular velocity of the mesh about the z-axis.
-   * \return Angular velocity of the mesh about the z-axis.
+   * \brief Generic interface for retrieving final value of a turbomachinery ramp
+   * \return Final value of a specified ramp
    */
-  su2double GetFinalRotation_Rate_Z() const { return FinalRotation_Rate_Z;}
-
-  /*!
-   * \brief Set the angular velocity of the mesh about the z-axis.
-   * \param[in] newRotation_Rate_Z - new rotation rate after computing the ramp value.
-   */
-  void SetRotation_Rate_Z(su2double newRotation_Rate_Z);
-
   su2double GetFinalValue(TURBO_RAMP_TYPE ramp_flag) {
     if (ramp_flag == TURBO_RAMP_TYPE::GRID && RampRotatingFrame) return FinalRotation_Rate_Z;
     else if (ramp_flag == TURBO_RAMP_TYPE::GRID && RampTranslationFrame) return FinalTranslation_Rate_Y;

Common/include/option_structure.hpp

@@ -1886,15 +1886,18 @@ enum TURBO_MARKER_TYPE{
   OUTFLOW = 2     /*!< \brief flag for outflow marker for compute turboperformance. */
 };
 
-enum TURBO_RAMP_TYPE{
-  GRID = 1,       /*!< \brief flag for rotational/translational ramps */
-  BOUNDARY = 2    /*!< \brief flag for pressure/mass flow ramps*/
+enum class TURBO_RAMP_TYPE{
+  GRID,       /*!< \brief flag for rotational/translational ramps */
+  BOUNDARY    /*!< \brief flag for pressure/mass flow ramps*/
 };
 
+/*!
+ * \brief Coefficients of the ramp specified in the config, ordered by index in the config
+ */
 enum TURBO_RAMP_COEFF{
   INITIAL_VALUE = 0,  /*!< \brief intial value of the ramp */
   UPDATE_FREQ = 1,    /*<! \brief update frequency of the ramp */
-  FINAL_ITER = 2     /*<! \brief final iteration of the ramp */
+  FINAL_ITER = 2      /*<! \brief final iteration of the ramp */
 };
 
 /*!

Common/src/CConfig.cpp

@@ -3074,6 +3074,14 @@ void CConfig::SetConfig_Parsing(istream& config_buffer){
             newString.append("SPECIES_USE_STRONG_BC is deprecated. Use MARKER_SPECIES_STRONG_BC= (marker1, ...) instead.\n\n");
           else if (!option_name.compare("DEAD_LOAD"))
             newString.append("DEAD_LOAD is deprecated. Use GRAVITY_FORCE or BODY_FORCE instead.\n\n");
+          else if (!option_name.compare("RAMP_OUTLET_PRESSURE"))
+            newString.append("RAMP_OUTLET_PRESSURE is deprectaed. Use RAMP_OUTLET instead");
+          else if (!option_name.compare("RAMP_OUTLET_PRESSURE_COEFF"))
+            newString.append("RAMP_OUTLET_PRESSURE_COEFF is deprectaed. Use RAMP_OUTLET_COEFF instead");
+          else if (!option_name.compare("RAMP_ROTATION_FRAME"))
+            newString.append("RAMP_ROTATION_FRAME is deprectaed. Use RAMP_MOTION_FRAME instead");
+          else if (!option_name.compare("RAMP_ROTATION_FRAME_COEFF"))
+            newString.append("RAMP_ROTATION_FRAME_COEFF is deprectaed. Use RAMP_MOTION_FRAME_COEFF instead");
           else {
             /*--- Find the most likely candidate for the unrecognized option, based on the length
              of start and end character sequences shared by candidates and the option. ---*/
@@ -4356,16 +4364,19 @@ void CConfig::SetPostprocessing(SU2_COMPONENT val_software, unsigned short val_i
   }
 
   /*--- Interface for handling turbo ramps ---*/
-  if(GetGrid_Movement() && RampMotionFrame && !DiscreteAdjoint){
+  if (GetGrid_Movement() && RampMotionFrame && !DiscreteAdjoint) {
     if (Kind_GridMovement == ENUM_GRIDMOVEMENT::ROTATING_FRAME) RampRotatingFrame = true;
     else if (Kind_GridMovement == ENUM_GRIDMOVEMENT::STEADY_TRANSLATION) RampTranslationFrame = true;
   }
 
   if(RampOutlet && !DiscreteAdjoint) {
     for (iMarker = 0; iMarker < nMarker_Giles; iMarker++){
-      if (Kind_Data_Giles[iMarker] == STATIC_PRESSURE ||  Kind_Data_Giles[iMarker] == STATIC_PRESSURE_1D || Kind_Data_Giles[iMarker] == RADIAL_EQUILIBRIUM )
-        RampOutletPressure = true;
-      else if (Kind_Data_Giles[iMarker] == MASS_FLOW_OUTLET) RampOutletMassFlow = true;
+      switch (Kind_Data_Giles[iMarker]) {
+        case STATIC_PRESSURE: case STATIC_PRESSURE_1D: case RADIAL_EQUILIBRIUM:
+          RampOutletPressure = true;
+        case MASS_FLOW_OUTLET:
+          RampOutletMassFlow = true;
+      }
     }
   }
 
@@ -5448,7 +5459,9 @@ void CConfig::SetPostprocessing(SU2_COMPONENT val_software, unsigned short val_i
     }
 
     RampOutletPressure = false;
+    //RampOutletMassFlow = false;
     RampRotatingFrame = false;
+    //RampTranslationFrame = false;
   }
 
   /* 2nd-order MUSCL is not possible for the continuous adjoint

SU2_CFD/src/iteration/CTurboIteration.cpp

@@ -81,8 +81,8 @@ void CTurboIteration::TurboRamp(CGeometry**** geometry_container, CConfig** conf
   /*-- Update grid velocities (ROTATING_FRAME, STEADY_TRANSLATION)*/
   if (ramp_flag == TURBO_RAMP_TYPE::GRID && config->GetGrid_Movement()) {
     const auto ini_vel = config->GetRamp_Coeff(ramp_flag, TURBO_RAMP_COEFF::INITIAL_VALUE);
-    const long unsigned rampFreq = SU2_TYPE::Int(config->GetRamp_Coeff(ramp_flag, TURBO_RAMP_COEFF::UPDATE_FREQ));
-    const long unsigned finalRamp_Iter = SU2_TYPE::Int(config->GetRamp_Coeff(ramp_flag, TURBO_RAMP_COEFF::FINAL_ITER));
+    const auto unsigned rampFreq = SU2_TYPE::Int(config->GetRamp_Coeff(ramp_flag, TURBO_RAMP_COEFF::UPDATE_FREQ));
+    const auto unsigned finalRamp_Iter = SU2_TYPE::Int(config->GetRamp_Coeff(ramp_flag, TURBO_RAMP_COEFF::FINAL_ITER));
 
     // Two options needed as if finalRamp_Iter % rampFreq != 0 final value is not set correctly 
     if((iter % rampFreq == 0 && iter < finalRamp_Iter) || (iter == finalRamp_Iter)){