[MOAB-dev] r3652 - in MOAB/trunk/src: . io moab parallel parallel/moab
kraftche at cae.wisc.edu
kraftche at cae.wisc.edu
Wed Mar 17 16:40:18 CDT 2010
Author: kraftche
Date: 2010-03-17 16:40:18 -0500 (Wed, 17 Mar 2010)
New Revision: 3652
Added:
MOAB/trunk/src/MBTagConventions.hpp
MOAB/trunk/src/parallel/MBParallelConventions.h
Removed:
MOAB/trunk/src/moab/MBTagConventions.hpp
MOAB/trunk/src/parallel/moab/MBParallelConventions.h
Modified:
MOAB/trunk/src/Core.cpp
MOAB/trunk/src/DualTool.cpp
MOAB/trunk/src/GeomTopoTool.cpp
MOAB/trunk/src/Makefile.am
MOAB/trunk/src/OrientedBoxTreeTool.cpp
MOAB/trunk/src/Skinner.cpp
MOAB/trunk/src/WriteUtil.cpp
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/ReadHDF5.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/ReadVtk.cpp
MOAB/trunk/src/io/Tqdcfr.cpp
MOAB/trunk/src/io/Tqdcfr.hpp
MOAB/trunk/src/io/WriteAns.cpp
MOAB/trunk/src/io/WriteCCMIO.cpp
MOAB/trunk/src/io/WriteGMV.cpp
MOAB/trunk/src/io/WriteGmsh.cpp
MOAB/trunk/src/io/WriteHDF5.cpp
MOAB/trunk/src/io/WriteNCDF.cpp
MOAB/trunk/src/io/WriteSLAC.cpp
MOAB/trunk/src/io/WriteSmf.cpp
MOAB/trunk/src/io/WriteTemplate.cpp
MOAB/trunk/src/io/WriteVtk.cpp
MOAB/trunk/src/parallel/Makefile.am
MOAB/trunk/src/parallel/ParallelComm.cpp
MOAB/trunk/src/parallel/ParallelData.cpp
MOAB/trunk/src/parallel/ReadParallel.cpp
MOAB/trunk/src/parallel/WriteHDF5Parallel.cpp
Log:
move MBTagConventions.hpp and MBParallelConventions.h back out of moab/ directory because they contain no namespace-d content
Modified: MOAB/trunk/src/Core.cpp
===================================================================
--- MOAB/trunk/src/Core.cpp 2010-03-17 21:10:10 UTC (rev 3651)
+++ MOAB/trunk/src/Core.cpp 2010-03-17 21:40:18 UTC (rev 3652)
@@ -61,7 +61,7 @@
# include "WriteVtk.hpp"
typedef moab::WriteVtk DefaultWriter;
#endif
-#include "moab/MBTagConventions.hpp"
+#include "MBTagConventions.hpp"
#include "ExoIIUtil.hpp"
#include "EntitySequence.hpp"
#include "FileOptions.hpp"
Modified: MOAB/trunk/src/DualTool.cpp
===================================================================
--- MOAB/trunk/src/DualTool.cpp 2010-03-17 21:10:10 UTC (rev 3651)
+++ MOAB/trunk/src/DualTool.cpp 2010-03-17 21:40:18 UTC (rev 3652)
@@ -18,7 +18,7 @@
// using Core for call to check_adjacencies
#include "moab/Core.hpp"
#include "Internals.hpp"
-#include "moab/MBTagConventions.hpp"
+#include "MBTagConventions.hpp"
#include "moab/Skinner.hpp"
#include "moab/Core.hpp"
#include "moab/MeshTopoUtil.hpp"
Modified: MOAB/trunk/src/GeomTopoTool.cpp
===================================================================
--- MOAB/trunk/src/GeomTopoTool.cpp 2010-03-17 21:10:10 UTC (rev 3651)
+++ MOAB/trunk/src/GeomTopoTool.cpp 2010-03-17 21:40:18 UTC (rev 3652)
@@ -15,7 +15,7 @@
#include "moab/GeomTopoTool.hpp"
#include "moab/Range.hpp"
-#include "moab/MBTagConventions.hpp"
+#include "MBTagConventions.hpp"
#include "moab/Interface.hpp"
#include "moab/CN.hpp"
#include "Internals.hpp"
Copied: MOAB/trunk/src/MBTagConventions.hpp (from rev 3651, MOAB/trunk/src/moab/MBTagConventions.hpp)
===================================================================
--- MOAB/trunk/src/MBTagConventions.hpp (rev 0)
+++ MOAB/trunk/src/MBTagConventions.hpp 2010-03-17 21:40:18 UTC (rev 3652)
@@ -0,0 +1,105 @@
+/**
+ * MOAB, a Mesh-Oriented datABase, is a software component for creating,
+ * storing and accessing finite element mesh data.
+ *
+ * Copyright 2004 Sandia Corporation. Under the terms of Contract
+ * DE-AC04-94AL85000 with Sandia Coroporation, the U.S. Government
+ * retains certain rights in this software.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ */
+
+#ifndef MB_TAG_CONVENTIONS_HPP
+#define MB_TAG_CONVENTIONS_HPP
+
+//! Conventional tag names used for some often-used sets
+
+/* MATERIAL_SET_TAG_NAME tag:
+ * Represents sets of elements having a common material (corresponds to
+ * element blocks in ExodusII)
+ * size = sizeof(int)
+ * type = int
+ * value = integer id for this set (block id from ExodusII)
+ */
+#define MATERIAL_SET_TAG_NAME "MATERIAL_SET"
+
+/* DIRICHLET_SET_TAG_NAME tag:
+ * Represents dirichlet-type boundary condition, usually contains only mesh vertices
+ * (corresponds to nodesets in ExodusII)
+ * size = sizeof(int)
+ * type = int
+ * value = integer id for this set (nodeset id from ExodusII)
+ */
+#define DIRICHLET_SET_TAG_NAME "DIRICHLET_SET"
+
+/* NEUMANN_SET_TAG_NAME tag:
+ * Represents neumann-type boundary condition, usually contains elements with dimension
+ * one lower than those found in material sets (i.e. edges in FE quad/tri models, quads/tris
+ * in FE hex/tet models) (corresponds to sidesets in ExodusII)
+ * size = sizeof(int)
+ * type = int
+ * value = integer id for this set (sideset id from ExodusII)
+ */
+#define NEUMANN_SET_TAG_NAME "NEUMANN_SET"
+
+/* HAS_MID_NODES_TAG_NAM tag:
+ * Flags telling whether elements in a given set have mid-(edge, face, region) vertices/nodes;
+ * index 0 is a place holder, so this datum can be indexed by dimension, e.g. has_mid_nodes[dim]
+ * indicates whether mesh entities of dimension dim have mid nodes
+ * size = 4*sizeof(int)
+ * type = int[4]
+ * value = 1 (has mid nodes), 0 (does not have mid nodes)
+ */
+#define HAS_MID_NODES_TAG_NAME "HAS_MID_NODES"
+
+/* GEOM_DIMENSION tag:
+ * Represents entities "owned" by a given topological entity in a geometric model
+ * size = sizeof(int)
+ * type = int
+ * value = dimension of geom entity
+ */
+#define GEOM_DIMENSION_TAG_NAME "GEOM_DIMENSION"
+
+/* MESH_TRANSFORM tag:
+ * Represents homogeneous transform to be applied to mesh; used in ExodusII writer to apply
+ * transform before writing nodal coordinates
+ * size = 16*sizeof(double)
+ * type = double[16]
+ * value = 4x4 homogenous transform matrix
+ */
+#define MESH_TRANSFORM_TAG_NAME "MESH_TRANSFORM"
+
+/* GLOBAL_ID tag:
+ * Represents global id of entities (sets or mesh entities); this id is different than the id
+ * embedded in the entity handle
+ * size = sizeof(int)
+ * type = int
+ * value = global id
+ */
+#define GLOBAL_ID_TAG_NAME "GLOBAL_ID"
+
+/* CATEGORY tag:
+ * String name indicating generic "category" if the entity to which it is assigned (usually
+ * sets); used e.g. to indicate a set represents geometric vertex/edge/face/region,
+ * dual surface/curve, etc.
+ * size = CATEGORY_TAG_NAME_LENGTH (defined below)
+ * type = char[CATEGORY_TAG_NAME_LENGTH]
+ * value = NULL-terminated string denoting category name
+ */
+#define CATEGORY_TAG_NAME "CATEGORY"
+#define CATEGORY_TAG_SIZE 32
+
+/* NAME tag:
+ * A fixed length NULL-padded string containing a name.
+ * All values should be assumed to be of type char[NAME_TAG_SIZE].
+ * The string need not be null terminated. All values used for
+ * storing or searching for a value must be padded with '\0' chars.
+ */
+#define NAME_TAG_NAME "NAME"
+#define NAME_TAG_SIZE 32
+
+#endif
Modified: MOAB/trunk/src/Makefile.am
===================================================================
--- MOAB/trunk/src/Makefile.am 2010-03-17 21:10:10 UTC (rev 3651)
+++ MOAB/trunk/src/Makefile.am 2010-03-17 21:40:18 UTC (rev 3652)
@@ -137,7 +137,7 @@
moab/ReaderIface.hpp \
moab/ReaderWriterSet.hpp \
moab/Skinner.hpp \
- moab/MBTagConventions.hpp \
+ MBTagConventions.hpp \
moab/Types.hpp \
moab/UnknownInterface.hpp \
moab/Util.hpp \
Modified: MOAB/trunk/src/OrientedBoxTreeTool.cpp
===================================================================
--- MOAB/trunk/src/OrientedBoxTreeTool.cpp 2010-03-17 21:10:10 UTC (rev 3651)
+++ MOAB/trunk/src/OrientedBoxTreeTool.cpp 2010-03-17 21:40:18 UTC (rev 3652)
@@ -25,7 +25,7 @@
#include "moab/Range.hpp"
#include "moab/CN.hpp"
#include "moab/GeomUtil.hpp"
-#include "moab/MBTagConventions.hpp"
+#include "MBTagConventions.hpp"
#include <iostream>
#include <iomanip>
#include <algorithm>
Modified: MOAB/trunk/src/Skinner.cpp
===================================================================
--- MOAB/trunk/src/Skinner.cpp 2010-03-17 21:10:10 UTC (rev 3651)
+++ MOAB/trunk/src/Skinner.cpp 2010-03-17 21:40:18 UTC (rev 3652)
@@ -28,7 +28,7 @@
#include <iostream>
#include "moab/Util.hpp"
#include "Internals.hpp"
-#include "moab/MBTagConventions.hpp"
+#include "MBTagConventions.hpp"
#include "moab/Core.hpp"
#include "AEntityFactory.hpp"
Modified: MOAB/trunk/src/WriteUtil.cpp
===================================================================
--- MOAB/trunk/src/WriteUtil.cpp 2010-03-17 21:10:10 UTC (rev 3651)
+++ MOAB/trunk/src/WriteUtil.cpp 2010-03-17 21:40:18 UTC (rev 3652)
@@ -25,7 +25,7 @@
#include "VertexSequence.hpp"
#include "TagServer.hpp"
#include "AEntityFactory.hpp"
-#include "moab/MBTagConventions.hpp"
+#include "MBTagConventions.hpp"
#include "RangeSeqIntersectIter.hpp"
#include <sys/types.h>
Modified: MOAB/trunk/src/io/ReadABAQUS.cpp
===================================================================
--- MOAB/trunk/src/io/ReadABAQUS.cpp 2010-03-17 21:10:10 UTC (rev 3651)
+++ MOAB/trunk/src/io/ReadABAQUS.cpp 2010-03-17 21:40:18 UTC (rev 3652)
@@ -31,7 +31,7 @@
#include "moab/Range.hpp"
#include "moab/Interface.hpp"
-#include "moab/MBTagConventions.hpp"
+#include "MBTagConventions.hpp"
#include "Internals.hpp"
#include "moab/ReadUtilIface.hpp"
#include "AffineXform.hpp"
Modified: MOAB/trunk/src/io/ReadCCMIO.cpp
===================================================================
--- MOAB/trunk/src/io/ReadCCMIO.cpp 2010-03-17 21:10:10 UTC (rev 3651)
+++ MOAB/trunk/src/io/ReadCCMIO.cpp 2010-03-17 21:40:18 UTC (rev 3652)
@@ -7,7 +7,7 @@
#include "moab/Range.hpp"
#include "moab/Interface.hpp"
-#include "moab/MBTagConventions.hpp"
+#include "MBTagConventions.hpp"
#include "Internals.hpp"
#include "moab/ReadUtilIface.hpp"
#include "FileOptions.hpp"
Modified: MOAB/trunk/src/io/ReadCGM.cpp
===================================================================
--- MOAB/trunk/src/io/ReadCGM.cpp 2010-03-17 21:10:10 UTC (rev 3651)
+++ MOAB/trunk/src/io/ReadCGM.cpp 2010-03-17 21:40:18 UTC (rev 3652)
@@ -36,7 +36,7 @@
#include "moab/Core.hpp"
#include "moab/Interface.hpp"
#include "moab/Range.hpp"
-#include "moab/MBTagConventions.hpp"
+#include "MBTagConventions.hpp"
#include "FileOptions.hpp"
#include "moab/GeomTopoTool.hpp"
Modified: MOAB/trunk/src/io/ReadGmsh.cpp
===================================================================
--- MOAB/trunk/src/io/ReadGmsh.cpp 2010-03-17 21:10:10 UTC (rev 3651)
+++ MOAB/trunk/src/io/ReadGmsh.cpp 2010-03-17 21:40:18 UTC (rev 3652)
@@ -28,8 +28,8 @@
#include "moab/Interface.hpp"
#include "moab/ReadUtilIface.hpp"
#include "moab/Range.hpp"
-#include "moab/MBTagConventions.hpp"
-#include "moab/MBParallelConventions.h"
+#include "MBTagConventions.hpp"
+#include "MBParallelConventions.h"
#include "moab/CN.hpp"
#include "GmshUtil.hpp"
Modified: MOAB/trunk/src/io/ReadHDF5.cpp
===================================================================
--- MOAB/trunk/src/io/ReadHDF5.cpp 2010-03-17 21:10:10 UTC (rev 3651)
+++ MOAB/trunk/src/io/ReadHDF5.cpp 2010-03-17 21:40:18 UTC (rev 3652)
@@ -33,7 +33,7 @@
#include <H5Ppublic.h>
#include "moab/Interface.hpp"
#include "Internals.hpp"
-#include "moab/MBTagConventions.hpp"
+#include "MBTagConventions.hpp"
#include "ReadHDF5.hpp"
#include "moab/CN.hpp"
#include "FileOptions.hpp"
Modified: MOAB/trunk/src/io/ReadNASTRAN.cpp
===================================================================
--- MOAB/trunk/src/io/ReadNASTRAN.cpp 2010-03-17 21:10:10 UTC (rev 3651)
+++ MOAB/trunk/src/io/ReadNASTRAN.cpp 2010-03-17 21:40:18 UTC (rev 3652)
@@ -29,7 +29,7 @@
#include "moab/Range.hpp"
#include "FileOptions.hpp"
#include "FileTokenizer.hpp"
-#include "moab/MBTagConventions.hpp"
+#include "MBTagConventions.hpp"
#include "moab/CN.hpp"
namespace moab {
Modified: MOAB/trunk/src/io/ReadNCDF.cpp
===================================================================
--- MOAB/trunk/src/io/ReadNCDF.cpp 2010-03-17 21:10:10 UTC (rev 3651)
+++ MOAB/trunk/src/io/ReadNCDF.cpp 2010-03-17 21:40:18 UTC (rev 3652)
@@ -35,7 +35,7 @@
#include "moab/Range.hpp"
#include "moab/Interface.hpp"
#include "ExoIIUtil.hpp"
-#include "moab/MBTagConventions.hpp"
+#include "MBTagConventions.hpp"
#include "Internals.hpp"
#include "moab/ReadUtilIface.hpp"
#include "exodus_order.h"
Modified: MOAB/trunk/src/io/ReadSms.cpp
===================================================================
--- MOAB/trunk/src/io/ReadSms.cpp 2010-03-17 21:10:10 UTC (rev 3651)
+++ MOAB/trunk/src/io/ReadSms.cpp 2010-03-17 21:40:18 UTC (rev 3652)
@@ -25,8 +25,8 @@
#include "moab/Interface.hpp"
#include "moab/ReadUtilIface.hpp"
#include "moab/Range.hpp"
-#include "moab/MBTagConventions.hpp"
-#include "moab/MBParallelConventions.h"
+#include "MBTagConventions.hpp"
+#include "MBParallelConventions.h"
#include "moab/CN.hpp"
#include <errno.h>
Modified: MOAB/trunk/src/io/ReadTetGen.cpp
===================================================================
--- MOAB/trunk/src/io/ReadTetGen.cpp 2010-03-17 21:10:10 UTC (rev 3651)
+++ MOAB/trunk/src/io/ReadTetGen.cpp 2010-03-17 21:40:18 UTC (rev 3652)
@@ -3,7 +3,7 @@
#include "moab/Range.hpp"
#include "moab/ReadUtilIface.hpp"
#include "FileOptions.hpp"
-#include "moab/MBTagConventions.hpp"
+#include "MBTagConventions.hpp"
#include <iostream>
#include <fstream>
#include <sstream>
Modified: MOAB/trunk/src/io/ReadVtk.cpp
===================================================================
--- MOAB/trunk/src/io/ReadVtk.cpp 2010-03-17 21:10:10 UTC (rev 3651)
+++ MOAB/trunk/src/io/ReadVtk.cpp 2010-03-17 21:40:18 UTC (rev 3652)
@@ -34,7 +34,7 @@
#define MB_VTK_MATERIAL_SETS
#ifdef MB_VTK_MATERIAL_SETS
-# include "moab/MBTagConventions.hpp"
+# include "MBTagConventions.hpp"
# include <map>
namespace moab {
Modified: MOAB/trunk/src/io/Tqdcfr.cpp
===================================================================
--- MOAB/trunk/src/io/Tqdcfr.cpp 2010-03-17 21:10:10 UTC (rev 3651)
+++ MOAB/trunk/src/io/Tqdcfr.cpp 2010-03-17 21:40:18 UTC (rev 3652)
@@ -27,7 +27,7 @@
#include "moab/ReadUtilIface.hpp"
#include "moab/GeomTopoTool.hpp"
-#include "moab/MBTagConventions.hpp"
+#include "MBTagConventions.hpp"
#include "moab/CN.hpp"
#include "Internals.hpp"
#include "moab/HigherOrderFactory.hpp"
Modified: MOAB/trunk/src/io/Tqdcfr.hpp
===================================================================
--- MOAB/trunk/src/io/Tqdcfr.hpp 2010-03-17 21:10:10 UTC (rev 3651)
+++ MOAB/trunk/src/io/Tqdcfr.hpp 2010-03-17 21:40:18 UTC (rev 3652)
@@ -23,7 +23,7 @@
#include "moab/Forward.hpp"
#include "moab/ReaderIface.hpp"
-#include "moab/MBTagConventions.hpp"
+#include "MBTagConventions.hpp"
#include "moab/Range.hpp"
#include <stdio.h>
Modified: MOAB/trunk/src/io/WriteAns.cpp
===================================================================
--- MOAB/trunk/src/io/WriteAns.cpp 2010-03-17 21:10:10 UTC (rev 3651)
+++ MOAB/trunk/src/io/WriteAns.cpp 2010-03-17 21:40:18 UTC (rev 3652)
@@ -40,7 +40,7 @@
#include "assert.h"
#include "Internals.hpp"
#include "ExoIIUtil.hpp"
-#include "moab/MBTagConventions.hpp"
+#include "MBTagConventions.hpp"
#define INS_ID(stringvar, prefix, id) \
sprintf(stringvar, prefix, id)
Modified: MOAB/trunk/src/io/WriteCCMIO.cpp
===================================================================
--- MOAB/trunk/src/io/WriteCCMIO.cpp 2010-03-17 21:10:10 UTC (rev 3651)
+++ MOAB/trunk/src/io/WriteCCMIO.cpp 2010-03-17 21:40:18 UTC (rev 3652)
@@ -42,7 +42,7 @@
#include "assert.h"
#include "Internals.hpp"
#include "ExoIIUtil.hpp"
-#include "moab/MBTagConventions.hpp"
+#include "MBTagConventions.hpp"
#include "moab/WriteUtilIface.hpp"
namespace moab {
Modified: MOAB/trunk/src/io/WriteGMV.cpp
===================================================================
--- MOAB/trunk/src/io/WriteGMV.cpp 2010-03-17 21:10:10 UTC (rev 3651)
+++ MOAB/trunk/src/io/WriteGMV.cpp 2010-03-17 21:40:18 UTC (rev 3652)
@@ -28,7 +28,7 @@
#include "Internals.hpp"
#include "moab/Range.hpp"
#include "moab/CN.hpp"
-#include "moab/MBTagConventions.hpp"
+#include "MBTagConventions.hpp"
#include "moab/WriteUtilIface.hpp"
#include <fstream>
#include <assert.h>
Modified: MOAB/trunk/src/io/WriteGmsh.cpp
===================================================================
--- MOAB/trunk/src/io/WriteGmsh.cpp 2010-03-17 21:10:10 UTC (rev 3651)
+++ MOAB/trunk/src/io/WriteGmsh.cpp 2010-03-17 21:40:18 UTC (rev 3652)
@@ -1,7 +1,7 @@
#include "WriteGmsh.hpp"
#include "moab/CN.hpp"
-#include "moab/MBTagConventions.hpp"
-#include "moab/MBParallelConventions.h"
+#include "MBTagConventions.hpp"
+#include "MBParallelConventions.h"
#include "moab/Interface.hpp"
#include "moab/Range.hpp"
#include "moab/WriteUtilIface.hpp"
Modified: MOAB/trunk/src/io/WriteHDF5.cpp
===================================================================
--- MOAB/trunk/src/io/WriteHDF5.cpp 2010-03-17 21:10:10 UTC (rev 3651)
+++ MOAB/trunk/src/io/WriteHDF5.cpp 2010-03-17 21:40:18 UTC (rev 3652)
@@ -49,7 +49,7 @@
#include <H5Ppublic.h>
#include "moab/Interface.hpp"
#include "Internals.hpp"
-#include "moab/MBTagConventions.hpp"
+#include "MBTagConventions.hpp"
#include "moab/CN.hpp"
#include "WriteHDF5.hpp"
#include "moab/WriteUtilIface.hpp"
Modified: MOAB/trunk/src/io/WriteNCDF.cpp
===================================================================
--- MOAB/trunk/src/io/WriteNCDF.cpp 2010-03-17 21:10:10 UTC (rev 3651)
+++ MOAB/trunk/src/io/WriteNCDF.cpp 2010-03-17 21:40:18 UTC (rev 3652)
@@ -40,7 +40,7 @@
#include "moab/Interface.hpp"
#include "moab/Range.hpp"
#include "moab/CN.hpp"
-#include "moab/MBTagConventions.hpp"
+#include "MBTagConventions.hpp"
#include "Internals.hpp"
#include "ExoIIUtil.hpp"
#include "moab/WriteUtilIface.hpp"
Modified: MOAB/trunk/src/io/WriteSLAC.cpp
===================================================================
--- MOAB/trunk/src/io/WriteSLAC.cpp 2010-03-17 21:10:10 UTC (rev 3651)
+++ MOAB/trunk/src/io/WriteSLAC.cpp 2010-03-17 21:40:18 UTC (rev 3652)
@@ -44,7 +44,7 @@
#include "moab/CN.hpp"
#include "Internals.hpp"
#include "ExoIIUtil.hpp"
-#include "moab/MBTagConventions.hpp"
+#include "MBTagConventions.hpp"
#include "moab/WriteUtilIface.hpp"
namespace moab {
Modified: MOAB/trunk/src/io/WriteSmf.cpp
===================================================================
--- MOAB/trunk/src/io/WriteSmf.cpp 2010-03-17 21:10:10 UTC (rev 3651)
+++ MOAB/trunk/src/io/WriteSmf.cpp 2010-03-17 21:40:18 UTC (rev 3652)
@@ -37,7 +37,7 @@
#include "moab/Interface.hpp"
#include "moab/Range.hpp"
#include "moab/CN.hpp"
-#include "moab/MBTagConventions.hpp"
+#include "MBTagConventions.hpp"
#include "moab/WriteUtilIface.hpp"
#include "Internals.hpp"
#include "FileOptions.hpp"
Modified: MOAB/trunk/src/io/WriteTemplate.cpp
===================================================================
--- MOAB/trunk/src/io/WriteTemplate.cpp 2010-03-17 21:10:10 UTC (rev 3651)
+++ MOAB/trunk/src/io/WriteTemplate.cpp 2010-03-17 21:40:18 UTC (rev 3652)
@@ -40,7 +40,7 @@
#include "assert.h"
#include "Internals.hpp"
#include "ExoIIUtil.hpp"
-#include "moab/MBTagConventions.hpp"
+#include "MBTagConventions.hpp"
#include "moab/WriteUtilIface.hpp"
namespace moab {
Modified: MOAB/trunk/src/io/WriteVtk.cpp
===================================================================
--- MOAB/trunk/src/io/WriteVtk.cpp 2010-03-17 21:10:10 UTC (rev 3651)
+++ MOAB/trunk/src/io/WriteVtk.cpp 2010-03-17 21:40:18 UTC (rev 3652)
@@ -37,7 +37,7 @@
#include "moab/Interface.hpp"
#include "moab/Range.hpp"
#include "moab/CN.hpp"
-#include "moab/MBTagConventions.hpp"
+#include "MBTagConventions.hpp"
#include "moab/WriteUtilIface.hpp"
#include "Internals.hpp"
#include "FileOptions.hpp"
Deleted: MOAB/trunk/src/moab/MBTagConventions.hpp
===================================================================
--- MOAB/trunk/src/moab/MBTagConventions.hpp 2010-03-17 21:10:10 UTC (rev 3651)
+++ MOAB/trunk/src/moab/MBTagConventions.hpp 2010-03-17 21:40:18 UTC (rev 3652)
@@ -1,105 +0,0 @@
-/**
- * MOAB, a Mesh-Oriented datABase, is a software component for creating,
- * storing and accessing finite element mesh data.
- *
- * Copyright 2004 Sandia Corporation. Under the terms of Contract
- * DE-AC04-94AL85000 with Sandia Coroporation, the U.S. Government
- * retains certain rights in this software.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- */
-
-#ifndef MB_TAG_CONVENTIONS_HPP
-#define MB_TAG_CONVENTIONS_HPP
-
-//! Conventional tag names used for some often-used sets
-
-/* MATERIAL_SET_TAG_NAME tag:
- * Represents sets of elements having a common material (corresponds to
- * element blocks in ExodusII)
- * size = sizeof(int)
- * type = int
- * value = integer id for this set (block id from ExodusII)
- */
-#define MATERIAL_SET_TAG_NAME "MATERIAL_SET"
-
-/* DIRICHLET_SET_TAG_NAME tag:
- * Represents dirichlet-type boundary condition, usually contains only mesh vertices
- * (corresponds to nodesets in ExodusII)
- * size = sizeof(int)
- * type = int
- * value = integer id for this set (nodeset id from ExodusII)
- */
-#define DIRICHLET_SET_TAG_NAME "DIRICHLET_SET"
-
-/* NEUMANN_SET_TAG_NAME tag:
- * Represents neumann-type boundary condition, usually contains elements with dimension
- * one lower than those found in material sets (i.e. edges in FE quad/tri models, quads/tris
- * in FE hex/tet models) (corresponds to sidesets in ExodusII)
- * size = sizeof(int)
- * type = int
- * value = integer id for this set (sideset id from ExodusII)
- */
-#define NEUMANN_SET_TAG_NAME "NEUMANN_SET"
-
-/* HAS_MID_NODES_TAG_NAM tag:
- * Flags telling whether elements in a given set have mid-(edge, face, region) vertices/nodes;
- * index 0 is a place holder, so this datum can be indexed by dimension, e.g. has_mid_nodes[dim]
- * indicates whether mesh entities of dimension dim have mid nodes
- * size = 4*sizeof(int)
- * type = int[4]
- * value = 1 (has mid nodes), 0 (does not have mid nodes)
- */
-#define HAS_MID_NODES_TAG_NAME "HAS_MID_NODES"
-
-/* GEOM_DIMENSION tag:
- * Represents entities "owned" by a given topological entity in a geometric model
- * size = sizeof(int)
- * type = int
- * value = dimension of geom entity
- */
-#define GEOM_DIMENSION_TAG_NAME "GEOM_DIMENSION"
-
-/* MESH_TRANSFORM tag:
- * Represents homogeneous transform to be applied to mesh; used in ExodusII writer to apply
- * transform before writing nodal coordinates
- * size = 16*sizeof(double)
- * type = double[16]
- * value = 4x4 homogenous transform matrix
- */
-#define MESH_TRANSFORM_TAG_NAME "MESH_TRANSFORM"
-
-/* GLOBAL_ID tag:
- * Represents global id of entities (sets or mesh entities); this id is different than the id
- * embedded in the entity handle
- * size = sizeof(int)
- * type = int
- * value = global id
- */
-#define GLOBAL_ID_TAG_NAME "GLOBAL_ID"
-
-/* CATEGORY tag:
- * String name indicating generic "category" if the entity to which it is assigned (usually
- * sets); used e.g. to indicate a set represents geometric vertex/edge/face/region,
- * dual surface/curve, etc.
- * size = CATEGORY_TAG_NAME_LENGTH (defined below)
- * type = char[CATEGORY_TAG_NAME_LENGTH]
- * value = NULL-terminated string denoting category name
- */
-#define CATEGORY_TAG_NAME "CATEGORY"
-#define CATEGORY_TAG_SIZE 32
-
-/* NAME tag:
- * A fixed length NULL-padded string containing a name.
- * All values should be assumed to be of type char[NAME_TAG_SIZE].
- * The string need not be null terminated. All values used for
- * storing or searching for a value must be padded with '\0' chars.
- */
-#define NAME_TAG_NAME "NAME"
-#define NAME_TAG_SIZE 32
-
-#endif
Copied: MOAB/trunk/src/parallel/MBParallelConventions.h (from rev 3651, MOAB/trunk/src/parallel/moab/MBParallelConventions.h)
===================================================================
--- MOAB/trunk/src/parallel/MBParallelConventions.h (rev 0)
+++ MOAB/trunk/src/parallel/MBParallelConventions.h 2010-03-17 21:40:18 UTC (rev 3652)
@@ -0,0 +1,92 @@
+#ifndef MB_PARALLEL_CONVENTIONS_H
+#define MB_PARALLEL_CONVENTIONS_H
+
+/** Tag conventions for naming parallel things. Note this header
+ * file belongs in the main MOAB directory because even serial
+ * applications (e.g. partitioners) may write tags for use in
+ * parallel applications.
+ */
+
+/** \brief Global identifier for interface mesh
+ *
+ * An integer identifier common to the corresponding mesh entity
+ * instances on each processor for a mesh entity on the interface.
+ */
+#define PARALLEL_GID_TAG_NAME "GLOBAL_ID"
+
+/** \brief Tag on a meshset representing a parallel partition.
+ *
+ * When the mesh is partitioned for use in a parallel environment,
+ * the each CPUs partiiton of the mesh is stored in a meshset with
+ * this tag. The value of the tag is an integer "part identifier".
+ */
+#define PARALLEL_PARTITION_TAG_NAME "PARALLEL_PARTITION"
+#define PARALLEL_PART_TAG_NAME PARALLEL_PARTITION_TAG_NAME
+
+/** \brief Tag that groups the set of parts/partitions that are
+ * a covering of the mesh.
+ *
+ * This tag labels an entity set for which the child sets are part(ition)s
+ * that together are a single partitioning of the mesh. I.e. There should
+ * be no mesh entity that is contained in more than one child part(ition)
+ * set, and typically every mesh entity of the dimenion used to partition
+ * the mesh is contained in exactly one of the child sets.
+ *
+ * The data for this tag is a single integer value. The value of
+ * the tag is undefined.
+ */
+#define PARALLEL_PARITIONING_TAG_NAME "PARALLEL_MESH_PARITIONING"
+
+/** \brief Tag storing which other processor a given entity is shared with
+ *
+ * This single-valued tag implies an entity is shared with one other proc
+ */
+#define PARALLEL_SHARED_PROC_TAG_NAME "__PARALLEL_SHARED_PROC"
+
+/** \brief Tag storing which other processorS a given entity is shared with
+ *
+ * This multiple-valued tag implies an entity is shared with multiple
+ * other processors. Length of tag is application-dependent, and depends on
+ * what the maximum number of processors is which share an entity
+ */
+#define PARALLEL_SHARED_PROCS_TAG_NAME "__PARALLEL_SHARED_PROCS"
+
+/** \brief Tag storing the handle of a shared entity on the other proc
+ *
+ * This single-valued tag implies an entity is shared with one other proc
+ */
+#define PARALLEL_SHARED_HANDLE_TAG_NAME "__PARALLEL_SHARED_HANDLE"
+
+/** \brief Tag storing handles of a shared entity on other processors
+ *
+ * This multiple-valued tag implies an entity is shared with multiple
+ * other processors. Length of tag is application-dependent, and depends on
+ * what the maximum number of processors is which share an entity
+ */
+#define PARALLEL_SHARED_HANDLES_TAG_NAME "__PARALLEL_SHARED_HANDLES"
+
+/** \brief Tag storing parallel status (as bits in this tag)
+ *
+ * This tag stores various aspects of parallel status in bits; see also
+ * #define's following, to be used in bit mask operations. If an entity is
+ * not shared with any other processors, the pstatus is 0, otherwise it's > 0
+ *
+ * bit 0: !owned (0=owned, 1=not owned)
+ * bit 1: shared (0=not shared, 1=shared)
+ * bit 2: multishared (shared by > 2 procs; 0=not shared, 1=shared)
+ * bit 3: interface (0=not interface, 1=interface)
+ * bit 4: ghost (0=not ghost, 1=ghost)
+ */
+#define PARALLEL_STATUS_TAG_NAME "__PARALLEL_STATUS"
+
+#define PSTATUS_NOT_OWNED 0x1
+#define PSTATUS_SHARED 0x2
+#define PSTATUS_MULTISHARED 0x4
+#define PSTATUS_INTERFACE 0x8
+// note, these numbers are in hex, so 0x10 is the 4th bit, or 2^4.
+#define PSTATUS_GHOST 0x10
+
+#define PSTATUS_AND 0x1
+#define PSTATUS_OR 0x2
+#define PSTATUS_NOT 0x3
+#endif
Modified: MOAB/trunk/src/parallel/Makefile.am
===================================================================
--- MOAB/trunk/src/parallel/Makefile.am 2010-03-17 21:10:10 UTC (rev 3651)
+++ MOAB/trunk/src/parallel/Makefile.am 2010-03-17 21:40:18 UTC (rev 3652)
@@ -42,7 +42,7 @@
moab/ParallelComm.hpp \
moab/ProcConfig.hpp \
moab/ParallelData.hpp \
- moab/MBParallelConventions.h
+ MBParallelConventions.h
if PARALLEL_HDF5
# libMOABpar_la_LIBADD = $(top_builddir)/mhdf/libmhdf.la
Modified: MOAB/trunk/src/parallel/ParallelComm.cpp
===================================================================
--- MOAB/trunk/src/parallel/ParallelComm.cpp 2010-03-17 21:10:10 UTC (rev 3651)
+++ MOAB/trunk/src/parallel/ParallelComm.cpp 2010-03-17 21:40:18 UTC (rev 3652)
@@ -5,9 +5,9 @@
#include "SequenceManager.hpp"
#include "EntitySequence.hpp"
#include "TagServer.hpp"
-#include "moab/MBTagConventions.hpp"
+#include "MBTagConventions.hpp"
#include "moab/Skinner.hpp"
-#include "moab/MBParallelConventions.h"
+#include "MBParallelConventions.h"
#include "moab/Core.hpp"
#include "Error.hpp"
#include "ElementSequence.hpp"
Modified: MOAB/trunk/src/parallel/ParallelData.cpp
===================================================================
--- MOAB/trunk/src/parallel/ParallelData.cpp 2010-03-17 21:10:10 UTC (rev 3651)
+++ MOAB/trunk/src/parallel/ParallelData.cpp 2010-03-17 21:40:18 UTC (rev 3652)
@@ -1,6 +1,6 @@
#include "moab/ParallelData.hpp"
#include "moab/ParallelComm.hpp"
-#include "moab/MBParallelConventions.h"
+#include "MBParallelConventions.h"
#include "moab/Interface.hpp"
#include <map>
Modified: MOAB/trunk/src/parallel/ReadParallel.cpp
===================================================================
--- MOAB/trunk/src/parallel/ReadParallel.cpp 2010-03-17 21:10:10 UTC (rev 3651)
+++ MOAB/trunk/src/parallel/ReadParallel.cpp 2010-03-17 21:40:18 UTC (rev 3652)
@@ -6,7 +6,7 @@
#include "moab/ReaderWriterSet.hpp"
#include "moab/ReadUtilIface.hpp"
#include "moab/ParallelComm.hpp"
-#include "moab/MBParallelConventions.h"
+#include "MBParallelConventions.h"
#include <iostream>
#include <iomanip>
Modified: MOAB/trunk/src/parallel/WriteHDF5Parallel.cpp
===================================================================
--- MOAB/trunk/src/parallel/WriteHDF5Parallel.cpp 2010-03-17 21:10:10 UTC (rev 3651)
+++ MOAB/trunk/src/parallel/WriteHDF5Parallel.cpp 2010-03-17 21:40:18 UTC (rev 3652)
@@ -33,8 +33,8 @@
#include "moab/Interface.hpp"
#include "Internals.hpp"
-#include "moab/MBTagConventions.hpp"
-#include "moab/MBParallelConventions.h"
+#include "MBTagConventions.hpp"
+#include "MBParallelConventions.h"
#include "moab/ParallelComm.hpp"
#include "moab/CN.hpp"
#include "moab/WriteUtilIface.hpp"
Deleted: MOAB/trunk/src/parallel/moab/MBParallelConventions.h
===================================================================
--- MOAB/trunk/src/parallel/moab/MBParallelConventions.h 2010-03-17 21:10:10 UTC (rev 3651)
+++ MOAB/trunk/src/parallel/moab/MBParallelConventions.h 2010-03-17 21:40:18 UTC (rev 3652)
@@ -1,92 +0,0 @@
-#ifndef MB_PARALLEL_CONVENTIONS_H
-#define MB_PARALLEL_CONVENTIONS_H
-
-/** Tag conventions for naming parallel things. Note this header
- * file belongs in the main MOAB directory because even serial
- * applications (e.g. partitioners) may write tags for use in
- * parallel applications.
- */
-
-/** \brief Global identifier for interface mesh
- *
- * An integer identifier common to the corresponding mesh entity
- * instances on each processor for a mesh entity on the interface.
- */
-#define PARALLEL_GID_TAG_NAME "GLOBAL_ID"
-
-/** \brief Tag on a meshset representing a parallel partition.
- *
- * When the mesh is partitioned for use in a parallel environment,
- * the each CPUs partiiton of the mesh is stored in a meshset with
- * this tag. The value of the tag is an integer "part identifier".
- */
-#define PARALLEL_PARTITION_TAG_NAME "PARALLEL_PARTITION"
-#define PARALLEL_PART_TAG_NAME PARALLEL_PARTITION_TAG_NAME
-
-/** \brief Tag that groups the set of parts/partitions that are
- * a covering of the mesh.
- *
- * This tag labels an entity set for which the child sets are part(ition)s
- * that together are a single partitioning of the mesh. I.e. There should
- * be no mesh entity that is contained in more than one child part(ition)
- * set, and typically every mesh entity of the dimenion used to partition
- * the mesh is contained in exactly one of the child sets.
- *
- * The data for this tag is a single integer value. The value of
- * the tag is undefined.
- */
-#define PARALLEL_PARITIONING_TAG_NAME "PARALLEL_MESH_PARITIONING"
-
-/** \brief Tag storing which other processor a given entity is shared with
- *
- * This single-valued tag implies an entity is shared with one other proc
- */
-#define PARALLEL_SHARED_PROC_TAG_NAME "__PARALLEL_SHARED_PROC"
-
-/** \brief Tag storing which other processorS a given entity is shared with
- *
- * This multiple-valued tag implies an entity is shared with multiple
- * other processors. Length of tag is application-dependent, and depends on
- * what the maximum number of processors is which share an entity
- */
-#define PARALLEL_SHARED_PROCS_TAG_NAME "__PARALLEL_SHARED_PROCS"
-
-/** \brief Tag storing the handle of a shared entity on the other proc
- *
- * This single-valued tag implies an entity is shared with one other proc
- */
-#define PARALLEL_SHARED_HANDLE_TAG_NAME "__PARALLEL_SHARED_HANDLE"
-
-/** \brief Tag storing handles of a shared entity on other processors
- *
- * This multiple-valued tag implies an entity is shared with multiple
- * other processors. Length of tag is application-dependent, and depends on
- * what the maximum number of processors is which share an entity
- */
-#define PARALLEL_SHARED_HANDLES_TAG_NAME "__PARALLEL_SHARED_HANDLES"
-
-/** \brief Tag storing parallel status (as bits in this tag)
- *
- * This tag stores various aspects of parallel status in bits; see also
- * #define's following, to be used in bit mask operations. If an entity is
- * not shared with any other processors, the pstatus is 0, otherwise it's > 0
- *
- * bit 0: !owned (0=owned, 1=not owned)
- * bit 1: shared (0=not shared, 1=shared)
- * bit 2: multishared (shared by > 2 procs; 0=not shared, 1=shared)
- * bit 3: interface (0=not interface, 1=interface)
- * bit 4: ghost (0=not ghost, 1=ghost)
- */
-#define PARALLEL_STATUS_TAG_NAME "__PARALLEL_STATUS"
-
-#define PSTATUS_NOT_OWNED 0x1
-#define PSTATUS_SHARED 0x2
-#define PSTATUS_MULTISHARED 0x4
-#define PSTATUS_INTERFACE 0x8
-// note, these numbers are in hex, so 0x10 is the 4th bit, or 2^4.
-#define PSTATUS_GHOST 0x10
-
-#define PSTATUS_AND 0x1
-#define PSTATUS_OR 0x2
-#define PSTATUS_NOT 0x3
-#endif
More information about the moab-dev
mailing list