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

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

Parent Directory Parent Directory | Revision Log Revision Log


Revision 1628 - (hide annotations)
Fri Jul 11 13:12:46 2008 UTC (11 years, 1 month ago) by phornby
File MIME type: text/plain
File size: 2994 byte(s)

Merge in /branches/windows_from_1456_trunk_1620_merged_in branch.

You will find a preserved pre-merge trunk in tags under tags/trunk_at_1625.
That will be useful for diffing & checking on my stupidity.

Here is a list of the conflicts and their resolution at this
point in time.


=================================================================================
(LLWS == looks like white space).

finley/src/Assemble_addToSystemMatrix.c - resolve to branch - unused var. may be wrong.....
finley/src/CPPAdapter/SystemMatrixAdapter.cpp - resolve to branch - LLWS
finley/src/CPPAdapter/MeshAdapter.cpp - resolve to branch - LLWS
paso/src/PCG.c - resolve to branch - unused var fixes.
paso/src/SolverFCT.c - resolve to branch - LLWS
paso/src/FGMRES.c - resolve to branch - LLWS
paso/src/Common.h - resolve to trunk version. It's omp.h's include... not sure it's needed,
but for the sake of saftey.....
paso/src/Functions.c - resolve to branch version, indentation/tab removal and return error
on bad unimplemented Paso_FunctionCall.
paso/src/SolverFCT_solve.c - resolve to branch version, unused vars
paso/src/SparseMatrix_MatrixVector.c - resolve to branch version, unused vars.
escript/src/Utils.cpp - resloved to branch, needs WinSock2.h
escript/src/DataExpanded.cpp - resolved to branch version - LLWS
escript/src/DataFactory.cpp - resolve to branch version
=================================================================================

This currently passes tests on linux (debian), but is not checked on windows or Altix yet.

This checkin is to make a trunk I can check out for windows to do tests on it.

Known outstanding problem is in the operator=() method of exceptions
causing warning messages on the intel compilers.

May the God of doughnuts have mercy on my soul.


1 jgs 150
2 ksteube 1312 /* $Id$ */
3    
4     /*******************************************************
5     *
6     * Copyright 2003-2007 by ACceSS MNRF
7     * Copyright 2007 by University of Queensland
8     *
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 jgs 82 /**************************************************************/
17    
18     /* Finley: ElementFile */
19    
20     /* mark the used nodes with offeset: */
21    
22     /**************************************************************/
23    
24     #include "ElementFile.h"
25    
26     /**************************************************************/
27    
28 jgs 123 void Finley_ElementFile_markNodes(index_t* mask,index_t offset,Finley_ElementFile* in,bool_t useLinear) {
29     dim_t i,NN,NN2,e;
30 phornby 1628 index_t *lin_node,*id=NULL;
31 jgs 82 if (in!=NULL) {
32 gross 1028 id=TMPMEMALLOC(in->ReferenceElement->Type->numNodes, index_t);
33     if (! Finley_checkPtr(id) ){
34     for (i=0;i<in->ReferenceElement->Type->numNodes;i++) id[i]=i;
35     if (useLinear) {
36     NN=in->LinearReferenceElement->Type->numNodes;
37     lin_node=in->ReferenceElement->Type->linearNodes;
38     } else {
39     NN=in->ReferenceElement->Type->numNodes;
40     lin_node=id;
41     }
42 ksteube 1312 NN2=in->numNodes;
43     #pragma omp parallel for private(e,i) schedule(static)
44     for (e=0;e<in->numElements;e++) {
45     for (i=0;i<NN;i++) {
46 gross 1028 mask[in->Nodes[INDEX2(lin_node[i],e,NN2)]-offset]=1;
47     }
48 jgs 82 }
49 gross 1028 TMPMEMFREE(id);
50     }
51 jgs 82 }
52     }
53 bcumming 751
54 ksteube 1312 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     {
56     dim_t i,NN,NN2,e,j;
57     index_t color,*lin_node,*id=NULL,k;
58     if (in!=NULL) {
59     id=TMPMEMALLOC(in->ReferenceElement->Type->numNodes, index_t);
60     if (! Finley_checkPtr(id) ){
61     for (i=0;i<in->ReferenceElement->Type->numNodes;i++) id[i]=i;
62     if (useLinear) {
63     NN=in->LinearReferenceElement->Type->numNodes;
64     lin_node=in->ReferenceElement->Type->linearNodes;
65     } else {
66     NN=in->ReferenceElement->Type->numNodes;
67     lin_node=id;
68     }
69     NN2=in->numNodes;
70     for (color=in->minColor;color<=in->maxColor;color++) {
71     #pragma omp parallel for private(e,i,j,k) schedule(static)
72     for (e=0;e<in->numElements;e++) {
73     if (in->Color[e]==color) {
74     for (i=0;i<NN;i++) {
75     k=dofIndex[in->Nodes[INDEX2(lin_node[i],e,NN2)]];
76     if ( (firstDOF<=k) && (k<lastDOF) ) {
77     for (j=0;j<NN;j++) mask[dofIndex[in->Nodes[INDEX2(lin_node[j],e,NN2)]]-offset]=marker;
78     break;
79     }
80     }
81     }
82     }
83     }
84     }
85     TMPMEMFREE(id);
86     }
87     }
88    

Properties

Name Value
svn:eol-style native
svn:keywords Author Date Id Revision

  ViewVC Help
Powered by ViewVC 1.1.26