[MOAB-dev] r4347 - in MOAB/trunk/src: . io moab

[tautges at mcs.anl.gov]

Author: tautges
Date: 2010-12-09 22:34:20 -0600 (Thu, 09 Dec 2010)
New Revision: 4347

Modified:
   MOAB/trunk/src/Range.cpp
   MOAB/trunk/src/io/ReadNC.cpp
   MOAB/trunk/src/io/ReadNCDF.cpp
   MOAB/trunk/src/io/ReadNCDF.hpp
   MOAB/trunk/src/moab/Range.hpp
Log:
Range: changed implementation of psize to be inlined, and removed my redundant num_sub_ranges function (thanks Jason)
ReadNCDF: changed to use C interface

Passes make check.



Modified: MOAB/trunk/src/Range.cpp
===================================================================
--- MOAB/trunk/src/Range.cpp	2010-12-09 20:35:02 UTC (rev 4346)
+++ MOAB/trunk/src/Range.cpp	2010-12-10 04:34:20 UTC (rev 4347)
@@ -70,20 +70,6 @@
   }
   return size;
 }
-/*! 
-  returns the number of pairs in the list
- */
-EntityHandle Range::psize() const
-{
-  // go through each pair and add up the number of values
-  // we have.
-  EntityHandle size=0;
-  for(PairNode* iter = mHead.mNext; iter != &mHead; iter = iter->mNext)
-  {
-    ++size;
-  }
-  return size;
-}
 
 /*!
   advance iterator

Modified: MOAB/trunk/src/io/ReadNC.cpp
===================================================================
--- MOAB/trunk/src/io/ReadNC.cpp	2010-12-09 20:35:02 UTC (rev 4346)
+++ MOAB/trunk/src/io/ReadNC.cpp	2010-12-10 04:34:20 UTC (rev 4347)
@@ -344,7 +344,7 @@
   rval = mbImpl->get_entities_by_dimension(file_set, 0, verts);
   ERRORR(rval, "Trouble getting vertices in set.");
   assert("Should only have a single vertex subrange, since they were read in one shot" &&
-         verts.num_sub_ranges() == 1);
+         verts.psize() == 1);
   
     // get ptr to tag space
   Range::iterator viter = verts.begin();

Modified: MOAB/trunk/src/io/ReadNCDF.cpp
===================================================================
--- MOAB/trunk/src/io/ReadNCDF.cpp	2010-12-09 20:35:02 UTC (rev 4346)
+++ MOAB/trunk/src/io/ReadNCDF.cpp	2010-12-10 04:34:20 UTC (rev 4347)
@@ -18,7 +18,7 @@
 #endif
 
 #include "ReadNCDF.hpp"
-#include "netcdf.hh"
+#include "netcdf.h"