/[escript]/trunk/escript/src/DataTagged.cpp
ViewVC logotype

Diff of /trunk/escript/src/DataTagged.cpp

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

revision 1118 by gross, Tue Apr 24 08:55:04 2007 UTC revision 1141 by gross, Tue May 15 04:24:51 2007 UTC
# Line 17  Line 17 
17  #include "DataConstant.h"  #include "DataConstant.h"
18  #include "DataException.h"  #include "DataException.h"
19  #ifdef USE_NETCDF  #ifdef USE_NETCDF
20  #include <netcdfcpp.h>  #include "netcdfcpp.h"
21  #endif  #endif
22    
23  using namespace std;  using namespace std;
# Line 364  DataTagged::toString() const Line 364  DataTagged::toString() const
364      tempView.setOffset(i->second);      tempView.setOffset(i->second);
365      temp << tempView.toString() << endl;      temp << tempView.toString() << endl;
366    }    }
367    return temp.str();    return string(temp.str());
368  }  }
369    
370  DataArrayView::ValueType::size_type  DataArrayView::ValueType::size_type
# Line 576  DataTagged::dump(const std::string fileN Line 576  DataTagged::dump(const std::string fileN
576     int type=  getFunctionSpace().getTypeCode();     int type=  getFunctionSpace().getTypeCode();
577     int ndims =0;     int ndims =0;
578     long dims[ldims];     long dims[ldims];
579       const double* d_ptr=&(m_data[0]);
580     DataArrayView::ShapeType shape = getPointDataView().getShape();     DataArrayView::ShapeType shape = getPointDataView().getShape();
581    
582     // netCDF error handler     // netCDF error handler
# Line 585  DataTagged::dump(const std::string fileN Line 586  DataTagged::dump(const std::string fileN
586     // check if writing was successful     // check if writing was successful
587     if (!dataFile.is_valid())     if (!dataFile.is_valid())
588          throw DataException("Error - DataTagged:: opening of netCDF file for output failed.");          throw DataException("Error - DataTagged:: opening of netCDF file for output failed.");
589     if (!dataFile.add_att("type","tagged") )     if (!dataFile.add_att("type_id",1) )
590          throw DataException("Error - DataTagged:: appending data type to netCDF file failed.");          throw DataException("Error - DataTagged:: appending data type to netCDF file failed.");
591     if (!dataFile.add_att("rank",rank) )     if (!dataFile.add_att("rank",rank) )
592          throw DataException("Error - DataTagged:: appending rank attribute to netCDF file failed.");          throw DataException("Error - DataTagged:: appending rank attribute to netCDF file failed.");
# Line 642  DataTagged::dump(const std::string fileN Line 643  DataTagged::dump(const std::string fileN
643      free(tags);      free(tags);
644          throw DataException("Error - DataTagged:: appending variable to netCDF file failed.");          throw DataException("Error - DataTagged:: appending variable to netCDF file failed.");
645     }     }
646     if (! (var->put(&m_data[0],dims)) )     if (! (var->put(d_ptr,dims)) )
647     {     {
648      free(tags);      free(tags);
649          throw DataException("Error - DataTagged:: copy data to netCDF buffer failed.");          throw DataException("Error - DataTagged:: copy data to netCDF buffer failed.");

Legend:
Removed from v.1118  
changed lines
  Added in v.1141

  ViewVC Help
Powered by ViewVC 1.1.26