[MOAB-dev] r1941 - MOAB/trunk/tools/mbcoupler

[kraftche at mcs.anl.gov]

Author: kraftche
Date: 2008-06-27 13:18:06 -0500 (Fri, 27 Jun 2008)
New Revision: 1941

Modified:
   MOAB/trunk/tools/mbcoupler/Makefile.am
   MOAB/trunk/tools/mbcoupler/findpt_test.cpp
Log:
fix build errors

Modified: MOAB/trunk/tools/mbcoupler/Makefile.am
===================================================================
--- MOAB/trunk/tools/mbcoupler/Makefile.am	2008-06-27 17:06:29 UTC (rev 1940)
+++ MOAB/trunk/tools/mbcoupler/Makefile.am	2008-06-27 18:18:06 UTC (rev 1941)
@@ -19,8 +19,8 @@
    findpt.c \
    findpt.h \
    minmax.h \
-   types.h \
-   MBCoupler.cpp
+   types.h #\
+   #MBCoupler.cpp
 
 libmbcoupler_la_include_HEADERS = \
    MBElemUtil.hpp \

Modified: MOAB/trunk/tools/mbcoupler/findpt_test.cpp
===================================================================
--- MOAB/trunk/tools/mbcoupler/findpt_test.cpp	2008-06-27 17:06:29 UTC (rev 1940)
+++ MOAB/trunk/tools/mbcoupler/findpt_test.cpp	2008-06-27 18:18:06 UTC (rev 1941)
@@ -2,6 +2,7 @@
 #include "MBElemUtil.hpp"
 
 using namespace std;
+using namespace MBElemUtil;
 
 
 extern "C"{
@@ -9,6 +10,7 @@
 #include "types.h"
 }
 
+
 void test_hex_findpt()
 {
 
@@ -16,8 +18,6 @@
     MBCartVect rst;
     double dist;
 
-    MBElemUtil u;
-
     double *xm[3]; //element coord fields, lex ordering
     const int n=5; //number of nodes per direction (min is 2, for linear element)
 
@@ -41,7 +41,7 @@
       }
     }
         
-    u.hex_findpt(xm, n, xyz, rst, dist);
+    hex_findpt(xm, n, xyz, rst, dist);
 
 
     cout << "Coords of " << xyz << " are:  "<< rst <<
@@ -58,8 +58,6 @@
   MBCartVect ncoords;;
   double etol;
   
-  MBElemUtil u;
-  
   //Make our sample hex the unit cube [0,1]**3
   hex[0] = MBCartVect(0,0,0);
   hex[1] = MBCartVect(1,0,0);
@@ -72,7 +70,7 @@
 
   etol = .1 ; //ignored by nat_coords
 
-  u.nat_coords_trilinear_hex2(hex, xyz, ncoords, etol);
+  nat_coords_trilinear_hex2(hex, xyz, ncoords, etol);
       
   cout << "Coords of " << xyz << " are:  "<< ncoords << endl;