/[escript]/trunk/esys2/finley/src/finleyC/Assemble_CopyElementData.c
ViewVC logotype

Diff of /trunk/esys2/finley/src/finleyC/Assemble_CopyElementData.c

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

revision 123 by jgs, Fri Jul 8 04:08:13 2005 UTC revision 147 by jgs, Fri Aug 12 01:45:47 2005 UTC
# Line 35  void Finley_Assemble_CopyElementData(Fin Line 35  void Finley_Assemble_CopyElementData(Fin
35      if (numComps!=getDataPointSize(in)) {      if (numComps!=getDataPointSize(in)) {
36         Finley_ErrorCode=TYPE_ERROR;         Finley_ErrorCode=TYPE_ERROR;
37         sprintf(Finley_ErrorMsg,"number of components of input and output Data do not match.");         sprintf(Finley_ErrorMsg,"number of components of input and output Data do not match.");
38      } else if (numSamplesEqual(out,numQuad,numElements)) {      } else if (!numSamplesEqual(in,numQuad,numElements)) {
        Finley_ErrorCode=TYPE_ERROR;  
        sprintf(Finley_ErrorMsg,"illegal number of samples of output Data object");  
     } else if (numSamplesEqual(in,numQuad,numElements)) {  
39         Finley_ErrorCode=TYPE_ERROR;         Finley_ErrorCode=TYPE_ERROR;
40         sprintf(Finley_ErrorMsg,"illegal number of samples of input Data object");         sprintf(Finley_ErrorMsg,"illegal number of samples of input Data object");
41        } else if (!numSamplesEqual(out,numQuad,numElements)) {
42           Finley_ErrorCode=TYPE_ERROR;
43           sprintf(Finley_ErrorMsg,"illegal number of samples of output Data object");
44      } else if (!isExpanded(out)) {      } else if (!isExpanded(out)) {
45         Finley_ErrorCode=TYPE_ERROR;         Finley_ErrorCode=TYPE_ERROR;
46         sprintf(Finley_ErrorMsg,"expanded Data object is expected for output data.");         sprintf(Finley_ErrorMsg,"expanded Data object is expected for output data.");
# Line 66  void Finley_Assemble_CopyElementData(Fin Line 66  void Finley_Assemble_CopyElementData(Fin
66  }  }
67  /*  /*
68   * $Log$   * $Log$
69     * Revision 1.3  2005/08/12 01:45:42  jgs
70     * erge of development branch dev-02 back to main trunk on 2005-08-12
71     *
72     * Revision 1.2.2.1  2005/08/02 05:29:11  gross
73     * bug in finley/src/Assemble_CopyElementData fixed
74     *
75   * Revision 1.2  2005/07/08 04:07:45  jgs   * Revision 1.2  2005/07/08 04:07:45  jgs
76   * Merge of development branch back to main trunk on 2005-07-08   * Merge of development branch back to main trunk on 2005-07-08
77   *   *

Legend:
Removed from v.123  
changed lines
  Added in v.147

  ViewVC Help
Powered by ViewVC 1.1.26