[cig-commits] r9181 - cs/benchmark/cigma/trunk/src/tests

[luis at geodynamics.org]

Author: luis
Date: 2008-01-29 11:47:48 -0800 (Tue, 29 Jan 2008)
New Revision: 9181

Modified:
   cs/benchmark/cigma/trunk/src/tests/TestHdfReader.cpp
Log:
Updated test for HdfReader class

Modified: cs/benchmark/cigma/trunk/src/tests/TestHdfReader.cpp
===================================================================
--- cs/benchmark/cigma/trunk/src/tests/TestHdfReader.cpp	2008-01-29 19:47:47 UTC (rev 9180)
+++ cs/benchmark/cigma/trunk/src/tests/TestHdfReader.cpp	2008-01-29 19:47:48 UTC (rev 9181)
@@ -127,23 +127,21 @@
 
     reader->open(filename);
 
-    reader->set_coordinates_path(coords_loc.c_str());
-    reader->set_connectivity_path(connect_loc.c_str());
-    reader->set_dataset_path(field_loc.c_str());
 
     int nno, nsd;
     double *coords;
-    reader->get_coordinates(&coords, &nno, &nsd);
+    reader->get_coordinates(coords_loc.c_str(), &coords, &nno, &nsd);
 
     int nel, ndofs;
     int *connect;
-    reader->get_connectivity(&connect, &nel, &ndofs);
+    reader->get_connectivity(connect_loc.c_str(), &connect, &nel, &ndofs);
 
 
     int dset_dims[2];
     double *dset_data;
-    reader->get_dataset(&dset_data, &dset_dims[0], &dset_dims[1]);
+    reader->get_dataset(field_loc.c_str(), &dset_data, &dset_dims[0], &dset_dims[1]);
     
+
     cout << "Reading " << filename << endl;
     cout << "Coordinates: " << coords_loc << " (" << nno << " x " << nsd << ")" << endl;
     cout << "Connectivity: " << connect_loc << " (" << nel << " x " << ndofs << ")" << endl;