/[escript]/branches/trilinos_from_5897/escriptcore/src/DataFactory.cpp
ViewVC logotype

Diff of /branches/trilinos_from_5897/escriptcore/src/DataFactory.cpp

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 5962 by caltinay, Fri Feb 5 03:37:49 2016 UTC revision 5963 by caltinay, Mon Feb 22 06:59:27 2016 UTC
# Line 338  load(const std::string fileName, Line 338  load(const std::string fileName,
338      // E) create a new Data based on dt      // E) create a new Data based on dt
339    
340        NcVar* var1;        NcVar* var1;
341        DataVector data1(len_data_point * ntags, 0., len_data_point * ntags);        DataTypes::RealVectorType data1(len_data_point * ntags, 0., len_data_point * ntags);
342        if (!(var1 = dataFile.get_var("data")))        if (!(var1 = dataFile.get_var("data")))
343        {        {
344           throw DataException("Error - load:: unable to find data in netCDF file.");           throw DataException("Error - load:: unable to find data in netCDF file.");
# Line 369  load(const std::string fileName, Line 369  load(const std::string fileName,
369      // get ids      // get ids
370      if (! ( ids_var = dataFile.get_var("id")) )      if (! ( ids_var = dataFile.get_var("id")) )
371          throw DataException("Error - load:: unable to find reference ids in netCDF file.");          throw DataException("Error - load:: unable to find reference ids in netCDF file.");
372      const dim_t* ids_p=function_space.borrowSampleReferenceIDs();      const DataTypes::dim_t* ids_p=function_space.borrowSampleReferenceIDs();
373      std::vector<dim_t> ids_of_nc(num_samples);      std::vector<DataTypes::dim_t> ids_of_nc(num_samples);
374      if (! ids_var->get(&ids_of_nc[0], (long) num_samples) )      if (! ids_var->get(&ids_of_nc[0], (long) num_samples) )
375      {      {
376          throw DataException("Error - load:: unable to recover ids from netCDF file.");          throw DataException("Error - load:: unable to recover ids from netCDF file.");

Legend:
Removed from v.5962  
changed lines
  Added in v.5963

  ViewVC Help
Powered by ViewVC 1.1.26