Merge branch 'simplify-uggrid-domain-creation' into 'master'

Simplify UGGrid domain creation

Closes #188

See merge request !755

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 = std::make_unique<typename UG_NS<dimworld>::domain>();
+  ugDomain->numOfSegments = grid_->numBoundarySegments_;
+  ugDomain->numOfCorners = noOfBNodes;
 
   // ///////////////////////////////////////////
   //   Insert the boundary segments
@@ -416,16 +413,12 @@ createGrid()
   typename UG_NS<dimworld>::BVP* theBVP = UG_NS<dimworld>::BVP_GetByName(BVPName.c_str());
   assert(theBVP);
 
-  std::string configureArgs[2] = {"configure " + BVPName, "d " + grid_->name_ + "_Domain"};
-  const char* configureArgs_c[2] = {configureArgs[0].c_str(), configureArgs[1].c_str()};
-
   typename UG_NS<dimworld>::BVP_DESC theBVPDesc;
   if (BVP_SetBVPDesc(theBVP,&theBVPDesc) != 0)
     DUNE_THROW(GridError, "Calling BVP_SetBVPDesc failed!");
 
-  if (theBVPDesc.ConfigProc!=nullptr)
-    if ((*theBVPDesc.ConfigProc)(2,const_cast<char**>(configureArgs_c)))
-      DUNE_THROW(GridError, "Could not configure the UG BVP");
+  if (STD_BVP_Configure(BVPName,std::move(ugDomain)))
+    DUNE_THROW(GridError, "Calling STD_BVP_Configure failed!");
 
   // Make sure there is no old multigrid object with the same name.
   // TODO: Can this happen at all?
@@ -573,12 +566,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;
@@ -1140,14 +1142,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);
     }