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

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

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

trunk/finley/src/finleyC/Mesh_rec8.c revision 155 by jgs, Wed Nov 9 02:02:19 2005 UTC trunk/finley/src/Mesh_rec8.c revision 730 by bcumming, Mon May 15 04:03:49 2006 UTC
# Line 1  Line 1 
1  /*  /*
2   ******************************************************************************   ************************************************************
3   *                                                                            *   *          Copyright 2006 by ACcESS MNRF                   *
4   *       COPYRIGHT  ACcESS 2003,2004,2005 -  All Rights Reserved              *   *                                                          *
5   *                                                                            *   *              http://www.access.edu.au                    *
6   * This software is the property of ACcESS. No part of this code              *   *       Primary Business: Queensland, Australia            *
7   * may be copied in any form or by any means without the expressed written    *   *  Licensed under the Open Software License version 3.0    *
8   * consent of ACcESS.  Copying, use or modification of this software          *   *     http://www.opensource.org/licenses/osl-3.0.php       *
9   * by any unauthorised person is illegal unless that person has a software    *   *                                                          *
10   * license agreement with ACcESS.                                             *   ************************************************************
  *                                                                            *  
  ******************************************************************************  
11  */  */
12    
13  /**************************************************************/  /**************************************************************/
# Line 33  Line 31 
31  Finley_Mesh* Finley_RectangularMesh_Rec8(int* numElements,double* Length,int* periodic,int order,int useElementsOnFace) {  Finley_Mesh* Finley_RectangularMesh_Rec8(int* numElements,double* Length,int* periodic,int order,int useElementsOnFace) {
32    dim_t N0,N1,NE0,NE1,i0,i1,totalNECount,faceNECount,NDOF0,NDOF1,NFaceElements,NUMNODES,M0,M1;    dim_t N0,N1,NE0,NE1,i0,i1,totalNECount,faceNECount,NDOF0,NDOF1,NFaceElements,NUMNODES,M0,M1;
33    index_t k,node0;    index_t k,node0;
34    Finley_Mesh* out;    Finley_Mesh* out=NULL;
35    char name[50];    char name[50];
36    double time0=Finley_timer();    double time0=Finley_timer();
37    NE0=MAX(1,numElements[0]);    NE0=MAX(1,numElements[0]);
# Line 66  Finley_Mesh* Finley_RectangularMesh_Rec8 Line 64  Finley_Mesh* Finley_RectangularMesh_Rec8
64    /*  allocate mesh: */    /*  allocate mesh: */
65        
66    sprintf(name,"Rectangular %d x %d mesh",N0,N1);    sprintf(name,"Rectangular %d x %d mesh",N0,N1);
67        /* TEMPFIX */
68    #ifndef PASO_MPI
69    out=Finley_Mesh_alloc(name,2,order);    out=Finley_Mesh_alloc(name,2,order);
70    
71    if (! Finley_noError()) return NULL;    if (! Finley_noError()) return NULL;
72    
73    out->Elements=Finley_ElementFile_alloc(Rec8,out->order);    out->Elements=Finley_ElementFile_alloc(Rec8,out->order);
# Line 78  Finley_Mesh* Finley_RectangularMesh_Rec8 Line 79  Finley_Mesh* Finley_RectangularMesh_Rec8
79       out->ContactElements=Finley_ElementFile_alloc(Line3_Contact,out->order);       out->ContactElements=Finley_ElementFile_alloc(Line3_Contact,out->order);
80    }    }
81    out->Points=Finley_ElementFile_alloc(Point1,out->order);    out->Points=Finley_ElementFile_alloc(Point1,out->order);
82    #else
83      /* TODO */
84    #endif
85    if (! Finley_noError()) {    if (! Finley_noError()) {
86         Finley_Mesh_dealloc(out);         Finley_Mesh_dealloc(out);
87         return NULL;         return NULL;
88    }    }
89        
90    /*  allocate tables: */    /*  allocate tables: */
91      #ifndef PASO_MPI
92    Finley_NodeFile_allocTable(out->Nodes,N0*N1);    Finley_NodeFile_allocTable(out->Nodes,N0*N1);
93    #else
94      /* TODO */
95    #endif
96    Finley_ElementFile_allocTable(out->Elements,NE0*NE1);    Finley_ElementFile_allocTable(out->Elements,NE0*NE1);
97    Finley_ElementFile_allocTable(out->FaceElements,NFaceElements);    Finley_ElementFile_allocTable(out->FaceElements,NFaceElements);
98    if (! Finley_noError()) {    if (! Finley_noError()) {

Legend:
Removed from v.155  
changed lines
  Added in v.730

  ViewVC Help
Powered by ViewVC 1.1.26