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

revision 2855 by gross, Tue Nov 17 07:32:59 2009 UTC revision 2856 by gross, Mon Jan 18 04:14:37 2010 UTC
# Line 65  Finley_Mesh* Finley_RectangularMesh_Rec8 Line 65  Finley_Mesh* Finley_RectangularMesh_Rec8
65    
66    /*  allocate mesh: */      /*  allocate mesh: */  
67    sprintf(name,"Rectangular %d x %d mesh",N0,N1);    sprintf(name,"Rectangular %d x %d mesh",N0,N1);
68    out=Finley_Mesh_alloc(name,DIM,order, reduced_order, mpi_info);    out=Finley_Mesh_alloc(name,DIM, mpi_info);
69    if (! Finley_noError()) {    if (! Finley_noError()) {
70        Paso_MPIInfo_free( mpi_info );        Paso_MPIInfo_free( mpi_info );
71        return NULL;        return NULL;
# Line 73  Finley_Mesh* Finley_RectangularMesh_Rec8 Line 73  Finley_Mesh* Finley_RectangularMesh_Rec8
73    if (generateAllNodes) {    if (generateAllNodes) {
74       /* 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."); */
75       if (useMacroElements) {       if (useMacroElements) {
76            refElements= Finley_ReferenceElementSet_alloc(Rec9Macro,out->order,out->reduced_order);            refElements= Finley_ReferenceElementSet_alloc(Rec9Macro,order,reduced_order);
77       } else {       } else {
78            refElements=Finley_ReferenceElementSet_alloc(Rec9, out->order,out->reduced_order);            refElements=Finley_ReferenceElementSet_alloc(Rec9, order,reduced_order);
79       }       }
80       if (useElementsOnFace) {       if (useElementsOnFace) {
81           Finley_setError(SYSTEM_ERROR,"rich elements for Rec9 elements is not supported yet.");           Finley_setError(SYSTEM_ERROR,"rich elements for Rec9 elements is not supported yet.");
82       } else {       } else {
83           if (useMacroElements) {           if (useMacroElements) {
84               refFaceElements=Finley_ReferenceElementSet_alloc(Line3Macro, out->order, out->reduced_order);               refFaceElements=Finley_ReferenceElementSet_alloc(Line3Macro, order, reduced_order);
85           } else {           } else {
86               refFaceElements=Finley_ReferenceElementSet_alloc(Line3, out->order, out->reduced_order);               refFaceElements=Finley_ReferenceElementSet_alloc(Line3, order, reduced_order);
87           }           }
88           refContactElements=Finley_ReferenceElementSet_alloc(Line3_Contact, out->order, out->reduced_order);           refContactElements=Finley_ReferenceElementSet_alloc(Line3_Contact, order, reduced_order);
89       }       }
90    
91    } else  {    } else  {
92       refElements= Finley_ReferenceElementSet_alloc(Rec8,out->order,out->reduced_order);       refElements= Finley_ReferenceElementSet_alloc(Rec8,order,reduced_order);
93       if (useElementsOnFace) {       if (useElementsOnFace) {
94           refFaceElements= Finley_ReferenceElementSet_alloc(Rec8Face ,out->order,out->reduced_order);           refFaceElements= Finley_ReferenceElementSet_alloc(Rec8Face ,order,reduced_order);
95           refContactElements=Finley_ReferenceElementSet_alloc(Rec8Face_Contact, out->order, out->reduced_order);           refContactElements=Finley_ReferenceElementSet_alloc(Rec8Face_Contact, order, reduced_order);
96    
97       } else {       } else {
98           refFaceElements= Finley_ReferenceElementSet_alloc(Line3 ,out->order,out->reduced_order);           refFaceElements= Finley_ReferenceElementSet_alloc(Line3 ,order,reduced_order);
99           refContactElements=Finley_ReferenceElementSet_alloc(Line3_Contact, out->order, out->reduced_order);           refContactElements=Finley_ReferenceElementSet_alloc(Line3_Contact, order, reduced_order);
100    
101       }       }
102    }    }
103    refPoints=Finley_ReferenceElementSet_alloc(Point1, out->order, out->reduced_order);    refPoints=Finley_ReferenceElementSet_alloc(Point1, order, reduced_order);
104    
105    
106    if ( Finley_noError()) {    if ( Finley_noError()) {

Legend:
Removed from v.2855  
changed lines
  Added in v.2856

  ViewVC Help
Powered by ViewVC 1.1.26