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

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

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

revision 1351 by ksteube, Mon Sep 24 06:18:44 2007 UTC revision 1352 by matt, Thu Nov 22 03:43:28 2007 UTC
# Line 60  void Finley_Assemble_PDE(Finley_NodeFile Line 60  void Finley_Assemble_PDE(Finley_NodeFile
60    double time0;    double time0;
61    dim_t dimensions[ESCRIPT_MAX_DATA_RANK];    dim_t dimensions[ESCRIPT_MAX_DATA_RANK];
62    type_t funcspace;    type_t funcspace;
63    double blocktimer_start = blocktimer_time();    // double blocktimer_start = blocktimer_time();
64    
65    Finley_resetError();    Finley_resetError();
66    
# Line 75  void Finley_Assemble_PDE(Finley_NodeFile Line 75  void Finley_Assemble_PDE(Finley_NodeFile
75    if (nodes==NULL || elements==NULL) return;    if (nodes==NULL || elements==NULL) return;
76    if (S==NULL && isEmpty(F)) return;    if (S==NULL && isEmpty(F)) return;
77    
78    if (isEmpty(F) && !isEmpty(X) && !isEmpty(F)) {    if (isEmpty(F) && !isEmpty(X) && !isEmpty(F)) {
79          Finley_setError(TYPE_ERROR,"Finley_Assemble_PDE: right hand side coefficients are non-zero bat no right hand side vector given.");          Finley_setError(TYPE_ERROR,"Finley_Assemble_PDE: right hand side coefficients are non-zero bat no right hand side vector given.");
80    }    }
81    
82    if (S==NULL && !isEmpty(A) && !isEmpty(B) && !isEmpty(C) && !isEmpty(D)) {    if (S==NULL && !isEmpty(A) && !isEmpty(B) && !isEmpty(C) && !isEmpty(D)) {
83          Finley_setError(TYPE_ERROR,"Finley_Assemble_PDE: coefficients are non-zero but no matrix is given.");          Finley_setError(TYPE_ERROR,"Finley_Assemble_PDE: coefficients are non-zero but no matrix is given.");
84    }    }
85    
# Line 173  void Finley_Assemble_PDE(Finley_NodeFile Line 173  void Finley_Assemble_PDE(Finley_NodeFile
173    }    }
174    
175    /*  check the dimensions: */    /*  check the dimensions: */
176      
177    if (p.numEqu==1 && p.numComp==1) {    if (p.numEqu==1 && p.numComp==1) {
178      if (!isEmpty(A)) {      if (!isEmpty(A)) {
179        dimensions[0]=p.numDim;        dimensions[0]=p.numDim;
# Line 213  void Finley_Assemble_PDE(Finley_NodeFile Line 213  void Finley_Assemble_PDE(Finley_NodeFile
213         if (!isDataPointShapeEqual(Y,0,dimensions)) {         if (!isDataPointShapeEqual(Y,0,dimensions)) {
214            Finley_setError(TYPE_ERROR,"Finley_Assemble_PDE: coefficient Y, rank 0 expected.");            Finley_setError(TYPE_ERROR,"Finley_Assemble_PDE: coefficient Y, rank 0 expected.");
215         }         }
216      }      }
217    } else {    } else {
218      if (!isEmpty(A)) {      if (!isEmpty(A)) {
219        dimensions[0]=p.numEqu;        dimensions[0]=p.numEqu;
# Line 360  void Finley_Assemble_PDE(Finley_NodeFile Line 360  void Finley_Assemble_PDE(Finley_NodeFile
360       printf("timing: assemblage PDE: %.4e sec\n",Finley_timer()-time0);       printf("timing: assemblage PDE: %.4e sec\n",Finley_timer()-time0);
361       #endif       #endif
362    }    }
363    blocktimer_increment("Finley_Assemble_PDE()", blocktimer_start);    // blocktimer_increment("Finley_Assemble_PDE()", blocktimer_start);
364  }  }
365  /*  /*
366   * $Log$   * $Log$

Legend:
Removed from v.1351  
changed lines
  Added in v.1352

  ViewVC Help
Powered by ViewVC 1.1.26