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

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

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

trunk/esys2/finley/src/finleyC/ElementFile_markNodes.c revision 123 by jgs, Fri Jul 8 04:08:13 2005 UTC trunk/finley/src/finley/ElementFile_markNodes.c revision 201 by jgs, Wed Nov 23 04:10:21 2005 UTC
# Line 1  Line 1 
1  /* $Id$ */  /*
2     ******************************************************************************
3     *                                                                            *
4     *       COPYRIGHT  ACcESS 2003,2004,2005 -  All Rights Reserved              *
5     *                                                                            *
6     * This software is the property of ACcESS. No part of this code              *
7     * may be copied in any form or by any means without the expressed written    *
8     * consent of ACcESS.  Copying, use or modification of this software          *
9     * by any unauthorised person is illegal unless that person has a software    *
10     * license agreement with ACcESS.                                             *
11     *                                                                            *
12     ******************************************************************************
13    */
14    
15  /**************************************************************/  /**************************************************************/
16    
17  /*   Finley: ElementFile */  /*   Finley: ElementFile */
# Line 7  Line 20 
20    
21  /**************************************************************/  /**************************************************************/
22    
23  /*   Copyrights by ACcESS Australia 2003 */  /*  Copyrights by ACcESS Australia 2003,2004,2005 */
24  /*   Author: gross@access.edu.au */  /*  Author: gross@access.edu.au */
25  /*   Version: $Id$ */  /*  Version: $Id$ */
26    
27  /**************************************************************/  /**************************************************************/
28    
 #include "Finley.h"  
29  #include "ElementFile.h"  #include "ElementFile.h"
30    
31  /**************************************************************/  /**************************************************************/
# Line 32  void Finley_ElementFile_markNodes(index_ Line 44  void Finley_ElementFile_markNodes(index_
44          lin_node=id;          lin_node=id;
45       }       }
46       NN2=in->ReferenceElement->Type->numNodes;       NN2=in->ReferenceElement->Type->numNodes;
47       #pragma omp parallel private(color)       if ((in->maxColor-in->minColor+1)*NN<in->numElements) {
48       {          #pragma omp parallel private(color)
49          for (color=in->minColor;color<=in->maxColor;color++) {          {
50            #pragma omp for private(e,i) schedule(static)             for (color=in->minColor;color<=in->maxColor;color++) {
51            for (e=0;e<in->numElements;e++) {               #pragma omp for private(e,i) schedule(static)
52              if (in->Color[e]==color) {               for (e=0;e<in->numElements;e++) {
53                 for (i=0;i<NN;i++) mask[in->Nodes[INDEX2(lin_node[i],e,NN2)]-offset]=1;                 if (in->Color[e]==color) {
54              }                    for (i=0;i<NN;i++) mask[in->Nodes[INDEX2(lin_node[i],e,NN2)]-offset]=1;
55            }                 }
56                 }
57               }
58               #pragma omp barrier
59          }          }
60          #pragma omp barrier        } else {
61       }          #pragma omp parallel for private(e,i) schedule(static)
62            for (e=0;e<in->numElements;e++) {
63               for (i=0;i<NN;i++) mask[in->Nodes[INDEX2(lin_node[i],e,NN2)]-offset]=1;
64            }
65          }
66     }     }
67  }  }
68  /*  /*
69  * $Log$  * $Log$
70    * Revision 1.4  2005/09/15 03:44:22  jgs
71    * Merge of development branch dev-02 back to main trunk on 2005-09-15
72    *
73    * Revision 1.3.2.1  2005/09/07 06:26:18  gross
74    * the solver from finley are put into the standalone package paso now
75    *
76    * Revision 1.3  2005/07/22 03:53:08  jgs
77    * Merge of development branch back to main trunk on 2005-07-22
78    *
79  * Revision 1.2  2005/07/08 04:07:50  jgs  * Revision 1.2  2005/07/08 04:07:50  jgs
80  * Merge of development branch back to main trunk on 2005-07-08  * Merge of development branch back to main trunk on 2005-07-08
81  *  *
82    * Revision 1.1.1.1.2.2  2005/07/18 10:34:54  gross
83    * some informance improvements when reading meshes
84    *
85  * Revision 1.1.1.1.2.1  2005/06/29 02:34:49  gross  * Revision 1.1.1.1.2.1  2005/06/29 02:34:49  gross
86  * some changes towards 64 integers in finley  * some changes towards 64 integers in finley
87  *  *

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

  ViewVC Help
Powered by ViewVC 1.1.26