[MOAB-dev] r5701 - in MOAB/branches/mcm_kwfixes: itaps/imesh src src/io test tools tools/dagmc

[mcmiller at mcs.anl.gov]

Author: mcmiller
Date: 2012-08-16 01:28:45 -0500 (Thu, 16 Aug 2012)
New Revision: 5701

Modified:
   MOAB/branches/mcm_kwfixes/itaps/imesh/testc_cbind.cpp
   MOAB/branches/mcm_kwfixes/src/Core.cpp
   MOAB/branches/mcm_kwfixes/src/io/ReadNC.cpp
   MOAB/branches/mcm_kwfixes/src/io/ReadNCDF.cpp
   MOAB/branches/mcm_kwfixes/src/io/WriteNCDF.cpp
   MOAB/branches/mcm_kwfixes/test/MBTest.cpp
   MOAB/branches/mcm_kwfixes/test/TestUtil.hpp
   MOAB/branches/mcm_kwfixes/test/reorder_test.cpp
   MOAB/branches/mcm_kwfixes/tools/dagmc/ray_fire_test.cc
   MOAB/branches/mcm_kwfixes/tools/parse.cpp
Log:
more KW fixes

Modified: MOAB/branches/mcm_kwfixes/itaps/imesh/testc_cbind.cpp
===================================================================
--- MOAB/branches/mcm_kwfixes/itaps/imesh/testc_cbind.cpp	2012-08-15 18:26:56 UTC (rev 5700)
+++ MOAB/branches/mcm_kwfixes/itaps/imesh/testc_cbind.cpp	2012-08-16 06:28:45 UTC (rev 5701)
@@ -423,12 +423,12 @@
             num_faces_per_region*num_region) {
           printf("exterior/interior failure: %d ext, %d int, %d regions, %d faces per\n",
                  num_ext, num_int, num_region, num_faces_per_region);
-          if (face_offsets) free(face_offsets);
-          if (region_offsets) free(region_offsets);
-          if (adj_faces) free(adj_faces);
-          if (adj_regions) free(adj_regions);
-          if (interior) free(interior);
-          if (exterior) free(exterior);
+          free(face_offsets);
+          free(region_offsets);
+          free(adj_faces);
+          free(adj_regions);
+          free(interior);
+          free(exterior);
           return FALSE;
     }
 

Modified: MOAB/branches/mcm_kwfixes/src/Core.cpp
===================================================================
--- MOAB/branches/mcm_kwfixes/src/Core.cpp	2012-08-15 18:26:56 UTC (rev 5700)
+++ MOAB/branches/mcm_kwfixes/src/Core.cpp	2012-08-16 06:28:45 UTC (rev 5701)
@@ -3994,14 +3994,14 @@
   
     // calculate totals
   if (total_storage)
-    *total_storage = entity_storage?*entity_storage:0 +
-                     adjacency_storage?*adjacency_storage:0 +
-                     total_tag_storage?*total_tag_storage:0;
+    *total_storage = (entity_storage?*entity_storage:0) +
+                     (adjacency_storage?*adjacency_storage:0) +
+                     (total_tag_storage?*total_tag_storage:0);
   
   if (total_amortized_storage)
-    *total_amortized_storage = amortized_entity_storage?*amortized_entity_storage:0
-                             + amortized_adjacency_storage?*amortized_adjacency_storage:0
-                             + amortized_total_tag_storage?*amortized_total_tag_storage:0;
+    *total_amortized_storage = (amortized_entity_storage?*amortized_entity_storage:0) +
+                               (amortized_adjacency_storage?*amortized_adjacency_storage:0) +
+                               (amortized_total_tag_storage?*amortized_total_tag_storage:0);
 }
 
 

Modified: MOAB/branches/mcm_kwfixes/src/io/ReadNC.cpp