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

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

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

revision 616 by elspeth, Wed Mar 22 02:46:56 2006 UTC revision 1312 by ksteube, Mon Sep 24 06:18:44 2007 UTC
# Line 1  Line 1 
 /*  
  ************************************************************  
  *          Copyright 2006 by ACcESS MNRF                   *  
  *                                                          *  
  *              http://www.access.edu.au                    *  
  *       Primary Business: Queensland, Australia            *  
  *  Licensed under the Open Software License version 3.0    *  
  *     http://www.opensource.org/licenses/osl-3.0.php       *  
  *                                                          *  
  ************************************************************  
 */  
1    
2  /**************************************************************/  /* $Id$ */
3    
4  /*    assemblage routines: copies node coordinates into an expanded Data Object */  /*******************************************************
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  /**************************************************************/  /**************************************************************/
17    
18  /*  Copyrights by ACcESS Australia 2003,2004,2005 */  /*    assemblage routines: copies node coordinates into an expanded Data Object */
 /*  Version: $Id$ */  
19    
20  /**************************************************************/  /**************************************************************/
21    
# Line 32  Line 30 
30  void Finley_Assemble_NodeCoordinates(Finley_NodeFile* nodes,escriptDataC* x) {  void Finley_Assemble_NodeCoordinates(Finley_NodeFile* nodes,escriptDataC* x) {
31    char error_msg[LenErrorMsg_MAX];    char error_msg[LenErrorMsg_MAX];
32    dim_t n;    dim_t n;
33      size_t dim_size;
34    Finley_resetError();    Finley_resetError();
35    if (nodes==NULL) return;    if (nodes==NULL) return;
36    if (! numSamplesEqual(x,1,nodes->numNodes)) {    if (! numSamplesEqual(x,1,nodes->numNodes)) {
# Line 44  void Finley_Assemble_NodeCoordinates(Fin Line 43  void Finley_Assemble_NodeCoordinates(Fin
43         sprintf(error_msg,"Finley_Assemble_NodeCoordinates: Data object of shape (%d,) expected",nodes->numDim);         sprintf(error_msg,"Finley_Assemble_NodeCoordinates: Data object of shape (%d,) expected",nodes->numDim);
44         Finley_setError(TYPE_ERROR,error_msg);         Finley_setError(TYPE_ERROR,error_msg);
45    } else {    } else {
46           dim_size=nodes->numDim*sizeof(double);
47         #pragma omp parallel for private(n)         #pragma omp parallel for private(n)
48         for (n=0;n<nodes->numNodes;n++)         for (n=0;n<nodes->numNodes;n++)
49            Finley_copyDouble(nodes->numDim,&(nodes->Coordinates[INDEX2(0,n,nodes->numDim)]),getSampleData(x,n));            memcpy(getSampleDataFast(x,n),&(nodes->Coordinates[INDEX2(0,n,nodes->numDim)]),dim_size);
50    }    }
51  }  }
 /*  
  * $Log$  
  * Revision 1.3  2005/09/15 03:44:21  jgs  
  * Merge of development branch dev-02 back to main trunk on 2005-09-15  
  *  
  * Revision 1.2.2.1  2005/09/07 06:26:17  gross  
  * the solver from finley are put into the standalone package paso now  
  *  
  * Revision 1.2  2005/07/08 04:07:45  jgs  
  * Merge of development branch back to main trunk on 2005-07-08  
  *  
  * Revision 1.1.1.1.2.1  2005/06/29 02:34:46  gross  
  * some changes towards 64 integers in finley  
  *  
  * Revision 1.1.1.1  2004/10/26 06:53:57  jgs  
  * initial import of project esys2  
  *  
  * Revision 1.5  2004/08/26 12:03:52  gross  
  * Some other bug in Finley_Assemble_gradient fixed.  
  *  
  * Revision 1.4  2004/08/05 03:58:27  gross  
  * Bug in Assemble_NodeCoordinates fixed  
  *  
  * Revision 1.3  2004/07/30 04:37:06  gross  
  * escript and finley are linking now and RecMeshTest.py has been passed  
  *  
  * Revision 1.2  2004/07/21 05:00:54  gross  
  * name changes in DataC  
  *  
  * Revision 1.1  2004/07/02 04:21:13  gross  
  * Finley C code has been included  
  *  
  *  
  */  

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

  ViewVC Help
Powered by ViewVC 1.1.26