One-equation (simplified) LM transition model for SST and SA

.github/workflows/regression.yml

@@ -233,7 +233,7 @@ jobs:
         uses: docker://ghcr.io/su2code/su2/test-su2:260405-0054
         with:
           # -t <Tutorials-branch> -c <Testcases-branch>
-          args: -b ${{github.ref}} -t develop -c develop -s ${{matrix.testscript}}
+          args: -b ${{github.ref}} -t develop -c feature_Trans_SLM -s ${{matrix.testscript}}
       - name: Cleanup
         uses: docker://ghcr.io/su2code/su2/test-su2:260405-0054
         with:
@@ -282,7 +282,7 @@ jobs:
         uses: docker://ghcr.io/su2code/su2/test-su2:260405-0054
         with:
           # -t <Tutorials-branch> -c <Testcases-branch>
-          args: -b ${{github.ref}} -t develop -c develop -s ${{matrix.testscript}} -a "--tapetests"
+          args: -b ${{github.ref}} -t develop -c feature_Trans_SLM -s ${{matrix.testscript}} -a "--tapetests"
       - name: Cleanup
         uses: docker://ghcr.io/su2code/su2/test-su2:260405-0054
         with:
@@ -330,7 +330,7 @@ jobs:
           PMIX_MCA_gds: hash
         with:
           # -t <Tutorials-branch> -c <Testcases-branch>
-          args: -b ${{github.ref}} -t develop -c develop -s ${{matrix.testscript}} -a "--tsan"
+          args: -b ${{github.ref}} -t develop -c feature_Trans_SLM -s ${{matrix.testscript}} -a "--tsan"
       - name: Cleanup
         uses: docker://ghcr.io/su2code/su2/test-su2-tsan:260405-0054
         with:
@@ -375,7 +375,7 @@ jobs:
         uses: docker://ghcr.io/su2code/su2/test-su2-asan:260405-0054
         with:
           # -t <Tutorials-branch> -c <Testcases-branch>
-          args: -b ${{github.ref}} -t develop -c develop -s ${{matrix.testscript}} -a "--asan"
+          args: -b ${{github.ref}} -t develop -c feature_Trans_SLM -s ${{matrix.testscript}} -a "--asan"
       - name: Cleanup
         uses: docker://ghcr.io/su2code/su2/test-su2-asan:260405-0054
         with:

Common/include/geometry/dual_grid/CPoint.hpp

@@ -111,6 +111,7 @@ class CPoint {
   su2activevector Curvature;          /*!< \brief Value of the surface curvature (SU2_GEO). */
   su2activevector MaxLength;          /*!< \brief The maximum cell-center to cell-center length. */
   su2activevector RoughnessHeight;    /*!< \brief Roughness of the nearest wall. */
+  su2activematrix Normals;            /*!< \brief Normal of the nearest wall element. */
 
   su2matrix<AD::Identifier>
       AD_InputIndex; /*!< \brief Indices of Coord variables in the adjoint vector before solver iteration. */
@@ -484,6 +485,27 @@ class CPoint {
   }
   inline void SetWall_Distance(unsigned long iPoint, su2double distance) { Wall_Distance(iPoint) = distance; }
 
+  /*!
+   * \brief Get the index of the closest wall element.
+   * \param[in] iPoint - Index of the point.
+   * \param[out] ClosestWall_Elem - ID of the closest element on a wall boundary.
+   */
+  inline unsigned long GetClosestWall_Elem(unsigned long iPoint) { return ClosestWall_Elem(iPoint); }
+
+  /*!
+   * \brief Get the marker of the closest wall marker.
+   * \param[in] iPoint - Index of the point.
+   * \param[out] ClosestWall_Marker - MarkerID of the closest wall boundary.
+   */
+  inline unsigned long GetClosestWall_Marker(unsigned long iPoint) { return ClosestWall_Marker(iPoint); }
+
+  /*!
+   * \brief Get the rank of the closest wall marker.
+   * \param[in] iPoint - Index of the point.
+   * \param[out] ClosestWall_Rank - RankID of the closest wall boundary.
+   */
+  inline unsigned long GetClosestWall_Rank(unsigned long iPoint) { return ClosestWall_Rank(iPoint); }
+
   /*!
    * \brief Get the value of the distance to the nearest wall.
    * \param[in] iPoint - Index of the point.
@@ -506,6 +528,23 @@ class CPoint {
    */
   inline su2double GetRoughnessHeight(unsigned long iPoint) const { return RoughnessHeight(iPoint); }
 
+  /*!
+   * \brief Set the value of the normal of the nearest wall element.
+   * \param[in] iPoint - Index of the point.
+   * \param[in] normal - Value of the normal.
+   */
+  template <typename Normals_type>
+  inline void SetNormal(unsigned long iPoint, Normals_type const& normal) {
+    for (unsigned long iDim = 0; iDim < nDim; iDim++) Normals(iPoint, iDim) = normal[iDim];
+  }
+
+  /*!
+   * \brief Set the value of the normal of the nearest wall element.
+   * \param[in] iPoint - Index of the point.
+   * \return normal to the normal of the nearest wall element.
+   */
+  inline su2double* GetNormal(unsigned long iPoint) { return Normals[iPoint]; }
+
   /*!
    * \brief Set the value of the distance to a sharp edge.
    * \param[in] iPoint - Index of the point.
@@ -885,4 +924,19 @@ class CPoint {
       }
     }
   }
+
+  /*!
+   * \brief Set wall normal according to stored closest wall information.
+   * \param[in] normals - Mapping [rank][zone][marker][element] -> normal
+   */
+  template <typename Normals_type>
+  void SetWallNormals(Normals_type const& normals) {
+    for (unsigned long iPoint = 0; iPoint < GlobalIndex.size(); ++iPoint) {
+      auto rankID = ClosestWall_Rank[iPoint];
+      auto zoneID = ClosestWall_Zone[iPoint];
+      auto markerID = ClosestWall_Marker[iPoint];
+      auto elementID = ClosestWall_Elem[iPoint];
+      if (rankID >= 0) SetNormal(iPoint, normals[rankID][zoneID][markerID][elementID]);
+    }
+  }
 };

