[UGGrid] Stop calling CreateDomain/RemoveDomain

These two methods have been removed from dune-uggrid.  Instead
'domain' objects can be simply handled via new/delete.

The current code looks like it leaks to the 'domain' object,
but it probably did so before, too.  To be fixed in a
later commit.

dune/grid/uggrid/uggridfactory.cc

@@ -297,13 +297,10 @@ createGrid()
   //   Create the domain data structure
   // ///////////////////////////////////////////
   grid_->numBoundarySegments_ = boundarySegments.size();
-  std::string domainName = grid_->name_ + "_Domain";
 
-  auto* ugDomain =UG_NS<dimworld>::CreateDomain(domainName.c_str(),     // The domain name
-                                                grid_->numBoundarySegments_,
-                                                noOfBNodes);
-  if (ugDomain == nullptr)
-    DUNE_THROW(GridError, "Calling UG::" << dimworld << "d::CreateDomain failed!");
+  auto* ugDomain = new UG_NS<dimworld>::domain;
+  ugDomain->numOfSegments = grid_->numBoundarySegments_;
+  ugDomain->numOfCorners = noOfBNodes;
 
   // ///////////////////////////////////////////
   //   Insert the boundary segments
@@ -423,7 +420,7 @@ createGrid()
   if (BVP_SetBVPDesc(theBVP,&theBVPDesc) != 0)
     DUNE_THROW(GridError, "Calling BVP_SetBVPDesc failed!");
 
-  if (UG_NS<dimworld>::STD_BVP_Configure(2,const_cast<char**>(configureArgs_c)))
+  if (UG_NS<dimworld>::STD_BVP_Configure(2,const_cast<char**>(configureArgs_c),ugDomain))
     DUNE_THROW(GridError, "Calling STD_BVP_Configure failed!");
 
   // Make sure there is no old multigrid object with the same name.
@@ -572,12 +569,6 @@ createBegin()
   elementTypes_.resize(0);
   elementVertices_.resize(0);
   vertexPositions_.resize(0);
-
-  // //////////////////////////////////////////////////////////
-  //   Delete the UG domain, if it exists
-  // //////////////////////////////////////////////////////////
-  std::string domainName = grid_->name_ + "_Domain";
-  UG_NS<dimworld>::RemoveDomain(domainName.c_str());
 }
 
 

dune/grid/uggrid/ugwrapper.hh

@@ -79,6 +79,8 @@ namespace Dune {
 
     typedef UG_NAMESPACE ::vertex Vertex;
 
+    typedef UG_NAMESPACE ::domain domain;
+
     typedef UG_NAMESPACE ::BVP BVP;
 
     typedef UG_NAMESPACE ::BVP_DESC BVP_DESC;
@@ -1071,9 +1073,9 @@ namespace Dune {
                                                        numOfUserFct, userfct);
     }
 
-    static int STD_BVP_Configure(int argc, char **argv)
+    static int STD_BVP_Configure(int argc, char **argv, UG_NAMESPACE::domain *theDomain)
     {
-      return UG_NAMESPACE :: STD_BVP_Configure(argc, argv);
+      return UG_NAMESPACE :: STD_BVP_Configure(argc, argv, theDomain);
     }
 
     //! Set the current boundary value problem
@@ -1145,14 +1147,6 @@ namespace Dune {
                                             optimizedIE, insertMesh, ppifContext);
     }
 
-    static auto* CreateDomain(const char* name, int segments, int corners) {
-      return UG_NAMESPACE ::CreateDomain(name, segments, corners);
-    }
-
-    static void RemoveDomain(const char* name) {
-      UG_NAMESPACE ::RemoveDomain(name);
-    }
-
     static void* InsertInnerNode(UG_NAMESPACE ::grid* grid, const double* pos) {
       return UG_NAMESPACE ::InsertInnerNode(grid, pos);
     }