Feature actuatordisk bem

Common/include/CConfig.hpp

@@ -344,8 +344,15 @@ class CConfig {
   su2double *ActDiskOutlet_GrossThrust;      /*!< \brief Specified outlet gross thrust for actuator disk. */
   su2double *ActDiskOutlet_Force;            /*!< \brief Specified outlet force for actuator disk. */
   su2double *ActDiskOutlet_Power;            /*!< \brief Specified outlet power for actuator disk. */
+  su2double *ActDiskOutlet_Thrust_BEM;       /*!< \brief Specified outlet thrust for actuator disk. */
+  su2double *ActDiskOutlet_Torque_BEM;       /*!< \brief Specified outlet torque for actuator disk. */
   su2double **ActDisk_PressJump,
   **ActDisk_TempJump,  **ActDisk_Omega;      /*!< \brief Specified deltas for actuator disk.*/
+  su2double **ActDisk_XCG, **ActDisk_YCG, **ActDisk_ZCG; /*!< \brief Specified CG for actuator disk.*/
+  su2double **ActDisk_RotRate;               /*!< \brief Value of the Rotation Rate.*/
+  su2double BEM_blade_angle ;                /*!< \brief Propeller blade angle.*/
+  string    BEM_prop_filename ;              /*!< \brief Propeller filename.*/
+  bool      History_File_Append_Flag;        /*!< \brief Flag to append history file.*/
   su2double *ActDisk_DeltaPress;             /*!< \brief Specified pressure delta for actuator disk. */
   su2double *ActDisk_DeltaTemp;              /*!< \brief Specified temperature delta for actuator disk. */
   su2double *ActDisk_TotalPressRatio;        /*!< \brief Specified tot. pres. ratio for actuator disk. */
@@ -6649,6 +6656,31 @@ class CConfig {
    */
   su2double GetActDisk_PressJump(const string& val_marker, unsigned short val_index) const;
 
+  /*!
+   * \brief Get the XCG of  the actuator disk.
+   */
+  su2double GetActDisk_XCG(string val_marker, unsigned short val_index) const;
+
+  /*!
+   * \brief Get the YCG of  the actuator disk.
+   */
+  su2double GetActDisk_YCG(string val_marker, unsigned short val_index) const;
+
+  /*!
+   * \brief Get the ZCG of  the actuator disk.
+   */
+  su2double GetActDisk_ZCG(string val_marker, unsigned short val_index) const;
+
+  /*!
+   * \brief Get the blade angle of the propeller.
+   */
+  su2double GetBEM_blade_angle(void) { return BEM_blade_angle; }
+
+  /*!
+   * \brief Get the filename of the propeller.
+   */
+  string    GetBEM_prop_filename(void) { return BEM_prop_filename; }
+
   /*!
    * \brief Get the thrust corffient of the actuator disk.
    */
@@ -8191,6 +8223,20 @@ class CConfig {
    */
   su2double GetActDiskOutlet_Power(const string& val_marker) const;
 
+  /*!
+   * \brief Get the thrust at the actuator disk outlet boundary.
+   * \param[in] val_marker - Marker corresponding to the outlet (actuator disk) boundary.
+   * \return The outlet (actuator disk) thrust.
+   */
+  su2double GetActDiskOutlet_Thrust_BEM(string val_marker) const;
+
+  /*!
+   * \brief Get the torque at the actuator disk outlet boundary.
+   * \param[in] val_marker - Marker corresponding to the outlet boundary.
+   * \return The outlet (actuator disk) torque.
+   */
+  su2double GetActDiskOutlet_Torque_BEM(string val_marker) const;
+
   /*!
    * \brief Get the back pressure (static) at an outlet boundary.
    * \param[in] val_index - Index corresponding to the outlet boundary.
@@ -8226,6 +8272,20 @@ class CConfig {
    */
   void SetActDiskOutlet_Power(unsigned short val_marker, su2double val_actdisk_power) { ActDiskOutlet_Power[val_marker] = val_actdisk_power; }
 
+  /*!
+   * \brief Set the thrust at the outlet (actuator disk) boundary.
+   * \param[in] val_marker - Marker corresponding to the outlet (actuator disk) boundary.
+   * \param[in] val_actdisk_thrust_bem - Value of the actuator disk thrust.
+   */
+  void SetActDiskOutlet_Thrust_BEM(unsigned short val_marker, su2double val_actdisk_thrust_bem) { ActDiskOutlet_Thrust_BEM[val_marker] = val_actdisk_thrust_bem; }
+
+  /*!
+   * \brief Get the back pressure (static) at an outlet boundary.
+   * \param[in] val_marker - Marker corresponding to the outlet boundary.
+   * \param[in] val_actdisk_torque_bem - Value of the actuator disk torque.
+   */
+  void SetActDiskOutlet_Torque_BEM(unsigned short val_marker, su2double val_actdisk_torque_bem) { ActDiskOutlet_Torque_BEM[val_marker] = val_actdisk_torque_bem; }
+
   /*!
    * \brief Get the displacement value at an displacement boundary.
    * \param[in] val_index - Index corresponding to the displacement boundary.

Common/include/option_structure.hpp

@@ -1857,7 +1857,8 @@ enum ACTDISK_TYPE {
   DRAG_MINUS_THRUST = 4,  /*!< \brief User specifies the D-T. */
   MASSFLOW = 5,           /*!< \brief User specifies the massflow. */
   POWER = 6,              /*!< \brief User specifies the power. */
-  VARIABLE_LOAD = 7       /*!< \brief User specifies the load distribution. */
+  VARIABLE_LOAD = 7,      /*!< \brief User specifies the load distribution. */
+  BLADE_ELEMENT = 8       /*!< \brief User specifies to use Blade element method. */
 };
 static const MapType<std::string, ACTDISK_TYPE> ActDisk_Map = {
   MakePair("VARIABLES_JUMP", VARIABLES_JUMP)
@@ -1867,6 +1868,7 @@ static const MapType<std::string, ACTDISK_TYPE> ActDisk_Map = {
   MakePair("MASSFLOW", MASSFLOW)
   MakePair("POWER", POWER)
   MakePair("VARIABLE_LOAD", VARIABLE_LOAD)
+  MakePair("BLADE_ELEMENT", BLADE_ELEMENT)
 };
 
 /*!

Common/include/option_structure.inl

@@ -1772,6 +1772,100 @@ class COptionActDisk : public COptionBase {
   }
 };
 
+class COptionActDiskCentroid : public COptionBase {
+  string name; // identifier for the option
+  unsigned short & inlet_size;
+  unsigned short & outlet_size;
+  string * & marker_inlet;
+  string * & marker_outlet;
+  su2double ** & actdisk_xcg;
+  su2double ** & actdisk_ycg;
+  su2double ** & actdisk_zcg;
+
+public:
+  COptionActDiskCentroid(const string name,
+                 unsigned short & nMarker_ActDiskInlet, unsigned short & nMarker_ActDiskOutlet, string * & Marker_ActDiskInlet, string * & Marker_ActDiskOutlet,
+                 su2double ** & ActDisk_XCG, su2double ** & ActDisk_YCG, su2double ** & ActDisk_ZCG) :
+  inlet_size(nMarker_ActDiskInlet), outlet_size(nMarker_ActDiskOutlet), marker_inlet(Marker_ActDiskInlet), marker_outlet(Marker_ActDiskOutlet),
+  actdisk_xcg(ActDisk_XCG), actdisk_ycg(ActDisk_YCG), actdisk_zcg(ActDisk_ZCG) {
+    this->name = name;
+  }
+
+  ~COptionActDiskCentroid() {};
+  string SetValue(vector<string> option_value) {
+    const int mod_num = 8;
+    unsigned short totalVals = option_value.size();
+    if ((totalVals == 1) && (option_value[0].compare("NONE") == 0)) {
+      this->SetDefault();
+      return "";
+    }
+
+    if (totalVals % mod_num != 0) {
+      string newstring;
+      newstring.append(this->name);
+      newstring.append(": must have a number of entries divisible by 8");
+      this->SetDefault();
+      return newstring;
+    }
+
+    unsigned short nVals = totalVals / mod_num;
+    this->inlet_size = nVals;
+    this->outlet_size = nVals;
+    this->marker_inlet = new string[this->inlet_size];
+    this->marker_outlet = new string[this->outlet_size];
+
+    this->actdisk_xcg = new su2double*[this->inlet_size];
+    this->actdisk_ycg = new su2double*[this->inlet_size];
+    this->actdisk_zcg = new su2double*[this->inlet_size];
+    for (int i = 0; i < this->inlet_size; i++) {
+      this->actdisk_xcg[i] = new su2double[2];
+      this->actdisk_ycg[i] = new su2double[2];
+      this->actdisk_zcg[i] = new su2double[2];
+    }
+
+    string tname = "actuator disk";
+
+    for (int i = 0; i < this->inlet_size; i++) {
+      this->marker_inlet[i].assign(option_value[mod_num*i]);
+      this->marker_outlet[i].assign(option_value[mod_num*i+1]);
+      istringstream ss_1st(option_value[mod_num*i + 2]);
+      if (!(ss_1st >> this->actdisk_xcg[i][0])) {
+        return badValue(tname, this->name);
+      }
+      istringstream ss_2nd(option_value[mod_num*i + 3]);
+      if (!(ss_2nd >> this->actdisk_ycg[i][0])) {
+        return badValue(tname, this->name);
+      }
+      istringstream ss_3rd(option_value[mod_num*i + 4]);
+      if (!(ss_3rd >> this->actdisk_zcg[i][0])) {
+        return badValue(tname, this->name);
+      }
+      istringstream ss_4th(option_value[mod_num*i + 5]);
+      if (!(ss_4th >> this->actdisk_xcg[i][1])) {
+        return badValue(tname, this->name);
+      }
+      istringstream ss_5th(option_value[mod_num*i + 6]);
+      if (!(ss_5th >> this->actdisk_ycg[i][1])) {
+        return badValue(tname, this->name);
+      }
+      istringstream ss_6th(option_value[mod_num*i + 7]);
+      if (!(ss_6th >> this->actdisk_zcg[i][1])) {
+        return badValue(tname, this->name);
+      }
+    }
+    return "";
+  }
+  void SetDefault() {
+    this->inlet_size = 0;
+    this->outlet_size = 0;
+    this->marker_inlet = NULL;
+    this->marker_outlet = NULL;
+    this->actdisk_xcg = NULL;
+    this->actdisk_ycg = NULL;
+    this->actdisk_zcg = NULL;
+  }
+};
+
 class COptionWallFunction : public COptionBase {
   string name;  // identifier for the option
   unsigned short& nMarkers;

Common/src/CConfig.cpp

@@ -921,6 +921,9 @@ void CConfig::SetPointersNull() {
   ActDiskOutlet_Power         = nullptr;   ActDiskOutlet_Temperature = nullptr;  ActDiskOutlet_TotalTemperature = nullptr;
   ActDiskOutlet_MassFlow      = nullptr;
 
+  ActDiskOutlet_Thrust_BEM = nullptr;
+  ActDiskOutlet_Torque_BEM = nullptr;
+
   ActDisk_DeltaPress      = nullptr;    ActDisk_DeltaTemp      = nullptr;
   ActDisk_TotalPressRatio = nullptr;    ActDisk_TotalTempRatio = nullptr;    ActDisk_StaticPressRatio = nullptr;
   ActDisk_StaticTempRatio = nullptr;    ActDisk_NetThrust      = nullptr;    ActDisk_GrossThrust      = nullptr;
@@ -1523,6 +1526,11 @@ void CConfig::SetConfig_Options() {
                    nMarker_ActDiskInlet, nMarker_ActDiskOutlet,  Marker_ActDiskInlet, Marker_ActDiskOutlet,
                    ActDisk_PressJump, ActDisk_TempJump, ActDisk_Omega);
 
+  /*!\brief MARKER_ACTDISK_CG\n DESCRIPTION: Actuator disk with CG for blade element momentum (BEM) method. \ingroup Config*/
+  addActDiskOption("MARKER_ACTDISK_CG",
+                   nMarker_ActDiskInlet, nMarker_ActDiskOutlet,  Marker_ActDiskInlet, Marker_ActDiskOutlet,
+                   ActDisk_XCG, ActDisk_YCG, ActDisk_ZCG);
+
   /*!\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"));
 
@@ -1648,6 +1656,14 @@ void CConfig::SetConfig_Options() {
   addBoolOption("SUBSONIC_ENGINE", SubsonicEngine, false);
   /* DESCRIPTION: Actuator disk double surface */
   addBoolOption("ACTDISK_DOUBLE_SURFACE", ActDisk_DoubleSurface, false);
+
+  /* DESCRIPTION: Actuator disk BEM switch for history file appending.*/
+  addBoolOption("HISTORY_FILE_APPEND", History_File_Append_Flag, false);
+  /* DESCRIPTION: Propeller blade angle for actuator disk BEM.*/
+  addDoubleOption("BEM_PROP_BLADE_ANGLE", BEM_blade_angle, 23.9);
+  /* DESCRIPTION: Propeller file name for actuator disk BEM.*/
+  addStringOption("BEM_PROP_FILENAME", BEM_prop_filename,string("prop_geom_alfclcd_data.txt"));
+
   /* DESCRIPTION: Only half engine is in the computational grid */
   addBoolOption("ENGINE_HALF_MODEL", Engine_HalfModel, false);
   /* DESCRIPTION: Actuator disk double surface */
@@ -4975,6 +4991,18 @@ void CConfig::SetPostprocessing(SU2_COMPONENT val_software, unsigned short val_i
     SU2_MPI::Error("Vorticity confinement feature currently not supported for incompressible or non-equilibrium model or axisymmetric flows.", CURRENT_FUNCTION);
   }
 
+  /*--- Actuator disk BEM method for propellers feature currently not supported for incompressible or non-equilibrium model or axisymmetric flows. ---*/
+
+  if ((Kind_Solver == MAIN_SOLVER::INC_EULER
+    || Kind_Solver == MAIN_SOLVER::INC_NAVIER_STOKES
+    || Kind_Solver == MAIN_SOLVER::INC_RANS
+    || Kind_Solver == MAIN_SOLVER::NEMO_EULER
+    || Kind_Solver == MAIN_SOLVER::NEMO_NAVIER_STOKES
+    || Axisymmetric)
+    && ActDisk_DoubleSurface) {
+    SU2_MPI::Error("Actuator disk BEM method for propellers feature currently not supported for incompressible or non-equilibrium model or axisymmetric flows.", CURRENT_FUNCTION);
+  }
+
   /*--- Check the coefficients for the polynomial models. ---*/
 
   if (Kind_Solver != MAIN_SOLVER::INC_EULER && Kind_Solver != MAIN_SOLVER::INC_NAVIER_STOKES && Kind_Solver != MAIN_SOLVER::INC_RANS) {
@@ -5682,6 +5710,9 @@ void CConfig::SetMarkers(SU2_COMPONENT val_software) {
   ActDiskOutlet_Force = new su2double[nMarker_ActDiskOutlet] ();
   ActDiskOutlet_Power = new su2double[nMarker_ActDiskOutlet] ();
 
+  ActDiskOutlet_Thrust_BEM = new su2double[nMarker_ActDiskOutlet] ();
+  ActDiskOutlet_Torque_BEM = new su2double[nMarker_ActDiskOutlet] ();
+
   for (iMarker_ActDiskOutlet = 0; iMarker_ActDiskOutlet < nMarker_ActDiskOutlet; iMarker_ActDiskOutlet++) {
     Marker_CfgFile_TagBound[iMarker_CfgFile] = Marker_ActDiskOutlet[iMarker_ActDiskOutlet];
     Marker_CfgFile_KindBC[iMarker_CfgFile] = ACTDISK_OUTLET;
@@ -8091,6 +8122,9 @@ CConfig::~CConfig() {
   delete[] ActDiskOutlet_Force;
   delete[] ActDiskOutlet_Power;
 
+  delete[]  ActDiskOutlet_Thrust_BEM;
+  delete[]  ActDiskOutlet_Torque_BEM;
+
   delete[] Outlet_MassFlow;
   delete[] Outlet_Density;
   delete[] Outlet_Area;
@@ -8660,6 +8694,30 @@ su2double CConfig::GetActDisk_PressJump(const string& val_marker, unsigned short
   return ActDisk_PressJump[iMarker_ActDisk][val_value];
 }
 
+su2double CConfig::GetActDisk_XCG(string val_marker, unsigned short val_value) const {
+  unsigned short iMarker_ActDisk;
+  for (iMarker_ActDisk = 0; iMarker_ActDisk < nMarker_ActDiskInlet; iMarker_ActDisk++)
+    if ((Marker_ActDiskInlet[iMarker_ActDisk] == val_marker) ||
+        (Marker_ActDiskOutlet[iMarker_ActDisk] == val_marker)) break;
+  return ActDisk_XCG[iMarker_ActDisk][val_value];
+}
+
+su2double CConfig::GetActDisk_YCG(string val_marker, unsigned short val_value) const {
+  unsigned short iMarker_ActDisk;
+  for (iMarker_ActDisk = 0; iMarker_ActDisk < nMarker_ActDiskInlet; iMarker_ActDisk++)
+    if ((Marker_ActDiskInlet[iMarker_ActDisk] == val_marker) ||
+        (Marker_ActDiskOutlet[iMarker_ActDisk] == val_marker)) break;
+  return ActDisk_YCG[iMarker_ActDisk][val_value];
+}
+
+su2double CConfig::GetActDisk_ZCG(string val_marker, unsigned short val_value) const {
+  unsigned short iMarker_ActDisk;
+  for (iMarker_ActDisk = 0; iMarker_ActDisk < nMarker_ActDiskInlet; iMarker_ActDisk++)
+    if ((Marker_ActDiskInlet[iMarker_ActDisk] == val_marker) ||
+        (Marker_ActDiskOutlet[iMarker_ActDisk] == val_marker)) break;
+  return ActDisk_ZCG[iMarker_ActDisk][val_value];
+}
+
 su2double CConfig::GetActDisk_TempJump(const string& val_marker, unsigned short val_value) const {
   unsigned short iMarker_ActDisk;
   for (iMarker_ActDisk = 0; iMarker_ActDisk < nMarker_ActDiskInlet; iMarker_ActDisk++)
@@ -9452,6 +9510,20 @@ su2double CConfig::GetActDiskOutlet_Power(const string& val_marker) const {
   return ActDiskOutlet_Power[iMarker_ActDiskOutlet];
 }
 
+su2double CConfig::GetActDiskOutlet_Thrust_BEM(string val_marker) const {
+  unsigned short iMarker_ActDiskOutlet;
+  for (iMarker_ActDiskOutlet = 0; iMarker_ActDiskOutlet < nMarker_ActDiskOutlet; iMarker_ActDiskOutlet++)
+    if (Marker_ActDiskOutlet[iMarker_ActDiskOutlet] == val_marker) break;
+  return ActDiskOutlet_Thrust_BEM[iMarker_ActDiskOutlet];
+}
+
+su2double CConfig::GetActDiskOutlet_Torque_BEM(string val_marker) const {
+  unsigned short iMarker_ActDiskOutlet;
+  for (iMarker_ActDiskOutlet = 0; iMarker_ActDiskOutlet < nMarker_ActDiskOutlet; iMarker_ActDiskOutlet++)
+    if (Marker_ActDiskOutlet[iMarker_ActDiskOutlet] == val_marker) break;
+  return ActDiskOutlet_Torque_BEM[iMarker_ActDiskOutlet];
+}
+
 su2double CConfig::GetActDiskInlet_Temperature(const string& val_marker) const {
   unsigned short iMarker_ActDiskInlet;
   for (iMarker_ActDiskInlet = 0; iMarker_ActDiskInlet < nMarker_ActDiskInlet; iMarker_ActDiskInlet++)