Changeset 9693
- Timestamp:
- Feb 25, 2015, 3:59:42 PM (9 years ago)
- Location:
- trunk/anuga_core
- Files:
-
- 11 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/anuga_core/anuga/__init__.py
r9680 r9693 21 21 #----------------------------------------------------- 22 22 23 24 25 26 # PEP0440 compatible formatted version, see:27 # https://www.python.org/dev/peps/pep-0440/28 #29 # Generic release markers:30 # X.Y31 # X.Y.Z # For bugfix releases32 #33 # Admissible pre-release markers:34 # X.YaN # Alpha release35 # X.YbN # Beta release36 # X.YrcN # Release Candidate37 # X.Y # Final release38 #39 # Dev branch marker is: 'X.Y.dev' or 'X.Y.devN' where N is an integer.40 #41 23 __version__ = '1.3.8' 42 24 … … 216 198 # Shallow Water Tsunamis 217 199 #----------------------------- 218 219 200 from anuga.tsunami_source.smf import slide_tsunami, slump_tsunami 220 201 … … 228 209 229 210 230 231 211 #----------------------------- 232 212 # File conversion utilities 233 213 #----------------------------- 234 from anuga.file_conversion.file_conversion import sww2obj, \ 235 timefile2netcdf, tsh2sww 214 from anuga.file_conversion.file_conversion import sww2obj 215 from anuga.file_conversion.file_conversion import timefile2netcdf 216 from anuga.file_conversion.file_conversion import tsh2sww 236 217 from anuga.file_conversion.urs2nc import urs2nc 237 218 from anuga.file_conversion.urs2sww import urs2sww -
trunk/anuga_core/anuga/abstract_2d_finite_volumes/tests/test_generic_domain.py
r9617 r9693 101 101 102 102 assert domain.CFL == 3.0 103 104 warnings.simplefilter("default") 103 105 104 106 -
trunk/anuga_core/anuga/config.py
r9265 r9693 26 26 27 27 pmesh_filename = '.\\pmesh' 28 version_filename = 'stored_version_info.py'28 #version_filename = 'stored_version_info.py' 29 29 default_datadir = '.' 30 30 time_format = '%d/%m/%y %H:%M:%S' # Used with timefile2netcdf … … 34 34 # Major revision number for use with create_distribution 35 35 # and update_anuga_user_guide 36 major_revision = '1.3.1'36 #major_revision = '1.3.1' 37 37 38 38 ################################################################################ -
trunk/anuga_core/anuga/fit_interpolate/interpolate2d.py
r8970 r9693 148 148 149 149 # Restrict interpolation points to those that are inside the grid 150 inside = -outside# Invert boolean array to find elements inside150 inside = numpy.logical_not(outside) # Invert boolean array to find elements inside 151 151 xi = xi[inside] 152 152 eta = eta[inside] … … 185 185 # Set up masks for the quadrants 186 186 left = alpha < 0.5 187 right = -left187 right = numpy.logical_not(left) 188 188 lower = beta < 0.5 189 upper = -lower189 upper = numpy.logical_not(lower) 190 190 191 191 lower_left = lower * left -
trunk/anuga_core/anuga/fit_interpolate/tests/test_interpolate2d.py
r9480 r9693 44 44 # Filter NaN's out 45 45 if numpy.any(xn): 46 x = x[ -xn]47 y = y[ -yn]46 x = x[numpy.logical_not(xn)] 47 y = y[numpy.logical_not(yn)] 48 48 49 49 # Compare non NaN's and return -
trunk/anuga_core/anuga/parallel/tests/test_parallel_inlet_operator.py
r9571 r9693 298 298 if myid == 0: 299 299 if verbose: print 'PARALLEL START' 300 random.seed(1001) 300 301 for i in range(samples): 301 302 x = random.randrange(0,1000)/1000.0 * length -
trunk/anuga_core/anuga/pmesh/mesh.py
r9591 r9693 1870 1870 # if attributes are brought back in. 1871 1871 #point_dict['geo_reference'] = self.geo_reference 1872 if mesh_dict['vertices'] == []:1872 if len(mesh_dict['vertices']) == 0: 1873 1873 #point_dict['pointlist'] = mesh_dict['points'] 1874 1874 geo = Geospatial_data(mesh_dict['points'], -
trunk/anuga_core/anuga/structures/inlet_operator.py
r9282 r9693 3 3 import inlet 4 4 5 from warnings import warn 5 import warnings 6 6 7 7 class Inlet_operator(anuga.Operator): … … 174 174 default(0.0) 175 175 except: 176 msg = "could not call default" 176 177 raise Exception(msg) 177 178 … … 204 205 'Note: Further warnings will be supressed' 205 206 % (str(err_msg), str(self.default(t)))) 206 warn(msg) 207 208 warnings.warn(msg) 207 209 208 210 # FIXME (Ole): Replace this crude flag with -
trunk/anuga_core/anuga/structures/tests/test_inlet_operator.py
r9566 r9693 16 16 from anuga.structures.inlet_operator import Inlet_operator 17 17 18 import warnings 19 warnings.simplefilter("ignore") 18 20 19 21 20 class Test_inlet_operator(unittest.TestCase): … … 289 288 os.chdir(baseDir) 290 289 290 import warnings 291 warnings.simplefilter("ignore") 292 291 293 Inlet_operator(domain, line1, Q1, default=6) 292 294 Inlet_operator(domain, line2, Q2, default=3) … … 298 300 299 301 302 warnings.simplefilter("default") 300 303 vol1 = domain.compute_total_volume() 301 304 -
trunk/anuga_core/anuga/test_all.py
r9583 r9693 26 26 from anuga.utilities.terminal_width import terminal_width 27 27 import anuga.utilities.system_tools as aust 28 from anuga import __version__ 28 29 29 30 … … 33 34 34 35 # Directories that should not be searched for test files. 35 exclude_dirs = ['shallow_water_balanced' , # Special requirements36 exclude_dirs = ['shallow_water_balanced' , 36 37 '.svn', # subversion 37 38 'props', 'wcprops', 'prop-base', 'text-base', 'tmp'] … … 253 254 # timestamp at the end 254 255 timestamp = time.asctime() 255 major_revision = config.major_revision256 major_revision = __version__ 256 257 minor_revision = aust.get_revision_number() 257 258 print '\nFinished at %s, version %s %s' % (timestamp, major_revision, minor_revision) -
trunk/anuga_core/tools/install_packages.sh
r9689 r9693 18 18 sudo apt-get install gfortran 19 19 20 ########################################################## 21 # Setup various versions of MPI 20 22 if [[ "$PARALLEL" == "mpich2" ]]; then 21 23 sudo apt-get install mpich2; 22 24 fi 23 25 26 if [[ "$PARALLEL" == "openmpi" ]]; then 27 sudo apt-get install -y libopenmpi-dev openmpi-bin; 28 fi 29 30 31 ########################################################## 24 32 if [[ "$DISTRIB" == "conda" ]]; then 33 25 34 # Deactivate the travis-provided virtual environment and setup a 26 35 # conda-based environment instead … … 35 44 export PATH=$HOME/miniconda/bin:$PATH 36 45 conda update --yes conda 37 38 39 46 40 47 # Configure the conda environment and put it in the path using the … … 57 64 58 65 66 # Install pypar if parallel set 67 if [[ "$PARALLEL" == "mpich2" || "$PARALLEL" == "openmpi" ]]; then 68 git clone https://github.com/daleroberts/pypar; 69 pushd pypar; 70 python setup.py install; 71 popd; 72 fi 73 59 74 # Useful for debugging any issues with conda 60 75 conda info -a 61 76 77 ######################################################## 62 78 elif [[ "$DISTRIB" == "ubuntu" ]]; then 63 79 # Use standard ubuntu packages in their default version 80 64 81 sudo apt-get install -qq python-dev python-numpy python-scipy \ 65 82 python-matplotlib netcdf-bin \ … … 67 84 python-gdal python-pip 68 85 69 pip install nose netCDF4 pyproj 86 sudo pip install nose netCDF4 pyproj 87 88 # Install pypar if parallel set 89 if [[ "$PARALLEL" == "mpich2" || "$PARALLEL" == "openmpi" ]]; then 90 git clone https://github.com/daleroberts/pypar; 91 pushd pypar; 92 python setup.py install; 93 popd; 94 fi 70 95 fi 71 96 72 97 73 # Install pypar if parallel set 74 if [[ "$PARALLEL" == "mpich2" ]]; then 75 git clone https://github.com/daleroberts/pypar; 76 pushd pypar; 77 python setup.py install; 78 popd; 79 fi 80 81 98 ######################################################## 82 99 if [[ "$COVERAGE" == "--coverage" ]]; then 83 100 pip install coverage coveralls
Note: See TracChangeset
for help on using the changeset viewer.