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

[commits-noreply at bitbucket.org]

3 new commits in MOAB:

https://bitbucket.org/fathomteam/moab/commits/724e7784da5e/
Changeset:   724e7784da5e
Branch:      None
User:        iulian07
Date:        2013-07-24 07:21:32
Summary:     add an option to create the quads for the flux form (-FF)
it is not triggered by default

Affected #:  1 file

diff --git a/tools/mbcslam/intx_mpas.cpp b/tools/mbcslam/intx_mpas.cpp
index 679bd03..ab50ce9 100644
--- a/tools/mbcslam/intx_mpas.cpp
+++ b/tools/mbcslam/intx_mpas.cpp
@@ -122,6 +122,7 @@ int main(int argc, char **argv)
   std::string extra_read_opts;
   std::string fileN= TestDir + "/mpas_p8.h5m";
   const char *filename_mesh1 = fileN.c_str();
+  bool flux_form = false;
   if (argc > 1)
   {
     int index = 1;
@@ -147,6 +148,11 @@ int main(int argc, char **argv)
       {
         extra_read_opts = std::string(argv[++index]);
       }
+      if (!strcmp(argv[index], "-FF"))
+      {
+        flux_form= true;
+        index++;
+      }
 
       index++;
     }
@@ -181,9 +187,12 @@ int main(int argc, char **argv)
     return 1;
   // create a set with quads corresponding to each initial edge spanned with the displacement field
 
-  rval = create_span_quads(&mb, euler_set, rank);
-  if (MB_SUCCESS != rval)
-    return 1;
+  if (flux_form)
+  {
+    rval = create_span_quads(&mb, euler_set, rank);
+    if (MB_SUCCESS != rval)
+      return 1;
+  }
 
   EntityHandle covering_lagr_set;
   rval = mb.create_meshset(MESHSET_SET, covering_lagr_set);


https://bitbucket.org/fathomteam/moab/commits/9190f6201d20/
Changeset:   9190f6201d20
Branch:      None
User:        iulian07
Date:        2013-07-24 15:31:37
Summary:     Merge branch 'master' of bitbucket.org:fathomteam/moab

Affected #:  1 file

diff --git a/src/io/ReadNC.cpp b/src/io/ReadNC.cpp
index 78c3fbc..cf301df 100644
--- a/src/io/ReadNC.cpp
+++ b/src/io/ReadNC.cpp
@@ -449,6 +449,7 @@ ErrorCode ReadNC::read_coordinate(const char* var_name, int lmin, int lmax, std:
     fail = NCFUNCA(get_vars_float)(fileId, (*vmit).second.varId, &tmin, &tcount, &dum_stride, &tcvals[0]);
     if (fail)
       ERRORS(MB_FAILURE, "Failed to get coordinate values.");
+    cvals.resize(tcount);
     std::copy(tcvals.begin(), tcvals.end(), cvals.begin());
   }
   else ERRORR(MB_FAILURE, "Wrong data type for coordinate variable.");


https://bitbucket.org/fathomteam/moab/commits/531700c98ca2/
Changeset:   531700c98ca2
Branch:      master
User:        iulian07
Date:        2013-07-25 00:15:26
Summary:     the ray_end stays the same during search

it should not be reset when we limit the number of intersection points
it will have the points ordered by distance, in the end.

Affected #:  1 file

diff --git a/src/AdaptiveKDTree.cpp b/src/AdaptiveKDTree.cpp
index 82c06e5..16599fa 100644
--- a/src/AdaptiveKDTree.cpp
+++ b/src/AdaptiveKDTree.cpp
@@ -2033,7 +2033,7 @@ ErrorCode AdaptiveKDTree::ray_intersect_triangles( EntityHandle root,
               }
               tris_out[w] = *iter;
               dists_out[w] = tri_t;
-              ray_end = dists_out.back();
+              //ray_end = dists_out.back();
             }
           }
         }

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.