[MOAB-dev] r3670 - in MOAB/trunk: config doc test

[tautges at mcs.anl.gov]

Author: tautges
Date: 2010-03-18 15:20:16 -0500 (Thu, 18 Mar 2010)
New Revision: 3670

Modified:
   MOAB/trunk/config/ccmio.m4
   MOAB/trunk/doc/MOABv4-UG.doc
   MOAB/trunk/test/MBTest.cpp
   MOAB/trunk/test/mbcn_test.cc
Log:
Coupla small test fixes having to do with namespaces.

Fixing comments in ccmio.m4.

Some more content addition in the user's guide.



Modified: MOAB/trunk/config/ccmio.m4
===================================================================
--- MOAB/trunk/config/ccmio.m4	2010-03-18 19:42:04 UTC (rev 3669)
+++ MOAB/trunk/config/ccmio.m4	2010-03-18 20:20:16 UTC (rev 3670)
@@ -1,10 +1,10 @@
 #######################################################################################
-# Check for NetCDF library ((C++)
-# Sets HAVE_NETCDF to 'yes' or 'no'
-# If HAVE_NETCDF == yes, then exports:
-#   NETCDF_CPPFLAGS
-#   NETCDF_LDFLAGS
-#   NETCDF_LIBS
+# Check for CCMIO library ((C++)
+# Sets HAVE_CCMIO to 'yes' or 'no'
+# If HAVE_CCMIO == yes, then exports:
+#   CCMIO_CPPFLAGS
+#   CCMIO_LDFLAGS
+#   CCMIO_LIBS
 #######################################################################################
 AC_DEFUN([FATHOM_CHECK_CCMIO],[
 

Modified: MOAB/trunk/doc/MOABv4-UG.doc
===================================================================
(Binary files differ)

Modified: MOAB/trunk/test/MBTest.cpp
===================================================================
--- MOAB/trunk/test/MBTest.cpp	2010-03-18 19:42:04 UTC (rev 3669)
+++ MOAB/trunk/test/MBTest.cpp	2010-03-18 20:20:16 UTC (rev 3670)
@@ -5077,11 +5077,11 @@
     for (int dim = 1; dim <= CN::Dimension(this_type); dim++) {
         // for each side of this dimension
       const CN::ConnMap &cm = CN::mConnectivityMap[this_type][dim-1];
-      int tmp_conn[MB_MAX_SUB_ENTITY_VERTICES];
+      int tmp_conn[moab::MAX_SUB_ENTITY_VERTICES];
 
       for (int side_no = 0; side_no < CN::NumSubEntities(this_type, dim); side_no++) {
 
-        for (int j = 0; j < MB_MAX_SUB_ENTITY_VERTICES; j++) tmp_conn[j] = cm.conn[side_no][j];
+        for (int j = 0; j < moab::MAX_SUB_ENTITY_VERTICES; j++) tmp_conn[j] = cm.conn[side_no][j];
         int temp_result = 
           CN::SideNumber(this_type,
                            tmp_conn, 

Modified: MOAB/trunk/test/mbcn_test.cc
===================================================================
--- MOAB/trunk/test/mbcn_test.cc	2010-03-18 19:42:04 UTC (rev 3669)
+++ MOAB/trunk/test/mbcn_test.cc	2010-03-18 20:20:16 UTC (rev 3670)
@@ -1063,7 +1063,7 @@
    
     // first test the types
   for (int i = 0; i < num_sub; ++i) {
-    int num, conn[MB_MAX_SUB_ENTITY_VERTICES];
+    int num, conn[moab::MAX_SUB_ENTITY_VERTICES];
     EntityType type;
     CN::SubEntityNodeIndices( parent, num_nodes, sub_dimension, i, type, num, conn );
     CHECK_EQUAL( CN::SubEntityType(parent, sub_dimension, i), type );
@@ -1071,7 +1071,7 @@
  
     // now test that they have the correct number of higher-order node
   for (int i = 0; i < num_sub; ++i) {
-    int num, conn[MB_MAX_SUB_ENTITY_VERTICES];
+    int num, conn[moab::MAX_SUB_ENTITY_VERTICES];
     EntityType type;
     CN::SubEntityNodeIndices( parent, num_nodes, sub_dimension, i, type, num, conn );
     const int ho = CN::HasMidNodes( type, num );
@@ -1080,7 +1080,7 @@
   
     // now test the actual indices
   for (int i = 0; i < num_sub; ++i) {
-    int num, conn[MB_MAX_SUB_ENTITY_VERTICES], corners[MB_MAX_SUB_ENTITY_VERTICES];
+    int num, conn[moab::MAX_SUB_ENTITY_VERTICES], corners[moab::MAX_SUB_ENTITY_VERTICES];
     EntityType type;
     CN::SubEntityNodeIndices( parent, num_nodes, sub_dimension, i, type, num, conn );