/[escript]/trunk/dataexporter/src/ElementData.cpp
ViewVC logotype

Diff of /trunk/dataexporter/src/ElementData.cpp

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

revision 2909 by caltinay, Mon Feb 1 01:23:46 2010 UTC revision 2910 by caltinay, Wed Feb 3 03:22:31 2010 UTC
# Line 14  Line 14 
14  #include <escriptexport/ElementData.h>  #include <escriptexport/ElementData.h>
15  #include <escriptexport/NodeData.h>  #include <escriptexport/NodeData.h>
16    
17    #ifndef VISIT_PLUGIN
18  #include <finley/CppAdapter/MeshAdapter.h>  #include <finley/CppAdapter/MeshAdapter.h>
19    #endif
20    
21  #include <iostream>  #include <iostream>
22    
# Line 136  ElementData::ElementData(const ElementDa Line 138  ElementData::ElementData(const ElementDa
138  //  //
139  bool ElementData::initFromFinley(const Finley_ElementFile* finleyFile)  bool ElementData::initFromFinley(const Finley_ElementFile* finleyFile)
140  {  {
141    #ifndef VISIT_PLUGIN
142      numElements = finleyFile->numElements;      numElements = finleyFile->numElements;
143    
144      if (numElements > 0) {      if (numElements > 0) {
# Line 217  bool ElementData::initFromFinley(const F Line 220  bool ElementData::initFromFinley(const F
220          buildMeshes();          buildMeshes();
221      }      }
222      return true;      return true;
223    
224    #else // VISIT_PLUGIN
225        return false;
226    #endif
227  }  }
228    
229  //  //
# Line 265  bool ElementData::readFromNc(NcFile* ncf Line 272  bool ElementData::readFromNc(NcFile* ncf
272          if (f.elementFactor > 1 || f.reducedElementSize != nodesPerElement)          if (f.elementFactor > 1 || f.reducedElementSize != nodesPerElement)
273              buildReducedElements(f);              buildReducedElements(f);
274    
275            // if we don't link with finley we can't get the quadrature nodes
276            // and hence cannot interpolate data properly
277    #ifndef VISIT_PLUGIN
278          if (f.useQuadNodes) {          if (f.useQuadNodes) {
279              att = ncfile->get_att("order");              att = ncfile->get_att("order");
280              int order = att->as_int(0);              int order = att->as_int(0);
# Line 308  bool ElementData::readFromNc(NcFile* ncf Line 318  bool ElementData::readFromNc(NcFile* ncf
318                  delete[] quadNodes[i];                  delete[] quadNodes[i];
319              quadNodes.clear();              quadNodes.clear();
320          }          }
321    #endif // VISIT_PLUGIN
322    
323          buildMeshes();          buildMeshes();
324      }      }

Legend:
Removed from v.2909  
changed lines
  Added in v.2910

  ViewVC Help
Powered by ViewVC 1.1.26