Changeset 8197

Timestamp:

Aug 12, 2011, 1:48:27 PM (13 years ago)

Author:

paul

Message:

Pipe flow code uses pressurised flux formulae again

Location:

trunk/anuga_work/development/2010-projects/anuga_1d/pipe

Files:

• pipe_domain_ext.c (modified) (1 diff)
• test_pipe.py (modified) (2 diffs)

trunk/anuga_work/development/2010-projects/anuga_1d/pipe/pipe_domain_ext.c

@@ -21 +21 @@
 
 // Hard coded choices of computational methods
-//#define flux_formula0 flux_formula_press0
-//#define flux_formula1 flux_formula_press1
-#define flux_formula0 flux_formula_fs0
-#define flux_formula1 flux_formula_fs1
+#define flux_formula0 flux_formula_press0
+#define flux_formula1 flux_formula_press1
+//#define flux_formula0 flux_formula_fs0
+//#define flux_formula1 flux_formula_fs1
 #define compute_flux compute_flux_godunov
 #define forcingterm_formula_press forcingterm_formula_press_naive
 #define forcingterm_formula_fs forcingterm_formula_fs_naive
-//#define compute_forcingterm compute_forcingterm_press
-#define compute_forcingterm compute_forcingterm_fs
+#define compute_forcingterm compute_forcingterm_press
+//#define compute_forcingterm compute_forcingterm_fs
 
 // Some formulae

trunk/anuga_work/development/2010-projects/anuga_1d/pipe/test_pipe.py

@@ -22 +22 @@
     y = numpy.zeros(len(x),numpy.float)
     for i in range(len(x)):
-        y[i] = z_infty+2*A0*z_infty/L_x*cos(omega*t)*(x[i]/L_x-0.5*A0/(L_x)*cos(omega*t))
-        #y[i] = 12.0
+        #y[i] = z_infty+2*A0*z_infty/L_x*cos(omega*t)*(x[i]/L_x-0.5*A0/(L_x)*cos(omega*t))
+        y[i] = 12.0
     return y
 
@@ -52 +52 @@
 
 # Set final time and yield time for simulation
-finaltime = 500.0
-yieldstep = 10.0
+finaltime = 130.0
+yieldstep = 1.0
 
 # Length of channel (m)