/[escript]/branches/trilinos_from_5897/dudley/src/Assemble_PDE.cpp
ViewVC logotype

Diff of /branches/trilinos_from_5897/dudley/src/Assemble_PDE.cpp

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

revision 6078 by caltinay, Wed Mar 2 04:13:26 2016 UTC revision 6079 by caltinay, Mon Mar 21 12:22:38 2016 UTC
# Line 77  inline void setShapeError(const char* c, Line 77  inline void setShapeError(const char* c,
77      throw DudleyException(errorMsg);      throw DudleyException(errorMsg);
78  }  }
79    
80  void Assemble_PDE(const Dudley_NodeFile* nodes, const Dudley_ElementFile* elements,  void Assemble_PDE(const NodeFile* nodes, const ElementFile* elements,
81                    escript::ASM_ptr S, escript::Data& F,                    escript::ASM_ptr S, escript::Data& F,
82                    const escript::Data& A, const escript::Data& B,                    const escript::Data& A, const escript::Data& B,
83                    const escript::Data& C, const escript::Data& D,                    const escript::Data& C, const escript::Data& D,
# Line 103  void Assemble_PDE(const Dudley_NodeFile* Line 103  void Assemble_PDE(const Dudley_NodeFile*
103      if (!X.isEmpty()) funcspace=X.getFunctionSpace().getTypeCode();      if (!X.isEmpty()) funcspace=X.getFunctionSpace().getTypeCode();
104      if (!Y.isEmpty()) funcspace=Y.getFunctionSpace().getTypeCode();      if (!Y.isEmpty()) funcspace=Y.getFunctionSpace().getTypeCode();
105      if (funcspace == -1)      if (funcspace == -1)
106          return; // all  data are empty          return; // all data are empty
107    
108      // check if all function spaces are the same      // check if all function spaces are the same
109      if (!A.isEmpty() && A.getFunctionSpace().getTypeCode()!=funcspace) {      if (!A.isEmpty() && A.getFunctionSpace().getTypeCode()!=funcspace) {
# Line 136  void Assemble_PDE(const Dudley_NodeFile* Line 136  void Assemble_PDE(const Dudley_NodeFile*
136      }      }
137    
138      // get assemblage parameters      // get assemblage parameters
139      Assemble_Parameters p;      AssembleParameters p;
140      Assemble_getAssembleParameters(nodes, elements, S, F, reducedIntegrationOrder, &p);      Assemble_getAssembleParameters(nodes, elements, S, F, reducedIntegrationOrder, &p);
141    
142      // check if sample numbers are the same      // check if sample numbers are the same

Legend:
Removed from v.6078  
changed lines
  Added in v.6079

  ViewVC Help
Powered by ViewVC 1.1.26