Changeset 8862

Timestamp:

May 9, 2013, 6:22:19 PM (12 years ago)

Author:

steve

Message:

Code to run a pipe

Location:

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

Files:

• culvert.py (added)
• parabolic_canal.py (modified) (3 diffs)
• run_culvert.py (added)
• run_parabolic_canal.py (moved) (moved from trunk/anuga_work/development/2010-projects/anuga_1d/sqpipe/test_sqpipe_domain.py) (1 diff)
• sqpipe.h (modified) (1 diff)
• sqpipe_domain.py (modified) (1 diff)

trunk/anuga_work/development/2010-projects/anuga_1d/sqpipe/parabolic_canal.py

@@ -6 +6 @@
 from anuga_1d.config import g, epsilon
 from anuga_1d.base.generic_mesh import uniform_mesh
+import anuga_1d.sqpipe.sqpipe_domain as dom
 
 #===============================================================================
@@ -66 +67 @@
 #===============================================================================
 
-def get_domain(dom):
+def get_domain():
     N = 100
     print "Evaluating domain with %d cells" %N
+    
     domain = dom.Domain(*uniform_mesh(N, x_0 = -2.0*L_x, x_1 = 2.0*L_x), bulk_modulus = 100.0)
 
@@ -99 +101 @@
 
     for t in domain.evolve(yieldstep = yieldstep, finaltime = finaltime):
+
+        domain.write_time()
         x, z, w, h, v, t, s, m, M = get_quantities(domain)
         

trunk/anuga_work/development/2010-projects/anuga_1d/sqpipe/run_parabolic_canal.py

@@ -1 @@
-import anuga_1d.sqpipe.parabolic_canal
+
 import time
-import anuga_1d.sqpipe.sqpipe_domain as dom
 
 
-domain = anuga_1d.sqpipe.parabolic_canal.get_domain(dom)
+import parabolic_canal as model
+
+domain = model.get_domain()
 finaltime = 1000.0
 yieldstep = 10.0
-#m0 = (domain.get_mass()).sum()
-#for t in domain.evolve(yieldstep = yieldstep, finaltime = finaltime):
-#       m = (domain.get_mass()).sum()
-#       if abs(m - m0) > 0.5:
-#               print m0 - m
-#               
-#       m0 = m
-        
-#outfile="out"
-#anuga_1d.sqpipe.parabolic_canal.write_domain(domain, outfile)
 
-anuga_1d.sqpipe.parabolic_canal.animate_domain(domain, yieldstep, finaltime)
+
+model.animate_domain(domain, yieldstep, finaltime)
 print "finished"
-anuga_1d.sqpipe.parabolic_canal.plot_domain(domain)
+model.plot_domain(domain)

trunk/anuga_work/development/2010-projects/anuga_1d/sqpipe/sqpipe.h

@@ -133 +133 @@
   struct sqpipe_params *sp = (struct sqpipe_params *) p;
 
-  quantityflux[0] = (normal * pq->u) * quantity_get_conserved(q, 0, normal);
-  quantityflux[1] = normal * (pq->u * quantity_get_conserved(q, 1, normal) + 0.5 * sp->g * pq->h *pq->h);
+  //quantityflux[0] = (normal * pq->u) * quantity_get_conserved(q, 0, normal);
+  //quantityflux[1] = normal * (pq->u * quantity_get_conserved(q, 1, normal) + 0.5 * sp->g * pq->h *pq->h);
+  quantityflux[0] = (normal * pq->u) * pq->a;
+  quantityflux[1] = normal * (pq->u * pq->d + 0.5 * sp->g * pq->h *pq->h);
 
   return quantityflux;

trunk/anuga_work/development/2010-projects/anuga_1d/sqpipe/sqpipe_domain.py

@@ -152 +152 @@
         # Import flux method and call it
         from anuga_1d.sqpipe.sqpipe_comp_flux import compute_fluxes_ext
-        self.flux_timestep = compute_fluxes_ext(timestep,self)        
+
+        self.flux_timestep = compute_fluxes_ext(timestep,self)
 
     def update_state(self):