* Remove Grid2dSetRepresentation support (#78)

cmake/swigResqml2CsInclude.i

@@ -242,10 +242,6 @@ public static f2i.energisticsStandardsApi.${FESAPI_COMMON_NS}.AbstractObject res
     {
        return new f2i.energisticsStandardsApi.${FESAPI_RESQML2_0_1_NS}.Grid2dRepresentation(cPtr, owner);
     }
-    else if (type == "Grid2dSetRepresentation")
-    {
-       return new f2i.energisticsStandardsApi.${FESAPI_RESQML2_0_1_NS}.Grid2dSetRepresentation(cPtr, owner);
-    }
     else if (type == "GridConnectionSetRepresentation")
     {
        return new f2i.energisticsStandardsApi.${FESAPI_RESQML2_0_1_NS}.GridConnectionSetRepresentation(cPtr, owner);

cmake/swigResqml2JavaInclude.i

@@ -237,10 +237,6 @@ Basically this file add methods resqml2_0_instantiate* which will create the rig
     {
        return new com.f2i.energisticsStandardsApi.${FESAPI_RESQML2_0_1_NS}.Grid2dRepresentation(cPtr, owner);
     }
-    else if (type.equals("Grid2dSetRepresentation"))
-    {
-       return new com.f2i.energisticsStandardsApi.${FESAPI_RESQML2_0_1_NS}.Grid2dSetRepresentation(cPtr, owner);
-    }
     else if (type.equals("GridConnectionSetRepresentation"))
     {
        return new com.f2i.energisticsStandardsApi.${FESAPI_RESQML2_0_1_NS}.GridConnectionSetRepresentation(cPtr, owner);

example/example.cpp

@@ -55,7 +55,6 @@ under the License.
 #include "resqml2_0_1/StructuralOrganizationInterpretation.h"
 #include "resqml2_0_1/StratigraphicUnitInterpretation.h"
 #include "resqml2_0_1/Grid2dRepresentation.h"
-#include "resqml2_0_1/Grid2dSetRepresentation.h"
 #include "resqml2_0_1/SeismicLatticeFeature.h"
 #include "resqml2_0_1/SeismicLineSetFeature.h"
 #include "resqml2_0_1/WellboreFeature.h"

src/common/EpcDocument.cpp

@@ -45,7 +45,6 @@ under the License.
 #include "resqml2_0_1/PointSetRepresentation.h"
 #include "resqml2_0_1/PlaneSetRepresentation.h"
 #include "resqml2_0_1/SeismicLatticeFeature.h"
-#include "resqml2_0_1/Grid2dSetRepresentation.h"
 #include "resqml2_0_1/Grid2dRepresentation.h"
 #include "resqml2_0_1/HdfProxy.h"
 #include "resqml2_0_1/TriangulatedSetRepresentation.h"
@@ -978,7 +977,6 @@ COMMON_NS::AbstractObject* EpcDocument::getResqml2_0_1WrapperFromGsoapContext(co
 	else if CHECK_AND_GET_RESQML_2_0_1_FESAPI_WRAPPER_FROM_GSOAP_CONTEXT(PointSetRepresentation)
 	else if CHECK_AND_GET_RESQML_2_0_1_FESAPI_WRAPPER_FROM_GSOAP_CONTEXT(PlaneSetRepresentation)
 	else if CHECK_AND_GET_RESQML_2_0_1_FESAPI_WRAPPER_FROM_GSOAP_CONTEXT(PolylineRepresentation)
-	else if CHECK_AND_GET_RESQML_2_0_1_FESAPI_WRAPPER_FROM_GSOAP_CONTEXT(Grid2dSetRepresentation)
 	else if CHECK_AND_GET_RESQML_2_0_1_FESAPI_WRAPPER_FROM_GSOAP_CONTEXT(Grid2dRepresentation)
 	else if CHECK_AND_GET_RESQML_2_0_1_FESAPI_WRAPPER_FROM_GSOAP_CONTEXT(TriangulatedSetRepresentation)
 	else if CHECK_AND_GET_RESQML_2_0_1_FESAPI_WRAPPER_FROM_GSOAP_CONTEXT(BlockedWellboreRepresentation)
@@ -1203,26 +1201,6 @@ vector<TriangulatedSetRepresentation*> EpcDocument::getFractureTriangulatedSetRe
 	return result;
 }
 
-vector<Grid2dSetRepresentation*> EpcDocument::getHorizonGrid2dSetRepSet() const
-{
-	vector<Grid2dSetRepresentation*> result;
-
-	vector<Horizon*> horizonSet = getHorizonSet();
-	for (size_t featureIndex = 0; featureIndex < horizonSet.size(); ++featureIndex) {
-		vector<RESQML2_NS::AbstractFeatureInterpretation*> interpSet = horizonSet[featureIndex]->getInterpretationSet();
-		for (size_t interpIndex = 0; interpIndex < interpSet.size(); ++interpIndex) {
-			vector<RESQML2_NS::AbstractRepresentation*> repSet = interpSet[interpIndex]->getRepresentationSet();
-			for (size_t repIndex = 0; repIndex < repSet.size(); ++repIndex) {
-				if (repSet[repIndex]->getGsoapType() == SOAP_TYPE_gsoap_resqml2_0_1_resqml2__obj_USCOREGrid2dSetRepresentation) {
-					result.push_back(static_cast<Grid2dSetRepresentation*>(repSet[repIndex]));
-				}
-			}
-		}
-	}
-
-	return result;
-}
-
 vector<Grid2dRepresentation*> EpcDocument::getHorizonGrid2dRepSet() const
 {
 	vector<Grid2dRepresentation*> result;
@@ -1558,7 +1536,6 @@ COMMON_NS::AbstractObject* EpcDocument::createPartial(gsoap_resqml2_0_1::eml20__
 	else if CREATE_RESQML_2_0_1_FESAPI_PARTIAL_WRAPPER(PointSetRepresentation)
 	else if CREATE_RESQML_2_0_1_FESAPI_PARTIAL_WRAPPER(PlaneSetRepresentation)
 	else if CREATE_RESQML_2_0_1_FESAPI_PARTIAL_WRAPPER(PolylineRepresentation)
-	else if CREATE_RESQML_2_0_1_FESAPI_PARTIAL_WRAPPER(Grid2dSetRepresentation)
 	else if CREATE_RESQML_2_0_1_FESAPI_PARTIAL_WRAPPER(Grid2dRepresentation)
 	else if CREATE_RESQML_2_0_1_FESAPI_PARTIAL_WRAPPER(TriangulatedSetRepresentation)
 	else if CREATE_RESQML_2_0_1_FESAPI_PARTIAL_WRAPPER(BlockedWellboreRepresentation)

src/common/EpcDocument.h

@@ -80,7 +80,6 @@ namespace RESQML2_0_1_NS
 	class PolylineSetRepresentation;
 	class PolylineRepresentation;
 	class TriangulatedSetRepresentation;
-	class Grid2dSetRepresentation;
 	class Grid2dRepresentation;
 	class WellboreTrajectoryRepresentation;
 	class DeviationSurveyRepresentation;
@@ -417,11 +416,6 @@ namespace COMMON_NS
 		* Get all the geobodies contained into the EPC document
 		*/
 		const std::vector<RESQML2_0_1_NS::GeobodyFeature*> & getGeobodySet() const;
-
-		/**
-		* Get all the individual representations of horizons which are associated to grid 2d set topology
-		*/
-		std::vector<RESQML2_0_1_NS::Grid2dSetRepresentation*> getHorizonGrid2dSetRepSet() const;
 
 		/**
 		* Get all the individual representations of horizons which are associated to grid 2d set topology

src/resqml2_0_1/Grid2dRepresentation.h

@@ -18,7 +18,7 @@ under the License.
 -----------------------------------------------------------------------*/
 #pragma once
 
-#include "resqml2_0_1/Grid2dSetRepresentation.h"
+#include "resqml2_0_1/AbstractSurfaceRepresentation.h"
 
 namespace RESQML2_0_1_NS
 {
@@ -352,13 +352,6 @@ namespace RESQML2_0_1_NS
 
 		// Backward relationships
 		std::vector<AbstractRepresentation *> supportedRepresentationSet;
-
-		friend void Grid2dSetRepresentation::pushBackGeometryPatch(
-				double * zValues,
-				const unsigned int & numI, const unsigned int & numJ, COMMON_NS::AbstractHdfProxy* proxy,
-				Grid2dRepresentation * supportingGrid2dRepresentation,
-				const unsigned int & startIndexI, const unsigned int & startIndexJ,
-				const int & indexIncrementI, const int & indexIncrementJ);
 	};
 }