[MOAB-dev] r3591 - MOAB/trunk/tools/dagmc

[kraftche at cae.wisc.edu]

Author: kraftche
Date: 2010-03-11 13:36:27 -0600 (Thu, 11 Mar 2010)
New Revision: 3591

Modified:
   MOAB/trunk/tools/dagmc/cub2h5m.cc
Log:
remove dependency on internal file-specific readers

Modified: MOAB/trunk/tools/dagmc/cub2h5m.cc
===================================================================
--- MOAB/trunk/tools/dagmc/cub2h5m.cc	2010-03-11 19:31:57 UTC (rev 3590)
+++ MOAB/trunk/tools/dagmc/cub2h5m.cc	2010-03-11 19:36:27 UTC (rev 3591)
@@ -4,9 +4,7 @@
 #include "MBCore.hpp"
 #include "MBCartVect.hpp"
 #include "cubfile.h"
-#include "Tqdcfr.hpp"
 #include "FileOptions.hpp"
-#include "ReadNCDF.hpp"
 #include "MBSkinner.hpp"
 #include "quads_to_tris.hpp"
 #include <limits>
@@ -1087,15 +1085,16 @@
   // Assume dead elements exist until I think of something better.
   bool dead_elements_exist = true;
   if(update_coords) {
-    ReadNCDF my_ex_reader(MBI);
+    //ReadNCDF my_ex_reader(MBI);
     char exo_options[120] = "tdata=coord,";
     strcat(exo_options, time_step);
     strcat(exo_options,",set");
-    FileOptions exo_opts(exo_options)  ;
+    //FileOptions exo_opts(exo_options)  ;
     //opts = "tdata=coord, 100, sum, temp.exo";
     //result =  my_ex_reader.load_file(exo_name, cgm_file_set, exo_opts, NULL, 0 , 0);
     //result =  my_ex_reader.load_file(exo_name, cub_file_set, exo_opts, NULL, 0 , 0);
-    result = my_ex_reader.load_file(exo_name, &cub_file_set, exo_opts, NULL, 0 , 0);
+    //result = my_ex_reader.load_file(exo_name, &cub_file_set, exo_opts, NULL, 0 , 0);
+    MBI->load_file( exo_name, 0, exo_options );
     if(MB_SUCCESS != result) {
       std::string last_error;
       MBI->get_last_error(last_error);