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

[commits-noreply at bitbucket.org]

4 new commits in MOAB:

https://bitbucket.org/fathomteam/moab/commits/1bd2608cd114/
Changeset:   1bd2608cd114
Branch:      None
User:        iulian07
Date:        2014-05-20 03:14:52
Summary:     stress_test warning

this var should be used only when configuring with netcdf, otherwise we get a
warning

Affected #:  1 file

diff --git a/test/MBTest.cpp b/test/MBTest.cpp
index 66e8501..d70753f 100644
--- a/test/MBTest.cpp
+++ b/test/MBTest.cpp
@@ -8182,7 +8182,9 @@ int main(int argc, char* argv[])
   argv0 = argv[0];
 
     // Check command line arg to see if we should avoid doing the stress test
+#if NETCDF_FILE
   bool stress_test = true;
+#endif
 
   std::cout << "Size of mConnMap = " << sizeof(CN::mConnectivityMap)
             << std::endl;
@@ -8192,10 +8194,13 @@ int main(int argc, char* argv[])
             << std::endl;
     
   for (int i = 1; i < argc; ++i) {
-    if (string(argv[i]) == "-nostress")
-      stress_test = false;
-    else if (string(argv[i]) == "-d" && (i+1) < argc)
+
+    if (string(argv[i]) == "-d" && (i+1) < argc)
       TestDir = argv[++i];
+#if NETCDF_FILE
+    else if (string(argv[i]) == "-nostress")
+      stress_test = false;
+#endif
     else if (string(argv[i]) == "-h" || string(argv[i]) == "--help")
       usage( argv[0] );
     else {


https://bitbucket.org/fathomteam/moab/commits/17e4b78b0d3c/
Changeset:   17e4b78b0d3c
Branch:      None
User:        iulian07
Date:        2014-05-20 03:23:03
Summary:     pass std::vector by reference

avoid a deep copy

Affected #:  1 file

diff --git a/test/io/read_cgm_group_test.cpp b/test/io/read_cgm_group_test.cpp
index 1098457..3bfb137 100644
--- a/test/io/read_cgm_group_test.cpp
+++ b/test/io/read_cgm_group_test.cpp
@@ -40,7 +40,7 @@ void read_file( Interface* moab, const char* input_file );
 int geom_id_by_handle( Interface* moab, const EntityHandle set );
 
 //Function for checking retrieved group data
-void check_group_data( std::vector<int> group_ids, std::vector<std::string> group_names, std::vector<int> group_ent_ids );
+void check_group_data( std::vector<int> & group_ids, std::vector<std::string> & group_names, std::vector<int> & group_ent_ids );
 
 //Function for loading all reference data
 void load_group_references( std::vector<int>& ids, std::vector<std::string>& names, std::vector<int>& ent_ids);
@@ -130,7 +130,7 @@ void read_cylcube_groups_test()
 }
 
 
-void check_group_data(std::vector<int> group_ids, std::vector<std::string> group_names, std::vector<int> group_ent_ids )
+void check_group_data(std::vector<int> & group_ids, std::vector<std::string> & group_names, std::vector<int> & group_ent_ids )
 {
 
   // Step files do not contain group data, MOAB shouldn't return errors when trying to access


https://bitbucket.org/fathomteam/moab/commits/23d4cca4f7da/
Changeset:   23d4cca4f7da
Branch:      None
User:        iulian07
Date:        2014-05-20 03:29:31
Summary:     remove warning

geom is not initialized yet, but the macro check is uing it to
report errors
print full message instead

Affected #:  1 file

diff --git a/itaps/igeom/testSmooth2.cc b/itaps/igeom/testSmooth2.cc
index 7e4fbf4..e6f678b 100644
--- a/itaps/igeom/testSmooth2.cc
+++ b/itaps/igeom/testSmooth2.cc
@@ -173,11 +173,14 @@ int main(int argc, char *argv[]) {
 
    iBase_EntitySetHandle root_set;
    iMesh_createEntSet(mesh, 0, &root_set, &err);
-   CHECK( "Failed to create a model root set.\n");
+   if (err != iBase_SUCCESS)
+     std::cerr << " Error code: " << err << " failed to create a model set"
+                 << "  At        : " << __FILE__ << ':' << __LINE__  << std::endl;
 
    iMesh_load(mesh, root_set, filename.c_str(), NULL, &err, filename.length(), 0);
-   CHECK( "Failed to create a model root set.\n");
-
+   if (err != iBase_SUCCESS)
+     std::cerr << " Error code: " << err << " failed load the file"
+                    << "  At        : " << __FILE__ << ':' << __LINE__  << std::endl;
 
    std::string opts("SMOOTH;");
    // new constructor


https://bitbucket.org/fathomteam/moab/commits/af3c4adfa4de/
Changeset:   af3c4adfa4de
Branch:      master
User:        iulian07
Date:        2014-05-20 03:35:06
Summary:     warning about error code not initialized

used before initializing it

Affected #:  1 file

diff --git a/test/perf/seqperf.cpp b/test/perf/seqperf.cpp
index 5b6d998..f031428 100644
--- a/test/perf/seqperf.cpp
+++ b/test/perf/seqperf.cpp
@@ -627,7 +627,7 @@ static double hex_centroid( double coords[24], double cent[3] )
 
 void forward_order_query_element_verts(int percent)
 {
-  ErrorCode r;
+  ErrorCode r=MB_SUCCESS;
   if (r){} // empty line to remove compiler warning  
   const EntityHandle* conn;
   int len;
@@ -652,7 +652,7 @@ void forward_order_query_element_verts(int percent)
 
 void reverse_order_query_element_verts(int percent)
 {
-  ErrorCode r;
+  ErrorCode r=MB_SUCCESS;
   if (r) {} // empty statement to remove compiler warning
   
   const EntityHandle* conn;
@@ -678,7 +678,7 @@ void reverse_order_query_element_verts(int percent)
 
 void  random_order_query_element_verts(int percent)
 {
-  ErrorCode r;
+  ErrorCode r=MB_SUCCESS;
   if (r){} // empty line to remove compiler warning  
   const EntityHandle* conn;
   int len;
@@ -734,7 +734,7 @@ void  random_order_delete_elements( int percent )
 void create_missing_vertices( int percent )
 {
   EntityHandle h;
-  ErrorCode rval;
+  ErrorCode rval=MB_SUCCESS;
   if (rval){} // empty line to remove compiler warning  
   double coords[3];
   for (long i = 0; i < numVert; ++i)

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.