/[escript]/trunk/finley/src/Assemble_LumpedSystem.c
ViewVC logotype

Diff of /trunk/finley/src/Assemble_LumpedSystem.c

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

revision 971 by ksteube, Wed Feb 14 04:40:49 2007 UTC revision 1072 by gross, Thu Mar 29 06:44:30 2007 UTC
# Line 61  void Finley_Assemble_PDE(Finley_NodeFile Line 61  void Finley_Assemble_PDE(Finley_NodeFile
61    Assemble_Parameters p;    Assemble_Parameters p;
62    double time0;    double time0;
63    dim_t dimensions[ESCRIPT_MAX_DATA_RANK];    dim_t dimensions[ESCRIPT_MAX_DATA_RANK];
64      type_t funcspace;
65    
66    Finley_resetError();    Finley_resetError();
67    
# Line 76  void Finley_Assemble_PDE(Finley_NodeFile Line 77  void Finley_Assemble_PDE(Finley_NodeFile
77    }    }
78    
79    /*  get the functionspace for this assemblage call */    /*  get the functionspace for this assemblage call */
80    type_t funcspace=UNKNOWN;    funcspace=UNKNOWN;
81    updateFunctionSpaceType(funcspace,A);    updateFunctionSpaceType(funcspace,A);
82    updateFunctionSpaceType(funcspace,B);    updateFunctionSpaceType(funcspace,B);
83    updateFunctionSpaceType(funcspace,C);    updateFunctionSpaceType(funcspace,C);
# Line 85  void Finley_Assemble_PDE(Finley_NodeFile Line 86  void Finley_Assemble_PDE(Finley_NodeFile
86    updateFunctionSpaceType(funcspace,Y);    updateFunctionSpaceType(funcspace,Y);
87    if (funcspace==UNKNOWN) return; /* all  data are empty */    if (funcspace==UNKNOWN) return; /* all  data are empty */
88    
   
89    /* check if all function spaces are the same */    /* check if all function spaces are the same */
90    if (! functionSpaceTypeEqual(funcspace,A) ) {    if (! functionSpaceTypeEqual(funcspace,A) ) {
91          Finley_setError(TYPE_ERROR,"Finley_Assemble_PDE: unexpected function space type for coefficient A");          Finley_setError(TYPE_ERROR,"Finley_Assemble_PDE: unexpected function space type for coefficient A");
# Line 116  void Finley_Assemble_PDE(Finley_NodeFile Line 116  void Finley_Assemble_PDE(Finley_NodeFile
116         reducedIntegrationOrder=FALSE;         reducedIntegrationOrder=FALSE;
117    } else if (funcspace==FINLEY_CONTACT_ELEMENTS_2)  {    } else if (funcspace==FINLEY_CONTACT_ELEMENTS_2)  {
118         reducedIntegrationOrder=FALSE;         reducedIntegrationOrder=FALSE;
119      } else if (funcspace==FINLEY_REDUCED_ELEMENTS) {
120           reducedIntegrationOrder=TRUE;
121      } else if (funcspace==FINLEY_REDUCED_FACE_ELEMENTS)  {
122           reducedIntegrationOrder=TRUE;
123      } else if (funcspace==FINLEY_REDUCED_CONTACT_ELEMENTS_1)  {
124           reducedIntegrationOrder=TRUE;
125      } else if (funcspace==FINLEY_REDUCED_CONTACT_ELEMENTS_2)  {
126           reducedIntegrationOrder=TRUE;
127    } else {    } else {
128         Finley_setError(TYPE_ERROR,"Finley_Assemble_PDE: assemblage failed because of illegal function space.");         Finley_setError(TYPE_ERROR,"Finley_Assemble_PDE: assemblage failed because of illegal function space.");
129    }    }

Legend:
Removed from v.971  
changed lines
  Added in v.1072

  ViewVC Help
Powered by ViewVC 1.1.26