Changeset 6595

Timestamp:

Mar 24, 2009, 2:06:16 PM (15 years ago)

Author:

ole

Message:

Added the nonstandard central meridian option, tested and implemented it in the Adeladie Phase II scripts.

Files:

• anuga_core/source/anuga/coordinate_transforms/test_redfearn.py (modified) (3 diffs)
• anuga_core/source/anuga/shallow_water/data_manager.py (modified) (2 diffs)
• anuga_core/source/anuga/shallow_water/test_data_manager.py (modified) (4 diffs)
• anuga_work/production/australia_ph2/adelaide/build_urs_boundary.py (modified) (2 diffs)
• anuga_work/production/australia_ph2/adelaide/project.py (modified) (1 diff)

anuga_core/source/anuga/coordinate_transforms/test_redfearn.py

@@ -147 +147 @@
 
         # Then project to zone 49
-        zone, easting, northing = redfearn(-29.233299999,114.05,zone=49)
+        zone, easting, northing = redfearn(-29.233299999,114.05, zone=49)
 
         assert zone == 49
@@ -163 +163 @@
 
         # Then project to zone 50
-        zone, easting, northing = redfearn(-29.1333,113.9667,zone=50)
+        zone, easting, northing = redfearn(-29.1333,113.9667, zone=50)
 
         assert zone == 50
@@ -178 +178 @@
 
         # Then project to zone 49
-        zone, easting, northing = redfearn(-29.1667,114,zone=49)
+        zone, easting, northing = redfearn(-29.1667,114, zone=49)
 
         assert zone == 49

anuga_core/source/anuga/shallow_water/data_manager.py

@@ -5503 +5503 @@
             origin=None,
             zone=None,
+            central_meridian=None,            
             mean_stage=0.0,
             zscale=1.0,
@@ -5719 +5720 @@
     # Check zone boundaries
     if zone is None:
-        refzone, _, _ = redfearn(latitudes[0], longitudes[0])
+        refzone, _, _ = redfearn(latitudes[0], longitudes[0],
+                                 central_meridian=central_meridian)
     else:
         refzone = zone
 
+        
+
     old_zone = refzone
 
     for i in range(number_of_points):
-        zone, easting, northing = redfearn(latitudes[i], longitudes[i],
-                                           zone=zone)
+        computed_zone, easting, northing = redfearn(latitudes[i], longitudes[i],
+                                                    zone=zone,
+                                                    central_meridian=central_meridian)
         x[i] = easting
         y[i] = northing
-        if zone != refzone:
+        if computed_zone != refzone:
             msg = 'All sts gauges need to be in the same zone. \n'
             msg += 'offending gauge:Zone %d,%.4f, %4f\n' \
-                   % (zone, easting, northing)
+                   % (computed_zone, easting, northing)
             msg += 'previous gauge:Zone %d,%.4f, %4f' \
                    % (old_zone, old_easting, old_northing)
             raise Exception, msg
-        old_zone = zone
+        old_zone = computed_zone
         old_easting = easting
         old_northing = northing

anuga_core/source/anuga/shallow_water/test_data_manager.py

@@ -6793 +6793 @@
         os.remove(sts_file)
 
-    def test_urs2sts_nonstandard_projection(self):
+    def test_urs2sts_nonstandard_meridian(self):
         """
-        Test single source
+        Test single source using the meridian from zone 50 as a nonstandard meridian
         """
         tide=0
@@ -6818 +6818 @@
 
         base_name, files = 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)
 
         urs2sts(base_name,
                 basename_out=base_name, 
-                zone=50,
-                mean_stage=tide,verbose=False)
+                central_meridian=123,
+                mean_stage=tide,
+                verbose=False)
 
         # now I want to check the sts file ...
@@ -6848 +6849 @@
         y = points[:,1]
 
-        #Check that all coordinate are correctly represented       
-        #Using the non standard projection (50) 
+        # Check that all coordinate are correctly represented       
+        # Using the non standard projection (50) 
         for i in range(4):
-            zone, e, n = redfearn(lat_long_points[i][0], lat_long_points[i][1], zone=50) 
+            zone, e, n = redfearn(lat_long_points[i][0],
+                                  lat_long_points[i][1],
+                                  central_meridian=123)
             assert num.allclose([x[i],y[i]], [e,n])
-            assert zone==geo_reference.zone
-
+            assert zone==-1
+
+            
     def test_urs2sts_nonstandard_projection_reverse(self):
         """
@@ -6910 +6914 @@
         y = points[:,1]
 
-        #Check that all coordinate are correctly represented       
-        #Using the non standard projection (50) 
+        # Check that all coordinate are correctly represented       
+        # Using the non standard projection (50) 
         for i in range(4):
-            zone, e, n = redfearn(lat_long_points[i][0], lat_long_points[i][1], zone=50) 
+            zone, e, n = redfearn(lat_long_points[i][0], lat_long_points[i][1],
+                                  zone=50) 
             assert num.allclose([x[i],y[i]], [e,n])
             assert zone==geo_reference.zone

anuga_work/production/australia_ph2/adelaide/build_urs_boundary.py

@@ -142 +142 @@
                 basename_out=output_dir,
                 ordering_filename=project.urs_order,
+                central_meridian=project.central_meridian,
                 weights=mux_weights,
-                mean_stage=project.tide,
                 verbose=True)
     else:                           # a single mux stem file, assume 1.0 weight
@@ -160 +160 @@
                 basename_out=output_dir,
                 ordering_filename=order_filename,
+                central_meridian=project.central_meridian,                
                 weights=mux_weights,
-                mean_stage=project.tide,
                 verbose=True)
 

anuga_work/production/australia_ph2/adelaide/project.py

@@ -25 +25 @@
 # Model specific parameters.
 # One or all can be changed each time the run_model script is executed
+
+central_meridian = 137.5 # This is the nonstandard projection needed
 tide = 0                # difference between MSL and HAT
 event_number = 64322    # the event number