Changeset 9714
- Timestamp:
- Mar 12, 2015, 7:10:53 PM (9 years ago)
- Location:
- trunk/anuga_core
- Files:
-
- 13 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/anuga_core/.travis.yml
r9712 r9714 4 4 env: 5 5 matrix: 6 - PYTHON_VERSION="2.7" PARALLEL="openmpi" DISTRIB="conda"7 #- PYTHON_VERSION="2.7" PARALLEL="openmpi" DISTRIB="ubuntu"8 #- PYTHON_VERSION="2.7" PARALLEL="mpich2" DISTRIB="conda"9 - PYTHON_VERSION="2.7" PARALLEL="mpich2" DISTRIB="ubuntu" COVERAGE="--coverage"10 #- PYTHON_VERSION="2.7" PARALLEL="false" DISTRIB="conda"11 #- PYTHON_VERSION="2.6" PARALLEL="false" DISTRIB="conda"6 - PYTHON_VERSION="2.7" ANUGA_PARALLEL="openmpi" DISTRIB="conda" 7 #- PYTHON_VERSION="2.7" ANUGA_PARALLEL="openmpi" DISTRIB="ubuntu" 8 #- PYTHON_VERSION="2.7" ANUGA_PARALLEL="mpich2" DISTRIB="conda" 9 - PYTHON_VERSION="2.7" ANUGA_PARALLEL="mpich2" DISTRIB="ubuntu" COVERAGE="--coverage" 10 #- PYTHON_VERSION="2.7" ANUGA_PARALLEL="false" DISTRIB="conda" 11 #- PYTHON_VERSION="2.6" ANUGA_PARALLEL="false" DISTRIB="conda" 12 12 13 13 install: -
trunk/anuga_core/anuga/abstract_2d_finite_volumes/setup.py
r9661 r9714 19 19 config.add_data_dir('tests') 20 20 21 util_dir = os.path.abspath(join(os.path.dirname(__file__),'..','utilities')) 22 runtime_dir = os.path.abspath(join(os.path.dirname(__file__),'..','runtime_libs')) 23 21 #util_dir = os.path.abspath(join(os.path.dirname(__file__),'..','utilities')) 22 #runtime_dir = os.path.abspath(join(os.path.dirname(__file__),'..','runtime_libs')) 23 24 util_dir = join('..','utilities') 25 24 26 config.add_extension('neighbour_mesh_ext', 25 27 sources=['neighbour_mesh_ext.c'], -
trunk/anuga_core/anuga/advection/setup.py
r9569 r9714 15 15 config.add_data_dir('tests') 16 16 17 util_dir = os.path.abspath(join(os.path.dirname(__file__),'..','utilities')) 17 #util_dir = os.path.abspath(join(os.path.dirname(__file__),'..','utilities')) 18 util_dir = join('..','utilities') 18 19 19 20 config.add_extension('advection_ext', -
trunk/anuga_core/anuga/file/setup.py
r9569 r9714 15 15 config.add_data_dir('tests') 16 16 17 util_dir = os.path.abspath(join(os.path.dirname(__file__),'..','utilities')) 17 #util_dir = os.path.abspath(join(os.path.dirname(__file__),'..','utilities')) 18 util_dir = join('..','utilities') 18 19 19 20 config.add_extension('urs_ext', -
trunk/anuga_core/anuga/file_conversion/setup.py
r9677 r9714 15 15 config.add_data_dir('tests') 16 16 17 util_dir = os.path.abspath(join(os.path.dirname(__file__),'..','utilities')) 17 #util_dir = os.path.abspath(join(os.path.dirname(__file__),'..','utilities')) 18 util_dir = join('..','utilities') 18 19 19 20 config.add_extension('calc_grid_values_ext', -
trunk/anuga_core/anuga/fit_interpolate/setup.py
r9569 r9714 16 16 17 17 18 util_dir = os.path.abspath(join(os.path.dirname(__file__),'..','utilities')) 19 18 #util_dir = os.path.abspath(join(os.path.dirname(__file__),'..','utilities')) 19 20 util_dir = join('..','utilities') 20 21 21 22 util_srcs = [join(util_dir,'quad_tree.c'), -
trunk/anuga_core/anuga/geometry/setup.py
r9569 r9714 15 15 config.add_data_dir('tests') 16 16 17 util_dir = os.path.abspath(join(os.path.dirname(__file__),'..','utilities')) 17 #util_dir = os.path.abspath(join(os.path.dirname(__file__),'..','utilities')) 18 util_dir = join('..','utilities') 18 19 19 20 config.add_extension('polygon_ext', -
trunk/anuga_core/anuga/mesh_engine/setup.py
r9569 r9714 15 15 config.add_data_dir('tests') 16 16 17 util_dir = os.path.abspath(join(os.path.dirname(__file__),'..','utilities')) 17 #util_dir = os.path.abspath(join(os.path.dirname(__file__),'..','utilities')) 18 util_dir = join('..','utilities') 18 19 19 20 config.add_extension('mesh_engine_c_layer', -
trunk/anuga_core/anuga/operators/setup.py
r9569 r9714 15 15 config.add_data_dir('tests') 16 16 17 util_dir = os.path.abspath(join(os.path.dirname(__file__),'..','utilities')) 17 #util_dir = os.path.abspath(join(os.path.dirname(__file__),'..','utilities')) 18 util_dir = join('..','utilities') 18 19 19 20 config.add_extension('mannings_operator_ext', -
trunk/anuga_core/anuga/shallow_water/setup.py
r9569 r9714 16 16 config.add_data_dir(join('tests','data')) 17 17 18 util_dir = os.path.abspath(join(os.path.dirname(__file__),'..','utilities')) 18 #util_dir = os.path.abspath(join(os.path.dirname(__file__),'..','utilities')) 19 util_dir = join('..','utilities') 19 20 20 21 config.add_extension('shallow_water_ext', -
trunk/anuga_core/examples/parallel/run_parallel_sw_merimbula.py
r9429 r9714 24 24 # ANUGA Modules 25 25 #------------------------ 26 import anuga 26 27 27 28 from anuga import Domain … … 36 37 37 38 38 from anuga_parallel import distribute, myid, numprocs, finalize, barrier 39 39 from anuga import distribute, myid, numprocs, finalize, barrier 40 41 from anuga.utilities.system_tools import get_pathname_from_package 40 42 41 43 #-------------------------------------------------------------------------- … … 43 45 #-------------------------------------------------------------------------- 44 46 45 mesh_filename = "data/merimbula_10785_1.tsh" ; x0 = 756000.0 ; x1 = 756500.0; yieldstep = 10; finaltime = 100 46 #mesh_filename = "data/merimbula_17156.tsh" ; x0 = 756000.0 ; x1 = 756500.0; yieldstep = 50; finaltime = 500 47 #mesh_filename = "data/merimbula_43200_1.tsh" ; x0 = 756000.0 ; x1 = 756500.0; yieldstep = 50; finaltime = 500 48 #mesh_filename = "data/test-100.tsh" ; x0 = 200.0 ; x1 = 300.0; yieldstep = 1; finaltime = 10 49 #mesh_filename = "data/test-20.tsh" ; x0 = 250.0 ; x1 = 350.0; yieldstep = 1; finaltime = 50 47 DATA_DIR = get_pathname_from_package('anuga.parallel') 48 49 mesh_filename = anuga.join(DATA_DIR,"data/merimbula_10785_1.tsh") ; x0 = 756000.0 ; x1 = 756500.0; yieldstep = 10; finaltime = 100 50 #mesh_filename = anuga.join(DATA_DIR,"data/merimbula_17156.tsh") ; x0 = 756000.0 ; x1 = 756500.0; yieldstep = 50; finaltime = 500 51 #mesh_filename = anuga.join(DATA_DIR,"data/merimbula_43200_1.tsh") ; x0 = 756000.0 ; x1 = 756500.0; yieldstep = 50; finaltime = 500 52 #mesh_filename = anuga.join(DATA_DIR,"data/test-100.tsh") ; x0 = 200.0 ; x1 = 300.0; yieldstep = 1; finaltime = 10 53 #mesh_filename = anuga.join(DATA_DIR,"data/test-20.tsh") ; x0 = 250.0 ; x1 = 350.0; yieldstep = 1; finaltime = 50 50 54 51 55 verbose = False -
trunk/anuga_core/tools/install_conda.sh
r9712 r9714 12 12 13 13 [ -z "$PYTHON_VERSION" ] && PYTHON_VERSION="2.7" 14 [ -z "$PARALLEL" ] && PARALLEL="mpich2" 14 15 15 16 16 sudo apt-get update -q … … 19 19 ########################################################## 20 20 # Setup various versions of MPI 21 if [[ "$ PARALLEL" == "mpich2" ]]; then21 if [[ "$ANUGA_PARALLEL" == "mpich2" ]]; then 22 22 sudo apt-get -y install mpich2; 23 23 fi 24 24 25 if [[ "$ PARALLEL" == "openmpi" ]]; then25 if [[ "$ANUGA_PARALLEL" == "openmpi" ]]; then 26 26 sudo apt-get install -y libopenmpi-dev openmpi-bin; 27 27 fi … … 66 66 67 67 # Install pypar if parallel set 68 if [[ "$ PARALLEL" == "mpich2" || "$PARALLEL" == "openmpi" ]]; then68 if [[ "$ANUGA_PARALLEL" == "mpich2" || "$ANUGA_PARALLEL" == "openmpi" ]]; then 69 69 git clone https://github.com/daleroberts/pypar.git; 70 70 pushd pypar; -
trunk/anuga_core/tools/install_ubuntu.sh
r9712 r9714 12 12 13 13 [ -z "$PYTHON_VERSION" ] && PYTHON_VERSION="2.7" 14 [ -z "$PARALLEL" ] && PARALLEL="mpich2"15 14 16 15 sudo apt-get update -q … … 28 27 ########################################################## 29 28 # Setup for various versions of MPI 30 if [[ "$ PARALLEL" == "mpich2" ]]; then29 if [[ "$ANUGA_PARALLEL" == "mpich2" ]]; then 31 30 sudo apt-get install -y mpich2; 32 31 fi 33 32 34 if [[ "$ PARALLEL" == "openmpi" ]]; then33 if [[ "$ANUGA_PARALLEL" == "openmpi" ]]; then 35 34 sudo apt-get install -y libopenmpi-dev openmpi-bin; 36 35 fi 37 36 38 ########################################################39 37 # Install pypar if parallel set 40 if [[ "$ PARALLEL" == "mpich2" || "$PARALLEL" == "openmpi" ]]; then38 if [[ "$ANUGA_PARALLEL" == "mpich2" || "$ANUGA_PARALLEL" == "openmpi" ]]; then 41 39 svn checkout https://github.com/daleroberts/pypar/trunk pypar; 42 40 pushd pypar;
Note: See TracChangeset
for help on using the changeset viewer.