Merge remote-tracking branch 'upstream/develop' into move_fem_files

Author: pcarruscag

Common/include/CConfig.hpp

@@ -1322,13 +1322,13 @@ class CConfig {
   * \brief Print the header to screen
   * \param val_software - Kind of software component
   */
-  void SetHeader(unsigned short val_software);
+  void SetHeader(unsigned short val_software) const;
 
   /*!
    * \brief Get the MPI communicator of SU2.
    * \return MPI communicator of SU2.
    */
-  SU2_MPI::Comm GetMPICommunicator();
+  SU2_MPI::Comm GetMPICommunicator() const;
 
   /*!
    * \brief Set the MPI communicator for SU2.
@@ -3937,7 +3937,7 @@ class CConfig {
    * \brief Get flag for whether a second gradient calculation is required for upwind reconstruction alone.
    * \return <code>TRUE</code> means that a second gradient will be calculated for upwind reconstruction.
    */
-  bool GetReconstructionGradientRequired(void) { return ReconstructionGradientRequired; }
+  bool GetReconstructionGradientRequired(void) const { return ReconstructionGradientRequired; }
 
   /*!
    * \brief Get flag for whether a least-squares gradient method is being applied.
@@ -5403,13 +5403,13 @@ class CConfig {
    * \brief Append the zone index to the restart or the solution files.
    * \return Name of the restart file for the flow variables.
    */
-  string GetMultizone_FileName(string val_filename, int val_iZone, string ext);
+  string GetMultizone_FileName(string val_filename, int val_iZone, string ext) const;
 
   /*!
    * \brief Append the zone index to the restart or the solution files.
    * \return Name of the restart file for the flow variables.
    */
-  string GetMultizone_HistoryFileName(string val_filename, int val_iZone, string ext);
+  string GetMultizone_HistoryFileName(string val_filename, int val_iZone, string ext) const;
 
   /*!
    * \brief Append the instance index to the restart or the solution files.
@@ -5483,7 +5483,7 @@ class CConfig {
    * \param[in] val_iter - Unsteady iteration number or time instance.
    * \return Name of the file with the iteration number for an unsteady solution file.
    */
-  string GetUnsteady_FileName(string val_filename, int val_iter, string ext);
+  string GetUnsteady_FileName(string val_filename, int val_iter, string ext) const;
 
   /*!
    * \brief Append the input filename string with the appropriate objective function extension.
@@ -5688,7 +5688,7 @@ class CConfig {
    * \param[in] val - new value of the origin
    * \return The mesh motion origin.
    */
-  void SetMotion_Origin(su2double* val) { for (int iDim = 0; iDim < 3; iDim++) Motion_Origin[iDim] = val[iDim]; }
+  void SetMotion_Origin(const su2double* val) { for (int iDim = 0; iDim < 3; iDim++) Motion_Origin[iDim] = val[iDim]; }
 
   /*!
    * \brief Get the mesh motion origin.
@@ -5703,7 +5703,7 @@ class CConfig {
    * \param[in] val - new value of the origin
    * \param[in] iMarkerMoving -  Index of the moving marker (as specified in Marker_Moving)
    */
-  void SetMarkerMotion_Origin(su2double* val, unsigned short iMarkerMoving) {
+  void SetMarkerMotion_Origin(const su2double* val, unsigned short iMarkerMoving) {
     for (int iDim = 0; iDim < 3; iDim++) MarkerMotion_Origin[3*iMarkerMoving + iDim] = val[iDim];
   }
 
@@ -8338,7 +8338,7 @@ class CConfig {
    * \brief Get the current number of non-physical reconstructions for 2nd-order upwinding.
    * \return Current number of non-physical reconstructions for 2nd-order upwinding.
    */
-  unsigned long GetNonphysical_Reconstr(void) { return Nonphys_Reconstr; }
+  unsigned long GetNonphysical_Reconstr(void) const { return Nonphys_Reconstr; }
 
   /*!
    * \brief Given arrays x[1..n] and y[1..n] containing a tabulated function, i.e., yi = f(xi), with
@@ -8401,7 +8401,7 @@ class CConfig {
    *
    * \brief Set freestream turbonormal for initializing solution.
    */
-  void SetFreeStreamTurboNormal(su2double* turboNormal);
+  void SetFreeStreamTurboNormal(const su2double* turboNormal);
 
   /*!
    *

Common/include/fem/fem_gauss_jacobi_quadrature.hpp

@@ -164,14 +164,14 @@ class CGaussJacobiQuadrature {
    * \brief Function in the original implementation of John Burkardt to compute
             the integration points of the Gauss-Jacobi quadrature rule.
    */
-  void scqf(int nt, passivedouble t[], int mlt[], passivedouble wts[], int nwts, int ndx[],
+  void scqf(int nt, const passivedouble t[], const int mlt[], const passivedouble wts[], int nwts, int ndx[],
             passivedouble swts[], passivedouble st[], int kind, passivedouble alpha,
             passivedouble beta, passivedouble a, passivedouble b);
 
   /*!
    * \brief Function in the original implementation of John Burkardt to compute
             the integration points of the Gauss-Jacobi quadrature rule.
    */
-  void sgqf(int nt, passivedouble aj[], passivedouble bj[], passivedouble zemu, passivedouble t[],
+  void sgqf(int nt, const passivedouble aj[], passivedouble bj[], passivedouble zemu, passivedouble t[],
             passivedouble wts[]);
 };

Common/include/fem/fem_geometry_structure.hpp

@@ -532,13 +532,13 @@ class CMeshFEM: public CGeometry {
   * \brief Function, which makes available the number of owned volume elements in the local FEM mesh.
   * \return  Number of owned volume elements of the local FEM mesh.
   */
-  inline unsigned long GetNVolElemOwned(void) {return nVolElemOwned;}
+  inline unsigned long GetNVolElemOwned(void) const {return nVolElemOwned;}
 
   /*!
   * \brief Function, which makes available the total number of volume elements in the local FEM mesh.
   * \return  Total number of volume elements of the local FEM mesh.
   */
-  inline unsigned long GetNVolElemTot(void) {return nVolElemTot;}
+  inline unsigned long GetNVolElemTot(void) const {return nVolElemTot;}
 
   /*!
   * \brief Function, which makes available the volume elements in the local FEM mesh.

Common/include/fem/fem_standard_element.hpp

@@ -119,7 +119,7 @@ class CFEMStandardElementBase {
   * \brief Function, which makes available the polynomial order that must be integrated exactly.
   * \return  The polynomial order that must be integrated exactly.
   */
-  inline unsigned short GetOrderExact(void){return orderExact;}
+  inline unsigned short GetOrderExact(void) const {return orderExact;}
 
   /*!
   * \brief Static function, which computes the inverse of the given square matrix.
@@ -698,7 +698,7 @@ class CFEMStandardElementBase {
   * \return                   The value of the viscous penalty parameter.
   */
   su2double ViscousPenaltyParameter(const unsigned short VTK_TypeElem,
-                                    const unsigned short nPolyElem);
+                                    const unsigned short nPolyElem) const;
 private:
   /*!
   * \brief Function, which determines the 1D Gauss Legendre integration points and weights.
@@ -1117,7 +1117,7 @@ class CFEMStandardElement : public CFEMStandardElementBase {
                                unsigned short         vert0,
                                unsigned short         vert1,
                                unsigned short         vert2,
-                               unsigned short         vert3);
+                               unsigned short         vert3) const;
 
   /*!
   * \brief Function, which changes the given triangular connectivity, such that the direction coincides
@@ -1130,7 +1130,7 @@ class CFEMStandardElement : public CFEMStandardElementBase {
   void ChangeDirectionTriangleConn(vector<unsigned short> &connTriangle,
                                    unsigned short         vert0,
                                    unsigned short         vert1,
-                                   unsigned short         vert2);
+                                   unsigned short         vert2) const;
 
   /*!
   * \brief Function, which copies the data of the given object into the current object.

Common/include/geometry/CGeometry.hpp

@@ -295,7 +295,7 @@ class CGeometry {
    * \param[in] commType - Enumerated type for the quantity to be communicated.
    * \param[in] val_reverse  - Boolean controlling forward or reverse communication between neighbors.
    */
-  void PostP2PRecvs(CGeometry *geometry, CConfig *config, unsigned short commType, bool val_reverse);
+  void PostP2PRecvs(CGeometry *geometry, CConfig *config, unsigned short commType, bool val_reverse) const;
 
   /*!
    * \brief Routine to launch a single non-blocking send once the buffer is loaded for a point-to-point commucation.
@@ -306,7 +306,7 @@ class CGeometry {
    * \param[in] val_iMessage - Index of the message in the order they are stored.
    * \param[in] val_reverse  - Boolean controlling forward or reverse communication between neighbors.
    */
-  void PostP2PSends(CGeometry *geometry, CConfig *config, unsigned short commType, int val_iMessage, bool val_reverse);
+  void PostP2PSends(CGeometry *geometry, CConfig *config, unsigned short commType, int val_iMessage, bool val_reverse) const;
 
   /*!
    * \brief Routine to set up persistent data structures for periodic communications.
@@ -338,7 +338,7 @@ class CGeometry {
    * \param[in] commType     - Enumerated type for the quantity to be communicated.
    * \param[in] val_iMessage - Index of the message in the order they are stored.
    */
-  void PostPeriodicSends(CGeometry *geometry, CConfig *config, unsigned short commType, int val_iMessage);
+  void PostPeriodicSends(CGeometry *geometry, CConfig *config, unsigned short commType, int val_iMessage) const;
 
   /*!
    * \brief Routine to load a geometric quantity into the data structures for MPI point-to-point communication and to
@@ -347,7 +347,7 @@ class CGeometry {
    * \param[in] config   - Definition of the particular problem.
    * \param[in] commType - Enumerated type for the quantity to be communicated.
    */
-  void InitiateComms(CGeometry *geometry, CConfig *config, unsigned short commType);
+  void InitiateComms(CGeometry *geometry, CConfig *config, unsigned short commType) const;
 
   /*!
    * \brief Routine to complete the set of non-blocking communications launched by InitiateComms() and unpacking of the data into the geometry class.
@@ -473,15 +473,15 @@ class CGeometry {
    * \param[in] second_point - Second point of the edge.
    * \return Index of the edge.
    */
-  long FindEdge(unsigned long first_point, unsigned long second_point);
+  long FindEdge(unsigned long first_point, unsigned long second_point) const;
 
   /*!
    * \brief Get the edge index from using the nodes of the edge.
    * \param[in] first_point - First point of the edge.
    * \param[in] second_point - Second point of the edge.
    * \return Index of the edge.
    */
-  bool CheckEdge(unsigned long first_point, unsigned long second_point);
+  bool CheckEdge(unsigned long first_point, unsigned long second_point) const;
 
   /*!
    * \brief Get the distance between a plane (defined by three point) and a point.
@@ -491,12 +491,12 @@ class CGeometry {
    * \param[in] kCoord - Coordinates of the third point that defines the plane.
    * \return Signed distance.
    */
-  su2double Point2Plane_Distance(su2double *Coord, su2double *iCoord, su2double *jCoord, su2double *kCoord);
+  su2double Point2Plane_Distance(const su2double *Coord, const su2double *iCoord, const su2double *jCoord, const su2double *kCoord);
 
   /*!
    * \brief Create a file for testing the geometry.
    */
-  void TestGeometry(void);
+  void TestGeometry(void) const;
 
   /*!
    * \brief A virtual member.
@@ -919,7 +919,7 @@ class CGeometry {
                               su2double MinXCoord, su2double MaxXCoord,
                               su2double MinYCoord, su2double MaxYCoord,
                               su2double MinZCoord, su2double MaxZCoord,
-                              su2double *FlowVariable,
+                              const su2double *FlowVariable,
                               vector<su2double> &Xcoord_Airfoil, vector<su2double> &Ycoord_Airfoil,
                               vector<su2double> &Zcoord_Airfoil, vector<su2double> &Variable_Airfoil,
                               bool original_surface, CConfig *config);
@@ -1219,38 +1219,38 @@ class CGeometry {
    * \param[in] Intersection - Definition of the particular problem.
    * \return If the intersection has has been successful.
    */
-  bool SegmentIntersectsPlane(su2double *Segment_P0, su2double *Segment_P1, su2double Variable_P0, su2double Variable_P1,
-                              su2double *Plane_P0, su2double *Plane_Normal, su2double *Intersection, su2double &Variable_Interp);
+  bool SegmentIntersectsPlane(const su2double *Segment_P0, const su2double *Segment_P1, su2double Variable_P0, su2double Variable_P1,
+                              const su2double *Plane_P0, const su2double *Plane_Normal, su2double *Intersection, su2double &Variable_Interp);
 
   /*!
    * \brief Ray Intersects Triangle (Moller and Trumbore algorithm)
    */
-  bool RayIntersectsTriangle(su2double orig[3], su2double dir[3],
-  su2double vert0[3], su2double vert1[3], su2double vert2[3],
+  bool RayIntersectsTriangle(const su2double orig[3], const su2double dir[3],
+  const su2double vert0[3], const su2double vert1[3], const su2double vert2[3],
   su2double *intersect);
 
   /*!
    * \brief Segment Intersects Triangle
    */
-  bool SegmentIntersectsTriangle(su2double point0[3], su2double point1[3],
+  bool SegmentIntersectsTriangle(su2double point0[3], const su2double point1[3],
   su2double vert0[3], su2double vert1[3], su2double vert2[3]);
 
   /*!
    * \brief Segment Intersects Line (for 2D FFD Intersection)
    */
-  bool SegmentIntersectsLine(su2double point0[2], su2double point1[2], su2double vert0[2], su2double vert1[2]);
+  bool SegmentIntersectsLine(const su2double point0[2], const su2double point1[2], const su2double vert0[2], const su2double vert1[2]);
 
   /*!
    * \brief Register the coordinates of the mesh nodes.
    * \param[in] config
    */
-  void RegisterCoordinates(CConfig *config);
+  void RegisterCoordinates(CConfig *config) const;
 
   /*!
    * \brief Register the coordinates of the mesh nodes as output.
    * \param[in] config
    */
-  void RegisterOutput_Coordinates(CConfig *config);
+  void RegisterOutput_Coordinates(CConfig *config) const;
 
   /*!
    * \brief Update the multi-grid structure and the wall-distance.

Common/include/geometry/CPhysicalGeometry.hpp

@@ -232,10 +232,10 @@ class CPhysicalGeometry final : public CGeometry {
    * \param[in] countPerElem - Pieces of data per element communicated.
    */
   void InitiateCommsAll(void *bufSend,
-                        int *nElemSend,
+                        const int *nElemSend,
                         SU2_MPI::Request *sendReq,
                         void *bufRecv,
-                        int *nElemRecv,
+                        const int *nElemRecv,
                         SU2_MPI::Request *recvReq,
                         unsigned short countPerElem,
                         unsigned short commType);

Common/include/geometry/meshreader/CCGNSMeshReaderFVM.hpp

@@ -126,10 +126,10 @@ class CCGNSMeshReaderFVM: public CMeshReaderFVM {
    * \param[in] countPerElem - Pieces of data per element communicated.
    */
   void InitiateCommsAll(void *bufSend,
-                        int *nElemSend,
+                        const int *nElemSend,
                         SU2_MPI::Request *sendReq,
                         void *bufRecv,
-                        int *nElemRecv,
+                        const int *nElemRecv,
                         SU2_MPI::Request *recvReq,
                         unsigned short countPerElem,
                         unsigned short commType);

Common/include/geometry/meshreader/CMeshReaderFVM.hpp

@@ -83,7 +83,7 @@ class CMeshReaderFVM {
    * \brief Get the physical dimension of the problem (2 or 3).
    * \returns Physical dimension of the problem.
    */
-  inline unsigned short GetDimension() {
+  inline unsigned short GetDimension() const {
     return dimension;
   }
 
@@ -125,7 +125,7 @@ class CMeshReaderFVM {
    * \brief Get the total number of markers in the mesh zone.
    * \returns Total number of markers in the mesh zone.
    */
-  inline unsigned long GetNumberOfMarkers() {
+  inline unsigned long GetNumberOfMarkers() const {
     return numberOfMarkers;
   }
 
@@ -141,31 +141,31 @@ class CMeshReaderFVM {
    * \brief Get the number of local grid points within the linear partition on this rank.
    * \returns Number of local grid points within the linear partition on this rank.
    */
-  inline unsigned long GetNumberOfLocalPoints() {
+  inline unsigned long GetNumberOfLocalPoints() const {
     return numberOfLocalPoints;
   }
 
   /*!
    * \brief Get the number of global grid points within the mesh file.
    * \returns Number of global grid points within the mesh file.
    */
-  inline unsigned long GetNumberOfGlobalPoints() {
+  inline unsigned long GetNumberOfGlobalPoints() const {
     return numberOfGlobalPoints;
   }
 
   /*!
    * \brief Get the number of local elements within the linear partition on this rank.
    * \returns Number of local elements within the linear partition on this rank.
    */
-  inline unsigned long GetNumberOfLocalElements() {
+  inline unsigned long GetNumberOfLocalElements() const {
     return numberOfLocalElements;
   }
 
   /*!
    * \brief Get the number of global elements within the mesh file.
    * \returns Number of global elements within the mesh file.
    */
-  inline unsigned long GetNumberOfGlobalElements() {
+  inline unsigned long GetNumberOfGlobalElements() const {
     return numberOfGlobalElements;
   }