[MOAB-dev] r3910 - in MOAB/trunk: examples src src/io src/moab test test/h5file test/perf tools/mbperf

[tautges at mcs.anl.gov]

Author: tautges
Date: 2010-05-17 11:59:42 -0500 (Mon, 17 May 2010)
New Revision: 3910

Modified:
   MOAB/trunk/examples/FileRead.cpp
   MOAB/trunk/src/Core.cpp
   MOAB/trunk/src/Range.cpp
   MOAB/trunk/src/ReadUtil.cpp
   MOAB/trunk/src/ReadUtil.hpp
   MOAB/trunk/src/WriteUtil.cpp
   MOAB/trunk/src/WriteUtil.hpp
   MOAB/trunk/src/io/ReadABAQUS.cpp
   MOAB/trunk/src/io/ReadCCMIO.cpp
   MOAB/trunk/src/io/ReadGmsh.cpp
   MOAB/trunk/src/io/ReadHDF5.cpp
   MOAB/trunk/src/io/ReadIDEAS.cpp
   MOAB/trunk/src/io/ReadMCNP5.cpp
   MOAB/trunk/src/io/ReadNASTRAN.cpp
   MOAB/trunk/src/io/ReadNCDF.cpp
   MOAB/trunk/src/io/ReadSTL.cpp
   MOAB/trunk/src/io/ReadSmf.cpp
   MOAB/trunk/src/io/ReadSms.cpp
   MOAB/trunk/src/io/ReadTetGen.cpp
   MOAB/trunk/src/io/ReadVtk.cpp
   MOAB/trunk/src/io/Tqdcfr.cpp
   MOAB/trunk/src/io/WriteCCMIO.cpp
   MOAB/trunk/src/io/WriteCCMIO.hpp
   MOAB/trunk/src/io/WriteGMV.cpp
   MOAB/trunk/src/io/WriteHDF5.cpp
   MOAB/trunk/src/io/WriteNCDF.cpp
   MOAB/trunk/src/io/WriteSLAC.cpp
   MOAB/trunk/src/io/WriteTemplate.cpp
   MOAB/trunk/src/moab/Range.hpp
   MOAB/trunk/src/moab/ReadUtilIface.hpp
   MOAB/trunk/src/moab/Skinner.hpp
   MOAB/trunk/src/moab/WriteUtilIface.hpp
   MOAB/trunk/test/h5file/h5regression.cpp
   MOAB/trunk/test/perf/perf.cpp
   MOAB/trunk/test/perf/seqperf.cpp
   MOAB/trunk/test/scdseq_timing.cpp
   MOAB/trunk/tools/mbperf/mbperf.cpp
Log:
CCMIO debugging.

Read/Write interfaces: 

- changed function names to better indicate what they did:
  get_node_arrays -> get_node_coords
  get_element_array ->get_element_connect
  get_poly_arrays ->get_poly_connect

- added capability to get all coordinate arrays, instead of just
  x/y/z, to the coordinate functions Jason added awhile back, to make it
  easier to take advantage of those more efficient functions.

- added extra argument "add_sizes" to get_element_connect; when input
  true, adds an integer before the connectivity of each element,
  holding the number of elements in the following connectivity array;
  many formats require this sort of output, including CCMIO

 
Range: added an operator-=

Skinner: adding some comments
 
ReadCCMIO/WriteCCMIO: major changes to make it work

Passes all the make check's.




Modified: MOAB/trunk/examples/FileRead.cpp
===================================================================
--- MOAB/trunk/examples/FileRead.cpp	2010-05-15 16:30:04 UTC (rev 3909)
+++ MOAB/trunk/examples/FileRead.cpp	2010-05-17 16:59:42 UTC (rev 3910)
@@ -75,7 +75,7 @@
   //   also, it will return a starting handle for the node sequence
   vector<double*> arrays;
   MBEntityHandle startv;
-  MBErrorCode rval = iface->get_node_arrays(2, num_nodes, 0, startv, arrays);
+  MBErrorCode rval = iface->get_node_coords(2, num_nodes, 0, startv, arrays);
   for (int i = 0; i < num_nodes; i++)
     {
       getline(nodeFile, line);
@@ -106,7 +106,7 @@
   MBEntityHandle *starth; // the connectivity array that will get populated
                           // with triangle data
   // allocate block of triangle handles and read connectivity into them
-  rval = iface->get_element_array(num_triangles, 3, MBTRI, 0, starte, starth);
+  rval = iface->get_element_connect(num_triangles, 3, MBTRI, 0, starte, starth);
   
   for (int j = 0; j < num_triangles; j++)
     {

Modified: MOAB/trunk/src/Core.cpp
===================================================================
--- MOAB/trunk/src/Core.cpp	2010-05-15 16:30:04 UTC (rev 3909)
+++ MOAB/trunk/src/Core.cpp	2010-05-17 16:59:42 UTC (rev 3910)
@@ -2089,7 +2089,7 @@
   
   std::vector<double*> arrays;
   EntityHandle start_handle_out = 0;
-  result = read_iface->get_node_arrays( 3, nverts, MB_START_ID, 
+  result = read_iface->get_node_coords( 3, nverts, MB_START_ID, 
                                         start_handle_out, arrays);
   if (MB_SUCCESS != result) return result;
   for (int i = 0; i < nverts; i++) {

Modified: MOAB/trunk/src/Range.cpp
===================================================================
--- MOAB/trunk/src/Range.cpp	2010-05-15 16:30:04 UTC (rev 3909)
+++ MOAB/trunk/src/Range.cpp	2010-05-17 16:59:42 UTC (rev 3910)
@@ -729,7 +729,63 @@
   }
 }
 
+Range &Range::operator-=(const Range &range2) 
+{
+  const bool braindead = false;
   
+  if (braindead) {
+      // brain-dead implementation right now