[MOAB-dev] r5647 - in MOAB/trunk: src/io test/io

[hayes6 at mcs.anl.gov]

Author: hayes6
Date: 2012-07-31 16:27:47 -0500 (Tue, 31 Jul 2012)
New Revision: 5647

Modified:
   MOAB/trunk/src/io/ReadNC.cpp
   MOAB/trunk/src/io/ReadNC.hpp
   MOAB/trunk/test/io/Makefile.am
Log:
possible build fix

Modified: MOAB/trunk/src/io/ReadNC.cpp
===================================================================
--- MOAB/trunk/src/io/ReadNC.cpp	2012-07-31 14:27:37 UTC (rev 5646)
+++ MOAB/trunk/src/io/ReadNC.cpp	2012-07-31 21:27:47 UTC (rev 5647)
@@ -100,6 +100,7 @@
                             const ReaderIface::SubsetList* /*subset_list*/,
                             const Tag* file_id_tag)
 {
+ 
   ErrorCode rval = MB_SUCCESS;
 
   //See if opts has variable(s) specified
@@ -127,7 +128,7 @@
   dbgOut.tprintf(1, "Opening file %s\n", file_name);
   fileName = std::string(file_name);
   int success;
-  
+
 #ifdef PNETCDF_FILE
   if (isParallel)
     success = NCFUNC(open)(myPcomm->proc_config().proc_comm(), file_name, 0, MPI_INFO_NULL, &fileId);
@@ -138,7 +139,22 @@
 #endif
 
   ERRORS(success, "Trouble opening file.");
+
+
+// BIL data
+
+  std::string file_path = std::string(file_name);
+  int idx = file_path.find_last_of("/");
+  std::string file = file_path.substr(idx+1);
+  if(file == "BIL_DIR.nc") {
+        
+    rval = load_BIL(file_name,file_set,opts,file_id_tag);
+    return rval;
+  }
+
+// end of BIL
   
+
     // Read the header (num dimensions, dimensions, num variables, global attribs)
   rval = read_header();
   ERRORR(rval, " ");
@@ -246,7 +262,7 @@
     rval = read_variables(tmp_set, dimNames, tstep_nums);
     if (MB_FAILURE == rval) return rval;
   }
- 
+
 #ifdef USE_MPI