Changeset 8823

Timestamp:

Apr 14, 2013, 5:37:22 PM (12 years ago)

Author:

steve

Message:

Small change to default netcdf_mode_w

Location:

trunk/anuga_core/source

Files:

• anuga/config.py (modified) (1 diff)
• anuga/file/netcdf.py (modified) (2 diffs)
• anuga/geospatial_data/geospatial_data.py (modified) (1 diff)
• anuga_parallel/run_parallel_sw_merimbula.py (modified) (3 diffs)

trunk/anuga_core/source/anuga/config.py

@@ -220 +220 @@
 
 # Determine if we can read/write large NetCDF files
-netcdf_mode_w = 'wl'
-netcdf_mode_a = 'r+'
+netcdf_mode_w = 'w'
+netcdf_mode_a = 'a'
 netcdf_mode_r = 'r'
 

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

@@ -41 +41 @@
     
     """
-
-
+   
 
     try:
         from Scientific.IO.NetCDF import NetCDFFile
         return NetCDFFile(file_name, netcdf_mode)
-    except:
+    except: 
         from netCDF4 import Dataset
         if netcdf_mode == 'wl' :
@@ -53 +52 @@
         else:
             return Dataset(file_name, netcdf_mode, format='NETCDF3_64BIT')
+
 
 #    from netCDF4 import Dataset

trunk/anuga_core/source/anuga/geospatial_data/geospatial_data.py

@@ -707 +707 @@
             if self.verbose is True:
                 log.critical('Geospatial_data: Reading %d points (in ~%d blocks) from file %s. '
-                             % (self.number_of_points, self.number_of_blocks,
+                             % (self.number_of_points, self.number_of_blocks+1,
                                 self.file_name))
                 log.critical('Geospatial_data: Each block consists of %d data points'

trunk/anuga_core/source/anuga_parallel/run_parallel_sw_merimbula.py

@@ -30 +30 @@
 from anuga import Time_boundary
 from anuga import Transmissive_boundary
+from anuga import Transmissive_n_momentum_zero_t_momentum_set_stage_boundary
 
 from anuga import rectangular_cross
@@ -84 +85 @@
 if myid == 0:
     domain = create_domain_from_file(mesh_filename)
-    domain.set_quantity('stage', Set_Stage(x0, x1, 1.0))
+    #domain.set_quantity('stage', Set_Stage(x0, x1, 1.0))
+    domain.set_quantity('stage', 0.0)
     #domain.set_datadir('.')
     domain.set_name('merimbula_new')
@@ -148 +150 @@
 Br = Reflective_boundary(domain)      # Solid reflective wall
 
-domain.set_boundary({'outflow' :Br, 'inflow' :Br, 'inner' :Br, 'exterior' :Br, 'open' :Br})
+from math import sin
+Bts = Transmissive_n_momentum_zero_t_momentum_set_stage_boundary(domain, lambda t: 10*sin(t/60))
+
+domain.set_boundary({'outflow' :Br, 'inflow' :Br, 'inner' :Br, 'exterior' :Br, 'open' :Bts})
+
+
+bdy_ids = domain.tag_boundary_cells['open']
+vol_ids = domain.boundary_cells[bdy_ids]
+edge_ids = domain.boundary_edges[bdy_ids]
+
+print domain.mesh.edge_midpoint_coordinates[3*vol_ids+edge_ids]
+
+
 
 #------------------------------------------------------------------------------