Fix fixed CL mode when sideslip is not 0

Common/src/grid_movement/CVolumetricMovement.cpp

@@ -356,68 +356,8 @@ void CVolumetricMovement::ComputenNonconvexElements(CGeometry *geometry, bool Sc
         nNonconvexElements++;
       }
     }
-  } else if (false) {
-
-    /*--- 3D elements ---*/
-    unsigned short iNode, iFace, nFaceNodes;
-
-    for (iElem = 0; iElem < geometry->GetnElem(); iElem++){
-      for (iFace = 0; iFace < geometry->elem[iElem]->GetnFaces(); iFace++){
-        nFaceNodes = geometry->elem[iElem]->GetnNodesFace(iFace);
-
-        su2double minCrossProductLength = 1.e6, maxCrossProductLength = -1.e6;
-        for (iNode = 0; iNode < nFaceNodes; iNode++) {
-          su2double crossProductLength = 0.0;
-
-          /*--- Get coords of node face_point_i and its adjacent nodes in the face ---*/
-          unsigned long face_point_i, face_point_j, face_point_k;
-
-          face_point_i = geometry->elem[iElem]->GetNode(geometry->elem[iElem]->GetFaces(iFace, iNode));
-
-          /// TODO: Faces may have up to 4 nodes, not all posibilities are covered
-
-          if (iNode == 0) {
-            face_point_j = geometry->elem[iElem]->GetNode(geometry->elem[iElem]->GetFaces(iFace, nFaceNodes-1));
-            face_point_k = geometry->elem[iElem]->GetNode(geometry->elem[iElem]->GetFaces(iFace, iNode+1));
-          } else if (iNode == nFaceNodes-1) {
-            face_point_j = geometry->elem[iElem]->GetNode(geometry->elem[iElem]->GetFaces(iFace, iNode-1));
-            face_point_k = geometry->elem[iElem]->GetNode(geometry->elem[iElem]->GetFaces(iFace, 0));
-          }
-
-          const auto Coords_i = geometry->nodes->GetCoord(face_point_i);
-          const auto Coords_j = geometry->nodes->GetCoord(face_point_j);
-          const auto Coords_k = geometry->nodes->GetCoord(face_point_k);
-
-          /*--- Get edge vectors from point k to i and point j to i ---*/
-          su2double edgeVector_i[3], edgeVector_j[3];
-          GeometryToolbox::Distance(nDim, Coords_k, Coords_i, edgeVector_i);
-          GeometryToolbox::Distance(nDim, Coords_j, Coords_i, edgeVector_j);
-
-          /*--- Calculate cross product of edge vectors and its length---*/
-          su2double crossProduct[3];
-          GeometryToolbox::CrossProduct(edgeVector_i, edgeVector_j, crossProduct);
-
-          /// TODO: This logic is incorrect, the norm will never be less than 0
-
-          crossProductLength = GeometryToolbox::Norm(nDim, crossProduct);
-
-          /*--- Check if length is minimum or maximum ---*/
-          if (crossProductLength < minCrossProductLength) {
-            minCrossProductLength = crossProductLength;
-          } else if (crossProductLength > maxCrossProductLength) {
-            maxCrossProductLength = crossProductLength;
-          }
-        }
-
-      /*--- If minimum cross product length is smaller than 0,
-      face (and therefore element) is not convex ---*/
-      if (minCrossProductLength < 0) {
-        nNonconvexElements++;
-        break;
-      }
-
-      }
-    }
+  } else if (rank == MASTER_NODE) {
+    cout << "\nWARNING: Convexity is not checked for 3D elements (issue #1171).\n" << endl;
   }
 
   unsigned long nNonconvexElements_Local = nNonconvexElements; nNonconvexElements = 0;

SU2_CFD/include/output/CAdjFlowCompOutput.hpp

@@ -97,6 +97,6 @@ class CAdjFlowCompOutput final: public COutput {
    * \param[in] config - Definition of the particular problem.
    * \return <TRUE> if the residuals should be initialized.
    */
-  bool SetInit_Residuals(CConfig *config) override;
+  bool SetInit_Residuals(const CConfig *config) override;
 
 };

SU2_CFD/include/output/CAdjFlowIncOutput.hpp