Common/include/option_structure.hpp

@@ -1374,27 +1374,36 @@ static const MapType<std::string, TURB_TRANS_MODEL> Trans_Model_Map = {
  * \brief LM Options
  */
 enum class LM_OPTIONS {
-  NONE,         /*!< \brief No option / default. */
-  LM2015,       /*!< \brief Cross-flow corrections. */
-  MALAN,        /*!< \brief Kind of transition correlation model (Malan). */
-  SULUKSNA,     /*!< \brief Kind of transition correlation model (Suluksna). */
-  KRAUSE,       /*!< \brief Kind of transition correlation model (Krause). */
-  KRAUSE_HYPER, /*!< \brief Kind of transition correlation model (Krause hypersonic). */
-  MEDIDA_BAEDER,/*!< \brief Kind of transition correlation model (Medida-Baeder). */
-  MEDIDA,       /*!< \brief Kind of transition correlation model (Medida). */
-  MENTER_LANGTRY,   /*!< \brief Kind of transition correlation model (Menter-Langtry). */
-  DEFAULT       /*!< \brief Kind of transition correlation model (Menter-Langtry if SST, MALAN if SA). */
+  NONE,           /*!< \brief No option / default. */
+  CROSSFLOW,      /*!< \brief Cross-flow corrections. */
+  SLM,            /*!< \brief Simplified version. */
+  MALAN,          /*!< \brief Kind of transition correlation model (Malan). */
+  SULUKSNA,       /*!< \brief Kind of transition correlation model (Suluksna). */
+  KRAUSE,         /*!< \brief Kind of transition correlation model (Krause). */
+  KRAUSE_HYPER,   /*!< \brief Kind of transition correlation model (Krause hypersonic). */
+  MEDIDA_BAEDER,  /*!< \brief Kind of transition correlation model (Medida-Baeder). */
+  MEDIDA,         /*!< \brief Kind of transition correlation model (Medida). */
+  MENTER_LANGTRY, /*!< \brief Kind of transition correlation model (Menter-Langtry). */
+  MENTER_SLM,     /*!< \brief Kind of transition correlation model (Menter Simplified LM model). */
+  CODER_SLM,      /*!< \brief Kind of transition correlation model (Coder Simplified LM model). */
+  MOD_EPPLER_SLM, /*!< \brief Kind of transition correlation model (Modified Eppler Simplified LM model). */
+  DEFAULT         /*!< \brief Kind of transition correlation model (Menter-Langtry if SST, MALAN if SA). */
 };
 
 static const MapType<std::string, LM_OPTIONS> LM_Options_Map = {
   MakePair("NONE", LM_OPTIONS::NONE)
-  MakePair("LM2015", LM_OPTIONS::LM2015)
+  MakePair("CROSSFLOW", LM_OPTIONS::CROSSFLOW)
+  MakePair("LM2015", LM_OPTIONS::CROSSFLOW)  // name of the option before the one-equation model was added
+  MakePair("SLM", LM_OPTIONS::SLM)
   MakePair("MALAN", LM_OPTIONS::MALAN)
   MakePair("SULUKSNA", LM_OPTIONS::SULUKSNA)
   MakePair("KRAUSE", LM_OPTIONS::KRAUSE)
   MakePair("KRAUSE_HYPER", LM_OPTIONS::KRAUSE_HYPER)
   MakePair("MEDIDA_BAEDER", LM_OPTIONS::MEDIDA_BAEDER)
   MakePair("MENTER_LANGTRY", LM_OPTIONS::MENTER_LANGTRY)
+  MakePair("MENTER_SLM", LM_OPTIONS::MENTER_SLM)
+  MakePair("CODER_SLM", LM_OPTIONS::CODER_SLM)
+  MakePair("MOD_EPPLER_SLM", LM_OPTIONS::MOD_EPPLER_SLM)
   MakePair("DEFAULT", LM_OPTIONS::DEFAULT)
 };
 
@@ -1412,13 +1421,34 @@ enum class TURB_TRANS_CORRELATION {
   DEFAULT       /*!< \brief Kind of transition correlation model (Menter-Langtry if SST, MALAN if SA). */
 };
 
+/*!
+ * \brief Types of transition correlations for Simplified LM model
+ */
+enum class TURB_TRANS_CORRELATION_SLM {
+  MENTER_SLM,        /*!< \brief Kind of transition correlation model (Menter Simplified LM model). */
+  CODER_SLM,        /*!< \brief Kind of transition correlation model (Coder Simplified LM model). */
+  MOD_EPPLER_SLM,        /*!< \brief Kind of transition correlation model (Modified Eppler Simplified LM model). */
+  DEFAULT       /*!< \brief Kind of transition correlation model. */
+};
+
+/*!
+ * \brief Lower limit of the roughness height (HROUGHNESS, same units) in the cross-flow corrections of the LM models,
+ *        where it enters a logarithm (Langtry et al., log(h/theta_t)) or a ratio (Vallinayagam Pillai and Lardeau,
+ *        h/h0). The papers give no calibration limit for small heights, so a small value keeps these terms finite
+ *        for smooth surfaces (h = 0). h and theta_t are both in mesh length units (the reference length of the
+ *        non-dimensionalization is 1), so log(h/theta_t) is consistent for any REF_DIMENSIONALIZATION.
+ */
+constexpr double LM_CROSSFLOW_MIN_ROUGHNESS = 1e-8;
+
 /*!
  * \brief Structure containing parsed LM options.
  */
 struct LM_ParsedOptions {
   LM_OPTIONS version = LM_OPTIONS::NONE;  /*!< \brief LM base model. */
-  bool LM2015 = false;                    /*!< \brief Use cross-flow corrections. */
+  bool SLM = false;                       /*!< \brief Use simplified version. */
+  bool CrossFlow = false;                    /*!< \brief Use cross-flow corrections. */
   TURB_TRANS_CORRELATION Correlation = TURB_TRANS_CORRELATION::DEFAULT;
+  TURB_TRANS_CORRELATION_SLM Correlation_SLM = TURB_TRANS_CORRELATION_SLM::DEFAULT;
 };
 
 /*!
@@ -1436,7 +1466,9 @@ inline LM_ParsedOptions ParseLMOptions(const LM_OPTIONS *LM_Options, unsigned sh
     return std::find(LM_Options, lm_options_end, option) != lm_options_end;
   };
 
-  LMParsedOptions.LM2015 = IsPresent(LM_OPTIONS::LM2015);
+  LMParsedOptions.SLM = IsPresent(LM_OPTIONS::SLM);
+
+  LMParsedOptions.CrossFlow = IsPresent(LM_OPTIONS::CROSSFLOW);
 
   int NFoundCorrelations = 0;
   if (IsPresent(LM_OPTIONS::MALAN)) {
@@ -1468,10 +1500,28 @@ inline LM_ParsedOptions ParseLMOptions(const LM_OPTIONS *LM_Options, unsigned sh
     NFoundCorrelations++;
   }
 
+  int NFoundCorrelations_SLM = 0;
+  if (IsPresent(LM_OPTIONS::MENTER_SLM)) {
+    LMParsedOptions.Correlation_SLM = TURB_TRANS_CORRELATION_SLM::MENTER_SLM;
+    NFoundCorrelations_SLM++;
+  }
+  if (IsPresent(LM_OPTIONS::CODER_SLM)) {
+    LMParsedOptions.Correlation_SLM = TURB_TRANS_CORRELATION_SLM::CODER_SLM;
+    NFoundCorrelations_SLM++;
+  }
+  if (IsPresent(LM_OPTIONS::MOD_EPPLER_SLM)) {
+    LMParsedOptions.Correlation_SLM = TURB_TRANS_CORRELATION_SLM::MOD_EPPLER_SLM;
+    NFoundCorrelations_SLM++;
+  }
+
   if (NFoundCorrelations > 1) {
     SU2_MPI::Error("Two correlations selected for LM_OPTIONS. Please choose only one.", CURRENT_FUNCTION);
   }
 
+  if (NFoundCorrelations_SLM > 1) {
+    SU2_MPI::Error("Two SLM correlations selected for LM_OPTIONS. Please choose only one.", CURRENT_FUNCTION);
+  }
+
   if (LMParsedOptions.Correlation == TURB_TRANS_CORRELATION::DEFAULT){
     if (Kind_Turb_Model == TURB_MODEL::SST) {
       LMParsedOptions.Correlation = TURB_TRANS_CORRELATION::MENTER_LANGTRY;
@@ -1480,6 +1530,10 @@ inline LM_ParsedOptions ParseLMOptions(const LM_OPTIONS *LM_Options, unsigned sh
     }
   }
 
+  if (LMParsedOptions.Correlation_SLM == TURB_TRANS_CORRELATION_SLM::DEFAULT){
+    LMParsedOptions.Correlation_SLM = TURB_TRANS_CORRELATION_SLM::MENTER_SLM;
+  }
+
   return LMParsedOptions;
 }