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

[hayes6 at mcs.anl.gov]

Author: hayes6
Date: 2012-08-06 16:50:58 -0500 (Mon, 06 Aug 2012)
New Revision: 5682

Modified:
   MOAB/trunk/src/io/ReadNC.cpp
   MOAB/trunk/src/io/ReadNC.hpp
   MOAB/trunk/test/io/read_nc.cpp
   MOAB/trunk/test/io/read_ucd_nc.cpp
Log:
put coordinate tags back on quads in scd meshes

Modified: MOAB/trunk/src/io/ReadNC.cpp
===================================================================
--- MOAB/trunk/src/io/ReadNC.cpp	2012-08-06 09:38:38 UTC (rev 5681)
+++ MOAB/trunk/src/io/ReadNC.cpp	2012-08-06 21:50:58 UTC (rev 5682)
@@ -17,6 +17,8 @@
 #include "FileOptions.hpp"
 #include "moab/ScdInterface.hpp"
 
+//#include "bil.h"
+
 #define ERRORR(rval, str) \
     if (MB_SUCCESS != rval) {readMeshIface->report_error("%s", str); return rval;}
     
@@ -143,19 +145,20 @@
 
 // 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") {
-/*
-    char * dir_name = (char*) malloc(128);
-    success = NCFUNC(get_att_text)(fileId,0,":BIL_DIR",dir_name);
-    printf("ddd: %s %d\n",dir_name,success);
-    ERRORS(success, "Trouble reading attribute");   
-    rval = load_BIL(file_name,file_set,opts,file_id_tag);
-    return rval;*/
+  if( BIL_mode_enabled(file_name) ) {
+
+    rval = get_BIL_dir();
+    ERRORS(rval, "Failed to find directory with BIL data.");
+
+    dbgOut.tprintf(1,"Reading BIL data from directory: %s\n",BIL_dir.c_str());
+
+    rval = load_BIL(BIL_dir,file_set,opts,file_id_tag);
+    ERRORR(rval, "Trouble reading BIL data.");
+
+    return rval;
   }
 
+
 // end of BIL
   
 
@@ -294,7 +297,7 @@
       ERRORR(rval, "Trouble getting owned quads in set.");
 
       dbgOut.tprintf(1,"Processor %d owns %d vertices\n", myPcomm->proc_config().proc_rank(), 
-                                                          verts_owned.size());
+                                                          (int)verts_owned.size());