Commit 95714930 authored by Jim Porter's avatar Jim Porter
Browse files

Rename iGeom interface to FBiGeom to prevent collisions with CGM's iGeom


git-svn-id: https://svn.mcs.anl.gov/repos/ITAPS/MOAB/trunk@5232 6162379e-bd28-0410-9a7d-b7f4dcfcad3c
parent b8dad846
......@@ -1148,7 +1148,7 @@ AC_CONFIG_FILES([Makefile
itaps/imesh/Makefile
itaps/imesh/iMesh-Defs.inc
itaps/igeom/Makefile
itaps/igeom/iGeom-Defs.inc
itaps/igeom/FBiGeom-Defs.inc
tools/Makefile
tools/refiner/Makefile
tools/mbcoupler/Makefile
......
FBIGEOM_CXXFLAGS = @CXXFLAGS@
FBIGEOM_CFLAGS = @CFLAGS@
FBIGEOM_LDFLAGS = @EXPORT_LDFLAGS@
FBIGEOM_FC = @FC@
FBIGEOM_FCFLAGS = @FCFLAGS@
FBIGEOM_FCDEFS = @DEFS@
FBIGEOM_CPPFLAGS = -I$(FBIGEOM_INCLUDEDIR) $(FBIGEOM_INCLUDEDIR2)
# This definition is deprecated; use IMESH_CPPFLAGS instead
FBIGEOM_INCLUDES = $(FBIGEOM_CPPFLAGS)
FBIGEOM_LIBS = $(FBIGEOM_LDFLAGS) -L$(MOAB_LIBDIR) \
-L$(FBIGEOM_LIBDIR) -liMesh -lMOAB \
@NETCDF_LIBS@ @HDF5_LIBS@ @LIBS@ \
@CGM_LDFLAGS@ @CGM_LIBS@
FBIGEOM_INCLUDEDIR1 = @abs_srcdir@
FBIGEOM_INCLUDEDIR2 = -I@abs_top_builddir@
FBIGEOM_LIBDIR = @abs_builddir@/.libs
MOAB_LIBDIR = @abs_builddir@/../../.libs
#ifndef IGEOM_MOAB_HPP
#define IGEOM_MOAB_HPP
#ifndef FBIGEOM_MOAB_HPP
#define FBIGEOM_MOAB_HPP
#include "iGeom.h"
#include "FBiGeom.h"
//#include "moab/Forward.hpp"
#include "moab/Interface.hpp"
#include "moab/FBEngine.hpp"
......@@ -41,12 +41,12 @@ public:
MBiMesh * mbimesh() { return _mbimesh; }
};
/* Define macro for quick reference to MBInterface instance */
static inline moab::Interface* MBI_cast( iGeom_Instance i )
static inline moab::Interface* MBI_cast( FBiGeom_Instance i )
{ return reinterpret_cast<MBiGeom*>(i)->moabItf(); }
#define MBI MBI_cast(instance)
static inline moab::FBEngine* FBE_cast( iGeom_Instance i )
static inline moab::FBEngine* FBE_cast( FBiGeom_Instance i )
{ return reinterpret_cast<MBiGeom*>(i) -> FBItf(); }
/* Define macro for quick reference to moab::Interface instance */
......@@ -55,9 +55,9 @@ static inline moab::EntityHandle MBH_cast( iBase_EntityHandle h )
#define GETGTT(a) (reinterpret_cast<MBiGeom*>(a)->FBItf()->get_gtt())
static inline bool iGeom_isError(int code)
static inline bool FBiGeom_isError(int code)
{ return (iBase_SUCCESS != code); }
static inline bool iGeom_isError(moab::ErrorCode code)
static inline bool FBiGeom_isError(moab::ErrorCode code)
{ return (moab::MB_SUCCESS != code); }
// easy access to imesh instance, used for tags, sets methods
......@@ -81,13 +81,13 @@ static inline bool iGeom_isError(moab::ErrorCode code)
#define CHKERR(CODE,MSG) \
do { \
if (iGeom_isError((CODE))) \
if (FBiGeom_isError((CODE))) \
ERROR((CODE),(MSG)); \
} while(false)
#define FWDERR() \
do { \
if (iGeom_isError(*err)) \
if (FBiGeom_isError(*err)) \
return; \
} while(false)
......@@ -107,4 +107,4 @@ static inline bool iGeom_isError(moab::ErrorCode code)
} \
} while(false)
#endif // IGEOM_MOAB_HPP
#endif // FBIGEOM_MOAB_HPP
#ifndef FBIGEOM_F_H
#define FBIGEOM_F_H
#include "iBase_f.h"
#define FBiGeom_Instance IBASE_HANDLE_T
#define FBiGeom_EntityIterator IBASE_HANDLE_T
#define FBiGeom_EntityArrIterator IBASE_HANDLE_T
#endif
BUILT_SOURCES = iGeom_protos.h
BUILT_SOURCES = FBiGeom_protos.h
MESHDIR = $(top_srcdir)/MeshFiles/unittest/iGeom
......@@ -11,25 +11,25 @@ AM_CPPFLAGS = -DSRCDIR=$(srcdir) \
-I$(top_builddir)/itaps/imesh
lib_LTLIBRARIES = libiGeomMOAB.la
lib_LTLIBRARIES = libFBiGeomMOAB.la
libiGeomMOAB_la_includedir = $(includedir)
libFBiGeomMOAB_la_includedir = $(includedir)
#libiGeomMOAB_la_LIBADD = $(top_builddir)/libMOAB.la
#libFBiGeomMOAB_la_LIBADD = $(top_builddir)/libMOAB.la
libiGeomMOAB_la_SOURCES = \
iGeom_MOAB.hpp \
iGeom_MOAB.cpp
libFBiGeomMOAB_la_SOURCES = \
FBiGeom_MOAB.hpp \
FBiGeom_MOAB.cpp
libiGeomMOAB_la_include_HEADERS = \
iGeom.h \
iGeom_protos.h \
iGeom_f.h
libFBiGeomMOAB_la_include_HEADERS = \
FBiGeom.h \
FBiGeom_protos.h \
FBiGeom_f.h
# stuff for test program
check_PROGRAMS = testgeom testSmoothGeom
testgeom_SOURCES = testgeom.cc
testgeom_DEPENDENCIES = libiGeomMOAB.la \
testgeom_DEPENDENCIES = libFBiGeomMOAB.la \
$(top_builddir)/itaps/imesh/libiMesh.la \
$(top_builddir)/src/libMOAB.la
testgeom_LDADD = libiGeomMOAB.la \
......@@ -38,7 +38,7 @@ testgeom_LDADD = libiGeomMOAB.la \
${MOAB_CXX_LINKFLAGS} ${MOAB_CXX_LIBS}
testSmoothGeom_SOURCES = testSmooth.cc
testSmoothGeom_DEPENDENCIES = libiGeomMOAB.la \
testSmoothGeom_DEPENDENCIES = libFBiGeomMOAB.la \
$(top_builddir)/itaps/imesh/libiMesh.la \
$(top_builddir)/src/libMOAB.la
testSmoothGeom_LDADD = libiGeomMOAB.la \
......@@ -53,7 +53,7 @@ TESTS = $(check_PROGRAMS)
# in $(libdir). Define a $(cfgdir) to get around automake's
# check that only libraries are going in $(libdir)
cfgdir = $(libdir)
cfg_DATA = iGeom-Defs.inc
cfg_DATA = FBiGeom-Defs.inc
# By default, moab.make will define these to $(srcdir). We
# want to override that during the INSTALL of the file so
......@@ -61,12 +61,12 @@ cfg_DATA = iGeom-Defs.inc
# 'make prefix=/foo install', we don't know the correct install
# directory until we're doing the install.
install-data-hook:
$(AM_V_at)echo "IGEOM_DIR=${cfgdir}/.." >> $(DESTDIR)$(cfgdir)/iGeom-SIDL-Defs.inc
$(AM_V_at)echo "IGEOM_INCLUDEDIR=${includedir}" >> $(DESTDIR)$(cfgdir)/iGeom-Defs.inc
$(AM_V_at)echo "IGEOM_INCLUDEDIR2=" >> $(DESTDIR)$(cfgdir)/iGeom-Defs.inc
$(AM_V_at)echo "IGEOM_LIBDIR=${libdir}" >> $(DESTDIR)$(cfgdir)/iGeom-Defs.inc
$(AM_V_at)echo "MOAB_LIBDIR=${libdir}" >> $(DESTDIR)$(cfgdir)/iGeom-Defs.inc
$(AM_V_at)echo "IGEOM_LIBS=-L${libdir} -liGeomMOAB" >> $(DESTDIR)$(cfgdir)/iGeom-Defs.inc
$(AM_V_at)echo "IGEOM_DIR=${cfgdir}/.." >> $(DESTDIR)$(cfgdir)/FBiGeom-SIDL-Defs.inc
$(AM_V_at)echo "IGEOM_INCLUDEDIR=${includedir}" >> $(DESTDIR)$(cfgdir)/FBiGeom-Defs.inc
$(AM_V_at)echo "IGEOM_INCLUDEDIR2=" >> $(DESTDIR)$(cfgdir)/FBiGeom-Defs.inc
$(AM_V_at)echo "IGEOM_LIBDIR=${libdir}" >> $(DESTDIR)$(cfgdir)/FBiGeom-Defs.inc
$(AM_V_at)echo "MOAB_LIBDIR=${libdir}" >> $(DESTDIR)$(cfgdir)/FBiGeom-Defs.inc
$(AM_V_at)echo "IGEOM_LIBS=-L${libdir} -liGeomMOAB" >> $(DESTDIR)$(cfgdir)/FBiGeom-Defs.inc
iGeom_protos.h: iGeom.h $(top_srcdir)/itaps/mkprotos.sh Makefile.am
$(AM_V_GEN)$(top_srcdir)/itaps/mkprotos.sh iGeom MOAB $< $@ MOAB_FCDefs.h
FBiGeom_protos.h: FBiGeom.h $(top_srcdir)/itaps/mkprotos.sh Makefile.am
$(AM_V_GEN)$(top_srcdir)/itaps/mkprotos.sh FBiGeom MOAB $< $@ MOAB_FCDefs.h
IGEOM_CXXFLAGS = @CXXFLAGS@
IGEOM_CFLAGS = @CFLAGS@
IGEOM_LDFLAGS = @EXPORT_LDFLAGS@
IGEOM_FC = @FC@
IGEOM_FCFLAGS = @FCFLAGS@
IGEOM_FCDEFS = @DEFS@
IGEOM_CPPFLAGS = -I$(IGEOM_INCLUDEDIR) $(IGEOM_INCLUDEDIR2)
# This definition is deprecated; use IMESH_CPPFLAGS instead
IGEOM_INCLUDES = $(IGEOM_CPPFLAGS)
IGEOM_LIBS = $(IGEOM_LDFLAGS) -L$(MOAB_LIBDIR) \
-L$(IGEOM_LIBDIR) -liMesh -lMOAB \
@NETCDF_LIBS@ @HDF5_LIBS@ @LIBS@ \
@CGM_LDFLAGS@ @CGM_LIBS@
IGEOM_INCLUDEDIR1 = @abs_srcdir@
IGEOM_INCLUDEDIR2 = -I@abs_top_builddir@
IGEOM_LIBDIR = @abs_builddir@/.libs
MOAB_LIBDIR = @abs_builddir@/../../.libs
#ifndef IGEOM_F_H
#define IGEOM_F_H
#include "iBase_f.h"
#define iGeom_Instance IBASE_HANDLE_T
#define iGeom_EntityIterator IBASE_HANDLE_T
#define iGeom_EntityArrIterator IBASE_HANDLE_T
#endif
This diff is collapsed.
This diff is collapsed.
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment