Changeset 9701
- Timestamp:
- Feb 28, 2015, 9:49:07 PM (9 years ago)
- Location:
- trunk/anuga_core
- Files:
-
- 7 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/anuga_core/.travis.yml
r9689 r9701 4 4 env: 5 5 matrix: 6 - PYTHON_VERSION="2.7" PARALLEL="openmpi" DISTRIB="conda" 7 - PYTHON_VERSION="2.7" PARALLEL="openmpi" DISTRIB="ubuntu" 6 8 - PYTHON_VERSION="2.7" PARALLEL="mpich2" DISTRIB="conda" 7 9 - PYTHON_VERSION="2.7" PARALLEL="mpich2" DISTRIB="ubuntu" COVERAGE="--coverage" -
trunk/anuga_core/anuga/parallel/tests/test_parallel_boyd_box_operator.py
r9695 r9701 355 355 356 356 357 finalize()358 359 357 finalize() 358 359 -
trunk/anuga_core/anuga/utilities/plot_utils.py
r9696 r9701 950 950 import scipy.spatial 951 951 import anuga 952 from anuga.utilities import plot_utils as util952 #from anuga.utilities import plot_utils as util 953 953 import os 954 954 … … 991 991 if(verbose): 992 992 print 'Reading sww File ...' 993 p2= util.get_centroids(swwFile, velocity_extrapolation, timeSlices=myTimeStep,993 p2=get_centroids(swwFile, velocity_extrapolation, timeSlices=myTimeStep, 994 994 minimum_allowed_height=min_allowed_height) 995 995 xllcorner=p2.xllcorner -
trunk/anuga_core/anuga/utilities/system_tools.py
r9697 r9701 193 193 def get_revision_number(): 194 194 """Get the (svn) revision number of this repository copy. 195 """ 196 from anuga.revision import revision_info 197 return process_revision_info(revision_info) 198 199 195 If svn not available just return 0 196 """ 197 try: 198 from anuga.revision import revision_info 199 return process_revision_info(revision_info) 200 except: 201 return 0 202 203 200 204 def process_revision_info(revision_info): 201 205 -
trunk/anuga_core/anuga/utilities/tests/test_system_tools.py
r9696 r9701 468 468 469 469 x = get_revision_number() 470 471 try: 472 y = x.split('.') 473 assert int(y[0]) 474 assert int(y[1]) 475 assert int(y[2]) 476 except: 477 assert int(x) 470 471 assert int(x) >= 0 478 472 479 473 ################################################################################ -
trunk/anuga_core/examples/cairns/export_results_to_qgis.py
r9209 r9701 32 32 Make_Geotif(swwFile=name+'.sww', 33 33 output_quantities=['stage'], 34 myTimeStep= 0,34 myTimeStep=[0], 35 35 CellSize=1000.0, 36 36 lower_left=None, upper_right=None, -
trunk/anuga_core/tools/install_packages.sh
r9693 r9701 48 48 # provided versions 49 49 conda create -n anuga_env --yes python=$PYTHON_VERSION pip numpy scipy netcdf4 \ 50 nose matplotlib gdal geos50 nose matplotlib 51 51 source activate anuga_env 52 53 # python 2.6 doesn't have argparse by default 54 if [[ "$PYTHON_VERSION" == "2.6" ]]; then conda install --yes argparse; fi 52 55 53 56 if [[ "$PYTHON_VERSION" == "2.7" ]]; then 54 57 conda install --yes -c pingucarsti gdal 58 fi 59 60 if [[ "$PYTHON_VERSION" == "2.6" ]]; then 61 conda install --yes gdal geos 55 62 fi 56 63 … … 59 66 # Install more software to deal with geographical projections 60 67 pip install pyproj 61 62 # python 2.6 doesn't have argparse by default63 if [[ "$PYTHON_VERSION" == "2.6" ]]; then conda install --yes argparse; fi64 65 68 66 69 # Install pypar if parallel set 67 70 if [[ "$PARALLEL" == "mpich2" || "$PARALLEL" == "openmpi" ]]; then 68 71 git clone https://github.com/daleroberts/pypar; 69 72 pushd pypar; 70 73 python setup.py install; 71 74 popd; 72 75 fi 73 76 74 77 # Useful for debugging any issues with conda
Note: See TracChangeset
for help on using the changeset viewer.