[MOAB-dev] r5489 - in MOAB/trunk: doc src/io tools/mbcoupler

[tautges at mcs.anl.gov]

Author: tautges
Date: 2012-04-22 21:09:46 -0500 (Sun, 22 Apr 2012)
New Revision: 5489

Modified:
   MOAB/trunk/doc/metadata_info.doc
   MOAB/trunk/src/io/ReadNCDF.cpp
   MOAB/trunk/src/io/Tqdcfr.cpp
   MOAB/trunk/tools/mbcoupler/mbcoupler_test.cpp
Log:
Fixing bug I'd introduced the last time I touched mbcoupler_test.  Iulian,
I owe you a beer.

Changed the name of the tag used to indicate reverse-sense faces in neumann
sets, from SENSE to NEUSET_SENSE; updated metadata_info document accordingly.



Modified: MOAB/trunk/doc/metadata_info.doc
===================================================================
(Binary files differ)

Modified: MOAB/trunk/src/io/ReadNCDF.cpp
===================================================================
--- MOAB/trunk/src/io/ReadNCDF.cpp	2012-04-22 13:31:40 UTC (rev 5488)
+++ MOAB/trunk/src/io/ReadNCDF.cpp	2012-04-23 02:09:46 UTC (rev 5489)
@@ -1052,7 +1052,7 @@
             // set the reverse tag
           Tag sense_tag;
           int dum_sense = 0;
-          result = mdbImpl->tag_get_handle("SENSE", 1, MB_TYPE_INTEGER, sense_tag, 
+          result = mdbImpl->tag_get_handle("NEUSET_SENSE", 1, MB_TYPE_INTEGER, sense_tag, 
                                            MB_TAG_SPARSE|MB_TAG_CREAT, &dum_sense);
           if (result != MB_SUCCESS) return result;
           dum_sense = -1;

Modified: MOAB/trunk/src/io/Tqdcfr.cpp
===================================================================
--- MOAB/trunk/src/io/Tqdcfr.cpp	2012-04-22 13:31:40 UTC (rev 5488)
+++ MOAB/trunk/src/io/Tqdcfr.cpp	2012-04-23 02:09:46 UTC (rev 5489)
@@ -742,7 +742,7 @@
     if (tmp_result != MB_SUCCESS) result = tmp_result;
     int def_val = 1;
     Tag sense_tag;
-    tmp_result = mdbImpl->tag_get_handle("SENSE", 1, MB_TYPE_INTEGER, sense_tag, 
+    tmp_result = mdbImpl->tag_get_handle("NEUSET_SENSE", 1, MB_TYPE_INTEGER, sense_tag, 
                                      MB_TAG_SPARSE|MB_TAG_CREAT, &def_val);
     if (tmp_result != MB_SUCCESS) result = tmp_result;
     def_val = -1;
@@ -800,7 +800,7 @@
     if (tmp_result != MB_SUCCESS) result = tmp_result;
     int def_val = 1;
     Tag sense_tag;
-    tmp_result = mdbImpl->tag_get_handle("SENSE", 1, MB_TYPE_INTEGER, sense_tag, 
+    tmp_result = mdbImpl->tag_get_handle("NEUSET_SENSE", 1, MB_TYPE_INTEGER, sense_tag, 
                                       MB_TAG_SPARSE|MB_TAG_CREAT, &def_val);
     if (tmp_result != MB_SUCCESS && tmp_result != MB_ALREADY_ALLOCATED) result = tmp_result;
     def_val = -1;

Modified: MOAB/trunk/tools/mbcoupler/mbcoupler_test.cpp
===================================================================
--- MOAB/trunk/tools/mbcoupler/mbcoupler_test.cpp	2012-04-22 13:31:40 UTC (rev 5488)
+++ MOAB/trunk/tools/mbcoupler/mbcoupler_test.cpp	2012-04-23 02:09:46 UTC (rev 5489)
@@ -1,6 +1,8 @@
 #include "moab/ParallelComm.hpp"
 #include "MBParallelConventions.h"
 #include "moab/Core.hpp"
+#include "FileOptions.hpp"
+#include "ReadParallel.hpp"