/[escript]/branches/doubleplusgood/finley/src/Mesh_glueFaces.cpp
ViewVC logotype

Diff of /branches/doubleplusgood/finley/src/Mesh_glueFaces.cpp

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

revision 4326 by jfenwick, Wed Feb 27 06:09:33 2013 UTC revision 4327 by jfenwick, Wed Mar 20 05:09:11 2013 UTC
# Line 54  void Finley_Mesh_glueFaces(Finley_Mesh* Line 54  void Finley_Mesh_glueFaces(Finley_Mesh*
54     }     }
55    
56     /* allocate work arrays */     /* allocate work arrays */
57     elem1=TMPMEMALLOC(self->FaceElements->numElements,index_t);     elem1=new index_t[self->FaceElements->numElements];
58     elem0=TMPMEMALLOC(self->FaceElements->numElements,index_t);     elem0=new index_t[self->FaceElements->numElements];
59     elem_mask=TMPMEMALLOC(self->FaceElements->numElements,index_t);     elem_mask=new index_t[self->FaceElements->numElements];
60     matching_nodes_in_elem1=TMPMEMALLOC(self->FaceElements->numElements*NN,index_t);     matching_nodes_in_elem1=new index_t[self->FaceElements->numElements*NN];
61     new_node_label=TMPMEMALLOC(self->Nodes->numNodes,index_t);     new_node_label=new index_t[self->Nodes->numNodes];
62     new_node_list=TMPMEMALLOC(self->Nodes->numNodes,index_t);     new_node_list=new index_t[self->Nodes->numNodes];
63     new_node_mask=TMPMEMALLOC(self->Nodes->numNodes,index_t);     new_node_mask=new index_t[self->Nodes->numNodes];
64     if (!(Finley_checkPtr(elem1) || Finley_checkPtr(elem0) || Finley_checkPtr(elem_mask) || Finley_checkPtr(new_node_label) || Finley_checkPtr(new_node_list) || Finley_checkPtr(new_node_mask) || Finley_checkPtr(matching_nodes_in_elem1)) ) {     if (!(Finley_checkPtr(elem1) || Finley_checkPtr(elem0) || Finley_checkPtr(elem_mask) || Finley_checkPtr(new_node_label) || Finley_checkPtr(new_node_list) || Finley_checkPtr(new_node_mask) || Finley_checkPtr(matching_nodes_in_elem1)) ) {
65        /* find the matching face elements */        /* find the matching face elements */
66        Finley_Mesh_findMatchingFaces(self->Nodes,self->FaceElements,safety_factor,tolerance,&numPairs,elem0,elem1,matching_nodes_in_elem1);        Finley_Mesh_findMatchingFaces(self->Nodes,self->FaceElements,safety_factor,tolerance,&numPairs,elem0,elem1,matching_nodes_in_elem1);
# Line 134  void Finley_Mesh_glueFaces(Finley_Mesh* Line 134  void Finley_Mesh_glueFaces(Finley_Mesh*
134                
135        }        }
136     }     }
137     TMPMEMFREE(elem1);     delete[] elem1;
138     TMPMEMFREE(elem0);     delete[] elem0;
139     TMPMEMFREE(elem_mask);     delete[] elem_mask;
140     TMPMEMFREE(new_node_label);     delete[] new_node_label;
141     TMPMEMFREE(new_node_list);     delete[] new_node_list;
142     TMPMEMFREE(new_node_mask);     delete[] new_node_mask;
143     TMPMEMFREE(matching_nodes_in_elem1);     delete[] matching_nodes_in_elem1;
144  }  }

Legend:
Removed from v.4326  
changed lines
  Added in v.4327

  ViewVC Help
Powered by ViewVC 1.1.26