← Back to branch summary

~vcs-imports/escript-finley/trunk

« back to all changes in this revision

Viewing changes to finley/src/Mesh_rec8.c

  • Committer: jfenwick
  • Date: 2010-10-11 01:48:14 UTC
  • Revision ID: svn-v4:77569008-7704-0410-b7a0-a92fef0b09fd:trunk:3259
Merging dudley and scons updates from branches

Show diffs side-by-side

added added

removed removed

Lines of Context:
finley/src/Mesh_rec8.c
42
42
  Finley_ReferenceElementSet *refPoints=NULL, *refContactElements=NULL, *refFaceElements=NULL, *refElements=NULL;
43
43
  index_t node0, myRank;
44
44
  Finley_Mesh* out;
45
 
  Paso_MPIInfo *mpi_info = NULL;
 
45
  Esys_MPIInfo *mpi_info = NULL;
46
46
  char name[50];
47
47
  bool_t generateAllNodes= useFullElementOrder || useMacroElements;
48
48
  #ifdef Finley_TRACE
50
50
  #endif
51
51
 
52
52
  /* get MPI information */
53
 
  mpi_info = Paso_MPIInfo_alloc( MPI_COMM_WORLD );
 
53
  mpi_info = Esys_MPIInfo_alloc( MPI_COMM_WORLD );
54
54
  if (! Finley_noError()) {
55
55
        return NULL;
56
56
  }
67
67
  sprintf(name,"Rectangular %d x %d mesh",N0,N1);
68
68
  out=Finley_Mesh_alloc(name,DIM, mpi_info);
69
69
  if (! Finley_noError()) { 
70
 
      Paso_MPIInfo_free( mpi_info );
 
70
      Esys_MPIInfo_free( mpi_info );
71
71
      return NULL;
72
72
  }
73
73
  if (generateAllNodes) {
74
74
     /* Finley_setError(SYSTEM_ERROR,"full element order for Hex elements is not supported yet."); */
75
75
     if (useMacroElements) {
76
 
                  refElements= Finley_ReferenceElementSet_alloc(Rec9Macro,order,reduced_order);
 
76
                  refElements= Finley_ReferenceElementSet_alloc(Finley_Rec9Macro,order,reduced_order);
77
77
     } else {
78
 
                  refElements=Finley_ReferenceElementSet_alloc(Rec9, order,reduced_order);
 
78
                  refElements=Finley_ReferenceElementSet_alloc(Finley_Rec9, order,reduced_order);
79
79
     }
80
80
     if (useElementsOnFace) {
81
 
         Finley_setError(SYSTEM_ERROR,"rich elements for Rec9 elements is not supported yet.");
 
81
         Finley_setError(SYSTEM_ERROR,"rich elements for Finley_Rec9 elements is not supported yet.");
82
82
     } else {
83
83
         if (useMacroElements) { 
84
 
                         refFaceElements=Finley_ReferenceElementSet_alloc(Line3Macro, order, reduced_order);
 
84
                         refFaceElements=Finley_ReferenceElementSet_alloc(Finley_Line3Macro, order, reduced_order);
85
85
         } else {
86
 
                         refFaceElements=Finley_ReferenceElementSet_alloc(Line3, order, reduced_order);
 
86
                         refFaceElements=Finley_ReferenceElementSet_alloc(Finley_Line3, order, reduced_order);
87
87
         }
88
 
                 refContactElements=Finley_ReferenceElementSet_alloc(Line3_Contact, order, reduced_order);
 
88
                 refContactElements=Finley_ReferenceElementSet_alloc(Finley_Line3_Contact, order, reduced_order);
89
89
     }
90
90
 
91
91
  } else  {
92
 
     refElements= Finley_ReferenceElementSet_alloc(Rec8,order,reduced_order);
 
92
     refElements= Finley_ReferenceElementSet_alloc(Finley_Rec8,order,reduced_order);
93
93
     if (useElementsOnFace) {
94
 
                 refFaceElements= Finley_ReferenceElementSet_alloc(Rec8Face ,order,reduced_order);
95
 
                 refContactElements=Finley_ReferenceElementSet_alloc(Rec8Face_Contact, order, reduced_order);
 
94
                 refFaceElements= Finley_ReferenceElementSet_alloc(Finley_Rec8Face ,order,reduced_order);
 
95
                 refContactElements=Finley_ReferenceElementSet_alloc(Finley_Rec8Face_Contact, order, reduced_order);
96
96
 
97
97
     } else {
98
 
                 refFaceElements= Finley_ReferenceElementSet_alloc(Line3 ,order,reduced_order);
99
 
                 refContactElements=Finley_ReferenceElementSet_alloc(Line3_Contact, order, reduced_order);
 
98
                 refFaceElements= Finley_ReferenceElementSet_alloc(Finley_Line3 ,order,reduced_order);
 
99
                 refContactElements=Finley_ReferenceElementSet_alloc(Finley_Line3_Contact, order, reduced_order);
100
100
 
101
101
     }
102
102
  }
103
 
  refPoints=Finley_ReferenceElementSet_alloc(Point1, order, reduced_order);
 
103
  refPoints=Finley_ReferenceElementSet_alloc(Finley_Point1, order, reduced_order);
104
104
 
105
105
 
106
106
  if ( Finley_noError()) {
116
116
                  Nstride1=N0;
117
117
                  local_NE0=NE0;
118
118
                  e_offset0=0;
119
 
                  Paso_MPIInfo_Split(mpi_info,NE1,&local_NE1,&e_offset1);
 
119
                  Esys_MPIInfo_Split(mpi_info,NE1,&local_NE1,&e_offset1);
120
120
          } else {
121
121
                  Nstride0=N1;
122
122
                  Nstride1=1;
123
 
                  Paso_MPIInfo_Split(mpi_info,NE0,&local_NE0,&e_offset0);
 
123
                  Esys_MPIInfo_Split(mpi_info,NE0,&local_NE0,&e_offset0);
124
124
                  local_NE1=NE1;
125
125
                  e_offset1=0;
126
126
          }
344
344
        Finley_ReferenceElementSet_dealloc(refContactElements);
345
345
        Finley_ReferenceElementSet_dealloc(refFaceElements);
346
346
        Finley_ReferenceElementSet_dealloc(refElements);
347
 
        Paso_MPIInfo_free( mpi_info );  
 
347
        Esys_MPIInfo_free( mpi_info );  
348
348
 
349
349
   return out;
350
350
}