Changeset 5737

Timestamp:

Sep 5, 2008, 1:59:15 PM (17 years ago)

Author:

sudi

Message:

 

Location:

anuga_work/development/anuga_1d

Files:

• dam_h_elevation.py (modified) (3 diffs)
• domain.py (modified) (10 diffs)
• shallow_water_domain_new.py (modified) (4 diffs)

anuga_work/development/anuga_1d/dam_h_elevation.py

@@ -61 +61 @@
     for i in range(len(x)):
         if 1100.0 <= x[i] <=1200.0:
-            y[i]=10.0
+            y[i]=10.001
         else:
             y[i]=10.0
@@ -106 +106 @@
     return y
 
-domain.set_quantity('stage',stage)
-domain.set_quantity('elevation', elevation_box)
+domain.set_quantity('stage',stage_perturb)
+domain.set_quantity('elevation', elevation_parabol)
 #domain.set_quantity('xmomentum', xmom_sincos)
 domain.order=domain.default_order
@@ -122 +122 @@
 import time
 t0=time.time()
-yieldstep=0.5 #30.0
+yieldstep=10.0 #30.0
 finaltime=10.0 #20.0
 print "integral", domain.quantities['stage'].get_integral()

anuga_work/development/anuga_1d/domain.py

@@ -24 +24 @@
         self.coordinates = array(coordinates)
 
-##        if geo_reference is None:
-##            self. = Geo_reference() #Use defaults 
-##        else:
-##            self.geo_reference = geo_reference
+# #        if geo_reference is None:
+# #            self. = Geo_reference() #Use defaults 
+# #        else:
+# #            self.geo_reference = geo_reference
 
         #Register number of Elements
@@ -76 +76 @@
             self.areas[i] = (xr-xl)
             
-##         print 'N', N
-##         print 'Centroid', self.centroids
-##         print 'Areas', self.areas
-##         print 'Vertex_Coordinates', self.vertices
+# #         print 'N', N
+# #         print 'Centroid', self.centroids
+# #         print 'Areas', self.areas
+# #         print 'Vertex_Coordinates', self.vertices
             
             #Initialise Neighbours (-1 means that it is a boundary neighbour)
@@ -554 +554 @@
         #from quantity import Quantity, Conserved_quantity
         #Create appropriate quantity object
-        ##if name in self.conserved_quantities:
-        ##    self.quantities[name] = Conserved_quantity(self)
-        ##else:
-        ##    self.quantities[name] = Quantity(self)
+        # #if name in self.conserved_quantities:
+        # #    self.quantities[name] = Conserved_quantity(self)
+        # #else:
+        # #    self.quantities[name] = Quantity(self)
 
 
@@ -617 +617 @@
 
         self.boundary_objects = []
-        
-
-
-
-        
         self.boundary_map = boundary_map  #Store for use with eg. boundary_stats.
 
@@ -664 +659 @@
             assert quantity in self.quantities, msg
 
-        ##assert hasattr(self, 'boundary_objects')
+        # #assert hasattr(self, 'boundary_objects')
 
     def write_time(self):
@@ -725 +720 @@
         assert hasattr(self, 'boundary_objects'), msg
 
-        ##self.set_defaults()
+        # #self.set_defaults()
 
         if yieldstep is None:
@@ -780 +775 @@
             elif self.time_order == 2:
                 
-                self.compute_timestep()
+                self.compute_timestep() #self.compute_fluxes() !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
                 #Solve inhomogeneous operator for half a timestep
@@ -989 +984 @@
                 Q = self.quantities[name]
                 Q.boundary_values[i] = q[j]
-
+    
     def update_timestep(self, yieldstep, finaltime):
 
@@ -1040 +1035 @@
 
         self.timestep = timestep
-
+    
 
     def compute_forcing_terms(self):
@@ -1111 +1106 @@
     #points2 = [0.0, 1.0, 2.0, 3.0, 2.5]
     #D2 = Domain(points2)
-

anuga_work/development/anuga_1d/shallow_water_domain_new.py

@@ -154 +154 @@
         #Call correct module function
         #(either from this module or C-extension)
-        compute_fluxes_C_short(self) #compute_fluxes_C_wellbalanced(self) #compute_fluxes_C_short(self)  #compute_fluxes_C_long(self)
+        compute_fluxes_C_short(self)    #compute_fluxes_C_wellbalanced(self)     #compute_fluxes(self)  #compute_fluxes_C_long(self)
 
     def compute_timestep(self):
@@ -545 +545 @@
                                   max_speed_array)
 
-####################################
+# ###################################
 
 
@@ -763 +763 @@
 
 
-###############################################
+# ##############################################
 #Boundaries - specific to the shallow water wave equation
 class Reflective_boundary(Boundary):
@@ -837 +837 @@
 
 
-#########################
+# ########################
 #Standard forcing terms:
 def gravity(domain):