/[escript]/trunk/ripley/src/Brick.cpp
ViewVC logotype

Diff of /trunk/ripley/src/Brick.cpp

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

revision 6140 by caltinay, Sun Apr 3 23:36:59 2016 UTC revision 6141 by caltinay, Wed Apr 6 03:51:30 2016 UTC
# Line 392  void Brick::readNcGrid(escript::Data& ou Line 392  void Brick::readNcGrid(escript::Data& ou
392  #endif  #endif
393  }  }
394    
 #ifdef USE_BOOSTIO  
395  void Brick::readBinaryGridFromZipped(escript::Data& out, string filename,  void Brick::readBinaryGridFromZipped(escript::Data& out, string filename,
396                             const ReaderParameters& params) const                             const ReaderParameters& params) const
397  {  {
398    #ifdef ESYS_HAVE_BOOST_IO
399      // the mapping is not universally correct but should work on our      // the mapping is not universally correct but should work on our
400      // supported platforms      // supported platforms
401      switch (params.dataType) {      switch (params.dataType) {
# Line 409  void Brick::readBinaryGridFromZipped(esc Line 409  void Brick::readBinaryGridFromZipped(esc
409              readBinaryGridZippedImpl<double>(out, filename, params);              readBinaryGridZippedImpl<double>(out, filename, params);
410              break;              break;
411          default:          default:
412              throw ValueError("readBinaryGrid(): invalid or unsupported datatype");              throw ValueError("readBinaryGridZipped(): invalid or unsupported datatype");
413      }      }
414  }  #else
415        throw RipleyException("readBinaryGridZipped(): not compiled with zip support");
416  #endif  #endif
417    }
418    
419  void Brick::readBinaryGrid(escript::Data& out, string filename,  void Brick::readBinaryGrid(escript::Data& out, string filename,
420                             const ReaderParameters& params) const                             const ReaderParameters& params) const
# Line 590  void Brick::readBinaryGridImpl(escript:: Line 592  void Brick::readBinaryGridImpl(escript::
592      f.close();      f.close();
593  }  }
594    
595  #ifdef USE_BOOSTIO  #ifdef ESYS_HAVE_BOOST_IO
596  template<typename ValueType>  template<typename ValueType>
597  void Brick::readBinaryGridZippedImpl(escript::Data& out, const string& filename,  void Brick::readBinaryGridZippedImpl(escript::Data& out, const string& filename,
598                                 const ReaderParameters& params) const                                 const ReaderParameters& params) const

Legend:
Removed from v.6140  
changed lines
  Added in v.6141

  ViewVC Help
Powered by ViewVC 1.1.26