← Back to branch summary

~vcs-imports/escript-finley/trunk

« back to all changes in this revision

Viewing changes to finley/src/Mesh_rec4.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_rec4.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
  #ifdef Finley_TRACE
48
48
  double time0=Finley_timer();
49
49
  #endif
50
50
 
51
51
  /* get MPI information */
52
 
  mpi_info = Paso_MPIInfo_alloc( MPI_COMM_WORLD );
 
52
  mpi_info = Esys_MPIInfo_alloc( MPI_COMM_WORLD );
53
53
  if (! Finley_noError()) {
54
54
        return NULL;
55
55
  }
66
66
  sprintf(name,"Rectangular %d x %d mesh",N0,N1);
67
67
  out=Finley_Mesh_alloc(name,DIM, mpi_info);
68
68
  if (! Finley_noError()) { 
69
 
      Paso_MPIInfo_free( mpi_info );
 
69
      Esys_MPIInfo_free( mpi_info );
70
70
      return NULL;
71
71
  }
72
 
  refElements= Finley_ReferenceElementSet_alloc(Rec4,order,reduced_order);
 
72
  refElements= Finley_ReferenceElementSet_alloc(Finley_Rec4,order,reduced_order);
73
73
  if (useElementsOnFace) {
74
 
                refFaceElements=Finley_ReferenceElementSet_alloc(Rec4Face, order, reduced_order);
75
 
                refContactElements=Finley_ReferenceElementSet_alloc(Rec4Face_Contact, order, reduced_order);
 
74
                refFaceElements=Finley_ReferenceElementSet_alloc(Finley_Rec4Face, order, reduced_order);
 
75
                refContactElements=Finley_ReferenceElementSet_alloc(Finley_Rec4Face_Contact, order, reduced_order);
76
76
  } else {
77
 
                refFaceElements=Finley_ReferenceElementSet_alloc(Line2, order, reduced_order);
78
 
                refContactElements=Finley_ReferenceElementSet_alloc(Line2_Contact, order, reduced_order);
 
77
                refFaceElements=Finley_ReferenceElementSet_alloc(Finley_Line2, order, reduced_order);
 
78
                refContactElements=Finley_ReferenceElementSet_alloc(Finley_Line2_Contact, order, reduced_order);
79
79
  }
80
 
  refPoints=Finley_ReferenceElementSet_alloc(Point1, order, reduced_order);
 
80
  refPoints=Finley_ReferenceElementSet_alloc(Finley_Point1, order, reduced_order);
81
81
  
82
82
  if ( Finley_noError()) {
83
83
  
92
92
        Nstride1=N0;
93
93
        local_NE0=NE0;
94
94
         e_offset0=0;
95
 
         Paso_MPIInfo_Split(mpi_info,NE1,&local_NE1,&e_offset1);
 
95
         Esys_MPIInfo_Split(mpi_info,NE1,&local_NE1,&e_offset1);
96
96
        } else {
97
97
          Nstride0=N1;
98
98
        Nstride1=1;
99
 
        Paso_MPIInfo_Split(mpi_info,NE0,&local_NE0,&e_offset0);
 
99
        Esys_MPIInfo_Split(mpi_info,NE0,&local_NE0,&e_offset0);
100
100
        local_NE1=NE1;
101
101
         e_offset1=0;
102
102
        }
291
291
  Finley_ReferenceElementSet_dealloc(refContactElements);
292
292
  Finley_ReferenceElementSet_dealloc(refFaceElements);
293
293
  Finley_ReferenceElementSet_dealloc(refElements);
294
 
  Paso_MPIInfo_free( mpi_info );  
 
294
  Esys_MPIInfo_free( mpi_info );  
295
295
 
296
296
  return out;
297
297
}