Changeset 9381

Timestamp:

Dec 12, 2014, 5:30:01 PM (10 years ago)

Author:

steve

Message:

Made changes to procedure names in swDE1_domain_ext.c to avoid weird name collision when using Macs.

Location:

trunk/anuga_core/source/anuga

Files:

• operators/set_quantity_operator.py (modified) (2 diffs)
• operators/set_stage.py (modified) (1 diff)
• operators/set_stage_operator.py (modified) (1 diff)
• shallow_water/shallow_water_domain.py (modified) (4 diffs)
• shallow_water/swDE1_domain_ext.c (modified) (7 diffs)

trunk/anuga_core/source/anuga/operators/set_quantity_operator.py

@@ -46 +46 @@
                  label = None,
                  logging = False,
-                 verbose = False):
+                 verbose = False,
+                 test_stage=True,
+                 test_elevation=True):
 
 
@@ -59 +61 @@
                               center=center, 
                               radius=radius, 
-                              line=line)
+                              line=line,
+                              test_stage=test_stage,
+                              test_elevation=test_elevation)
 
         Operator.__init__(self, domain, description, label, logging, verbose)

trunk/anuga_core/source/anuga/operators/set_stage.py

@@ -47 +47 @@
                               verbose=verbose,
                               test_stage=False)
-
-
-
-
-
 
         #------------------------------------------

trunk/anuga_core/source/anuga/operators/set_stage_operator.py

@@ -55 +55 @@
                                        label = label,
                                        logging = logging,
-                                       verbose = verbose)
+                                       verbose = verbose,
+                                       test_stage=False)
 
 

trunk/anuga_core/source/anuga/shallow_water/shallow_water_domain.py

@@ -1893 +1893 @@
         if self.flow_algorithm == 'tsunami':
 
-            from swb2_domain_ext import protect as protect_swb2
+            from swb2_domain_ext import protect
 
             # shortcuts
@@ -1904 +1904 @@
             areas = self.areas
 
-            mass_error = protect_swb2(self.minimum_allowed_height, self.maximum_allowed_speed,
+            mass_error = protect(self.minimum_allowed_height, self.maximum_allowed_speed,
                 self.epsilon, wc, wv, zc,zv, xmomc, ymomc, areas)
 
@@ -1912 +1912 @@
         elif self.flow_algorithm.startswith('DE'):
 
-            from swDE1_domain_ext import protect as protect_de
+            from swDE1_domain_ext import protect
 
             # shortcuts
@@ -1925 +1925 @@
             yc = self.centroid_coordinates[:,1] 
 
-            mass_error = protect_de(self.minimum_allowed_height, self.maximum_allowed_speed,
+            mass_error = protect(self.minimum_allowed_height, self.maximum_allowed_speed,
                     self.epsilon, wc, wv, zc,zv, xmomc, ymomc, areas, xc, yc)
             

trunk/anuga_core/source/anuga/shallow_water/swDE1_domain_ext.c

@@ -1950 +1950 @@
 // Modified central flux function
 
-PyObject *compute_fluxes_ext_central(PyObject *self, PyObject *args) {
+PyObject *swde1_compute_fluxes_ext_central(PyObject *self, PyObject *args) {
   /*Compute all fluxes and the timestep suitable for all volumes
     in domain.
@@ -1985 +1985 @@
 
 
-PyObject *flux_function_central(PyObject *self, PyObject *args) {
+PyObject *swde1_flux_function_central(PyObject *self, PyObject *args) {
   //
   // Gateway to innermost flux function.
@@ -2040 +2040 @@
 //========================================================================
 
-PyObject *gravity(PyObject *self, PyObject *args) {
+PyObject *swde1_gravity(PyObject *self, PyObject *args) {
   //
   //  gravity(g, h, v, x, xmom, ymom)
@@ -2107 +2107 @@
 }
 
-PyObject *compute_flux_update_frequency(PyObject *self, PyObject *args) {
+PyObject *swde1_compute_flux_update_frequency(PyObject *self, PyObject *args) {
   /*
     
@@ -2134 +2134 @@
 
 
-PyObject *extrapolate_second_order_edge_sw(PyObject *self, PyObject *args) {
+PyObject *swde1_extrapolate_second_order_edge_sw(PyObject *self, PyObject *args) {
   /*Compute the edge values based on a linear reconstruction 
     on each triangle
@@ -2176 +2176 @@
 //========================================================================
 
-PyObject *protect(PyObject *self, PyObject *args) {
+PyObject *swde1_protect(PyObject *self, PyObject *args) {
   //
   //    protect(minimum_allowed_height, maximum_allowed_speed, wc, zc, xmomc, ymomc)
@@ -2235 +2235 @@
    */
   //{"rotate", (PyCFunction)rotate, METH_VARARGS | METH_KEYWORDS, "Print out"},
-  {"compute_fluxes_ext_central", compute_fluxes_ext_central, METH_VARARGS, "Print out"},
-  {"gravity_c",        gravity,            METH_VARARGS, "Print out"},
-  {"flux_function_central", flux_function_central, METH_VARARGS, "Print out"},  
-  {"extrapolate_second_order_edge_sw", extrapolate_second_order_edge_sw, METH_VARARGS, "Print out"},
-  {"compute_flux_update_frequency", compute_flux_update_frequency, METH_VARARGS, "Print out"},
-  {"protect",          protect, METH_VARARGS | METH_KEYWORDS, "Print out"},
+  {"compute_fluxes_ext_central", swde1_compute_fluxes_ext_central, METH_VARARGS, "Print out"},
+  {"gravity_c",        swde1_gravity,            METH_VARARGS, "Print out"},
+  {"flux_function_central", swde1_flux_function_central, METH_VARARGS, "Print out"},
+  {"extrapolate_second_order_edge_sw", swde1_extrapolate_second_order_edge_sw, METH_VARARGS, "Print out"},
+  {"compute_flux_update_frequency", swde1_compute_flux_update_frequency, METH_VARARGS, "Print out"},
+  {"protect",          swde1_protect, METH_VARARGS | METH_KEYWORDS, "Print out"},
   {NULL, NULL, 0, NULL}
 };