Changeset 9714


Ignore:
Timestamp:
Mar 12, 2015, 7:10:53 PM (9 years ago)
Author:
steve
Message:

changed extension include files to relative address

Location:
trunk/anuga_core
Files:
13 edited

Legend:

Unmodified
Added
Removed
  • trunk/anuga_core/.travis.yml

    r9712 r9714  
    44env:
    55  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"
    1212
    1313install:
  • trunk/anuga_core/anuga/abstract_2d_finite_volumes/setup.py

    r9661 r9714  
    1919    config.add_data_dir('tests')
    2020
    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 
    2426    config.add_extension('neighbour_mesh_ext',
    2527                         sources=['neighbour_mesh_ext.c'],
  • trunk/anuga_core/anuga/advection/setup.py

    r9569 r9714  
    1515    config.add_data_dir('tests')
    1616
    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')
    1819           
    1920    config.add_extension('advection_ext',
  • trunk/anuga_core/anuga/file/setup.py

    r9569 r9714  
    1515    config.add_data_dir('tests')
    1616
    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')
    1819   
    1920    config.add_extension('urs_ext',
  • trunk/anuga_core/anuga/file_conversion/setup.py

    r9677 r9714  
    1515    config.add_data_dir('tests')
    1616
    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')
    1819   
    1920    config.add_extension('calc_grid_values_ext',
  • trunk/anuga_core/anuga/fit_interpolate/setup.py

    r9569 r9714  
    1616
    1717
    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')
    2021   
    2122    util_srcs = [join(util_dir,'quad_tree.c'),
  • trunk/anuga_core/anuga/geometry/setup.py

    r9569 r9714  
    1515    config.add_data_dir('tests')
    1616
    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')
    1819   
    1920    config.add_extension('polygon_ext',
  • trunk/anuga_core/anuga/mesh_engine/setup.py

    r9569 r9714  
    1515    config.add_data_dir('tests')
    1616
    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')
    1819   
    1920    config.add_extension('mesh_engine_c_layer',
  • trunk/anuga_core/anuga/operators/setup.py

    r9569 r9714  
    1515    config.add_data_dir('tests')
    1616
    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')
    1819   
    1920    config.add_extension('mannings_operator_ext',
  • trunk/anuga_core/anuga/shallow_water/setup.py

    r9569 r9714  
    1616    config.add_data_dir(join('tests','data'))
    1717
    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')
    1920   
    2021    config.add_extension('shallow_water_ext',
  • trunk/anuga_core/examples/parallel/run_parallel_sw_merimbula.py

    r9429 r9714  
    2424# ANUGA Modules
    2525#------------------------
     26import anuga
    2627       
    2728from anuga import Domain
     
    3637
    3738
    38 from anuga_parallel import distribute, myid, numprocs, finalize, barrier
    39 
     39from anuga import distribute, myid, numprocs, finalize, barrier
     40
     41from anuga.utilities.system_tools import get_pathname_from_package
    4042
    4143#--------------------------------------------------------------------------
     
    4345#--------------------------------------------------------------------------
    4446
    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
     47DATA_DIR = get_pathname_from_package('anuga.parallel')
     48
     49mesh_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
    5054
    5155verbose = False
  • trunk/anuga_core/tools/install_conda.sh

    r9712 r9714  
    1212
    1313[ -z "$PYTHON_VERSION" ] && PYTHON_VERSION="2.7"
    14 [ -z "$PARALLEL" ] && PARALLEL="mpich2"
     14
    1515
    1616sudo apt-get update -q
     
    1919##########################################################
    2020# Setup various versions of MPI
    21 if [[ "$PARALLEL" == "mpich2" ]]; then
     21if [[ "$ANUGA_PARALLEL" == "mpich2" ]]; then
    2222    sudo apt-get -y install mpich2;
    2323fi
    2424
    25 if [[ "$PARALLEL" == "openmpi" ]]; then
     25if [[ "$ANUGA_PARALLEL" == "openmpi" ]]; then
    2626    sudo apt-get install -y libopenmpi-dev openmpi-bin;
    2727fi
     
    6666
    6767# Install pypar if parallel set
    68 if [[ "$PARALLEL" == "mpich2" || "$PARALLEL" == "openmpi" ]]; then
     68if [[ "$ANUGA_PARALLEL" == "mpich2" || "$ANUGA_PARALLEL" == "openmpi" ]]; then
    6969    git clone https://github.com/daleroberts/pypar.git;
    7070    pushd pypar;
  • trunk/anuga_core/tools/install_ubuntu.sh

    r9712 r9714  
    1212
    1313[ -z "$PYTHON_VERSION" ] && PYTHON_VERSION="2.7"
    14 [ -z "$PARALLEL" ] && PARALLEL="mpich2"
    1514
    1615sudo apt-get update -q
     
    2827##########################################################
    2928# Setup for various versions of MPI
    30 if [[ "$PARALLEL" == "mpich2" ]]; then
     29if [[ "$ANUGA_PARALLEL" == "mpich2" ]]; then
    3130    sudo apt-get install -y mpich2;
    3231fi
    3332
    34 if [[ "$PARALLEL" == "openmpi" ]]; then
     33if [[ "$ANUGA_PARALLEL" == "openmpi" ]]; then
    3534    sudo apt-get install -y libopenmpi-dev openmpi-bin;
    3635fi
    3736
    38 ########################################################
    3937# Install pypar if parallel set
    40 if [[ "$PARALLEL" == "mpich2" || "$PARALLEL" == "openmpi" ]]; then
     38if [[ "$ANUGA_PARALLEL" == "mpich2" || "$ANUGA_PARALLEL" == "openmpi" ]]; then
    4139     svn checkout https://github.com/daleroberts/pypar/trunk pypar;
    4240     pushd pypar;
Note: See TracChangeset for help on using the changeset viewer.