/[escript]/branches/domexper/dudley/src/Mesh_hex20.c
ViewVC logotype

Diff of /branches/domexper/dudley/src/Mesh_hex20.c

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

revision 2748 by gross, Tue Nov 17 07:32:59 2009 UTC revision 2881 by jfenwick, Thu Jan 28 02:03:15 2010 UTC
# Line 1  Line 1 
1    
2  /*******************************************************  /*******************************************************
3  *  *
4  * Copyright (c) 2003-2009 by University of Queensland  * Copyright (c) 2003-2010 by University of Queensland
5  * Earth Systems Science Computational Center (ESSCC)  * Earth Systems Science Computational Center (ESSCC)
6  * http://www.uq.edu.au/esscc  * http://www.uq.edu.au/esscc
7  *  *
# Line 67  Finley_Mesh* Finley_RectangularMesh_Hex2 Line 67  Finley_Mesh* Finley_RectangularMesh_Hex2
67    
68    /*  allocate mesh: */      /*  allocate mesh: */  
69    sprintf(name,"Brick %d x %d x %d mesh",N0,N1,N2);    sprintf(name,"Brick %d x %d x %d mesh",N0,N1,N2);
70    out=Finley_Mesh_alloc(name,DIM,order, reduced_order, mpi_info);    out=Finley_Mesh_alloc(name,DIM, mpi_info);
71    if (! Finley_noError()) {    if (! Finley_noError()) {
72        Paso_MPIInfo_free( mpi_info );        Paso_MPIInfo_free( mpi_info );
73        return NULL;        return NULL;
# Line 76  Finley_Mesh* Finley_RectangularMesh_Hex2 Line 76  Finley_Mesh* Finley_RectangularMesh_Hex2
76    if (generateAllNodes) {    if (generateAllNodes) {
77       /* Finley_setError(SYSTEM_ERROR,"full element order for Hex elements is not supported yet."); */       /* Finley_setError(SYSTEM_ERROR,"full element order for Hex elements is not supported yet."); */
78       if (useMacroElements) {       if (useMacroElements) {
79            refElements= Finley_ReferenceElementSet_alloc(Hex27Macro,out->order,out->reduced_order);            refElements= Finley_ReferenceElementSet_alloc(Hex27Macro,order,reduced_order);
80       } else {       } else {
81            refElements=Finley_ReferenceElementSet_alloc(Hex27, out->order,out->reduced_order);            refElements=Finley_ReferenceElementSet_alloc(Hex27, order,reduced_order);
82       }       }
83       if (useElementsOnFace) {       if (useElementsOnFace) {
84           Finley_setError(SYSTEM_ERROR,"rich elements for Hex27 elements is not supported yet.");           Finley_setError(SYSTEM_ERROR,"rich elements for Hex27 elements is not supported yet.");
85       } else {       } else {
86           if (useMacroElements) {           if (useMacroElements) {
87               refFaceElements=Finley_ReferenceElementSet_alloc(Rec9Macro, out->order, out->reduced_order);               refFaceElements=Finley_ReferenceElementSet_alloc(Rec9Macro, order, reduced_order);
88           } else {           } else {
89               refFaceElements=Finley_ReferenceElementSet_alloc(Rec9, out->order, out->reduced_order);               refFaceElements=Finley_ReferenceElementSet_alloc(Rec9, order, reduced_order);
90           }           }
91           refContactElements=Finley_ReferenceElementSet_alloc(Rec9_Contact, out->order, out->reduced_order);           refContactElements=Finley_ReferenceElementSet_alloc(Rec9_Contact, order, reduced_order);
92       }       }
93    
94    } else  {    } else  {
95       refElements= Finley_ReferenceElementSet_alloc(Hex20,out->order,out->reduced_order);       refElements= Finley_ReferenceElementSet_alloc(Hex20,order,reduced_order);
96       if (useElementsOnFace) {       if (useElementsOnFace) {
97           refFaceElements = Finley_ReferenceElementSet_alloc(Hex20Face ,out->order,out->reduced_order);           refFaceElements = Finley_ReferenceElementSet_alloc(Hex20Face ,order,reduced_order);
98           refContactElements=Finley_ReferenceElementSet_alloc(Hex20Face_Contact, out->order, out->reduced_order);           refContactElements=Finley_ReferenceElementSet_alloc(Hex20Face_Contact, order, reduced_order);
99    
100       } else {       } else {
101           refFaceElements = Finley_ReferenceElementSet_alloc(Rec8 ,out->order,out->reduced_order);           refFaceElements = Finley_ReferenceElementSet_alloc(Rec8 ,order,reduced_order);
102           refContactElements=Finley_ReferenceElementSet_alloc(Rec8_Contact, out->order, out->reduced_order);           refContactElements=Finley_ReferenceElementSet_alloc(Rec8_Contact, order, reduced_order);
103    
104       }       }
105    }    }
106    refPoints=Finley_ReferenceElementSet_alloc(Point1, out->order, out->reduced_order);    refPoints=Finley_ReferenceElementSet_alloc(Point1, order, reduced_order);
107    
108    if ( Finley_noError()) {    if ( Finley_noError()) {
109        

Legend:
Removed from v.2748  
changed lines
  Added in v.2881

  ViewVC Help
Powered by ViewVC 1.1.26