do not assume that deformable markers can be straight

Author: pcarruscag

Common/include/CConfig.hpp

@@ -6559,26 +6559,38 @@ class CConfig {
    * \brief Get the internal index for a moving boundary <i>val_marker</i>.
    * \return Internal index for a moving boundary <i>val_marker</i>.
    */
-  unsigned short GetMarker_Moving(string val_marker) const;
+  unsigned short GetMarker_Moving(const string& val_marker) const;
 
   /*!
-   * \brief Get bool if marker is moving. <i>val_marker</i>.
-   * \param[in] val_marker - String of the marker to test.
-   * \return Bool if the marker is a moving boundary <i>val_marker</i>.
+   * \brief Get a bool for whether a marker is moving. <i>val_marker</i>.
+   * \param[in] val_marker - Name of the marker to test.
+   * \return True if the marker is a moving boundary <i>val_marker</i>.
    */
-  bool GetMarker_Moving_Bool(string val_marker) const;
+  inline bool GetMarker_Moving_Bool(const string& val_marker) const {
+    return GetMarker_Moving(val_marker) < nMarker_Moving;
+  }
 
   /*!
    * \brief Get the internal index for a DEFORM_MESH boundary <i>val_marker</i>.
    * \return Internal index for a DEFORM_MESH boundary <i>val_marker</i>.
    */
-  unsigned short GetMarker_Deform_Mesh(string val_marker) const;
+  unsigned short GetMarker_Deform_Mesh(const string& val_marker) const;
 
   /*!
    * \brief Get the internal index for a DEFORM_MESH_SYM_PLANE boundary <i>val_marker</i>.
    * \return Internal index for a DEFORM_MESH_SYM_PLANE boundary <i>val_marker</i>.
    */
-  unsigned short GetMarker_Deform_Mesh_Sym_Plane(string val_marker) const;
+  unsigned short GetMarker_Deform_Mesh_Sym_Plane(const string& val_marker) const;
+
+  /*!
+   * \brief Get a bool for whether the marker is deformed. <i>val_marker</i>.
+   * \param[in] val_marker - Name of the marker to test.
+   * \return True if the marker is a deforming boundary <i>val_marker</i>.
+   */
+  inline bool GetMarker_Deform_Mesh_Bool(const string& val_marker) const {
+    return GetMarker_Deform_Mesh(val_marker) < nMarker_Deform_Mesh ||
+        GetMarker_Deform_Mesh_Sym_Plane(val_marker) < nMarker_Deform_Mesh_Sym_Plane;
+  }
 
   /*!
    * \brief Get the internal index for a Fluid_Load boundary <i>val_marker</i>.

Common/src/CConfig.cpp

@@ -8676,44 +8676,34 @@ bool CConfig::GetSurface_Movement(unsigned short kind_movement) const {
   return false;
 }
 
-unsigned short CConfig::GetMarker_Moving(string val_marker) const {
-  unsigned short iMarker_Moving;
+unsigned short CConfig::GetMarker_Moving(const string& val_marker) const {
+  unsigned short iMarker;
 
   /*--- Find the marker for this moving boundary. ---*/
-  for (iMarker_Moving = 0; iMarker_Moving < nMarker_Moving; iMarker_Moving++)
-    if (Marker_Moving[iMarker_Moving] == val_marker) break;
+  for (iMarker = 0; iMarker < nMarker_Moving; iMarker++)
+    if (Marker_Moving[iMarker] == val_marker) break;
 
-  return iMarker_Moving;
+  return iMarker;
 }
 
-bool CConfig::GetMarker_Moving_Bool(string val_marker) const {
-  unsigned short iMarker_Moving;
-
-  /*--- Find the marker for this moving boundary, if it exists. ---*/
-  for (iMarker_Moving = 0; iMarker_Moving < nMarker_Moving; iMarker_Moving++)
-    if (Marker_Moving[iMarker_Moving] == val_marker) return true;
-
-  return false;
-}
-
-unsigned short CConfig::GetMarker_Deform_Mesh(string val_marker) const {
-  unsigned short iMarker_Deform_Mesh;
+unsigned short CConfig::GetMarker_Deform_Mesh(const string& val_marker) const {
+  unsigned short iMarker;
 
   /*--- Find the marker for this interface boundary. ---*/
-  for (iMarker_Deform_Mesh = 0; iMarker_Deform_Mesh < nMarker_Deform_Mesh; iMarker_Deform_Mesh++)
-    if (Marker_Deform_Mesh[iMarker_Deform_Mesh] == val_marker) break;
+  for (iMarker = 0; iMarker < nMarker_Deform_Mesh; iMarker++)
+    if (Marker_Deform_Mesh[iMarker] == val_marker) break;
 
-  return iMarker_Deform_Mesh;
+  return iMarker;
 }
 
-unsigned short CConfig::GetMarker_Deform_Mesh_Sym_Plane(string val_marker) const {
-  unsigned short iMarker_Deform_Mesh_Sym_Plane;
+unsigned short CConfig::GetMarker_Deform_Mesh_Sym_Plane(const string& val_marker) const {
+  unsigned short iMarker;
 
   /*--- Find the marker for this interface boundary. ---*/
-  for (iMarker_Deform_Mesh_Sym_Plane = 0; iMarker_Deform_Mesh_Sym_Plane < nMarker_Deform_Mesh_Sym_Plane; iMarker_Deform_Mesh_Sym_Plane++)
-    if (Marker_Deform_Mesh_Sym_Plane[iMarker_Deform_Mesh_Sym_Plane] == val_marker) break;
+  for (iMarker = 0; iMarker < nMarker_Deform_Mesh_Sym_Plane; iMarker++)
+    if (Marker_Deform_Mesh_Sym_Plane[iMarker] == val_marker) break;
 
-  return iMarker_Deform_Mesh_Sym_Plane;
+  return iMarker;
 }
 
 unsigned short CConfig::GetMarker_Fluid_Load(string val_marker) const {

Common/src/geometry/CGeometry.cpp

@@ -2592,7 +2592,8 @@ void CGeometry::ComputeSurf_Straightness(CConfig *config,
           other GridMovements are rigid. ---*/
     if ((config->GetMarker_All_KindBC(iMarker) == SYMMETRY_PLANE ||
          config->GetMarker_All_KindBC(iMarker) == EULER_WALL) &&
-         !config->GetMarker_Moving_Bool(Local_TagBound)) {
+         !config->GetMarker_Moving_Bool(Local_TagBound) &&
+         !config->GetMarker_Deform_Mesh_Bool(Local_TagBound)) {
 
       /*--- Loop over all global markers, and find the local-global pair via
             matching unique string tags. ---*/