Changeset 1949

Timestamp:

Oct 17, 2005, 5:46:55 PM (20 years ago)

Author:

steve

Message:

Starting to code up Euler equation

Location:

inundation

Files:

• analytical solutions/Analytical solution_oblique_shock_01.py (modified) (3 diffs)
• pyvolution/euler.py (added)
• pyvolution/euler_config.py (added)
• pyvolution/euler_ext.c (added)
• pyvolution/test_euler.py (added)
• zeus/anuga-workspace.zwi (modified) (1 diff)
• zeus/pyvolution.zpi (modified) (2 diffs)

inundation/analytical solutions/Analytical solution_oblique_shock_01.py

@@ -42 +42 @@
 leny = 30.
 lenx = 40.
-f = 1
+f = 5
 n = 60*f
 m = 80*f
+theta = 25
+h_bc = 1.5
+p_bc = 5.0
 
-points, elements, boundary = oblique_cross(m, n, lenx, leny, theta = 25)
+points, elements, boundary = oblique_cross(m, n, lenx, leny, theta = theta)
 domain = Domain(points, elements, boundary)
 
+
+print 'Number of Elements = ',domain.number_of_elements
 # Order of solver
 domain.default_order=2
@@ -56 +61 @@
 domain.store=True
 
+# Provide file name for storing output
+domain.filename="oblique_cross_%g_%g_%g_%g_%g" % (n,m,theta,h_bc,p_bc)
+print domain.filename
+
 # Output format
 domain.format="sww" #NET.CDF binary format
                     # "dat" for ASCII
 
-# Provide file name for storing output
-domain.filename="oblique_cross"
 
 # Visualization smoothing
-domain.smooth=True
-domain.visualise=True
+domain.smooth=False
+domain.visualise=False
 
 #######################
 #Bed-slope and friction
+class ConstantFunctionT:
+
+    def __init__(self,value):
+        self.value = value
+
+    def __call__(self,t):
+        return self.value
+
+
+shock_hb = ConstantFunctionT(h_bc)
+shock_hh = ConstantFunctionT(h_bc)
+shock_pb = ConstantFunctionT(p_bc)
+shock_pp = ConstantFunctionT(p_bc)
+
+
 def x_slope(x, y):
     return 0*x
 
-def shock_hb(t):
-    return 1.5
-
-def shock_hh(t):
-    return 1.5
-
-def shock_pb(t):
-    return 5
-
-def shock_pp(t):
-    return 5
 
 
@@ -105 +116 @@
             w[i] = 0.0
     return w
+
+
+
 
 

inundation/zeus/anuga-workspace.zwi

@@ -2 +2 @@
 <workspace name="anuga-workspace">
     <mode>Debug</mode>
-    <active>parallel</active>
+    <active>pyvolution</active>
     <project name="analytic solns">analytic solns.zpi</project>
     <project name="Merimbula">Merimbula.zpi</project>

inundation/zeus/pyvolution.zpi

@@ -84 +84 @@
     <file>..\pyvolution\data_manager.py</file>
     <file>..\pyvolution\domain.py</file>
+    <file>..\pyvolution\euler.py</file>
+    <file>..\pyvolution\euler_config.py</file>
+    <file>..\pyvolution\euler_ext.c</file>
     <file>..\pyvolution\flatbed.py</file>
     <file>..\pyvolution\flatbed_compare.py</file>
@@ -120 +123 @@
     <file>..\pyvolution\test_data_manager.py</file>
     <file>..\pyvolution\test_domain.py</file>
+    <file>..\pyvolution\test_euler.py</file>
     <file>..\pyvolution\test_general_mesh.py</file>
     <file>..\pyvolution\test_generic_boundary_conditions.py</file>