Changeset 9170

Timestamp:

Jun 17, 2014, 12:03:09 AM (10 years ago)

Author:

steve

Message:

Uncommenting run_anuga_script from init.py

Location:

trunk/anuga_core/source/anuga

Files:

• __init__.py (modified) (1 diff)
• file/test_read_sww.py (modified) (1 diff)
• shallow_water/shallow_water_domain.py (modified) (3 diffs)

trunk/anuga_core/source/anuga/__init__.py

@@ -161 +161 @@
 # Running Script
 #-----------------------------
-#from anuga.utilities.run_anuga_script import run_script as run_anuga_script
+from anuga.utilities.run_anuga_script import run_script as run_anuga_script
 
 

trunk/anuga_core/source/anuga/file/test_read_sww.py

@@ -132 +132 @@
 
         for qname, q in sww_file.read_quantities(last_frame_number).items():
+            
+            #print qname
+            #print num.linalg.norm(num.abs((domain.get_quantity(qname).get_values()-q).flatten()), ord=1)
+            
             assert num.allclose(domain.get_quantity(qname).get_values(), q)
 

trunk/anuga_core/source/anuga/shallow_water/shallow_water_domain.py

@@ -426 +426 @@
            A 'discontinuous elevation' method
         """
-        self.set_CFL(1.00)
+        self.set_CFL(0.9)
         self.set_use_kinematic_viscosity(False)
         #self.timestepping_method='rk2'#'rk3'#'euler'#'rk2' 
@@ -443 +443 @@
         self.set_extrapolate_velocity()
 
-        self.beta_w=1.0
-        self.beta_w_dry=0.0
-        self.beta_uh=1.0
-        self.beta_uh_dry=0.0
-        self.beta_vh=1.0
-        self.beta_vh_dry=0.0
+        self.beta_w=0.75
+        self.beta_w_dry=0.2
+        self.beta_uh=0.75
+        self.beta_uh_dry=0.2
+        self.beta_vh=0.75
+        self.beta_vh_dry=0.2
         
 
@@ -1745 +1745 @@
         Elev = self.quantities['elevation']
         Stage = self.quantities['stage']
-        
-        self.work_centroid_values[:] = Stage.centroid_values
+        Xmom = self.quantities['xmomentum']
+        Ymom = self.quantities['ymomentum']
+        
+        #self.work_centroid_values[:] = Stage.centroid_values
         
         tff = self.tri_full_flag
-        success = False
-        try:
-            Stage.update(timestep)
-            assert num.all(tff*(Stage.centroid_values - Elev.centroid_values) >= 0.0)
-            success  = True
-        except:
-            Stage.centroid_values[:] = self.work_centroid_values
-            success = False
-        
-        if not success : print 'NEGATIVE UPDATE'
-        if success:
-            Xmom = self.quantities['xmomentum']
-            Xmom.update(timestep)   
- 
-            Ymom = self.quantities['ymomentum']
-            Ymom.update(timestep)   
+        
+        Stage.update(timestep)
+        Xmom.update(timestep)   
+        Ymom.update(timestep)   
   
-            
+        negative_ids = num.where( num.logical_and((Stage.centroid_values - Elev.centroid_values) < 0.0 , tff > 0) )[0]
+        
+        if len(negative_ids)>0:
+            #print 'NEGATIVE INDICES'
+            Stage.centroid_values[negative_ids] = Elev.centroid_values[negative_ids]
+            Xmom.centroid_values[negative_ids] = 0.0
+            Ymom.centroid_values[negative_ids] = 0.0