Merge branch 'develop' into cleanup_flow_solver_duplication

Author: pcarruscag

Common/include/CConfig.hpp

@@ -227,6 +227,7 @@ class CConfig {
   bool Inlet_From_File;         /*!< \brief True if the inlet profile is to be loaded from a file. */
   string Inlet_Filename;        /*!< \brief Filename specifying an inlet profile. */
   su2double Inlet_Matching_Tol; /*!< \brief Tolerance used when matching a point to a point from the inlet file. */
+  string ActDisk_FileName;      /*!< \brief Filename specifying an actuator disk. */
 
   string *Marker_Euler,           /*!< \brief Euler wall markers. */
   *Marker_FarField,               /*!< \brief Far field markers. */
@@ -4702,6 +4703,12 @@ class CConfig {
    */
   string GetInlet_FileName(void) const { return Inlet_Filename; }
 
+  /*!
+   * \brief Get name of the input file for the specified actuator disk.
+   * \return Name of the input file for the specified actuator disk.
+   */
+  string GetActDisk_FileName(void) const { return ActDisk_FileName; }
+
   /*!
    * \brief Get the tolerance used for matching two points on a specified inlet
    * \return Tolerance used for matching a point to a specified inlet

Common/include/option_structure.hpp

@@ -1381,7 +1381,8 @@ enum ACTDISK_TYPE {
   NET_THRUST = 3,         /*!< \brief User specifies the Net thrust. */
   DRAG_MINUS_THRUST = 4,  /*!< \brief User specifies the D-T. */
   MASSFLOW = 5,           /*!< \brief User specifies the massflow. */
-  POWER = 6               /*!< \brief User specifies the power. */
+  POWER = 6,              /*!< \brief User specifies the power. */
+  VARIABLE_LOAD = 7       /*!< \brief User specifies the load distribution. */
 };
 static const MapType<string, ACTDISK_TYPE> ActDisk_Map = {
   MakePair("VARIABLES_JUMP", VARIABLES_JUMP)
@@ -1390,6 +1391,7 @@ static const MapType<string, ACTDISK_TYPE> ActDisk_Map = {
   MakePair("DRAG_MINUS_THRUST", DRAG_MINUS_THRUST)
   MakePair("MASSFLOW", MASSFLOW)
   MakePair("POWER", POWER)
+  MakePair("VARIABLE_LOAD", VARIABLE_LOAD)
 };
 
 /*!

Common/src/CConfig.cpp

@@ -1402,6 +1402,9 @@ void CConfig::SetConfig_Options() {
                    nMarker_ActDiskInlet, nMarker_ActDiskOutlet,  Marker_ActDiskInlet, Marker_ActDiskOutlet,
                    ActDisk_PressJump, ActDisk_TempJump, ActDisk_Omega);
 
+  /*!\brief ACTDISK_FILENAME \n DESCRIPTION: Input file for a specified actuator disk (w/ extension) \n DEFAULT: actdiskinput.dat \ingroup Config*/
+  addStringOption("ACTDISK_FILENAME", ActDisk_FileName, string("actdiskinput.dat"));
+
   /*!\brief INLET_TYPE  \n DESCRIPTION: Inlet boundary type \n OPTIONS: see \link Inlet_Map \endlink \n DEFAULT: TOTAL_CONDITIONS \ingroup Config*/
   addEnumOption("INLET_TYPE", Kind_Inlet, Inlet_Map, TOTAL_CONDITIONS);
   /*!\brief INC_INLET_TYPE \n DESCRIPTION: List of inlet types for incompressible flows. List length must match number of inlet markers. Options: VELOCITY_INLET, PRESSURE_INLET. \ingroup Config*/
@@ -6890,6 +6893,13 @@ void CConfig::SetOutput(unsigned short val_software, unsigned short val_izone) {
     BoundaryTable.PrintFooter();
   }
 
+  if (nMarker_ActDiskOutlet != 0) {
+    if (GetKind_ActDisk() == VARIABLE_LOAD) {
+      cout << endl << "Actuator disk with variable load." << endl;
+      cout << "Actuator disk data read from file: " << GetActDisk_FileName() << endl;
+    }
+  }
+
 }
 
 bool CConfig::TokenizeString(string & str, string & option_name,

SU2_CFD/include/solvers/CEulerSolver.hpp

@@ -68,6 +68,17 @@ class CEulerSolver : public CFVMFlowSolverBase<CEulerVariable, COMPRESSIBLE> {
   **ActDisk_DeltaP = nullptr,    /*!< \brief Value of the Delta P. */
   **ActDisk_DeltaT = nullptr;    /*!< \brief Value of the Delta T. */
 
+  su2activevector
+  ActDisk_R;         /*!< \brief Value of the actuator disk Radius. */
+  su2activematrix
+  ActDisk_C,         /*!< \brief Value of the actuator disk Center. */
+  ActDisk_Axis;      /*!< \brief Value of the actuator disk Axis. */
+  su2double
+  **ActDisk_Fa,        /*!< \brief Value of the actuator disk Axial Force per Unit Area. */
+  **ActDisk_Fx,        /*!< \brief Value of the actuator disk X component of the radial and tangential forces per Unit Area resultant. */
+  **ActDisk_Fy,        /*!< \brief Value of the actuator disk Y component of the radial and tangential forces per Unit Area resultant. */
+  **ActDisk_Fz;        /*!< \brief Value of the actuator disk Z component of the radial and tangential forces per Unit Area resultant. */
+
   su2double
   Total_CL_Prev = 0.0,        /*!< \brief Total lift coefficient for all the boundaries (fixed lift mode). */
   Total_SolidCD = 0.0,        /*!< \brief Total drag coefficient for all the boundaries. */
@@ -219,6 +230,16 @@ class CEulerSolver : public CFVMFlowSolverBase<CEulerVariable, COMPRESSIBLE> {
   void SetActDisk_BCThrust(CGeometry *geometry, CSolver **solver_container,
                            CConfig *config, unsigned short iMesh, bool Output);
 
+  /*!
+   * \brief Read the actuator disk input file for the VARIABLE_LOAD type.
+   * \param[in] geometry - Geometrical definition of the problem.
+   * \param[in] solver_container - Container vector with all the solutions.
+   * \param[in] config - Definition of the particular problem.
+   * \param[in] iMesh - current mesh level for the multigrid.
+   * \param[in] Output - boolean to determine whether to print output.
+   */
+  void ReadActDisk_InputFile(CGeometry *geometry, CSolver **solver_container,
+                           CConfig *config, unsigned short iMesh, bool Output);
   /*!
    * \brief Compute the max eigenvalue.
    * \param[in] geometry - Geometrical definition of the problem.
@@ -507,6 +528,24 @@ class CEulerSolver : public CFVMFlowSolverBase<CEulerVariable, COMPRESSIBLE> {
                   unsigned short val_marker,
                   bool val_inlet_surface) final;
 
+  /*!
+   * \brief Impose an actuator disk with variable load boundary condition.
+   * \param[in] geometry - Geometrical definition of the problem.
+   * \param[in] solver_container - Container vector with all the solutions.
+   * \param[in] conv_numerics - Description of the numerical method.
+   * \param[in] visc_numerics - Description of the numerical method.
+   * \param[in] config - Definition of the particular problem.
+   * \param[in] val_marker - Surface marker where the boundary condition is applied.
+   * \param[in] val_inlet_surface - Boolean for whether val_marker is an inlet
+   */
+  void BC_ActDisk_VariableLoad(CGeometry *geometry,
+                               CSolver **solver_container,
+                               CNumerics *conv_numerics,
+                               CNumerics *visc_numerics,
+                               CConfig *config,
+                               unsigned short val_marker,
+                               bool val_inlet_surface);
+
   /*!
    * \brief Impose the interface boundary condition using the residual.
    * \param[in] geometry - Geometrical definition of the problem.
@@ -1065,6 +1104,90 @@ class CEulerSolver : public CFVMFlowSolverBase<CEulerVariable, COMPRESSIBLE> {
     DonorGlobalIndex[val_marker][val_vertex] = val_index;
   }
 
+  /*!
+   * \brief Value of the characteristic global index at the boundaries.
+   * \param[in] val_marker - Surface marker where the coefficient is computed.
+   * \param[in] val_vertex - Vertex of the marker <i>val_marker</i> where the coefficient is evaluated.
+   * \return Value of the axial force per unit area.
+   */
+  inline su2double GetActDisk_Fa(unsigned short val_marker,
+                                 unsigned long val_vertex) const {
+    return ActDisk_Fa[val_marker][val_vertex];
+  }
+
+  /*!
+   * \brief Value of the characteristic global index at the boundaries.
+   * \param[in] val_marker - Surface marker where the coefficient is computed.
+   * \param[in] val_vertex - Vertex of the marker <i>val_marker</i> where the coefficient is evaluated.
+   * \return Value of the axial force per unit area.
+   */
+  inline void SetActDisk_Fa(unsigned short val_marker,
+                            unsigned long val_vertex,
+                            su2double val_fa) { ActDisk_Fa[val_marker][val_vertex] = val_fa; }
+
+  /*!
+   * \brief Value of the characteristic global index at the boundaries.
+   * \param[in] val_marker - Surface marker where the coefficient is computed.
+   * \param[in] val_vertex - Vertex of the marker <i>val_marker</i> where the coefficient is evaluated.
+   * \return Value of the x component of the radial and tangential forces per unit area resultant.
+   */
+  inline su2double GetActDisk_Fx(unsigned short val_marker,
+                                 unsigned long val_vertex) const {
+    return ActDisk_Fx[val_marker][val_vertex];
+  }
+
+  /*!
+   * \brief Value of the characteristic global index at the boundaries.
+   * \param[in] val_marker - Surface marker where the coefficient is computed.
+   * \param[in] val_vertex - Vertex of the marker <i>val_marker</i> where the coefficient is evaluated.
+   * \return Value of the x component of the radial and tangential forces per unit area resultant.
+   */
+  inline void SetActDisk_Fx(unsigned short val_marker,
+                            unsigned long val_vertex,
+                            su2double val_fx) { ActDisk_Fx[val_marker][val_vertex] = val_fx; }
+
+  /*!
+   * \brief Value of the characteristic global index at the boundaries.
+   * \param[in] val_marker - Surface marker where the coefficient is computed.
+   * \param[in] val_vertex - Vertex of the marker <i>val_marker</i> where the coefficient is evaluated.
+   * \return Value of the y component of the radial and tangential forces per unit area resultant.
+   */
+  inline su2double GetActDisk_Fy(unsigned short val_marker,
+                                 unsigned long val_vertex) const {
+    return ActDisk_Fy[val_marker][val_vertex];
+  }
+
+  /*!
+   * \brief Value of the characteristic global index at the boundaries.
+   * \param[in] val_marker - Surface marker where the coefficient is computed.
+   * \param[in] val_vertex - Vertex of the marker <i>val_marker</i> where the coefficient is evaluated.
+   * \return Value of the y component of the radial and tangential forces per unit area resultant.
+   */
+  inline void SetActDisk_Fy(unsigned short val_marker,
+                            unsigned long val_vertex,
+                            su2double val_fy) { ActDisk_Fy[val_marker][val_vertex] = val_fy; }
+
+  /*!
+   * \brief Value of the characteristic global index at the boundaries.
+   * \param[in] val_marker - Surface marker where the coefficient is computed.
+   * \param[in] val_vertex - Vertex of the marker <i>val_marker</i> where the coefficient is evaluated.
+   * \return Value of the z component of the radial and tangential forces per unit area resultant.
+   */
+  inline su2double GetActDisk_Fz(unsigned short val_marker,
+                                 unsigned long val_vertex) const {
+    return ActDisk_Fz[val_marker][val_vertex];
+  }
+
+  /*!
+   * \brief Value of the characteristic global index at the boundaries.
+   * \param[in] val_marker - Surface marker where the coefficient is computed.
+   * \param[in] val_vertex - Vertex of the marker <i>val_marker</i> where the coefficient is evaluated.
+   * \return Value of the z component of the radial and tangential forces per unit area resultant.
+   */
+  inline void SetActDisk_Fz(unsigned short val_marker,
+                            unsigned long val_vertex,
+                            su2double val_fz) { ActDisk_Fz[val_marker][val_vertex] = val_fz; }
+
   /*!
    * \brief Value of the characteristic global index at the boundaries.
    * \param[in] val_marker - Surface marker where the coefficient is computed.