[MOAB-dev] r3917 - in MOAB/trunk: itaps/igeom itaps/imesh test test/io test/obb test/parallel

[tautges at mcs.anl.gov]

Author: tautges
Date: 2010-05-19 09:05:37 -0500 (Wed, 19 May 2010)
New Revision: 3917

Modified:
   MOAB/trunk/itaps/igeom/Makefile.am
   MOAB/trunk/itaps/igeom/testgeom.cc
   MOAB/trunk/itaps/imesh/Makefile.am
   MOAB/trunk/test/MBTest.cpp
   MOAB/trunk/test/Makefile.am
   MOAB/trunk/test/io/Makefile.am
   MOAB/trunk/test/io/cub_file_test.cc
   MOAB/trunk/test/io/exodus_test.cc
   MOAB/trunk/test/io/gmsh_test.cc
   MOAB/trunk/test/io/ideas_test.cc
   MOAB/trunk/test/io/nastran_test.cc
   MOAB/trunk/test/io/smf_test.cc
   MOAB/trunk/test/io/stl_test.cc
   MOAB/trunk/test/obb/Makefile.am
   MOAB/trunk/test/obb/obb_test.cpp
   MOAB/trunk/test/parallel/Makefile.am
   MOAB/trunk/test/parallel/parallel_hdf5_test.cc
   MOAB/trunk/test/parallel/parallel_unit_tests.cpp
   MOAB/trunk/test/parallel/pcomm_serial.cpp
   MOAB/trunk/test/parallel/uber_parallel_test.cpp
Log:
Moving mesh files used in various places into a "MeshFiles/unittest" 
directory.  This will make it easier for new users to find sample mesh files, 
and also gives us a place under which to hang other mesh files eventually.

All tests pass, including parallel ones.  Haven't tested 'make clean' and 
'make distclean' yet for in-source builds.



Modified: MOAB/trunk/itaps/igeom/Makefile.am
===================================================================
--- MOAB/trunk/itaps/igeom/Makefile.am	2010-05-18 22:14:32 UTC (rev 3916)
+++ MOAB/trunk/itaps/igeom/Makefile.am	2010-05-19 14:05:37 UTC (rev 3917)
@@ -1,6 +1,9 @@
 BUILT_SOURCES = iGeom_protos.h
 
+MESHDIR = $(top_srcdir)/MeshFiles/unittest/iGeom
+
 AM_CPPFLAGS = -DSRCDIR=$(srcdir) \
+	      -DMESHDIR=$(MESHDIR) \
               -I$(top_srcdir)/src \
               -I$(top_builddir)/src \
               -I.. -I$(srcdir)/.. \

Modified: MOAB/trunk/itaps/igeom/testgeom.cc
===================================================================
--- MOAB/trunk/itaps/igeom/testgeom.cc	2010-05-18 22:14:32 UTC (rev 3916)
+++ MOAB/trunk/itaps/igeom/testgeom.cc	2010-05-19 14:05:37 UTC (rev 3917)
@@ -127,21 +127,24 @@
 
 int main( int argc, char *argv[] )
 {
+#ifndef MESHDIR
+#define MESHDIR .
+#endif
     // Check command line arg
   #ifdef FORCE_OCC
     #ifndef HAVE_OCC
       #error "Cannot force use of OCC w/out OCC support"
     #endif
-  std::string filename = STRINGIFY(SRCDIR) "/../test/LeverArm.brep";
+  std::string filename = STRINGIFY(MESHDIR) "LeverArm.brep";
     std::string engine_opt = ";engine=OCC";
   #elif defined(HAVE_ACIS)
-    std::string filename = STRINGIFY(SRCDIR) "/testgeom.sat";
+    std::string filename = STRINGIFY(MESHDIR) "testgeom.sat";
     std::string engine_opt = ";engine=ACIS";
   #elif defined(HAVE_OCC)
-    std::string filename = STRINGIFY(SRCDIR) "/../test/LeverArm.brep";
+    std::string filename = STRINGIFY(MESHDIR) "LeverArm.brep";
     std::string engine_opt = ";engine=OCC";
   #else
-    std::string filename = STRINGIFY(SRCDIR) "/brick.stp";
+    std::string filename = STRINGIFY(MESHDIR) "brick.stp";
     std::string engine_opt;
   #endif
   if (argc == 1) {

Modified: MOAB/trunk/itaps/imesh/Makefile.am
===================================================================