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

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

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

revision 1311 by gross, Mon Mar 26 06:17:53 2007 UTC revision 1312 by ksteube, Mon Sep 24 06:18:44 2007 UTC
# Line 1  Line 1 
1  /*  
2   ************************************************************  /* $Id$ */
3   *          Copyright 2006 by ACcESS MNRF                   *  
4   *                                                          *  /*******************************************************
5   *              http://www.access.edu.au                    *   *
6   *       Primary Business: Queensland, Australia            *   *           Copyright 2003-2007 by ACceSS MNRF
7   *  Licensed under the Open Software License version 3.0    *   *       Copyright 2007 by University of Queensland
8   *     http://www.opensource.org/licenses/osl-3.0.php       *   *
9   *                                                          *   *                http://esscc.uq.edu.au
10   ************************************************************   *        Primary Business: Queensland, Australia
11  */   *  Licensed under the Open Software License version 3.0
12     *     http://www.opensource.org/licenses/osl-3.0.php
13     *
14     *******************************************************/
15    
16  /**************************************************************/  /**************************************************************/
17    
# Line 18  Line 21 
21    
22  /**************************************************************/  /**************************************************************/
23    
 /*  Author: gross@access.edu.au */  
 /*  Version: $Id$ */  
   
 /**************************************************************/  
   
24  #include "Mesh.h"  #include "Mesh.h"
25    
26  /**************************************************************/  /**************************************************************/
27    
28  void Finley_Mesh_joinFaces(Finley_Mesh* self,double safety_factor,double tolerance, bool_t optimize_labeling) {  void Finley_Mesh_joinFaces(Finley_Mesh* self,double safety_factor,double tolerance, bool_t optimize) {
29    
30     char error_msg[LenErrorMsg_MAX];     char error_msg[LenErrorMsg_MAX];
31     index_t e0,e1,*elem1=NULL,*elem0=NULL,*elem_mask=NULL,*matching_nodes_in_elem1=NULL;     index_t e0,e1,*elem1=NULL,*elem0=NULL,*elem_mask=NULL,*matching_nodes_in_elem1=NULL;
32     Finley_ElementFile *newFaceElementsFile=NULL,*newContactElementsFile=NULL;     Finley_ElementFile *newFaceElementsFile=NULL,*newContactElementsFile=NULL;
33     dim_t e,i,numPairs, NN, NN_Contact,c, new_numFaceElements;     dim_t e,i,numPairs, NN, NN_Contact,c, new_numFaceElements;
34    
35       if (self->MPIInfo->size>1) {
36         Finley_setError(TYPE_ERROR,"Finley_Mesh_joinFaces: MPI is not supported yet.");
37         return;
38       }
39     if (self->FaceElements==NULL) return;     if (self->FaceElements==NULL) return;
40    
41     if (self->FaceElements->ReferenceElement->Type->numNodesOnFace<=0) {     if (self->FaceElements->ReferenceElement->Type->numNodesOnFace<=0) {
# Line 81  void Finley_Mesh_joinFaces(Finley_Mesh* Line 84  void Finley_Mesh_joinFaces(Finley_Mesh*
84               }               }
85           }           }
86           /*  allocate new face element and Contact element files */           /*  allocate new face element and Contact element files */
87  #ifndef PASO_MPI           newContactElementsFile=Finley_ElementFile_alloc(self->ContactElements->ReferenceElement->Type->TypeId,self->ContactElements->order,self->ContactElements->reduced_order, self->MPIInfo);
88           newContactElementsFile=Finley_ElementFile_alloc(self->ContactElements->ReferenceElement->Type->TypeId,self->ContactElements->order,self->ContactElements->reduced_order);           newFaceElementsFile=Finley_ElementFile_alloc(self->FaceElements->ReferenceElement->Type->TypeId,self->FaceElements->order,self->FaceElements->reduced_order, self->MPIInfo);
          newFaceElementsFile=Finley_ElementFile_alloc(self->FaceElements->ReferenceElement->Type->TypeId,self->FaceElements->order,self->FaceElements->reduced_order);  
 #else  
   /* TODO */  
   PASO_MPI_TODO;  
 #endif  
89           if (Finley_noError()) {           if (Finley_noError()) {
90                 Finley_ElementFile_allocTable(newContactElementsFile,numPairs+self->ContactElements->numElements);                 Finley_ElementFile_allocTable(newContactElementsFile,numPairs+self->ContactElements->numElements);
91                 Finley_ElementFile_allocTable(newFaceElementsFile,new_numFaceElements);                 Finley_ElementFile_allocTable(newFaceElementsFile,new_numFaceElements);
# Line 112  void Finley_Mesh_joinFaces(Finley_Mesh* Line 110  void Finley_Mesh_joinFaces(Finley_Mesh*
110              }              }
111              newContactElementsFile->minColor=0;              newContactElementsFile->minColor=0;
112              newContactElementsFile->maxColor=numPairs-1;              newContactElementsFile->maxColor=numPairs-1;
             newContactElementsFile->isPrepared=self->FaceElements->isPrepared;  
113           }           }
114           /* set new face and Contact elements */           /* set new face and Contact elements */
115           if (Finley_noError()) {           if (Finley_noError()) {
116    
117              Finley_ElementFile_dealloc(self->FaceElements);              Finley_ElementFile_free(self->FaceElements);
118              self->FaceElements=newFaceElementsFile;              self->FaceElements=newFaceElementsFile;
119              Finley_ElementFile_prepare(&(self->FaceElements),self->Nodes->numNodes,self->Nodes->degreeOfFreedom);              Finley_ElementFile_free(self->ContactElements);
   
             Finley_ElementFile_dealloc(self->ContactElements);  
120              self->ContactElements=newContactElementsFile;              self->ContactElements=newContactElementsFile;
121              Finley_ElementFile_prepare(&(self->ContactElements),self->Nodes->numNodes,self->Nodes->degreeOfFreedom);              Finley_Mesh_prepare(self, optimize);
   
             Finley_Mesh_prepare(self);  
122    
123           } else {           } else {
124              Finley_ElementFile_dealloc(newFaceElementsFile);              Finley_ElementFile_free(newFaceElementsFile);
125              Finley_ElementFile_dealloc(newContactElementsFile);              Finley_ElementFile_free(newContactElementsFile);
126           }           }
127        }        }
128     }     }
# Line 137  void Finley_Mesh_joinFaces(Finley_Mesh* Line 130  void Finley_Mesh_joinFaces(Finley_Mesh*
130     TMPMEMFREE(elem0);     TMPMEMFREE(elem0);
131     TMPMEMFREE(matching_nodes_in_elem1);     TMPMEMFREE(matching_nodes_in_elem1);
132     TMPMEMFREE(elem_mask);     TMPMEMFREE(elem_mask);
    if (Finley_noError()) {  
        if ( ! Finley_Mesh_isPrepared(self) ) {  
           Finley_setError(SYSTEM_ERROR,"Mesh is not prepared for calculation. Contact the programmers.");  
        }  
   }  
133  }  }

Legend:
Removed from v.1311  
changed lines
  Added in v.1312

  ViewVC Help
Powered by ViewVC 1.1.26