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

[hayes6 at mcs.anl.gov]

Author: hayes6
Date: 2012-08-06 04:35:35 -0500 (Mon, 06 Aug 2012)
New Revision: 5680

Modified:
   MOAB/trunk/src/io/ReadNC.cpp
   MOAB/trunk/test/io/Makefile.am
Log:
ReadNC reads data onto variables, with test

Modified: MOAB/trunk/src/io/ReadNC.cpp
===================================================================
--- MOAB/trunk/src/io/ReadNC.cpp	2012-08-06 09:19:54 UTC (rev 5679)
+++ MOAB/trunk/src/io/ReadNC.cpp	2012-08-06 09:35:35 UTC (rev 5680)
@@ -147,9 +147,13 @@
   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;
+    return rval;*/
   }
 
 // end of BIL
@@ -620,16 +624,6 @@
   NCDF_SIZE tmp_dims[2] = {0, 0}, tmp_counts[2] = {4, num_quads};
   success = NCFUNCAG(_vara_int)(connectId, cornerVarId, tmp_dims, tmp_counts, &tmp_conn[0] NCREQ);
 
-
-/*
-  std::vector<int> tcl(4*num_quads);
-  NCDF_SIZE tds[1] = {0}, tcs[1] = {4*num_quads};
-//  NCDF_SIZE ss[2] = {1,1};
-//  NCDF_SIZE im[2] = {4*num_quads,1};
-  success = NCFUNCAG(_vara_int)(connectId, cornerVarId, tds,tcs,&tcl[0] NCREQ);
-*/
-
-
   int m = 0;
   for (int i = 0; i < 4*num_quads-3; i+=4) {
     conn_intrlvd[i]   = tmp_conn[m ];
@@ -1025,16 +1019,14 @@
   }
 
   if (!vdatas.empty()) {
-    if(!ucdMesh)
-      rval = read_variable_to_nonset(file_set, vdatas, tstep_nums);
-    else //ucd data
-      rval = read_variable_to_ucdmesh(file_set, var_names, tstep_nums, vdatas);
+    rval = read_variable_to_nonset(file_set, vdatas, tstep_nums);
     ERRORR(rval, "Trouble read variables to entities verts/edges/quads.");
   }
 
   return MB_SUCCESS;
 }