[MOAB-dev] commit/MOAB: 2 new changesets

[commits-noreply at bitbucket.org]

2 new commits in MOAB:

https://bitbucket.org/fathomteam/moab/commits/f75f6275d4ed/
Changeset:   f75f6275d4ed
Branch:      None
User:        iulian07
Date:        2013-11-20 18:10:18
Summary:     add TET4 as supported element in exodus reader
TETRA, TETRA4 were already supported, but some files seem
to have TET4 string instead of TETRA4

Affected #:  1 file

diff --git a/src/io/ExoIIUtil.cpp b/src/io/ExoIIUtil.cpp
index ef9156b..61d9b9e 100644
--- a/src/io/ExoIIUtil.cpp
+++ b/src/io/ExoIIUtil.cpp
@@ -54,6 +54,7 @@ const EntityType ExoIIUtil::ExoIIElementMBEntity[] =
   MBQUAD, // SHELL9,
   MBTET, // TETRA,
   MBTET, // TETRA4,
+  MBTET, // TET4
   MBTET, // TETRA8,
   MBTET, // TETRA10,
   MBTET, // TETRA14,
@@ -102,7 +103,8 @@ const char* ExoIIUtil::ElementTypeNames[] =
   "SHELL8", 
   "SHELL9",
   "TETRA", 
-  "TETRA4", 
+  "TETRA4",
+  "TET4",
   "TETRA8", 
   "TETRA10", 
   "TETRA14",
@@ -151,6 +153,7 @@ const int ExoIIUtil::VerticesPerElement[] =
   9,  // SHELL
   4, 
   4,  
+  4,  // TET4
   8, 
   10, 
   14,  // TETRA
@@ -199,6 +202,7 @@ const int ExoIIUtil::HasMidNodes[][4] =
   {0, 1, 1, 0}, // SHELL9 - mid nodes on edges and faces
   {0, 0, 0, 0}, // TETRA - no mid nodes
   {0, 0, 0, 0}, // TETRA4 - no mid nodes
+  {0, 0, 0, 0}, // TET4 - no mid nodes
   {0, 0, 1, 0}, // TETRA8 - mid nodes on faces
   {0, 1, 0, 0}, // TETRA10 - mid nodes on edges
   {0, 1, 1, 0}, // TETRA14 - mid nodes on edges and faces
@@ -250,6 +254,7 @@ const int ExoIIUtil::ElementGeometricDimension[] =
   3, 
   3, 
   3, // TETRA
+  3,
   3, 
   3, 
   3, 


https://bitbucket.org/fathomteam/moab/commits/bd52ba125174/
Changeset:   bd52ba125174
Branch:      master
User:        iulian07
Date:        2013-11-20 18:20:31
Summary:     add TET4 to our enums for exodus reader

Affected #:  2 files

diff --git a/src/io/moab/ExoIIInterface.hpp b/src/io/moab/ExoIIInterface.hpp
index b31bf8c..efd0164 100644
--- a/src/io/moab/ExoIIInterface.hpp
+++ b/src/io/moab/ExoIIInterface.hpp
@@ -32,7 +32,7 @@ enum ExoIIElementType
   EXOII_TRI, EXOII_TRI3, EXOII_TRI6, EXOII_TRI7,
   EXOII_QUAD, EXOII_QUAD4, EXOII_QUAD5, EXOII_QUAD8, EXOII_QUAD9,
   EXOII_SHELL, EXOII_SHELL4, EXOII_SHELL5, EXOII_SHELL8, EXOII_SHELL9,
-  EXOII_TETRA, EXOII_TETRA4, EXOII_TETRA8, EXOII_TETRA10, EXOII_TETRA14,
+  EXOII_TETRA, EXOII_TETRA4, EXOII_TET4, EXOII_TETRA8, EXOII_TETRA10, EXOII_TETRA14,
   EXOII_PYRAMID, EXOII_PYRAMID5, EXOII_PYRAMID10, EXOII_PYRAMID13, EXOII_PYRAMID18,
   EXOII_WEDGE,
   EXOII_KNIFE,

diff --git a/test/io/exodus_test.cc b/test/io/exodus_test.cc
index c5d8786..8d1813d 100644
--- a/test/io/exodus_test.cc
+++ b/test/io/exodus_test.cc
@@ -743,6 +743,7 @@ void test_types()
     { MBQUAD,    EXOII_SHELL9,     9, "SHELL9" },
     { MBTET,     EXOII_TETRA,      4, "TETRA" },
     { MBTET,     EXOII_TETRA4,     4, "TETRA4" },
+    { MBTET,     EXOII_TET4,       4, "TET4" },
     { MBTET,     EXOII_TETRA8,     8, "TETRA8" },
     { MBTET,     EXOII_TETRA10,   10, "TETRA10" },
     { MBTET,     EXOII_TETRA14,   14, "TETRA14" },

Repository URL: https://bitbucket.org/fathomteam/moab/

--

This is a commit notification from bitbucket.org. You are receiving
this because you have the service enabled, addressing the recipient of
this email.