/[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

revision 1028 by gross, Wed Mar 14 00:15:24 2007 UTC revision 1312 by ksteube, Mon Sep 24 06:18:44 2007 UTC
# Line 1  Line 1 
1  /*  
2   ************************************************************  /* $Id$ */
3   *          Copyright 2006 by ACcESS MNRF                   *  
4   *                                                          *  /*******************************************************
5   *              http://www.access.edu.au                    *   *
6   *       Primary Business: Queensland, Australia            *   *           Copyright 2003-2007 by ACceSS MNRF
7   *  Licensed under the Open Software License version 3.0    *   *       Copyright 2007 by University of Queensland
8   *     http://www.opensource.org/licenses/osl-3.0.php       *   *
9   *                                                          *   *                http://esscc.uq.edu.au
10   ************************************************************   *        Primary Business: Queensland, Australia
11  */   *  Licensed under the Open Software License version 3.0
12     *     http://www.opensource.org/licenses/osl-3.0.php
13     *
14     *******************************************************/
15    
16  /**************************************************************/  /**************************************************************/
17    
# Line 18  Line 21 
21    
22  /**************************************************************/  /**************************************************************/
23    
 /*  Copyrights by ACcESS Australia 2003,2004,2005 */  
 /*  Author: gross@access.edu.au */  
 /*  Version: $Id$ */  
   
 /**************************************************************/  
   
24  #include "ElementFile.h"  #include "ElementFile.h"
25    
26  /**************************************************************/  /**************************************************************/
# Line 42  void Finley_ElementFile_markNodes(index_ Line 39  void Finley_ElementFile_markNodes(index_
39             NN=in->ReferenceElement->Type->numNodes;             NN=in->ReferenceElement->Type->numNodes;
40             lin_node=id;             lin_node=id;
41          }          }
42          NN2=in->ReferenceElement->Type->numNodes;          NN2=in->numNodes;
43          if ((in->maxColor-in->minColor+1)*NN<in->numElements) {          #pragma omp parallel for private(e,i) schedule(static)
44             #pragma omp parallel private(color)          for (e=0;e<in->numElements;e++) {
45             {              for (i=0;i<NN;i++) {
               for (color=in->minColor;color<=in->maxColor;color++) {  
                 #pragma omp for private(e,i) schedule(static)  
                 for (e=0;e<in->numElements;e++) {  
                   if (in->Color[e]==color) {  
                      for (i=0;i<NN;i++)  
                        mask[in->Nodes[INDEX2(lin_node[i],e,NN2)]-offset]=1;  
                   }  
                 }  
               }  
               #pragma omp barrier  
            }  
         } else {  
            #pragma omp parallel for private(e,i) schedule(static)  
            for (e=0;e<in->numElements;e++) {  
               for (i=0;i<NN;i++)  
46                  mask[in->Nodes[INDEX2(lin_node[i],e,NN2)]-offset]=1;                  mask[in->Nodes[INDEX2(lin_node[i],e,NN2)]-offset]=1;
47             }             }
48          }          }
# Line 69  void Finley_ElementFile_markNodes(index_ Line 51  void Finley_ElementFile_markNodes(index_
51     }     }
52  }  }
53    
54  /*  void Finley_ElementFile_markDOFsConnectedToRange(index_t* mask,index_t offset,index_t marker,index_t firstDOF,index_t lastDOF,index_t *dofIndex,Finley_ElementFile*in ,bool_t useLinear)
55  * $Log$  {
56  * Revision 1.4  2005/09/15 03:44:22  jgs     dim_t i,NN,NN2,e,j;
57  * Merge of development branch dev-02 back to main trunk on 2005-09-15     index_t color,*lin_node,*id=NULL,k;
58  *     if (in!=NULL) {
59  * Revision 1.3.2.1  2005/09/07 06:26:18  gross       id=TMPMEMALLOC(in->ReferenceElement->Type->numNodes, index_t);
60  * the solver from finley are put into the standalone package paso now       if (! Finley_checkPtr(id) ){
61  *          for (i=0;i<in->ReferenceElement->Type->numNodes;i++) id[i]=i;
62  * Revision 1.3  2005/07/22 03:53:08  jgs          if (useLinear) {
63  * Merge of development branch back to main trunk on 2005-07-22             NN=in->LinearReferenceElement->Type->numNodes;
64  *             lin_node=in->ReferenceElement->Type->linearNodes;
65  * Revision 1.2  2005/07/08 04:07:50  jgs          } else {
66  * Merge of development branch back to main trunk on 2005-07-08             NN=in->ReferenceElement->Type->numNodes;
67  *             lin_node=id;
68  * Revision 1.1.1.1.2.2  2005/07/18 10:34:54  gross          }
69  * some informance improvements when reading meshes          NN2=in->numNodes;
70  *          for (color=in->minColor;color<=in->maxColor;color++) {
71  * Revision 1.1.1.1.2.1  2005/06/29 02:34:49  gross              #pragma omp parallel for private(e,i,j,k) schedule(static)
72  * some changes towards 64 integers in finley              for (e=0;e<in->numElements;e++) {
73  *                 if (in->Color[e]==color) {
74  * Revision 1.1.1.1  2004/10/26 06:53:57  jgs                    for (i=0;i<NN;i++) {
75  * initial import of project esys2                       k=dofIndex[in->Nodes[INDEX2(lin_node[i],e,NN2)]];
76  *                       if ( (firstDOF<=k) && (k<lastDOF) ) {
77  * Revision 1.1.1.1  2004/06/24 04:00:40  johng                          for (j=0;j<NN;j++) mask[dofIndex[in->Nodes[INDEX2(lin_node[j],e,NN2)]]-offset]=marker;
78  * Initial version of eys using boost-python.                          break;
79  *                       }
80  *                    }
81  */                 }
82                }
83            }
84         }
85         TMPMEMFREE(id);
86       }
87    }
88    

Legend:
Removed from v.1028  
changed lines
  Added in v.1312

  ViewVC Help
Powered by ViewVC 1.1.26