[MOAB-dev] r5920 - in MOAB/trunk: . src src/io test/io

[tautges at mcs.anl.gov]

Author: tautges
Date: 2012-12-17 15:59:54 -0600 (Mon, 17 Dec 2012)
New Revision: 5920

Modified:
   MOAB/trunk/RELEASE_NOTES
   MOAB/trunk/src/Core.cpp
   MOAB/trunk/src/MBTagConventions.hpp
   MOAB/trunk/src/io/ReadABAQUS.cpp
   MOAB/trunk/src/io/ReadCCMIO.cpp
   MOAB/trunk/src/io/ReadCGM.cpp
   MOAB/trunk/src/io/ReadGmsh.cpp
   MOAB/trunk/src/io/ReadIDEAS.cpp
   MOAB/trunk/src/io/ReadNASTRAN.cpp
   MOAB/trunk/src/io/ReadNCDF.cpp
   MOAB/trunk/src/io/ReadSms.cpp
   MOAB/trunk/src/io/ReadTetGen.cpp
   MOAB/trunk/src/io/Tqdcfr.cpp
   MOAB/trunk/src/io/WriteAns.cpp
   MOAB/trunk/src/io/WriteCCMIO.cpp
   MOAB/trunk/src/io/WriteGMV.cpp
   MOAB/trunk/src/io/WriteNCDF.cpp
   MOAB/trunk/src/io/WriteSLAC.cpp
   MOAB/trunk/src/io/WriteTemplate.cpp
   MOAB/trunk/test/io/exodus_test.cc
Log:
Added default values for conventional tags MATERIAL_SET, DIRICHLET_SET,
NEUMANN_SET, GLOBAL_ID, and HAS_MID_NODES.  Most of the default values
are -1, except for GLOBAL_ID, which is zero.

Also updated MBTagConventions.hpp to this effect.

Passes all tests, serial and parallel.



Modified: MOAB/trunk/RELEASE_NOTES
===================================================================
--- MOAB/trunk/RELEASE_NOTES	2012-12-17 17:59:31 UTC (rev 5919)
+++ MOAB/trunk/RELEASE_NOTES	2012-12-17 21:59:54 UTC (rev 5920)
@@ -19,6 +19,9 @@
 * Additions/improvements to examples
 * New performance tests that include direct tag access tests
 * Undeprecated one of the "tag_get_handle" functions for returning tag handle given tag name
+* Several conventional tags (GLOBAL_ID, MATERIAL_SET, others) now have conventional default 
+  values; see src/MBTagConventions.hpp for a list of default values and other conventional tag
+  characteristics.
 
 Version 4.5:
 * ITAPS: added iMesh_stepEntIter, iMesh_stepEntArrIter, iMesh_tagIterate, iMesh_createTagWithOptions (see iMesh_extensions.h)

Modified: MOAB/trunk/src/Core.cpp
===================================================================
--- MOAB/trunk/src/Core.cpp	2012-12-17 17:59:31 UTC (rev 5919)
+++ MOAB/trunk/src/Core.cpp	2012-12-17 21:59:54 UTC (rev 5920)
@@ -2626,41 +2626,46 @@
 
 Tag Core::material_tag()
 {
+  const int negone = -1;
   if (0 == materialTag)
     tag_get_handle(MATERIAL_SET_TAG_NAME, 1, 
-                   MB_TYPE_INTEGER, materialTag,MB_TAG_CREAT|MB_TAG_SPARSE);
+                   MB_TYPE_INTEGER, materialTag,MB_TAG_CREAT|MB_TAG_SPARSE, &negone);
   return materialTag;
 }
 
 Tag Core::neumannBC_tag()
 {
+  const int negone = -1;
   if (0 == neumannBCTag)
     tag_get_handle(NEUMANN_SET_TAG_NAME, 1, 
-                   MB_TYPE_INTEGER, neumannBCTag,MB_TAG_CREAT|MB_TAG_SPARSE);
+                   MB_TYPE_INTEGER, neumannBCTag,MB_TAG_CREAT|MB_TAG_SPARSE, &negone);
   return neumannBCTag;
 }
 
 Tag Core::dirichletBC_tag()
 {
+  const int negone = -1;
   if (0 == dirichletBCTag)
     tag_get_handle(DIRICHLET_SET_TAG_NAME, 1, 
-                   MB_TYPE_INTEGER, dirichletBCTag,MB_TAG_CREAT|MB_TAG_SPARSE);
+                   MB_TYPE_INTEGER, dirichletBCTag,MB_TAG_CREAT|MB_TAG_SPARSE, &negone);
   return dirichletBCTag;
 }