/[escript]/branches/doubleplusgood/dudley/src/Mesh_readGmsh.cpp
ViewVC logotype

Diff of /branches/doubleplusgood/dudley/src/Mesh_readGmsh.cpp

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

revision 1811 by ksteube, Thu Sep 25 23:11:13 2008 UTC revision 1814 by gross, Tue Sep 30 00:21:21 2008 UTC
# Line 119  Finley_Mesh* Finley_Mesh_readGmsh(char* Line 119  Finley_Mesh* Finley_Mesh_readGmsh(char*
119        
120           ElementTypeId final_element_type = NoType;           ElementTypeId final_element_type = NoType;
121           ElementTypeId final_face_element_type = NoType;           ElementTypeId final_face_element_type = NoType;
122             ElementTypeId contact_element_type = NoType;
123           numElements=0;           numElements=0;
124           numFaceElements=0;           numFaceElements=0;
125           fscanf(fileHandle_p, "%d", &totalNumElements);           fscanf(fileHandle_p, "%d", &totalNumElements);
# Line 263  Finley_Mesh* Finley_Mesh_readGmsh(char* Line 264  Finley_Mesh* Finley_Mesh_readGmsh(char*
264                      final_face_element_type=Tri3;                      final_face_element_type=Tri3;
265                   }                   }
266                }                }
267                  if (final_face_element_type == Line2) {
268                      contact_element_type=Line2_Contact;
269                  } else  if (final_face_element_type == Line3) {
270                      contact_element_type=Line3_Contact;
271                  } else  if (final_face_element_type == Tri3) {
272                      contact_element_type=Tri3_Contact;
273                  } else  if (final_face_element_type == Tri6) {
274                      contact_element_type=Tri6_Contact;
275                  } else {
276                      contact_element_type=Point1_Contact;
277                  }
278    
279                mesh_p->Elements=Finley_ElementFile_alloc(final_element_type,mesh_p->order, mesh_p->reduced_order, mpi_info);                mesh_p->Elements=Finley_ElementFile_alloc(final_element_type,mesh_p->order, mesh_p->reduced_order, mpi_info);
280                mesh_p->FaceElements=Finley_ElementFile_alloc(final_face_element_type,mesh_p->order, mesh_p->reduced_order, mpi_info);                mesh_p->FaceElements=Finley_ElementFile_alloc(final_face_element_type,mesh_p->order, mesh_p->reduced_order, mpi_info);
281                mesh_p->ContactElements=Finley_ElementFile_alloc(Point1_Contact,mesh_p->order, mesh_p->reduced_order, mpi_info);                mesh_p->ContactElements=Finley_ElementFile_alloc(contact_element_type,mesh_p->order, mesh_p->reduced_order, mpi_info);
282                mesh_p->Points=Finley_ElementFile_alloc(Point1,mesh_p->order, mesh_p->reduced_order, mpi_info);                mesh_p->Points=Finley_ElementFile_alloc(Point1,mesh_p->order, mesh_p->reduced_order, mpi_info);
283                if (Finley_noError()) {                if (Finley_noError()) {
284                    Finley_ElementFile_allocTable(mesh_p->Elements, numElements);                    Finley_ElementFile_allocTable(mesh_p->Elements, numElements);

Legend:
Removed from v.1811  
changed lines
  Added in v.1814

  ViewVC Help
Powered by ViewVC 1.1.26