Skip to content

Commit 81f3687

Browse files
committed
const correctness
1 parent 737df10 commit 81f3687

10 files changed

Lines changed: 166 additions & 178 deletions

File tree

Common/include/geometry/CGeometry.hpp

Lines changed: 56 additions & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -263,7 +263,7 @@ class CGeometry {
263263
/*!
264264
* \brief Constructor of the class.
265265
*/
266-
CGeometry(void);
266+
CGeometry();
267267

268268
/*!
269269
* \brief Constructor of the class.
@@ -273,7 +273,7 @@ class CGeometry {
273273
/*!
274274
* \brief Destructor of the class.
275275
*/
276-
virtual ~CGeometry(void);
276+
virtual ~CGeometry();
277277

278278
/*!
279279
* \brief Routine to launch non-blocking recvs only for all periodic communications.
@@ -384,55 +384,55 @@ class CGeometry {
384384
* \brief Get number of coordinates.
385385
* \return Number of coordinates.
386386
*/
387-
inline unsigned short GetnDim(void) const {return nDim;}
387+
inline unsigned short GetnDim() const {return nDim;}
388388

389389
/*!
390390
* \brief Get number of zones.
391391
* \return Number of zones.
392392
*/
393-
inline unsigned short GetnZone(void) const {return nZone;}
393+
inline unsigned short GetnZone() const {return nZone;}
394394

395395
/*!
396396
* \brief Get number of points.
397397
* \return Number of points.
398398
*/
399-
inline unsigned long GetnPoint(void) const {return nPoint;}
399+
inline unsigned long GetnPoint() const {return nPoint;}
400400

401401
/*!
402402
* \brief Get number of real points (that belong to the domain).
403403
* \return Number of real points.
404404
*/
405-
inline unsigned long GetnPointDomain(void) const {return nPointDomain;}
405+
inline unsigned long GetnPointDomain() const {return nPointDomain;}
406406

407407
/*!
408408
* \brief Retrieve total number of nodes in a simulation across all processors (including halos).
409409
* \return Total number of nodes in a simulation across all processors (including halos).
410410
*/
411-
inline unsigned long GetGlobal_nPoint(void) const { return Global_nPoint; }
411+
inline unsigned long GetGlobal_nPoint() const { return Global_nPoint; }
412412

413413
/*!
414414
* \brief Retrieve total number of nodes in a simulation across all processors (excluding halos).
415415
* \return Total number of nodes in a simulation across all processors (excluding halos).
416416
*/
417-
inline unsigned long GetGlobal_nPointDomain(void) const { return Global_nPointDomain; }
417+
inline unsigned long GetGlobal_nPointDomain() const { return Global_nPointDomain; }
418418

419419
/*!
420420
* \brief Get number of elements.
421421
* \return Number of elements.
422422
*/
423-
inline unsigned long GetnElem(void) const {return nElem;}
423+
inline unsigned long GetnElem() const {return nElem;}
424424

425425
/*!
426426
* \brief Get number of edges.
427427
* \return Number of edges.
428428
*/
429-
inline unsigned long GetnEdge(void) const {return nEdge;}
429+
inline unsigned long GetnEdge() const {return nEdge;}
430430

431431
/*!
432432
* \brief Get number of markers.
433433
* \return Number of markers.
434434
*/
435-
inline unsigned short GetnMarker(void) const {return nMarker;}
435+
inline unsigned short GetnMarker() const {return nMarker;}
436436

437437
/*!
438438
* \brief Get number of vertices.
@@ -533,7 +533,7 @@ class CGeometry {
533533
/*!
534534
* \brief Create a file for testing the geometry.
535535
*/
536-
void TestGeometry(void) const;
536+
void TestGeometry() const;
537537

538538
/*!
539539
* \brief A virtual member.
@@ -603,7 +603,7 @@ class CGeometry {
603603
/*!
604604
* \brief Get the number of elements in vtk fortmat.
605605
*/
606-
inline unsigned long GetMax_GlobalPoint(void) const { return Max_GlobalPoint; }
606+
inline unsigned long GetMax_GlobalPoint() const { return Max_GlobalPoint; }
607607

608608
/*!
609609
* \brief Finds face of element.
@@ -635,28 +635,28 @@ class CGeometry {
635635
/*!
636636
* \brief Connects elements .
637637
*/
638-
inline virtual void SetElement_Connectivity(void) {}
638+
inline virtual void SetElement_Connectivity() {}
639639

640640
/*!
641641
* \brief Sets the edges of an elemment.
642642
*/
643-
void SetEdges(void);
643+
void SetEdges();
644644

645645
/*!
646646
* \brief Sets the faces of an element..
647647
*/
648-
void SetFaces(void);
648+
void SetFaces();
649649

650650
/*!
651651
* \brief Sets the boundary volume.
652652
*/
653-
inline virtual void SetBoundVolume(void) {}
653+
inline virtual void SetBoundVolume() {}
654654

655655
/*!
656656
* \brief Sets the vertices.
657657
* \param[in] config - Definition of the particular problem.
658658
*/
659-
inline virtual void SetVertex(CConfig *config) {}
659+
inline virtual void SetVertex(const CConfig *config) {}
660660

661661
/*!
662662
* \brief Computes the N span.
@@ -723,13 +723,13 @@ class CGeometry {
723723
* \brief A virtual member.
724724
* \param[in] config - Definition of the particular problem.
725725
*/
726-
inline virtual void MatchActuator_Disk(CConfig *config) {}
726+
inline virtual void MatchActuator_Disk(const CConfig *config) {}
727727

728728
/*!
729729
* \brief A virtual member.
730730
* \param[in] config - Definition of the particular problem.
731731
*/
732-
inline virtual void MatchPeriodic(CConfig *config, unsigned short val_periodic) {}
732+
inline virtual void MatchPeriodic(const CConfig *config, unsigned short val_periodic) {}
733733

734734
/*!
735735
* \brief A virtual member.
@@ -806,23 +806,23 @@ class CGeometry {
806806

807807
/*!
808808
* \brief A virtual member.
809-
* \param[in] geometry - Geometrical definition of the problem.
809+
* \param[in] fine_grid - Geometrical definition of the problem.
810810
*/
811-
inline virtual void SetCoord(CGeometry *geometry) {}
811+
inline virtual void SetCoord(const CGeometry *fine_grid) {}
812812

813813
/*!
814814
* \brief A virtual member.
815-
* \param[in] geometry - Geometrical definition of the problem.
815+
* \param[in] fine_grid - Geometrical definition of the problem.
816816
* \param[in] val_marker - Index of the boundary marker.
817817
*/
818-
inline virtual void SetMultiGridWallHeatFlux(const CGeometry *geometry, unsigned short val_marker) {}
818+
inline virtual void SetMultiGridWallHeatFlux(const CGeometry *fine_grid, unsigned short val_marker) {}
819819

820820
/*!
821821
* \brief A virtual member.
822-
* \param[in] geometry - Geometrical definition of the problem.
822+
* \param[in] fine_grid - Geometrical definition of the problem.
823823
* \param[in] val_marker - Index of the boundary marker.
824824
*/
825-
inline virtual void SetMultiGridWallTemperature(const CGeometry *geometry, unsigned short val_marker) {}
825+
inline virtual void SetMultiGridWallTemperature(const CGeometry *fine_grid, unsigned short val_marker) {}
826826

827827
/*!
828828
* \brief A virtual member.
@@ -840,26 +840,24 @@ class CGeometry {
840840

841841
/*!
842842
* \brief A virtual member.
843-
* \param[in] geometry - Geometrical definition of the problem.
843+
* \param[in] fine_grid - Geometrical definition of the problem.
844844
* \param[in] config - Definition of the particular problem.
845845
*/
846-
inline virtual void SetVertex(CGeometry *geometry, CConfig *config) {}
846+
inline virtual void SetVertex(const CGeometry *fine_grid, const CConfig *config) {}
847847

848848
/*!
849849
* \brief A virtual member.
850-
* \param[in] config - Definition of the particular problem.
851-
* \param[in] geometry - Geometrical definition of the problem.
850+
* \param[in] fine_grid - Geometrical definition of the problem.
852851
* \param[in] action - Allocate or not the new elements.
853852
*/
854-
inline virtual void SetControlVolume(CConfig *config, CGeometry *geometry, unsigned short action) {}
853+
inline virtual void SetControlVolume(const CGeometry *fine_grid, unsigned short action) {}
855854

856855
/*!
857856
* \brief A virtual member.
858-
* \param[in] config - Definition of the particular problem.
859-
* \param[in] geometry - Geometrical definition of the problem.
857+
* \param[in] fine_grid - Geometrical definition of the problem.
860858
* \param[in] action - Allocate or not the new elements.
861859
*/
862-
inline virtual void SetBoundControlVolume(CConfig *config, CGeometry *geometry, unsigned short action) {}
860+
inline virtual void SetBoundControlVolume(const CGeometry *fine_grid, unsigned short action) {}
863861

864862
/*!
865863
* \brief A virtual member.
@@ -908,10 +906,9 @@ class CGeometry {
908906

909907
/*!
910908
* \brief A virtual member.
911-
* \param[in] geometry - Geometry of the fine mesh.
912-
* \param[in] config - Definition of the particular problem.
909+
* \param[in] fine_grid - Geometry of the fine mesh.
913910
*/
914-
inline virtual void SetRestricted_GridVelocity(CGeometry *fine_mesh, const CConfig *config) {}
911+
inline virtual void SetRestricted_GridVelocity(const CGeometry *fine_grid) {}
915912

916913
/*!
917914
* \brief Check if a boundary is straight(2D) / plane(3D) for EULER_WALL and SYMMETRY_PLANE
@@ -1060,7 +1057,7 @@ class CGeometry {
10601057
* \brief A virtual member.
10611058
* \param[in] config - Definition of the particular problem.
10621059
*/
1063-
inline virtual void FindNormal_Neighbor(CConfig *config) {}
1060+
inline virtual void FindNormal_Neighbor(const CConfig *config) {}
10641061

10651062
/*!
10661063
* \brief A virtual member.
@@ -1078,97 +1075,97 @@ class CGeometry {
10781075
* \brief Retrieve total number of elements in a simulation across all processors.
10791076
* \return Total number of elements in a simulation across all processors.
10801077
*/
1081-
inline unsigned long GetGlobal_nElem(void) const { return Global_nElem; }
1078+
inline unsigned long GetGlobal_nElem() const { return Global_nElem; }
10821079

10831080
/*!
10841081
* \brief Retrieve total number of elements in a simulation across all processors (excluding halos).
10851082
* \return Total number of elements in a simulation across all processors (excluding halos).
10861083
*/
1087-
inline unsigned long GetGlobal_nElemDomain(void) const { return Global_nElemDomain; }
1084+
inline unsigned long GetGlobal_nElemDomain() const { return Global_nElemDomain; }
10881085

10891086
/*!
10901087
* \brief Retrieve total number of triangular elements in a simulation across all processors.
10911088
* \return Total number of line elements in a simulation across all processors.
10921089
*/
1093-
inline unsigned long GetGlobal_nElemLine(void) const { return Global_nelem_edge; }
1090+
inline unsigned long GetGlobal_nElemLine() const { return Global_nelem_edge; }
10941091

10951092
/*!
10961093
* \brief Retrieve total number of triangular elements in a simulation across all processors.
10971094
* \return Total number of triangular elements in a simulation across all processors.
10981095
*/
1099-
inline unsigned long GetGlobal_nElemTria(void) const { return Global_nelem_triangle; }
1096+
inline unsigned long GetGlobal_nElemTria() const { return Global_nelem_triangle; }
11001097

11011098
/*!
11021099
* \brief Retrieve total number of quadrilateral elements in a simulation across all processors.
11031100
* \return Total number of quadrilateral elements in a simulation across all processors.
11041101
*/
1105-
inline unsigned long GetGlobal_nElemQuad(void) const { return Global_nelem_quad; }
1102+
inline unsigned long GetGlobal_nElemQuad() const { return Global_nelem_quad; }
11061103

11071104
/*!
11081105
* \brief Retrieve total number of tetrahedral elements in a simulation across all processors.
11091106
* \return Total number of tetrahedral elements in a simulation across all processors.
11101107
*/
1111-
inline unsigned long GetGlobal_nElemTetr(void) const { return Global_nelem_tetra; }
1108+
inline unsigned long GetGlobal_nElemTetr() const { return Global_nelem_tetra; }
11121109

11131110
/*!
11141111
* \brief Retrieve total number of hexahedral elements in a simulation across all processors.
11151112
* \return Total number of hexahedral elements in a simulation across all processors.
11161113
*/
1117-
inline unsigned long GetGlobal_nElemHexa(void) const { return Global_nelem_hexa; }
1114+
inline unsigned long GetGlobal_nElemHexa() const { return Global_nelem_hexa; }
11181115

11191116
/*!
11201117
* \brief Retrieve total number of prism elements in a simulation across all processors.
11211118
* \return Total number of prism elements in a simulation across all processors.
11221119
*/
1123-
inline unsigned long GetGlobal_nElemPris(void) const { return Global_nelem_prism; }
1120+
inline unsigned long GetGlobal_nElemPris() const { return Global_nelem_prism; }
11241121

11251122
/*!
11261123
* \brief Retrieve total number of pyramid elements in a simulation across all processors.
11271124
* \return Total number of pyramid elements in a simulation across all processors.
11281125
*/
1129-
inline unsigned long GetGlobal_nElemPyra(void) const { return Global_nelem_pyramid; }
1126+
inline unsigned long GetGlobal_nElemPyra() const { return Global_nelem_pyramid; }
11301127

11311128
/*!
11321129
* \brief Get number of triangular elements.
11331130
* \return Number of line elements.
11341131
*/
1135-
inline unsigned long GetnElemLine(void) const { return nelem_edge; }
1132+
inline unsigned long GetnElemLine() const { return nelem_edge; }
11361133

11371134
/*!
11381135
* \brief Get number of triangular elements.
11391136
* \return Number of triangular elements.
11401137
*/
1141-
inline unsigned long GetnElemTria(void) const { return nelem_triangle; }
1138+
inline unsigned long GetnElemTria() const { return nelem_triangle; }
11421139

11431140
/*!
11441141
* \brief Get number of quadrilateral elements.
11451142
* \return Number of quadrilateral elements.
11461143
*/
1147-
inline unsigned long GetnElemQuad(void) const { return nelem_quad; }
1144+
inline unsigned long GetnElemQuad() const { return nelem_quad; }
11481145

11491146
/*!
11501147
* \brief Get number of tetrahedral elements.
11511148
* \return Number of tetrahedral elements.
11521149
*/
1153-
inline unsigned long GetnElemTetr(void) const { return nelem_tetra; }
1150+
inline unsigned long GetnElemTetr() const { return nelem_tetra; }
11541151

11551152
/*!
11561153
* \brief Get number of hexahedral elements.
11571154
* \return Number of hexahedral elements.
11581155
*/
1159-
inline unsigned long GetnElemHexa(void) const { return nelem_hexa; }
1156+
inline unsigned long GetnElemHexa() const { return nelem_hexa; }
11601157

11611158
/*!
11621159
* \brief Get number of prism elements.
11631160
* \return Number of prism elements.
11641161
*/
1165-
inline unsigned long GetnElemPris(void) const { return nelem_prism; }
1162+
inline unsigned long GetnElemPris() const { return nelem_prism; }
11661163

11671164
/*!
11681165
* \brief Get number of pyramid elements.
11691166
* \return Number of pyramid elements.
11701167
*/
1171-
inline unsigned long GetnElemPyra(void) const { return nelem_pyramid; }
1168+
inline unsigned long GetnElemPyra() const { return nelem_pyramid; }
11721169

11731170
/*!
11741171
* \brief Get x coords of geometrical planes in the mesh
@@ -1570,7 +1567,7 @@ class CGeometry {
15701567
* \brief Get the multigrid index for the current geometry object.
15711568
* \return Multigrid index for current geometry object.
15721569
*/
1573-
inline unsigned short GetMGLevel(void) const { return MGLevel; }
1570+
inline unsigned short GetMGLevel() const { return MGLevel; }
15741571

15751572
/*!
15761573
* \brief A virtual member.
@@ -1599,7 +1596,7 @@ class CGeometry {
15991596
* \note This method builds the map and required pattern (0-fill FVM) if that has not been done yet.
16001597
* \return Reference to the map.
16011598
*/
1602-
const CEdgeToNonZeroMapUL& GetEdgeToSparsePatternMap(void);
1599+
const CEdgeToNonZeroMapUL& GetEdgeToSparsePatternMap();
16031600

16041601
/*!
16051602
* \brief Get the transpose of the (main, i.e 0 fill) sparse pattern (e.g. CSR becomes CSC).
@@ -1625,7 +1622,7 @@ class CGeometry {
16251622
* \brief Get the group size used in edge coloring.
16261623
* \return Group size.
16271624
*/
1628-
inline unsigned long GetEdgeColorGroupSize(void) const { return edgeColorGroupSize; }
1625+
inline unsigned long GetEdgeColorGroupSize() const { return edgeColorGroupSize; }
16291626

16301627
/*!
16311628
* \brief Get the element coloring.
@@ -1644,7 +1641,7 @@ class CGeometry {
16441641
* \brief Get the group size used in element coloring.
16451642
* \return Group size.
16461643
*/
1647-
inline unsigned long GetElementColorGroupSize(void) const { return elemColorGroupSize; }
1644+
inline unsigned long GetElementColorGroupSize() const { return elemColorGroupSize; }
16481645

16491646
/*!
16501647
* \brief Compute an ADT including the coordinates of all viscous markers
@@ -1698,6 +1695,6 @@ class CGeometry {
16981695
* \brief Get a pointer to the reference node coordinate vector.
16991696
* \return A pointer to the reference node coordinate vector.
17001697
*/
1701-
inline virtual const su2double* GetStreamwise_Periodic_RefNode(void) const { return nullptr; }
1698+
inline virtual const su2double* GetStreamwise_Periodic_RefNode() const { return nullptr; }
17021699
};
17031700

0 commit comments

Comments
 (0)