Changeset 991

Timestamp:

Mar 2, 2005, 11:11:30 PM (20 years ago)

Author:

steve

Message:

 

Location:

inundation/ga/storm_surge/pyvolution

Files:

• config.py (modified) (4 diffs)
• domain.py (modified) (2 diffs)
• netherlands.py (modified) (3 diffs)
• shallow_water_ext.c (modified) (1 diff)
• test_data_manager.py (modified) (2 diffs)

inundation/ga/storm_surge/pyvolution/config.py

@@ -23 +23 @@
 # shallow water wave equation
 #
-#The actual soundspeed can be as high as 1530m
-#(see http://staff.washington.edu/aganse/public.projects/clustering/clustering.html), but that would only happen with h>225000m in this equation. Why ?
+#The actual soundspeed can be as high as 1530m/s
+#(see http://staff.washington.edu/aganse/public.projects/clustering/clustering.html),
+#but that would only happen with h>225000m in this equation. Why ?
 #The maximal speed we specify is really related to the max speed
 #of surface pertubation
@@ -37 +38 @@
 
 g = 9.8        #Gravity
-manning = 0.3 #Manning's friction coefficient
+manning = 0.3  #Manning's friction coefficient
 
 
@@ -71 +72 @@
 
 beta_w = 0.9
-beta_h = 0.2 
+beta_h = 0.2
+CFL = 1.0
 
 
@@ -86 +88 @@
 
 
-use_extensions = True   #Try to use C-extensions
+use_extensions = True    #Try to use C-extensions
 #use_extensions = False   #Do not use C-extensions
 

inundation/ga/storm_surge/pyvolution/domain.py

@@ -51 +51 @@
 
         #Defaults
-        from config import max_smallsteps, beta_w, beta_h, epsilon
+        from config import max_smallsteps, beta_w, beta_h, epsilon, CFL
         self.beta_w = beta_w
         self.beta_h = beta_h        
@@ -64 +64 @@
         self.number_of_steps = 0
         self.number_of_first_order_steps = 0        
-
+        self.CFL = CFL
+        
         #Model time    
         self.time = 0.0

inundation/ga/storm_surge/pyvolution/netherlands.py

@@ -75 +75 @@
 #
 
-N = 250
-#N= 8
-N = 16
-#N = 4
-#N = 102
-N = 25
-N = 16
-N = 60
+
 N = 150 #size = 45000
 N = 130 #size = 33800
-#N = 60
-#N = 40
-N = 260
-#N = 150
-N = 264
-
 N = 600 #Size = 720000
-N = 20
-#N = 150
-N = 110
-N = 60
-
-#N = 140
+N = 30
 
 #N = 15
@@ -113 +95 @@
 
 #Output params
-domain.smooth = True
+domain.smooth = False
 domain.reduction = min  #Looks a lot better on top of steep slopes
 
@@ -169 +151 @@
 t0 = time.time()
 
-for t in domain.evolve(yieldstep = 0.01, finaltime = 7.0):
+for t in domain.evolve(yieldstep = 0.1, finaltime = 7.0):
     domain.write_time()
     

inundation/ga/storm_surge/pyvolution/shallow_water_ext.c

@@ -781 +781 @@
     for (i=0; i<3; i++) {
       n = ((long*) neighbours -> data)[k3+i];
-      // FIXME SR This line should be included to ensure conservation, 
-      // but the unit tests give errors at the moment!
-      //((double*) hvbar -> data)[k3+i] = ((double*) hc -> data)[k];  
+      ((double*) hvbar -> data)[k3+i] = ((double*) hc -> data)[k];  
       if (n >= 0) {
         hn = ((double*) hc -> data)[n]; //Neighbour's centroid value

inundation/ga/storm_surge/pyvolution/test_data_manager.py

@@ -693 +693 @@
 
         
-    def test_sww_DSG(self):
+    def test_sww_extent(self):
         """Not a test, rather a look at the sww format
         """
@@ -723 +723 @@
         [xmin, xmax, ymin, ymax, stagemin, stagemax] = \
                extent_sww(file_and_extension_name )
-        #print "[xmin, xmax, ymin, ymax, stagemin, stagemax",[xmin, xmax, ymin, ymax, stagemin, stagemax] 
+        #print "[xmin, xmax, ymin, ymax, stagemin, stagemax]",[xmin, xmax, ymin, ymax, stagemin, stagemax] 
         assert allclose(xmin, 0.0) 
         assert allclose(xmax, 1.0) 
         assert allclose(ymin, 0.0) 
-        assert allclose(ymax, 1.0) 
-        assert allclose(stagemin, -0.88) 
-        assert allclose(stagemax, 0.12)
+        assert allclose(ymax, 1.0)
+        assert allclose(stagemin, -0.85) 
+        assert allclose(stagemax, 0.15)
         
     def test_ferret2sww_nz_origin(self):