[MOAB-dev] r5477 - in MOAB/trunk: examples/itaps src src/moab tools/mbcoupler

[tautges at mcs.anl.gov]

Author: tautges
Date: 2012-04-11 15:45:52 -0500 (Wed, 11 Apr 2012)
New Revision: 5477

Added:
   MOAB/trunk/src/moab/Matrix3.hpp
Removed:
   MOAB/trunk/src/Matrix3.hpp
Modified:
   MOAB/trunk/examples/itaps/Makefile.am
   MOAB/trunk/src/AffineXform.hpp
   MOAB/trunk/src/GeomUtil.cpp
   MOAB/trunk/src/Makefile.am
   MOAB/trunk/src/Matrix3.cpp
   MOAB/trunk/src/OrientedBox.cpp
   MOAB/trunk/src/OrientedBox.hpp
   MOAB/trunk/tools/mbcoupler/ElemUtil.cpp
   MOAB/trunk/tools/mbcoupler/ElemUtil.hpp
   MOAB/trunk/tools/mbcoupler/mbcoupler_test.cpp
Log:
Removing some dependencies in mbcoupler_test, and moving the Matrix3.hpp
header down to moab/, since it's included by another API header (ElemUtil.hpp).

Also fixing include paths for TagIterateC, which depends on moab_mpi.h.



Modified: MOAB/trunk/examples/itaps/Makefile.am
===================================================================
--- MOAB/trunk/examples/itaps/Makefile.am	2012-04-11 17:04:54 UTC (rev 5476)
+++ MOAB/trunk/examples/itaps/Makefile.am	2012-04-11 20:45:52 UTC (rev 5477)
@@ -5,6 +5,7 @@
 
 AM_CPPFLAGS += -I$(top_srcdir)/itaps/imesh \
 	-I$(top_srcdir)/itaps/ \
+	-I$(top_srcdir)/src/parallel/ \
 	-I$(top_builddir)/itaps \
 	-I$(top_builddir)/itaps/imesh
 

Modified: MOAB/trunk/src/AffineXform.hpp
===================================================================
--- MOAB/trunk/src/AffineXform.hpp	2012-04-11 17:04:54 UTC (rev 5476)
+++ MOAB/trunk/src/AffineXform.hpp	2012-04-11 20:45:52 UTC (rev 5477)
@@ -19,7 +19,7 @@
 
 #include "moab/Forward.hpp"
 #include "moab/CartVect.hpp"
-#include "Matrix3.hpp"
+#include "moab/Matrix3.hpp"
 
 #include <cmath>
 #include <limits>

Modified: MOAB/trunk/src/GeomUtil.cpp
===================================================================
--- MOAB/trunk/src/GeomUtil.cpp	2012-04-11 17:04:54 UTC (rev 5476)
+++ MOAB/trunk/src/GeomUtil.cpp	2012-04-11 20:45:52 UTC (rev 5477)
@@ -21,7 +21,7 @@
 #include "moab/CartVect.hpp"
 #include "moab/CN.hpp"
 #include "moab/GeomUtil.hpp"
-#include "Matrix3.hpp"
+#include "moab/Matrix3.hpp"
 #include <cmath>
 #include <algorithm>
 #include <assert.h>

Modified: MOAB/trunk/src/Makefile.am
===================================================================
--- MOAB/trunk/src/Makefile.am	2012-04-11 17:04:54 UTC (rev 5476)
+++ MOAB/trunk/src/Makefile.am	2012-04-11 20:45:52 UTC (rev 5477)
@@ -63,7 +63,6 @@
   HomXform.cpp \
   Internals.hpp \
   Matrix3.cpp \
-  Matrix3.hpp \
   MBCNArrays.hpp \