Changeset 5414

Timestamp:

Jun 24, 2008, 10:19:54 AM (16 years ago)

Author:

ole

Message:

Comments

File:

• anuga_core/source/anuga/shallow_water/test_data_manager.py (modified) (6 diffs)

anuga_core/source/anuga/shallow_water/test_data_manager.py

@@ -6423 +6423 @@
         ua=5*ones((n,time_step_count),Float)
         va=-10*ones((n,time_step_count),Float)
-    
+
+        # Create two identical mux files to be combined by urs2sts
         base_nameI, filesI = self.write_mux2(lat_long_points,
-                                      time_step_count, time_step,
-                                      first_tstep, last_tstep,
-                                      depth=gauge_depth,
-                                      ha=ha,
-                                      ua=ua,
-                                      va=va)
+                                             time_step_count, time_step,
+                                             first_tstep, last_tstep,
+                                             depth=gauge_depth,
+                                             ha=ha,
+                                             ua=ua,
+                                             va=va)
 
         base_nameII, filesII = self.write_mux2(lat_long_points,
-                                      time_step_count, time_step,
-                                      first_tstep, last_tstep,
-                                      depth=gauge_depth,
-                                      ha=ha,
-                                      ua=ua,
-                                      va=va)
-
-        urs2sts([base_nameI,base_nameII],weights=[1.0,1.0],mean_stage=tide,
+                                               time_step_count, time_step,
+                                               first_tstep, last_tstep,
+                                               depth=gauge_depth,
+                                               ha=ha,
+                                               ua=ua,
+                                               va=va)
+
+        # Call urs2sts with multiple mux files
+        urs2sts([base_nameI, base_nameII], weights=[1.0,1.0],
+                mean_stage=tide,
                 verbose=False)
 
@@ -6446 +6449 @@
         sts_file = base_nameI + '.sts'
 
-        #Let's interigate the sww file
-        # Note, the sww info is not gridded.  It is point data.
+        #Let's interrogate the sts file
+        # Note, the sts info is not gridded.  It is point data.
         fid = NetCDFFile(sts_file)
 
@@ -6483 +6486 @@
 
         # Set original data used to write mux file to be zero when gauges are
-        #not recdoring
+        # not recdoring
         
         ha[0][0]=0.0
@@ -6497 +6500 @@
         # The stage stored in the .sts file should be the sum of the stage
         # in the two mux2 files because both have weights = 1. In this case
-        #the mux2 files are the same so stage == 2.0 * ha
-        assert allclose(2.0*transpose(ha),stage)  #Meters
+        # the mux2 files are the same so stage == 2.0 * ha
+        #print 2.0*transpose(ha) - stage 
+        assert allclose(2.0*transpose(ha), stage)  #Meters
 
         #Check the momentums - ua
@@ -6512 +6516 @@
         # The xmomentum stored in the .sts file should be the sum of the ua
         # in the two mux2 files multiplied by the depth.
-        assert allclose(2.0*transpose(ua*depth),xmomentum) 
+        assert allclose(2.0*transpose(ua*depth), xmomentum) 
 
         #Check the momentums - va
@@ -6521 +6525 @@
         # The ymomentum stored in the .sts file should be the sum of the va
         # in the two mux2 files multiplied by the depth.
-        assert allclose(2.0*transpose(va*depth),ymomentum)
+        assert allclose(2.0*transpose(va*depth), ymomentum)
 
         # check the elevation values.