[MOAB-dev] r5476 - in MOAB/trunk: MeshFiles/unittest src/io test/io tools/mbcoupler

[tautges at mcs.anl.gov]

Author: tautges
Date: 2012-04-11 12:04:54 -0500 (Wed, 11 Apr 2012)
New Revision: 5476

Added:
   MOAB/trunk/MeshFiles/unittest/64bricks_12ktet.h5m
   MOAB/trunk/MeshFiles/unittest/64bricks_1khex.h5m
Modified:
   MOAB/trunk/src/io/ReadNCDF.cpp
   MOAB/trunk/src/io/ReadNCDF.hpp
   MOAB/trunk/test/io/exodus_test.cc
   MOAB/trunk/tools/mbcoupler/Coupler.cpp
   MOAB/trunk/tools/mbcoupler/Makefile.am
   MOAB/trunk/tools/mbcoupler/README
   MOAB/trunk/tools/mbcoupler/addfield.cpp
   MOAB/trunk/tools/mbcoupler/mbcoupler_test.cpp
Log:
- fix a few things in mbcoupler that weren't caught when new TupleList stuff was committed
- adding a few mesh files with which to test mbcoupler
- turning on auto testing of mbcoupler for parallel testing
- fixing reading/handling of sidesets having reverse-sense faces
- updating addfield and adding that to the programs built

Passes make check, serial and parallel.



Added: MOAB/trunk/MeshFiles/unittest/64bricks_12ktet.h5m
===================================================================
(Binary files differ)


Property changes on: MOAB/trunk/MeshFiles/unittest/64bricks_12ktet.h5m
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: MOAB/trunk/MeshFiles/unittest/64bricks_1khex.h5m
===================================================================
(Binary files differ)


Property changes on: MOAB/trunk/MeshFiles/unittest/64bricks_1khex.h5m
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Modified: MOAB/trunk/src/io/ReadNCDF.cpp
===================================================================
--- MOAB/trunk/src/io/ReadNCDF.cpp	2012-04-11 16:49:57 UTC (rev 5475)
+++ MOAB/trunk/src/io/ReadNCDF.cpp	2012-04-11 17:04:54 UTC (rev 5476)
@@ -1125,6 +1125,7 @@
   int side_node_idx[32];
 
   int df_index = 0;
+  int sense;
   for(i=0; i < num_sides; i++)
   {
     ExoIIElementType exoii_type;
@@ -1153,9 +1154,10 @@
       for (k = 0; k < num_side_nodes; ++k)
         connectivity[k] = nodes[ side_node_idx[k] ];
         
-      if (MB_SUCCESS != create_sideset_element( connectivity, subtype, ent_handle ))
+      if (MB_SUCCESS != create_sideset_element( connectivity, subtype, ent_handle, sense ))
         return MB_FAILURE;
-      entities_to_add.push_back( ent_handle );
+      if (1 == sense) entities_to_add.push_back( ent_handle );
+      else reverse_entities.push_back(ent_handle);
 
       //read in distribution factor array
       if( num_dist_factors )
@@ -1180,9 +1182,10 @@
       for (k = 0; k < num_side_nodes; ++k)
         connectivity[k] = nodes[ side_node_idx[k] ];
         
-      if (MB_SUCCESS != create_sideset_element( connectivity, subtype, ent_handle ))
+      if (MB_SUCCESS != create_sideset_element( connectivity, subtype, ent_handle, sense ))