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

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

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

revision 6143 by caltinay, Wed Apr 6 03:51:30 2016 UTC revision 6144 by caltinay, Wed Apr 6 05:25:13 2016 UTC
# Line 29  Line 29 
29  #include <boost/scoped_array.hpp>  #include <boost/scoped_array.hpp>
30  #include <boost/math/special_functions/fpclassify.hpp> // for isnan  #include <boost/math/special_functions/fpclassify.hpp> // for isnan
31    
32  #ifdef USE_NETCDF  #ifdef ESYS_HAVE_NETCDF
33  #include <netcdfcpp.h>  #include <netcdfcpp.h>
34  #endif  #endif
35    
36  #if USE_SILO  #ifdef ESYS_HAVE_SILO
37  #include <silo.h>  #include <silo.h>
38  #ifdef ESYS_MPI  #ifdef ESYS_MPI
39  #include <pmpio.h>  #include <pmpio.h>
# Line 202  bool Rectangle::operator==(const escript Line 202  bool Rectangle::operator==(const escript
202  void Rectangle::readNcGrid(escript::Data& out, std::string filename,  void Rectangle::readNcGrid(escript::Data& out, std::string filename,
203          std::string varname, const ReaderParameters& params) const          std::string varname, const ReaderParameters& params) const
204  {  {
205  #ifdef USE_NETCDF  #ifdef ESYS_HAVE_NETCDF
206      // check destination function space      // check destination function space
207      dim_t myN0, myN1;      dim_t myN0, myN1;
208      if (out.getFunctionSpace().getTypeCode() == Nodes) {      if (out.getFunctionSpace().getTypeCode() == Nodes) {
# Line 724  void Rectangle::write(const std::string& Line 724  void Rectangle::write(const std::string&
724    
725  void Rectangle::dump(const std::string& fileName) const  void Rectangle::dump(const std::string& fileName) const
726  {  {
727  #if USE_SILO  #ifdef ESYS_HAVE_SILO
728      std::string fn(fileName);      std::string fn(fileName);
729      if (fileName.length() < 6 || fileName.compare(fileName.length()-5, 5, ".silo") != 0) {      if (fileName.length() < 6 || fileName.compare(fileName.length()-5, 5, ".silo") != 0) {
730          fn+=".silo";          fn+=".silo";
# Line 861  void Rectangle::dump(const std::string& Line 861  void Rectangle::dump(const std::string&
861          DBClose(dbfile);          DBClose(dbfile);
862      }      }
863    
864  #else // USE_SILO  #else // ESYS_HAVE_SILO
865      throw SpeckleyException("dump: no Silo support");      throw SpeckleyException("dump: no Silo support");
866  #endif  #endif
867  }  }

Legend:
Removed from v.6143  
changed lines
  Added in v.6144

  ViewVC Help
Powered by ViewVC 1.1.26