New search neighborhood: SearchAnnulusStratigraphic to perform lateral searches along a given stratigraphic interval (index W) in GeoGrids.

Author: PauloCarvalhoRJ

GammaRay.pro

@@ -53,6 +53,7 @@ SOURCES += main.cpp\
     geostats/contactanalysis.cpp \
     geostats/mcmcdataimputation.cpp \
     geostats/searchannulus.cpp \
+    geostats/searchannulusstratigraphic.cpp \
     geostats/searchsphericalshell.cpp \
     geostats/searchverticaldumbbell.cpp \
     geostats/searchwasher.cpp \
@@ -337,6 +338,7 @@ HEADERS  += mainwindow.h \
     geostats/contactanalysis.h \
     geostats/mcmcdataimputation.h \
     geostats/searchannulus.h \
+    geostats/searchannulusstratigraphic.h \
     geostats/searchsphericalshell.h \
     geostats/searchverticaldumbbell.h \
     geostats/searchwasher.h \

geostats/searchannulusstratigraphic.cpp

@@ -0,0 +1,26 @@
+#include "searchannulusstratigraphic.h"
+
+#include "domain/geogrid.h"
+
+SearchAnnulusStratigraphic::SearchAnnulusStratigraphic(double innerRadius, double outerRadius, GeoGrid* geoGrid) :
+    SearchAnnulus( innerRadius, outerRadius ),
+    m_geoGrid( geoGrid )
+{}
+
+bool SearchAnnulusStratigraphic::isInside(double centerX, double centerY, double centerZ,
+                                          double x, double y, double z) const
+{
+    //determine the stratigraphic intervals corresponding to the
+    //reference location and to the query location
+    uint I, J, refK, queryK;
+    m_geoGrid->XYZtoIJK(centerX, centerY, centerZ, I, J, refK);
+    m_geoGrid->XYZtoIJK(x, y, z, I, J, queryK);
+
+    //if both locations don't lie in the same stratigraphic interval, return a miss.
+    if( refK != queryK )
+        return false;
+
+    //if the locations belong to the same stratigraphic interval, do the same geometric in/out
+    //test as in SeachAnnulus for 2D datasets.
+    return SearchAnnulus::isInside( centerX, centerY, centerZ, x, y, z );
+}

geostats/searchannulusstratigraphic.h

@@ -0,0 +1,34 @@
+#ifndef SEARCHANNULUSSTRATIGRAPHIC_H
+#define SEARCHANNULUSSTRATIGRAPHIC_H
+
+#include "geostats/searchannulus.h"
+
+class GeoGrid;
+
+/**
+ * The SearchAnnulusStratigraphic class represents a search neighborhood with the shape of an annulus (2D ring)
+ * along a given stratigraphic interval (topological index K) of a geological grid (class GeoGrid).
+ * Being 2D, this search neighborhood is recommended for usage with 2D data sets.
+ */
+class SearchAnnulusStratigraphic : public SearchAnnulus
+{
+public:
+    SearchAnnulusStratigraphic( double innerRadius, double outerRadius, GeoGrid* geoGrid );
+
+    /** Move constructor. */
+    SearchAnnulusStratigraphic( SearchAnnulusStratigraphic&& right_hand_side );
+
+
+    ////-------------SearchNeighborhood interface------------------------------------------
+    /**
+     * @note As this search neighborhood is 2D, the z coordinates are ignored in the test.
+     */
+    virtual bool isInside(double centerX, double centerY, double centerZ,
+                          double x, double y, double z ) const;
+    ////-------------------------------------------------------------------------------------
+
+
+    GeoGrid* m_geoGrid;
+};
+
+#endif // SEARCHANNULUSSTRATIGRAPHIC_H