Commit 45584e01 authored by Iulian Grindeanu's avatar Iulian Grindeanu Committed by vijaysm
Browse files

Introduce a structure GlobalContext that coalesces all global variables

from iMOAB.cpp. Now there is just one static object context, of type
GlobalContext.

Additionally, add CMake support for iMOAB interfaces and tests.
parent 12db4339
......@@ -67,6 +67,7 @@ set(MOAB_LIB_SOURCES
HalfFacetRep.cpp
HigherOrderFactory.cpp
HomXform.cpp
iMOAB.cpp
Internals.hpp
LloydSmoother.cpp
MBCNArrays.hpp
......@@ -144,6 +145,7 @@ set( MOAB_INSTALL_HEADERS
moab/FindPtFuncs.h
moab/Forward.hpp
moab/GeomUtil.hpp
moab/iMOAB.h
moab/Interface.hpp
moab/LloydSmoother.hpp
moab/point_locater/tree/common_tree.hpp
......
This diff is collapsed.
......@@ -17,7 +17,6 @@
*/
/*
Comments from Mike and Emily:
1) Fortran MPI_Comm won't work. Take an integer argument and use MPI_F2C calls to get the C-Comm object
2) ReadHeaderInfo - Does it need the pid ?
......
......@@ -53,7 +53,8 @@ if(MOAB_HAVE_HDF5)
mbfacet_test.cpp
mbground_test.cpp
gttool_test.cpp
crop_vol_test.cpp )
crop_vol_test.cpp
imoab_test.cpp )
endif()
foreach( fname ${TESTS} )
......
......@@ -75,7 +75,10 @@ if HAVE_HDF5
if PARALLEL
# imoab tests
TESTS += imoab_test imoab_testF
TESTS += imoab_test
if ENABLE_FORTRAN
TESTS += imoab_testF
endif
endif
endif
......@@ -111,7 +114,7 @@ test_Matrix3_SOURCES = test_Matrix3.cpp
imoab_testF_SOURCES = imoab_testF.F
# -DMOAB_HAVE_MPI is added just for fortran compiling; is that wrong?
# still don't know how to "stringify" for the mesh input files
imoab_testF_FFLAGS = -DMOAB_HAVE_MPI -DFMDIR=\"$(MESHDIR)\" -ffixed-line-length-none
imoab_testF_FFLAGS = -DMOAB_HAVE_MPI -DMESHDIR=\"$(MESHDIR)\" -ffixed-line-length-none
imoab_testF_LDADD = $(LDADD) $(FCLIBS)
imoab_test_SOURCES = imoab_test.cpp
verdict_test_SOURCES = verdict_test.cpp
......
......@@ -11,7 +11,6 @@
program fdriver
C include '/home/iulian/3rdparty/mpich-3.1/install/include/mpif.h'
#ifdef MOAB_HAVE_MPI
include 'mpif.h'
#endif
......@@ -87,7 +86,7 @@ c find out MY process ID, and how many processes were started.
#endif
call errorout(ierr, 'fail to register application')
C
tmpfile =FMDIR
tmpfile =MESHDIR
filename = trim(tmpfile) // '/io/p8ex1.h5m' //CHAR(0)
ierr = iMOAB_ReadHeaderInfo ( filename, ngv, nge, ndim, nparts)
call errorout(ierr, 'fail to read header info')
......
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