/[escript]/trunk/esys2/finley/src/finleyC/Mesh_joinFaces.c
ViewVC logotype

Diff of /trunk/esys2/finley/src/finleyC/Mesh_joinFaces.c

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

revision 150 by jgs, Thu Sep 15 03:44:45 2005 UTC revision 153 by jgs, Tue Oct 25 01:51:20 2005 UTC
# Line 38  void Finley_Mesh_joinFaces(Finley_Mesh* Line 38  void Finley_Mesh_joinFaces(Finley_Mesh*
38     if (self->FaceElements==NULL) return;     if (self->FaceElements==NULL) return;
39    
40     if (self->FaceElements->ReferenceElement->Type->numNodesOnFace<=0) {     if (self->FaceElements->ReferenceElement->Type->numNodesOnFace<=0) {
41       sprintf(error_msg,"__FILE__:joining faces cannot be applied to face elements of type %s",self->FaceElements->ReferenceElement->Type->Name);       sprintf(error_msg,"Finley_Mesh_joinFaces:joining faces cannot be applied to face elements of type %s",self->FaceElements->ReferenceElement->Type->Name);
42       Finley_setError(TYPE_ERROR,error_msg);       Finley_setError(TYPE_ERROR,error_msg);
43       return;       return;
44     }     }
45     if (self->ContactElements==NULL) {     if (self->ContactElements==NULL) {
46       Finley_setError(TYPE_ERROR,"__FILE__: no contact element file present.");       Finley_setError(TYPE_ERROR,"Finley_Mesh_joinFaces: no contact element file present.");
47       return;       return;
48     }     }
49    
# Line 51  void Finley_Mesh_joinFaces(Finley_Mesh* Line 51  void Finley_Mesh_joinFaces(Finley_Mesh*
51     int NN_Contact=self->ContactElements->ReferenceElement->Type->numNodes;     int NN_Contact=self->ContactElements->ReferenceElement->Type->numNodes;
52    
53     if (2*NN!=NN_Contact) {     if (2*NN!=NN_Contact) {
54       sprintf(error_msg,"__FILE__:contact element file for %s cannot hold elements created from face elements %s",       sprintf(error_msg,"Finley_Mesh_joinFaces:contact element file for %s cannot hold elements created from face elements %s",
55             self->ContactElements->ReferenceElement->Type->Name,self->FaceElements->ReferenceElement->Type->Name);             self->ContactElements->ReferenceElement->Type->Name,self->FaceElements->ReferenceElement->Type->Name);
56       Finley_setError(TYPE_ERROR,error_msg);       Finley_setError(TYPE_ERROR,error_msg);
57       return;       return;
# Line 121  void Finley_Mesh_joinFaces(Finley_Mesh* Line 121  void Finley_Mesh_joinFaces(Finley_Mesh*
121              self->ContactElements=newContactElementsFile;              self->ContactElements=newContactElementsFile;
122              Finley_ElementFile_prepare(&(self->ContactElements),self->Nodes->numNodes,self->Nodes->degreeOfFreedom);              Finley_ElementFile_prepare(&(self->ContactElements),self->Nodes->numNodes,self->Nodes->degreeOfFreedom);
123    
124              Finley_Mesh_prepareNodes(self);              Finley_Mesh_prepare(self);
125    
126           } else {           } else {
127              Finley_ElementFile_dealloc(newFaceElementsFile);              Finley_ElementFile_dealloc(newFaceElementsFile);
# Line 134  void Finley_Mesh_joinFaces(Finley_Mesh* Line 134  void Finley_Mesh_joinFaces(Finley_Mesh*
134     TMPMEMFREE(matching_nodes_in_elem1);     TMPMEMFREE(matching_nodes_in_elem1);
135     TMPMEMFREE(elem_mask);     TMPMEMFREE(elem_mask);
136  }  }
   
 /*  
 * $Log$  
 * Revision 1.6  2005/09/15 03:44:22  jgs  
 * Merge of development branch dev-02 back to main trunk on 2005-09-15  
 *  
 * Revision 1.5.2.1  2005/09/07 06:26:19  gross  
 * the solver from finley are put into the standalone package paso now  
 *  
 * Revision 1.5  2005/07/08 04:07:52  jgs  
 * Merge of development branch back to main trunk on 2005-07-08  
 *  
 * Revision 1.4  2004/12/15 07:08:33  jgs  
 * *** empty log message ***  
 * Revision 1.1.1.1.2.2  2005/06/29 02:34:52  gross  
 * some changes towards 64 integers in finley  
 *  
 * Revision 1.1.1.1.2.1  2004/11/24 01:37:14  gross  
 * some changes dealing with the integer overflow in memory allocation. Finley solves 4M unknowns now  
 *  
 *  
 *  
 */  
   

Legend:
Removed from v.150  
changed lines
  Added in v.153

  ViewVC Help
Powered by ViewVC 1.1.26