/[escript]/trunk/speckley/src/speckleycpp.cpp
ViewVC logotype

Diff of /trunk/speckley/src/speckleycpp.cpp

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

revision 6140 by jfenwick, Thu Mar 31 09:40:10 2016 UTC revision 6141 by caltinay, Wed Apr 6 03:51:30 2016 UTC
# Line 82  escript::Data readBinaryGrid(std::string Line 82  escript::Data readBinaryGrid(std::string
82      return res;      return res;
83  }  }
84    
 #ifdef USE_BOOSTIO  
85  escript::Data readBinaryGridFromZipped(std::string filename, escript::FunctionSpace fs,  escript::Data readBinaryGridFromZipped(std::string filename, escript::FunctionSpace fs,
86          const object& pyShape, double fill, int byteOrder, int dataType,          const object& pyShape, double fill, int byteOrder, int dataType,
87          const object& pyFirst, const object& pyNum, const object& pyMultiplier,          const object& pyFirst, const object& pyNum, const object& pyMultiplier,
88          const object& pyReverse)          const object& pyReverse)
89  {  {
90    #ifdef ESYS_HAVE_BOOST_IO
91      int dim=fs.getDim();      int dim=fs.getDim();
92      ReaderParameters params;      ReaderParameters params;
93    
# Line 106  escript::Data readBinaryGridFromZipped(s Line 106  escript::Data readBinaryGridFromZipped(s
106      escript::Data res(fill, shape, fs, true);      escript::Data res(fill, shape, fs, true);
107      dom->readBinaryGridFromZipped(res, filename, params);      dom->readBinaryGridFromZipped(res, filename, params);
108      return res;      return res;
109  }  #else
110        throw SpeckleyException("Speckley was not built with zip support!");
111  #endif  #endif
112    }
113    
114  escript::Data readNcGrid(std::string filename, std::string varname,  escript::Data readNcGrid(std::string filename, std::string varname,
115          escript::FunctionSpace fs, const object& pyShape, double fill,          escript::FunctionSpace fs, const object& pyShape, double fill,
# Line 361  BOOST_PYTHON_MODULE(speckleycpp) Line 363  BOOST_PYTHON_MODULE(speckleycpp)
363                  arg("byteOrder"), arg("dataType"), arg("first"),                  arg("byteOrder"), arg("dataType"), arg("first"),
364                  arg("numValues"), arg("multiplier"), arg("reverse")),                  arg("numValues"), arg("multiplier"), arg("reverse")),
365  "Reads a binary Grid");  "Reads a binary Grid");
 #ifdef USE_BOOSTIO  
366      def("_readBinaryGridFromZipped", &speckley::readBinaryGridFromZipped, (arg("filename"),      def("_readBinaryGridFromZipped", &speckley::readBinaryGridFromZipped, (arg("filename"),
367                  arg("functionspace"), arg("shape"), arg("fill")=0.,                  arg("functionspace"), arg("shape"), arg("fill")=0.,
368                  arg("byteOrder"), arg("dataType"), arg("first"),                  arg("byteOrder"), arg("dataType"), arg("first"),
369                  arg("numValues"), arg("multiplier"), arg("reverse")),                  arg("numValues"), arg("multiplier"), arg("reverse")),
370  "Reads a binary Grid");  "Reads a binary Grid");
 #endif  
371      def("_readNcGrid", &speckley::readNcGrid, (arg("filename"), arg("varname"),      def("_readNcGrid", &speckley::readNcGrid, (arg("filename"), arg("varname"),
372                  arg("functionspace"), arg("shape"), arg("fill"), arg("first"),                  arg("functionspace"), arg("shape"), arg("fill"), arg("first"),
373                  arg("numValues"), arg("multiplier"), arg("reverse")),                  arg("numValues"), arg("multiplier"), arg("reverse")),

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

  ViewVC Help
Powered by ViewVC 1.1.26