Add guarded accessors for geometry and relations.

jedbrown · Jun 13, 2011 · f8793ec · f8793ec
1 parent 5456e73
commit f8793ec
Show file tree

Hide file tree

Showing 4 changed files with 47 additions and 4 deletions.
diff --git a/include/dohpmesh.h b/include/dohpmesh.h
@@ -2,11 +2,14 @@
 #define _DOHPMESH_H
 
 #include <petscsys.h>
-#include <stdlib.h>
-#include <string.h>
 #include <dohptype.h>
 #include <dohpjacobi.h>
 
+#ifdef dHAVE_ITAPS_REL
+#  include <iGeom.h>
+#  include <iRel.h>
+#endif
+
 dEXTERN_C_BEGIN
 
 typedef struct _p_dMeshPacker *dMeshPacker;
@@ -168,6 +171,11 @@ extern dErr dMeshPartitionOnOwnership(dMesh,dMeshEH[],dInt,dInt*);
 extern dErr dMeshMorph(dMesh,void(*morph)(void*,double*),void*);
 extern dErr dMeshSetClosure(dMesh,dMeshESH);
 
+#ifdef dHAVE_ITAPS_REL
+extern dErr dMeshSetGeometryRelation(dMesh,iGeom_Instance,iRel_Instance);
+extern dErr dMeshGetGeometryRelation(dMesh,iGeom_Instance*,iRel_Instance*);
+#endif
+
 dEXTERN_C_END
 
 #endif
diff --git a/include/dohpmeshimpl.h b/include/dohpmeshimpl.h
@@ -16,6 +16,10 @@ struct _p_dMesh {
   PETSCHEADER(struct _dMeshOps);
   char *infile,*inoptions;
   iMesh_Instance mi;
+#ifdef dHAVE_ITAPS_REL
+  iGeom_Instance igeom;
+  iRel_Instance irel;
+#endif
   dMeshESH root,emptyset;
   dMeshTag senseTag;
   MeshListEH v,e,f,r;           /* vertices, edges, faces, vertices */

diff --git a/include/dohptype.h b/include/dohptype.h
@@ -1,7 +1,7 @@
 #ifndef _DOHPTYPE_H
 #define _DOHPTYPE_H
 
-#include "dohpconfig.h"
+#include <dohpconfig.h>
 #include <petscconf.h>
 #include <iMesh.h>
 #include <mpi.h>

diff --git a/src/fs/mesh/interface/mesh.c b/src/fs/mesh/interface/mesh.c
@@ -1108,6 +1108,7 @@ dErr dMeshDestroy(dMesh *meshp)
 {
   dMesh m = *meshp;
   dErr err;
+  dIInt ierr;
 
   dFunctionBegin;
   if (!m) dFunctionReturn(0);
@@ -1120,9 +1121,13 @@ dErr dMeshDestroy(dMesh *meshp)
   MeshListFree(m->arf); MeshListFree(m->afe); MeshListFree(m->aev);
   MeshListFree(m->orf); MeshListFree(m->ofe);
   MeshListFree(m->x);
-  iMesh_dtor(m->mi,&err);dICHK(m->mi,err);
+  iMesh_dtor(m->mi,&ierr);dICHK(m->mi,ierr);
   err = PetscFree(m->infile);dCHK(err);
   err = PetscFree(m->inoptions);dCHK(err);
+#ifdef dHAVE_ITAPS_REL
+  if (m->irel)  {iRel_destroy(m->irel,&ierr);dIRCHK(m->irel,ierr);}
+  if (m->igeom) {iGeom_dtor(m->igeom,&ierr);dIGCHK(m->igeom,ierr);}
+#endif
   err = PetscHeaderDestroy(meshp);dCHK(err);
   dFunctionReturn(0);
 }
@@ -1535,3 +1540,29 @@ dErr dMeshSetClosure(dMesh mesh,dMeshESH set)
   ents_a = adj_a = off_a = 0;
   dFunctionReturn(0);
 }
+
+#ifdef dHAVE_ITAPS_REL
+// The mesh takes ownership with this call. ITAPS interfaces do not have reference counting.
+dErr dMeshSetGeometryRelation(dMesh mesh,iGeom_Instance geom,iRel_Instance rel)
+{
+  dFunctionBegin;
+  dValidHeader(mesh,dMESH_CLASSID,1);
+  if (rel) {
+    if (mesh->irel && rel != mesh->irel) dERROR(((dObject)mesh)->comm,PETSC_ERR_ARG_WRONGSTATE,"Can only set relation once");
+    mesh->irel = rel;
+  }
+  if (geom) {
+    if (mesh->igeom && geom != mesh->igeom) dERROR(((dObject)mesh)->comm,PETSC_ERR_ARG_WRONGSTATE,"Can only set geometry once");
+    mesh->igeom = geom;
+  }
+  dFunctionReturn(0);
+}
+dErr dMeshGetGeometryRelation(dMesh mesh,iGeom_Instance *geom,iRel_Instance *rel)
+{
+  dFunctionBegin;
+  dValidHeader(mesh,dMESH_CLASSID,1);
+  if (rel)  *rel = mesh->irel;
+  if (geom) *geom = mesh->igeom;
+  dFunctionReturn(0);
+}
+#endif