Changeset 8810

Timestamp:

Apr 5, 2013, 10:25:46 AM (12 years ago)

Author:

steve

Message:

Some changes to netcdf config

Location:

trunk/anuga_core/source

Files:

• anuga/abstract_2d_finite_volumes/generic_domain.py (modified) (1 diff)
• anuga/config.py (modified) (1 diff)
• anuga/file/netcdf.py (modified) (2 diffs)
• anuga/file/sww.py (modified) (6 diffs)
• anuga/shallow_water/boundaries.py (modified) (1 diff)
• anuga/shallow_water/shallow_water_domain.py (modified) (2 diffs)
• anuga/shallow_water/shallow_water_ext.c (modified) (1 diff)
• anuga_validation_tests/Case_studies/Okushiri/compare_timeseries_with_measures.py (modified) (1 diff)
• anuga_validation_tests/Case_studies/Okushiri/create_okushiri.py (modified) (1 diff)
• anuga_validation_tests/Case_studies/Okushiri/run_okushiri.py (modified) (3 diffs)

trunk/anuga_core/source/anuga/abstract_2d_finite_volumes/generic_domain.py

@@ -1612 +1612 @@
                 self.max_speed = num.zeros(N, num.float)
 
+
     def evolve_one_euler_step(self, yieldstep, finaltime):
         """One Euler Time Step

trunk/anuga_core/source/anuga/config.py

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

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

@@ -43 +43 @@
 
 
+
     try:
         from Scientific.IO.NetCDF import NetCDFFile
@@ -48 +49 @@
     except:
         from netCDF4 import Dataset
-        return Dataset(file_name, netcdf_mode, format='NETCDF3_64BIT')
-
-    
+        if netcdf_mode == 'wl' :
+            return Dataset(file_name, 'w', format='NETCDF3_64BIT')
+        else:
+            return Dataset(file_name, netcdf_mode, format='NETCDF3_64BIT')
+
+#    from netCDF4 import Dataset
+#    return Dataset(file_name, netcdf_mode, format='NETCDF3_64BIT')
 
     #return Dataset(file_name, netcdf_mode, format='NETCDF3_CLASSIC')

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

@@ -205 +205 @@
         fid.close()
 
+
     def store_timestep(self):
         """Store time and time dependent quantities
         """
 
-        import types
+        #import types
         from time import sleep
         from os import stat
+
 
         # Get NetCDF
@@ -238 +240 @@
         # Check to see if the file is already too big:
         time = fid.variables['time']
+
         i = len(time) + 1
         file_size = stat(self.filename)[6]
@@ -309 +312 @@
                 z, _ = Q.get_vertex_values(xy=False)                
                 
-                storable_indices = (w-z >= self.minimum_storable_height)
+                storable_indices = num.array(w-z >= self.minimum_storable_height)
             else:
                 # Very unlikely branch
@@ -317 +320 @@
             dynamic_quantities = {}
             for name in self.writer.dynamic_quantities:
-                netcdf_array = fid.variables[name]
+                #netcdf_array = fid.variables[name]
                 
                 Q = domain.quantities[name]
@@ -363 +366 @@
 
             # Flush and close
-            fid.sync()
+            #fid.sync()
             fid.close()
 
@@ -793 +796 @@
                     
         
-        
+
     def store_quantities(self, 
                          outfile, 

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

@@ -26 +26 @@
      import Boundary, File_boundary
 import numpy as num
+
+import anuga.utilities.log as log
      
 

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

@@ -1553 +1553 @@
 
 
-    
+
     def evolve(self,
                yieldstep=None,
@@ -1583 +1583 @@
                                        finaltime=finaltime, duration=duration,
                                        skip_initial_step=skip_initial_step):
+
             # Store model data, e.g. for subsequent visualisation
             if self.store is True:

trunk/anuga_core/source/anuga/shallow_water/shallow_water_ext.c

@@ -5486 +5486 @@
 }
 
+
 PyObject *compute_fluxes_ext_wb(PyObject *self, PyObject *args) {
     /*Compute all fluxes and the timestep suitable for all volumes

trunk/anuga_core/source/anuga_validation_tests/Case_studies/Okushiri/compare_timeseries_with_measures.py

@@ -168 +168 @@
 #eps = get_machine_precision()
 
-# Windows tolerances
-rtol = 1.0e-2
-atol = 1.0e-2
+# Tolerances  for 20,000 triangles
+rtol = 2.0e-2
+atol = 2.0e-2
+
+# Tolerances  for 60,000 triangles
+#rtol = 1.0e-2
+#atol = 1.0e-2
+
 print 'Precisions used: rtol=%e, atol=%e' %(rtol, atol)
 

trunk/anuga_core/source/anuga_validation_tests/Case_studies/Okushiri/create_okushiri.py

@@ -31 +31 @@
 #base_resolution = 0.04 # 989,669 triangles
 #base_resolution = 0.1 # 397,456 triangles
-base_resolution = 0.6 # 68162 triangles
-#base_resolution = 2.0 # 21214 triangles
+#base_resolution = 0.6 # 68162 triangles
+base_resolution = 2.0 # 21214 triangles
 #base_resolution = 4.0 # 11069 triangles
 

trunk/anuga_core/source/anuga_validation_tests/Case_studies/Okushiri/run_okushiri.py

@@ -62 +62 @@
     domain.set_default_order(2)               # Apply second order scheme 
     domain.set_minimum_storable_height(0.001) # Don't store w < 0.001m
-    domain.set_quantities_to_be_monitored('stage')
+    #domain.set_quantities_to_be_monitored('stage')
 
 
@@ -69 +69 @@
     # or override manually yourself
     #------------------------------------------------------------------------------
-    from anuga.utilities.argparsing import parse_standard_args
-    alg, cfl = parse_standard_args()
+    #from anuga.utilities.argparsing import parse_standard_args
+    #alg, cfl = parse_standard_args()
+    alg = '1_5'
+    cfl = 1.0
     domain.set_flow_algorithm(alg)
     domain.set_CFL(cfl)
+    
+    
+    domain.set_store(False)
         
 
@@ -105 +110 @@
     t0 = time.time()
 
-    for t in domain.evolve(yieldstep = 0.05, finaltime = 22.5):
+    for t in domain.evolve(yieldstep = 0.01, finaltime = 4.0):
+        print 80*"="
         domain.write_time()
-        print domain.quantity_statistics(precision='%.12f')
+        import objgraph
+        #objgraph.show_most_common_types()
+        #print objgraph.typestats(objgraph.get_leaking_objects())
+        objgraph.show_growth()
+        #print domain.quantity_statistics(precision='%.12f')
 
     print 'That took %.2f seconds' %(time.time()-t0)