Changeset 8947 for trunk/anuga_core/source

Timestamp:

Aug 3, 2013, 9:34:38 PM (11 years ago)

Author:

steve

Message:

changed delete_all to different name in each c file

Location:

trunk/anuga_core/source/anuga

Files:

• abstract_2d_finite_volumes/neighbour_table_ext.c (modified) (5 diffs)
• abstract_2d_finite_volumes/pmesh2domain_ext.c (modified) (3 diffs)
• utilities/sparse_dok.c (modified) (2 diffs)
• utilities/sparse_dok.h (modified) (1 diff)

trunk/anuga_core/source/anuga/abstract_2d_finite_volumes/neighbour_table_ext.c

@@ -52 +52 @@
 
 void delete_edge(edge_t *edge) {
-    HASH_DEL( edgetable, edge);  /* user: pointer to deletee */
+    HASH_DEL( edgetable, edge);  /* edge: pointer to deletee */
     free(edge);
 }
 
-void delete_all() {
+void delete_edge_all() {
   edge_t *current_edge, *tmp;
 
   HASH_ITER(hh, edgetable, current_edge, tmp) {
     HASH_DEL(edgetable, current_edge);  /* delete it (edgetable advances to next) */
-    if (current_edge != NULL) {
-        free(current_edge);            /* free it */
-    }
+    free(current_edge);                 /* free it */
   } 
 }
@@ -191 +189 @@
         //printf("key.i %d key.j %d vol_id %d edge_id %d \n",
         //       key.i,key.j,vol_id,edge_id);
-        delete_all();
+        delete_edge_all();
         return err;
     }
@@ -246 +244 @@
     }
     
-    delete_all();  /* free any structures */
+    delete_edge_all();  /* free any structures */
 
     return err;
@@ -384 +382 @@
                 break;
             case 4:
-                delete_all();
+                delete_edge_all();
                 break;
             case 5:
@@ -405 +403 @@
     }
 
-    delete_all();  
+    delete_edge_all();
     return 0;
 }

trunk/anuga_core/source/anuga/abstract_2d_finite_volumes/pmesh2domain_ext.c

@@ -62 +62 @@
 }
 
-void delete_all() {
+void delete_segment_all() {
     segment_t *current_segment, *tmp;
 
@@ -244 +244 @@
         //printf("key.i %d key.j %d vol_id %d edge_id %d \n",
         //       key.i,key.j,vol_id,edge_id);
-        delete_all();
+        delete_segment_all();
         PyErr_SetString(PyExc_RuntimeError,
                 "pmesh2domain.c: build_boundary_dictionary Duplicate segments");
@@ -302 +302 @@
     }
 
-    delete_all(); /* free any structures */
+    delete_segment_all(); /* free any structures */
 
     return Py_BuildValue("O", pyobj_tag_dict);

trunk/anuga_core/source/anuga/utilities/sparse_dok.c

@@ -72 +72 @@
 }
 
-void delete_all(sparse_dok * hashtable) {
+void delete_dok_all(sparse_dok * hashtable) {
   edge_t *current_edge, *tmp;
 
@@ -83 +83 @@
 void delete_dok_matrix(sparse_dok * mat) {
 
-    delete_all(mat);
+    delete_dok_all(mat);
     free(mat->edgetable);
     free(mat);

trunk/anuga_core/source/anuga/utilities/sparse_dok.h

@@ -72 +72 @@
 void delete_dok_entry(sparse_dok * edgetable,edge_t *edge);
 
-// delete_all - Remove all edges from the hash table. Used to do clean up
-void delete_all(sparse_dok * edgetable);
+// delete_dok_all - Remove all edges from the hash table. Used to do clean up
+void delete_dok_all(sparse_dok * edgetable);
 
 // delete_dok_matrix - Free all the memory associated with struct and