Changeset 7276 for anuga_core/source/anuga/config.py

Timestamp:

Jun 30, 2009, 2:07:41 PM (15 years ago)

Author:

ole

Message:

Merged numpy branch back into the trunk.

In ~/sandpit/anuga/anuga_core/source
svn merge -r 6246:HEAD ../../branches/numpy .

In ~/sandpit/anuga/anuga_validation
svn merge -r 6417:HEAD ../branches/numpy_anuga_validation .

In ~/sandpit/anuga/misc
svn merge -r 6809:HEAD ../branches/numpy_misc .

For all merges, I used numpy version where conflicts existed

The suites test_all.py (in source/anuga) and validate_all.py passed using Python2.5 with numpy on my Ubuntu Linux box.

File:

• anuga_core/source/anuga/config.py (modified) (4 diffs)

anuga_core/source/anuga/config.py

@@ -4 +4 @@
 import os
 import sys
+
 
 ################################################################################
@@ -162 +163 @@
                              # Too large (100) creates 'flopping' water
                              # Too small (0) creates 'creep'
-                            
+
 maximum_froude_number = 100.0 # To be used in limiters.
 
@@ -183 +184 @@
 
 ################################################################################
+# NetCDF-specific type constants.  Used when defining NetCDF file variables.
+################################################################################
+
+netcdf_char = 'c'
+netcdf_byte = 'b'
+netcdf_int = 'i'
+netcdf_float = 'd'
+netcdf_float64 = 'd'
+netcdf_float32 = 'f'
+
+################################################################################
 # Dynamically-defined constants.
 ################################################################################
@@ -193 +205 @@
 # Code to set the write mode depending on
 # whether Scientific.IO supports large NetCDF files
-s = """from Scientific.IO.NetCDF import NetCDFFile; fid = NetCDFFile('tmpfilenamexx', 'wl')"""
+s = """
+import os
+from Scientific.IO.NetCDF import NetCDFFile
+fid = NetCDFFile('tmpfilenamexx', 'wl')
+fid.close()
+os.remove('tmpfilenamexx')
+"""
 
 # Need to run in a separate process due an