Changeset 9085

Timestamp:

Apr 11, 2014, 10:06:44 AM (11 years ago)

Author:

steve

Message:

Adding anuga_1d to test all

Location:

trunk/anuga_core

Files:

• compile_all.py (modified) (2 diffs)
• source/anuga/utilities/compile.py (modified) (1 diff)
• source/anuga_1d/base/generic_domain.py (modified) (1 diff)
• source/anuga_1d/sqpipe/culvert.py (modified) (4 diffs)
• source/anuga_1d/sqpipe/run_culvert.py (modified) (1 diff)
• source/anuga_1d/sqpipe/sqpipe_domain.py (modified) (2 diffs)
• source/anuga_1d/sqpipe/sqpipe_forcing_terms.py (modified) (1 diff)
• test_all.py (modified) (1 diff)

trunk/anuga_core/compile_all.py

@@ -6 +6 @@
 buildroot = os.getcwd()
 
+
+#--------------------------------------------------
+# Compiling anuga code
+#--------------------------------------------------
 os.chdir('source')
 os.chdir('anuga')
@@ -20 +24 @@
 
 
-os.chdir(buildroot)    
+os.chdir(buildroot)
+
+#--------------------------------------------------
+# Compiling anuga_1d code
+#--------------------------------------------------
+os.chdir('source')
+os.chdir('anuga_1d')
+
+
+print 'Changing to', os.getcwd()        
+
+#entries = listdir('.')
+
+t0 = time.time()
+
+# Attempt to compile all ANUGA_1D extensions
+execfile('compile_all.py')
+
+
+os.chdir(buildroot)
+
+#--------------------------------------------------
+# Compiling anuga_parallel code
+#--------------------------------------------------
 
 try:

trunk/anuga_core/source/anuga/utilities/compile.py

@@ -490 +490 @@
               msg = 'Could not compile C extension %s\n' %filename
               msg += str(e)
-              raise Exception(msg)
+f.              raise Exception(msg)
           else:
               print 'C extension %s OK' %filename

trunk/anuga_core/source/anuga_1d/base/generic_domain.py

@@ -1376 +1376 @@
                 Q = self.quantities[name]
                 Q.explicit_update[:] = 0.0
+                
+        #for name in self.conserved_quantities:
+        #    Q = self.quantities[name]
+        #    Q.semi_implicit_update[:] = 0.0
 
         for f in self.forcing_terms:

trunk/anuga_core/source/anuga_1d/sqpipe/culvert.py

@@ -36 +36 @@
 def top(x):
 
-    t = numpy.ones_like(x)
+    t = numpy.ones_like(x)*4
 
     t = numpy.where(x<-40, 20, t)
@@ -45 +45 @@
     return height(x)*width(x)
 
+def friction(x):
+    return numpy.ones_like(x)*0.01
+
 
 #===============================================================================
 
 def get_domain():
-    N = 100
+    N = 20
     print "Evaluating domain with %d cells" %N
 
@@ -57 +60 @@
 
     domain.set_spatial_order(2)
-    domain.set_timestepping_method('euler')
+    domain.set_timestepping_method('rk2')
     domain.set_CFL(0.5)
     domain.set_limiter("vanleer")
@@ -68 +71 @@
     domain.set_quantity('width',width)
     domain.set_quantity('top',top)
+    domain.set_quantity('friction',friction)
 
     Br = dom.Reflective_boundary(domain)
     Bt = dom.Transmissive_boundary(domain)
 
-    domain.set_boundary({'left': Br, 'right' : Bt})
+    domain.set_boundary({'left': Br, 'right' : Br})
 
     return domain

trunk/anuga_core/source/anuga_1d/sqpipe/run_culvert.py

@@ -8 +8 @@
 
 finaltime = 100.0
-yieldstep = 0.001
+yieldstep = 0.1
 
 model.animate_domain(domain, yieldstep, finaltime)

trunk/anuga_core/source/anuga_1d/sqpipe/sqpipe_domain.py

@@ -81 +81 @@
         self.epsilon = epsilon
 
+        #setup manning's friction
+        f = manning_friction
+        self.forcing_terms.append(f)
+        
         #forcing terms
         for f in forcing_terms:
@@ -171 +175 @@
 
         self.state = new_state
-        self.state = numpy.where(h>=t, 1, 0)
+        #self.state = numpy.where(h>=t, 1, 0)
 
     def distribute_to_vertices_and_edges(self):

trunk/anuga_core/source/anuga_1d/sqpipe/sqpipe_forcing_terms.py

@@ -101 +101 @@
     """
 
-    from math import sqrt
-
-    w = domain.quantities['stage'].centroid_values
-    z = domain.quantities['elevation'].centroid_values
-    h = w-z
-
-    uh = domain.quantities['xmomentum'].centroid_values
-    #vh = domain.quantities['ymomentum'].centroid_values
+    from math import sqrt, fabs
+
     eta = domain.quantities['friction'].centroid_values
 
-    xmom_update = domain.quantities['xmomentum'].semi_implicit_update
+    hw = domain.quantities['area'].centroid_values
+    w  = domain.quantities['width'].centroid_values
+    uhw = domain.quantities['discharge'].centroid_values
+    
+    h = hw/w
+    
+    uhw_update = domain.quantities['discharge'].semi_implicit_update
     #ymom_update = domain.quantities['ymomentum'].semi_implicit_update
 
     N = domain.number_of_elements
-    eps = domain.minimum_allowed_height
-    g = domain.g
-
+    eps = 1.0e-10
+    g = domain.g
+
+    #print 'mannings'
     for k in range(N):
         if eta[k] >= eps:
             if h[k] >= eps:
                 #S = -g * eta[k]**2 * sqrt((uh[k]**2 + vh[k]**2))
-                S = -g * eta[k]**2 * uh[k]
+                S = -g * eta[k]**2 * fabs(uhw[k])
                 S /= h[k]**(7.0/3)
+                S /= w[k]
 
                 #Update momentum
-                xmom_update[k] += S*uh[k]
+                uhw_update[k] += S*uhw[k]
                 #ymom_update[k] += S*vh[k]
 

trunk/anuga_core/test_all.py

@@ -10 +10 @@
 print
 print '======================= anuga tests ================================='    
+print 'Changing to', os.getcwd() # This is now different from buildroot   
+execfile('test_all.py')
+
+
+os.chdir(buildroot)
+os.chdir('source')
+os.chdir('anuga_1d')
+print
+print '======================= anuga_1d tests ================================='    
 print 'Changing to', os.getcwd() # This is now different from buildroot   
 execfile('test_all.py')