From 4a8af2ff9d7b7f36d2a0fde8da44aed1eaccb2bf Mon Sep 17 00:00:00 2001 From: Kristian Bendiksen Date: Wed, 3 Sep 2025 13:19:59 +0200 Subject: [PATCH] Add [[nodiscard]] to new api. --- .../GeoMech/GeoMechDataModel/RigFemPartGrid.h | 6 +++--- .../Intersections/RivEclipseIntersectionGrid.h | 12 ++++++------ .../Intersections/RivFemIntersectionGrid.h | 12 ++++++------ .../Intersections/RivIntersectionHexGridInterface.h | 12 ++++++------ ApplicationLibCode/ReservoirDataModel/RigGridBase.h | 4 ++-- Fwk/AppFwk/CommonCode/cvfStructGrid.h | 4 ++-- 6 files changed, 25 insertions(+), 25 deletions(-) diff --git a/ApplicationLibCode/GeoMech/GeoMechDataModel/RigFemPartGrid.h b/ApplicationLibCode/GeoMech/GeoMechDataModel/RigFemPartGrid.h index 926e432a4d..3f972ad535 100644 --- a/ApplicationLibCode/GeoMech/GeoMechDataModel/RigFemPartGrid.h +++ b/ApplicationLibCode/GeoMech/GeoMechDataModel/RigFemPartGrid.h @@ -42,9 +42,9 @@ public: cvf::Vec3i findMainIJKFaces( int elementIndex ) const; - std::pair reservoirIJKBoundingBox() const; - std::array cellCornerVertices( size_t cellIndex ) const override; - cvf::Vec3d cellCentroid( size_t cellIndex ) const override; + std::pair reservoirIJKBoundingBox() const; + [[nodiscard]] std::array cellCornerVertices( size_t cellIndex ) const override; + cvf::Vec3d cellCentroid( size_t cellIndex ) const override; private: void generateStructGridData(); diff --git a/ApplicationLibCode/ModelVisualization/Intersections/RivEclipseIntersectionGrid.h b/ApplicationLibCode/ModelVisualization/Intersections/RivEclipseIntersectionGrid.h index 6f65fe215e..de244b06dd 100644 --- a/ApplicationLibCode/ModelVisualization/Intersections/RivEclipseIntersectionGrid.h +++ b/ApplicationLibCode/ModelVisualization/Intersections/RivEclipseIntersectionGrid.h @@ -40,12 +40,12 @@ class RivEclipseIntersectionGrid : public RivIntersectionHexGridInterface public: RivEclipseIntersectionGrid( const RigMainGrid* mainGrid, const RigActiveCellInfo* activeCellInfo, bool showInactiveCells ); - cvf::Vec3d displayOffset() const override; - cvf::BoundingBox boundingBox() const override; - std::vector findIntersectingCells( const cvf::BoundingBox& intersectingBB ) const override; - bool useCell( size_t cellIndex ) const override; - std::array cellCornerVertices( size_t cellIndex ) const override; - std::array cellCornerIndices( size_t cellIndex ) const override; + cvf::Vec3d displayOffset() const override; + cvf::BoundingBox boundingBox() const override; + std::vector findIntersectingCells( const cvf::BoundingBox& intersectingBB ) const override; + bool useCell( size_t cellIndex ) const override; + [[nodiscard]] std::array cellCornerVertices( size_t cellIndex ) const override; + [[nodiscard]] std::array cellCornerIndices( size_t cellIndex ) const override; const RigFault* findFaultFromCellIndexAndCellFace( size_t reservoirCellIndex, cvf::StructGridInterface::FaceType face ) const override; void setKIntervalFilter( bool enabled, std::string kIntervalStr ) override; diff --git a/ApplicationLibCode/ModelVisualization/Intersections/RivFemIntersectionGrid.h b/ApplicationLibCode/ModelVisualization/Intersections/RivFemIntersectionGrid.h index 7d7bcbeb33..98f92b07d0 100644 --- a/ApplicationLibCode/ModelVisualization/Intersections/RivFemIntersectionGrid.h +++ b/ApplicationLibCode/ModelVisualization/Intersections/RivFemIntersectionGrid.h @@ -38,12 +38,12 @@ class RivFemIntersectionGrid : public RivIntersectionHexGridInterface public: explicit RivFemIntersectionGrid( const RigFemPartCollection* femParts, const RimGeoMechPartCollection* parts ); - cvf::Vec3d displayOffset() const override; - cvf::BoundingBox boundingBox() const override; - std::vector findIntersectingCells( const cvf::BoundingBox& intersectingBB ) const override; - bool useCell( size_t cellIndex ) const override; - std::array cellCornerVertices( size_t cellIndex ) const override; - std::array cellCornerIndices( size_t cellIndex ) const override; + cvf::Vec3d displayOffset() const override; + cvf::BoundingBox boundingBox() const override; + std::vector findIntersectingCells( const cvf::BoundingBox& intersectingBB ) const override; + bool useCell( size_t cellIndex ) const override; + [[nodiscard]] std::array cellCornerVertices( size_t cellIndex ) const override; + [[nodiscard]] std::array cellCornerIndices( size_t cellIndex ) const override; const RigFault* findFaultFromCellIndexAndCellFace( size_t reservoirCellIndex, cvf::StructGridInterface::FaceType face ) const override; void setKIntervalFilter( bool enabled, std::string kIntervalStr ) override; diff --git a/ApplicationLibCode/ModelVisualization/Intersections/RivIntersectionHexGridInterface.h b/ApplicationLibCode/ModelVisualization/Intersections/RivIntersectionHexGridInterface.h index 1b8f505861..dde063e6be 100644 --- a/ApplicationLibCode/ModelVisualization/Intersections/RivIntersectionHexGridInterface.h +++ b/ApplicationLibCode/ModelVisualization/Intersections/RivIntersectionHexGridInterface.h @@ -35,12 +35,12 @@ class RigFault; class RivIntersectionHexGridInterface : public cvf::Object { public: - virtual cvf::Vec3d displayOffset() const = 0; - virtual cvf::BoundingBox boundingBox() const = 0; - virtual std::vector findIntersectingCells( const cvf::BoundingBox& intersectingBB ) const = 0; - virtual bool useCell( size_t cellIndex ) const = 0; - virtual std::array cellCornerVertices( size_t cellIndex ) const = 0; - virtual std::array cellCornerIndices( size_t cellIndex ) const = 0; + virtual cvf::Vec3d displayOffset() const = 0; + virtual cvf::BoundingBox boundingBox() const = 0; + virtual std::vector findIntersectingCells( const cvf::BoundingBox& intersectingBB ) const = 0; + virtual bool useCell( size_t cellIndex ) const = 0; + [[nodiscard]] virtual std::array cellCornerVertices( size_t cellIndex ) const = 0; + [[nodiscard]] virtual std::array cellCornerIndices( size_t cellIndex ) const = 0; virtual const RigFault* findFaultFromCellIndexAndCellFace( size_t reservoirCellIndex, cvf::StructGridInterface::FaceType face ) const = 0; virtual void setKIntervalFilter( bool enabled, std::string kIntervalStr ) = 0; }; diff --git a/ApplicationLibCode/ReservoirDataModel/RigGridBase.h b/ApplicationLibCode/ReservoirDataModel/RigGridBase.h index 3a62485fc9..23a72e0753 100644 --- a/ApplicationLibCode/ReservoirDataModel/RigGridBase.h +++ b/ApplicationLibCode/ReservoirDataModel/RigGridBase.h @@ -104,8 +104,8 @@ public: bool cellIJKFromCoordinate( const cvf::Vec3d& coord, size_t* i, size_t* j, size_t* k ) const override; // unused void cellMinMaxCordinates( size_t cellIndex, cvf::Vec3d* minCoordinate, cvf::Vec3d* maxCoordinate ) const override; // unused - std::array cellCornerVertices( size_t cellIndex ) const override; - cvf::Vec3d cellCentroid( size_t cellIndex ) const override; + [[nodiscard]] std::array cellCornerVertices( size_t cellIndex ) const override; + cvf::Vec3d cellCentroid( size_t cellIndex ) const override; size_t gridPointIndexFromIJK( size_t i, size_t j, size_t k ) const override; cvf::Vec3d gridPointCoordinate( size_t i, size_t j, size_t k ) const override; diff --git a/Fwk/AppFwk/CommonCode/cvfStructGrid.h b/Fwk/AppFwk/CommonCode/cvfStructGrid.h index bf6de71773..1447c54ba3 100644 --- a/Fwk/AppFwk/CommonCode/cvfStructGrid.h +++ b/Fwk/AppFwk/CommonCode/cvfStructGrid.h @@ -101,8 +101,8 @@ public: virtual bool cellIJKFromCoordinate( const cvf::Vec3d& coord, size_t* i, size_t* j, size_t* k ) const = 0; - virtual std::array cellCornerVertices( size_t cellIndex ) const = 0; - virtual cvf::Vec3d cellCentroid( size_t cellIndex ) const = 0; + [[nodiscard]] virtual std::array cellCornerVertices( size_t cellIndex ) const = 0; + [[nodiscard]] virtual cvf::Vec3d cellCentroid( size_t cellIndex ) const = 0; virtual void cellMinMaxCordinates( size_t cellIndex, cvf::Vec3d* minCoordinate, cvf::Vec3d* maxCoordinate ) const = 0; virtual size_t gridPointIndexFromIJK( size_t i, size_t j, size_t k ) const = 0;