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

[commits-noreply at bitbucket.org]

2 new commits in MOAB:

https://bitbucket.org/fathomteam/moab/commits/d38f13100d3e/
Changeset:   d38f13100d3e
Branch:      None
User:        iulian07
Date:        2013-10-10 06:00:49
Summary:     error in merging the ranges

warning reported by Carlos Breviglieri on a valid h5m file
it seems that the ranges were not merged properly. maybe this code was not updated
when internal format for sets was changed.

Affected #:  1 file

diff --git a/src/io/mhdf/example/validate.c b/src/io/mhdf/example/validate.c
index 3ed7e78..4bd3ad8 100644
--- a/src/io/mhdf/example/validate.c
+++ b/src/io/mhdf/example/validate.c
@@ -816,12 +816,13 @@ static int merge_ranges( long* ranges, int nranges )
   qsort( ranges, nranges, 2*sizeof(long), &lcomp );
   n = 1;
   for (i = 1; i < nranges; ++i) {
-    if (ranges[2*n-2] + ranges[2*n-1+1] == ranges[2*i]) {
-      ranges[2*n-1] += ranges[2*i+1];
+    if (ranges[2*n-2] + ranges[2*n-1] == ranges[2*i]) {
+      ranges[2*n-1] += ranges[2*i+1]; /*compact the range*/
     }
     else {
-      ranges[2*n  ] = ranges[i];
-      ranges[2*n+1] = ranges[i+1];
+      /* do not compact, just copy, and increase number of ranges*/
+      ranges[2*n  ] = ranges[2*i];
+      ranges[2*n+1] = ranges[2*i+1];
       ++n;
     }
   }


https://bitbucket.org/fathomteam/moab/commits/4e5fadf9cab2/
Changeset:   4e5fadf9cab2
Branch:      master
User:        iulian07
Date:        2013-10-10 06:04:10
Summary:     Merge branch 'master' of https://bitbucket.org/fathomteam/moab

Affected #:  3 files

diff --git a/doc/MetaData/metadata.h b/doc/MetaData/metadata.h
index d67ca27..9bca8a6 100644
--- a/doc/MetaData/metadata.h
+++ b/doc/MetaData/metadata.h
@@ -208,6 +208,12 @@ to the variable name. Multiple time step values can be specified, separated from
 
 Create a gather set (associated with tag GATHER_SET) on one processor with the specified rank, to duplicate entities on other processors. If the rank is not specified, it will be rank 0 by default. If an invalid rank is passed, no gather set will be created. Gather set is specially used by HOMME, MPAS, and any other unstructured grid.
 
+<H3>no_mixed_elements </H3>
+
+Indicates that no mixed elements (e.g. pentagons and hexagons) should be created by the MPAS reader. If this option is used, a common parameter maxEdgesPerCell will be computed to be used across all
+processors (instead of the one reported in the MPAS file header, which is usually 10), and each cell is created with maxEdgesPerCell edges. Any cell that has less actual edges will be padded by duplicating
+the last vertex in the connectivity array. As a result, all created cells will be in one contiguous chunk.
+
 \ref md-contents "Top"
 
   \section meta-references References

diff --git a/doc/metadata_info.doc b/doc/metadata_info.doc
index 6e3eb34..a143f91 100644
Binary files a/doc/metadata_info.doc and b/doc/metadata_info.doc differ

diff --git a/doc/metadata_info.pdf b/doc/metadata_info.pdf
index 376aa51..d86a470 100644
Binary files a/doc/metadata_info.pdf and b/doc/metadata_info.pdf differ

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.