@@ -100,6 +100,6 @@ class CAdjFlowIncOutput final: public COutput {
    * \param[in] config - Definition of the particular problem.
    * \return <TRUE> if the residuals should be initialized.
    */
-  bool SetInit_Residuals(CConfig *config) override;
+  bool SetInit_Residuals(const CConfig *config) override;
 
 };

SU2_CFD/include/output/CElasticityOutput.hpp

@@ -87,6 +87,6 @@ class CElasticityOutput final: public COutput {
    * \param[in] config - Definition of the particular problem.
    * \return <TRUE> if the residuals should be initialized.
    */
-  bool SetInit_Residuals(CConfig *config) override;
+  bool SetInit_Residuals(const CConfig *config) override;
 
 };

SU2_CFD/include/output/CFlowCompFEMOutput.hpp

@@ -101,6 +101,6 @@ class CFlowCompFEMOutput final: public CFlowOutput {
    * \param[in] config - Definition of the particular problem.
    * \return <TRUE> if the residuals should be initialized.
    */
-  bool SetInit_Residuals(CConfig *config) override;
+  bool SetInit_Residuals(const CConfig *config) override;
 
 };

SU2_CFD/include/output/CFlowCompOutput.hpp

@@ -40,7 +40,6 @@ class CFlowCompOutput final: public CFlowOutput {
 private:
 
   unsigned short turb_model; //!< Kind of turbulence model
-  unsigned long lastInnerIter;
 
 public:
 
@@ -50,12 +49,6 @@ class CFlowCompOutput final: public CFlowOutput {
    */
   CFlowCompOutput(CConfig *config, unsigned short nDim);
 
-  /*!
-   * \brief Destructor of the class.
-   */
-  ~CFlowCompOutput(void) override;
-
-
   /*!
    * \brief Load the history output field values
    * \param[in] config - Definition of the particular problem.
@@ -100,23 +93,17 @@ class CFlowCompOutput final: public CFlowOutput {
    * \param[in] config - Definition of the particular problem.
    * \return <TRUE> if the residuals should be initialized.
    */
-  bool SetInit_Residuals(CConfig *config) override;
+  bool SetInit_Residuals(const CConfig *config) override;
 
   /*!
    * \brief Write any additional output defined for the current solver.
    * \param[in] config - Definition of the particular problem per zone.
    */
-  void SetAdditionalScreenOutput(CConfig *config) override;
-
-  /*!
-   * \brief Write additional output for fixed CL mode.
-   * \param[in] config - Definition of the particular problem per zone.
-   */
-  void SetFixedCLScreenOutput(CConfig *config);
+  void SetAdditionalScreenOutput(const CConfig *config) override;
 
   /*!
    * \brief Determines if the history file output.
    * \param[in] config - Definition of the particular problem.
    */
-  bool WriteHistoryFile_Output(CConfig *config) override;
+  bool WriteHistoryFile_Output(const CConfig *config) override;
 };

SU2_CFD/include/output/CFlowIncOutput.hpp

@@ -102,6 +102,6 @@ class CFlowIncOutput final: public CFlowOutput {
    * \param[in] config - Definition of the particular problem.
    * \return <TRUE> if the residuals should be initialized.
    */
-  bool SetInit_Residuals(CConfig *config) override;
+  bool SetInit_Residuals(const CConfig *config) override;
 
 };

SU2_CFD/include/output/CFlowOutput.hpp

@@ -31,19 +31,15 @@
 #include "../variables/CVariable.hpp"
 
 class CFlowOutput : public CFVMOutput{
-public:
+protected:
+  unsigned long lastInnerIter;
+
   /*!
    * \brief Constructor of the class
    * \param[in] config - Definition of the particular problem.
    */
   CFlowOutput(CConfig *config, unsigned short nDim, bool femOutput);
 
-  /*!
-   * \brief Destructor of the class.
-   */
-  ~CFlowOutput(void) override;
-
-protected:
   /*!
    * \brief Add flow surface output fields
    * \param[in] config - Definition of the particular problem.
@@ -104,7 +100,7 @@ class CFlowOutput : public CFVMOutput{
    * \brief Write information to meta data file
    * \param[in] config - Definition of the particular problem per zone.
    */
-  void WriteMetaData(CConfig *config);
+  void WriteMetaData(const CConfig *config);
 
   /*!
    * \brief Write any additional files defined for the current solver.
@@ -142,4 +138,10 @@ class CFlowOutput : public CFVMOutput{
    */
   void LoadTimeAveragedData(unsigned long iPoint, CVariable *node_flow);
 
+  /*!
+   * \brief Write additional output for fixed CL mode.
+   * \param[in] config - Definition of the particular problem per zone.
+   */
+  void SetFixedCLScreenOutput(const CConfig *config);
+
 };

SU2_CFD/include/output/CMultizoneOutput.hpp

@@ -86,17 +86,17 @@ class CMultizoneOutput final: public COutput {
    * \brief Determines if the history file output.
    * \param[in] config - Definition of the particular problem.
    */
-  bool WriteHistoryFile_Output(CConfig *config) override;
+  bool WriteHistoryFile_Output(const CConfig *config) override;
 
   /*!
    * \brief Determines if the screen header should be written.
    * \param[in] config - Definition of the particular problem.
    */
-  bool WriteScreen_Header(CConfig *config) override;
+  bool WriteScreen_Header(const CConfig *config) override;
 
   /*!
    * \brief Determines if the screen header should be written.
    * \param[in] config - Definition of the particular problem.
    */
-  bool WriteScreen_Output(CConfig *config) override;
+  bool WriteScreen_Output(const CConfig *config) override;
 };

SU2_CFD/include/output/CNEMOCompOutput.hpp

@@ -41,8 +41,6 @@ class CNEMOCompOutput final: public CFlowOutput {
   unsigned short turb_model, /*!< \brief Kind of turbulence model */
                  iSpecies,   /*!< \brief Species index */
                  nSpecies;   /*!< \brief Number of species */
-  unsigned long lastInnerIter;
-
 public:
 
   /*!
@@ -51,12 +49,6 @@ class CNEMOCompOutput final: public CFlowOutput {
    */
   CNEMOCompOutput(CConfig *config, unsigned short nDim);
 
-  /*!
-   * \brief Destructor of the class.
-   */
-  ~CNEMOCompOutput(void) override;
-
-
   /*!
    * \brief Load the history output field values
    * \param[in] config - Definition of the particular problem.
@@ -101,23 +93,17 @@ class CNEMOCompOutput final: public CFlowOutput {
    * \param[in] config - Definition of the particular problem.
    * \return <TRUE> if the residuals should be initialized.
    */
-  bool SetInit_Residuals(CConfig *config) override;
+  bool SetInit_Residuals(const CConfig *config) override;
 
   /*!
    * \brief Write any additional output defined for the current solver.
    * \param[in] config - Definition of the particular problem per zone.
    */
-  void SetAdditionalScreenOutput(CConfig *config) override;
-
-  /*!
-   * \brief Write additional output for fixed CL mode.
-   * \param[in] config - Definition of the particular problem per zone.
-   */
-  void SetFixedCLScreenOutput(CConfig *config);
+  void SetAdditionalScreenOutput(const CConfig *config) override;
 
   /*!
    * \brief Determines if the history file output.
    * \param[in] config - Definition of the particular problem.
    */
-  bool WriteHistoryFile_Output(CConfig *config) override;
+  bool WriteHistoryFile_Output(const CConfig *config) override;
 };

SU2_CFD/include/output/COutput.hpp

@@ -490,26 +490,25 @@ class COutput {
    * \brief Set the history file header
    * \param[in] config - Definition of the particular problem.
    */
-  void SetHistoryFile_Header(CConfig *config);
+  void SetHistoryFile_Header(const CConfig *config);
 
   /*!
    * \brief Write the history file output
    * \param[in] config - Definition of the particular problem.
    */
-  void SetHistoryFile_Output(CConfig *config);
+  void SetHistoryFile_Output(const CConfig *config);
 
   /*!
    * \brief Write the screen header.
    * \param[in] config - Definition of the particular problem.
    */
-  void SetScreen_Header(CConfig *config);
-
+  void SetScreen_Header(const CConfig *config);
 
   /*!
    * \brief Write the screen output.
    * \param[in] config - Definition of the particular problem.
    */
-  void SetScreen_Output(CConfig *config);
+  void SetScreen_Output(const CConfig *config);
 
   /*!
    * \brief Add a new field to the history output.
@@ -691,19 +690,19 @@ class COutput {
    * \brief Determines if the history file output.
    * \param[in] config - Definition of the particular problem.
    */
-  virtual bool WriteHistoryFile_Output(CConfig *config);
+  virtual bool WriteHistoryFile_Output(const CConfig *config);
 
   /*!
    * \brief Determines if the screen header should be written.
    * \param[in] config - Definition of the particular problem.
    */
-  virtual bool WriteScreen_Header(CConfig *config);
+  virtual bool WriteScreen_Header(const CConfig *config);
 
   /*!
    * \brief Determines if the screen header should be written.
    * \param[in] config - Definition of the particular problem.
    */
-  virtual bool WriteScreen_Output(CConfig *config);
+  virtual bool WriteScreen_Output(const CConfig *config);
 
   /*!
    * \brief Determines if the the volume output should be written.
@@ -739,7 +738,7 @@ class COutput {
    * \param[in] config - Definition of the particular problem.
    * \return <TRUE> if the residuals should be initialized.
    */
-  inline virtual bool SetInit_Residuals(CConfig *config) {return false;}
+  inline virtual bool SetInit_Residuals(const CConfig *config) {return false;}
 
   /*!
    * \brief Set the values of the volume output fields for a surface point.
@@ -798,6 +797,6 @@ class COutput {
    * \brief Write any additional output defined for the current solver.
    * \param[in] config - Definition of the particular problem per zone.
    */
-  inline virtual void SetAdditionalScreenOutput(CConfig *config){}
+  inline virtual void SetAdditionalScreenOutput(const CConfig *config){}
 
 };

SU2_CFD/src/output/CAdjFlowCompOutput.cpp

@@ -460,7 +460,7 @@ void CAdjFlowCompOutput::LoadSurfaceData(CConfig *config, CGeometry *geometry, C
 }
 
 
-bool CAdjFlowCompOutput::SetInit_Residuals(CConfig *config){
+bool CAdjFlowCompOutput::SetInit_Residuals(const CConfig *config){
 
   return ((config->GetTime_Marching() != TIME_MARCHING::STEADY) && (curInnerIter == 0)) ||
          ((config->GetTime_Marching() == TIME_MARCHING::STEADY) && (curInnerIter < 2));

SU2_CFD/src/output/CAdjFlowIncOutput.cpp

@@ -524,7 +524,7 @@ void CAdjFlowIncOutput::LoadSurfaceData(CConfig *config, CGeometry *geometry, CS
 }
 
 
-bool CAdjFlowIncOutput::SetInit_Residuals(CConfig *config){
+bool CAdjFlowIncOutput::SetInit_Residuals(const CConfig *config){
 
   return (config->GetTime_Marching() != TIME_MARCHING::STEADY && (curInnerIter == 0))||
          (config->GetTime_Marching() == TIME_MARCHING::STEADY && (curTimeIter < 2));

SU2_CFD/src/output/CElasticityOutput.cpp

@@ -265,7 +265,7 @@ void CElasticityOutput::SetVolumeOutputFields(CConfig *config){
   }
 }
 
-bool CElasticityOutput::SetInit_Residuals(CConfig *config){
+bool CElasticityOutput::SetInit_Residuals(const CConfig *config){
 
   return (config->GetTime_Domain() == NO && (curInnerIter  == 0));
 

SU2_CFD/src/output/CFlowCompFEMOutput.cpp

@@ -272,7 +272,7 @@ void CFlowCompFEMOutput::LoadHistoryData(CConfig *config, CGeometry *geometry, C
 
 }
 
-bool CFlowCompFEMOutput::SetInit_Residuals(CConfig *config){
+bool CFlowCompFEMOutput::SetInit_Residuals(const CConfig *config){
 
   return (config->GetTime_Marching() != TIME_MARCHING::STEADY && (curInnerIter == 0))||
          (config->GetTime_Marching() == TIME_MARCHING::STEADY && (curTimeIter < 2));