Changeset 7877


Ignore:
Timestamp:
Jun 29, 2010, 11:26:45 AM (15 years ago)
Author:
James Hudson
Message:

Moved all development files into trunk.

Location:
trunk
Files:
1 deleted
14 edited
90 copied

Legend:

Unmodified
Added
Removed

  • trunk/anuga_core/benchmarks/benchmark_sww2dem.py

    r7813 r7877  
    44"""
    55
    6 from anuga.file_conversion.sww2dem import sww2dem
    7 from create_test_sww import create_test_sww
     6import anuga
    87import os.path
    98import cProfile
    109import time
    1110
     11from create_test_sww import create_test_sww
    1212
    1313sww_name = 'test.sww'
    … …  
    1616        # do export to DEM
    1717
    18         sww2dem(sww_name,
     18        anuga.sww2dem(sww_name,
    1919                        name_out='sww2dem_out.asc',
    20                         quantity='stage',
     20                        quantity='xmomentum',
    2121                        cellsize=0.25,     
    2222                        easting_min=0,

  • trunk/anuga_core/benchmarks/create_test_sww.py

    r7810 r7877  
    99        # Setup computational domain
    1010        #------------------------------------------------------------------------------
    11         points, vertices, boundary = anuga.rectangular_cross(50, 50,
     11        points, vertices, boundary = anuga.rectangular_cross(5, 5,
    1212                                                                                                   len1=50.0, len2=50.0) # Mesh
    1313
    … …  
    1919        #------------------------------------------------------------------------------
    2020        def topography(x, y):
    21                 return -x/20                             # linear bed slope
     21                return -x/2                             # linear bed slope
    2222
    2323        domain.set_quantity('elevation', topography) # Use function for elevation

  • trunk/anuga_core/documentation/user_manual/demos/cairns/ExportResults.py

    r7838 r7877  
    99
    1010print 'output dir:', name
    11 which_var = 4
     11which_var = 3
    1212
    1313if which_var == 0:    # Stage
    … …  
    3434
    3535anuga.sww2dem(name+'.sww',
    36         outname+'.ers',
     36        outname+'.asc',
    3737        quantity=quantityname,
    3838        cellsize=100,     

  • trunk/anuga_core/source/anuga_parallel/parallel_advection.py

    r7449 r7877  
    1515from anuga.advection import *
    1616
     17from anuga import Domain
    1718
    1819import numpy as num

  • trunk/anuga_core/source/anuga_parallel/parallel_shallow_water.py

    r7449 r7877  
    1212"""
    1313
    14 from anuga.interface import Domain
     14from anuga import Domain
    1515
    1616

  • trunk/anuga_core/source/anuga_parallel/print_stats.py

    r5242 r7877  
    2121import pypar
    2222
    23 from Numeric import array, Int8, zeros, ones, take, nonzero, Float
     23from numpy import array, zeros, ones, take, nonzero, float
    2424from anuga.utilities.norms import l1_norm, l2_norm, linf_norm
    2525

  • trunk/anuga_core/source/anuga_parallel/run_parallel_sw_rectangle.py

    r7449 r7877  
    2323# Sequential interface
    2424#---------------------------
    25 from anuga.interface import Domain
    26 from anuga.interface import Transmissive_boundary, Reflective_boundary
     25from anuga import Domain
     26from anuga import Transmissive_boundary, Reflective_boundary
    2727
    2828#----------------------------

  • trunk/anuga_core/source/anuga_parallel/test_parallel.py

    r7519 r7877  
    66from math import sqrt
    77
    8 
    9 
    10 
    11 
    12 from anuga.interface import Domain
    13 from anuga.interface import rectangular_cross
     8import anuga
    149
    1510from anuga_parallel.distribute_mesh import pmesh_divide_metis
    … …  
    7469        if myid == 0:
    7570
    76             points, vertices, boundary = rectangular_cross(2,2)
    77 
    78             domain = Domain(points, vertices, boundary)
     71            points, vertices, boundary = anuga.rectangular_cross(2,2)
     72
     73            domain = anuga.Domain(points, vertices, boundary)
    7974
    8075

  • trunk/anuga_core/source/anuga_parallel/test_parallel_distribute_domain.py

    r7562 r7877  
    2525from anuga.utilities.norms           import l1_norm, l2_norm, linf_norm
    2626
    27 from anuga.interface import Domain
    28 from anuga.interface import Reflective_boundary
    29 from anuga.interface import Dirichlet_boundary
    30 from anuga.interface import Time_boundary
    31 from anuga.interface import Transmissive_boundary
    32 
    33 from anuga.interface import rectangular_cross
    34 from anuga.interface import create_domain_from_file
     27from anuga import Domain
     28from anuga import Reflective_boundary
     29from anuga import Dirichlet_boundary
     30from anuga import Time_boundary
     31from anuga import Transmissive_boundary
     32
     33from anuga import rectangular_cross
     34from anuga import create_domain_from_file
    3535
    3636

  • trunk/anuga_validation/automated_validation_tests/flow_tests/test_inflow_using_flowline.py

    r7846 r7877  
    2828length = 400.
    2929width  = 20.
    30 dx = dy = 1.25          # Resolution: of grid on both axes
     30dx = dy = 5.0          # Resolution: of grid on both axes
    3131
    3232points, vertices, boundary = anuga.rectangular_cross(int(length/dx), \
    … …  
    111111                print domain.volumetric_balance_statistics()               
    112112
     113        anuga.sww2dem('inflow_flowline_test.sww',
     114                name_out='sww2dem_out.asc',
     115                        quantity='xmomentum',
     116                        cellsize=0.075,     
     117                        easting_min=0,
     118                        easting_max=400,
     119                        northing_min=0,
     120                        northing_max=20,       
     121                        reduction=max,
     122                        verbose=True)
     123
    113124
    114125        #----------------------------------------------------------------------
    … …  
    143154        assert num.allclose(domain_depth,normal_depth, rtol=1.0e-2), msg
    144155
     156       
    145157
    146 

  • trunk/anuga_validation/convergence_study/dam_break.py

    r7846 r7877  
    7676
    7777def height(x,y):
    78     z = zeros(len(x),Float)
     78    z = zeros(len(x), float)
    7979    for i in range(len(x)):
    8080        if x[i]<=50000.0:

  • trunk/anuga_work/production/australia_ph2/perth/project.py

    r7010 r7877  
    4141starttime=0             # start time for simulation
    4242finaltime=60000 # final time for simulation
    43 setup = 'final_30'         # This can be one of three values
     43setup = 'trial'         # This can be one of three values
    4444                        #    trial - coarsest mesh, fast
    4545                        #    basic - coarse mesh
    … …  
    186186
    187187# create paths generated from environment variables.
     188print os.getenv(ENV_INUNDATIONHOME)
    188189home = join(os.getenv(ENV_INUNDATIONHOME), 'data') # Absolute path for data folder
    189190muxhome = os.getenv(ENV_MUXHOME)

  • trunk/anuga_work/production/australia_ph2/perth/setup_model.py

    r7010 r7877  
    1010
    1111from os.path import join, exists
    12 from anuga.utilities.polygon import read_polygon, number_mesh_triangles
     12from anuga.geometry.polygon import read_polygon, number_mesh_triangles
    1313
    1414import project

  • trunk/anuga_work/production/new_south_wales/batemans_bay/setup_model.py

    r7045 r7877  
    1010
    1111from os.path import join, exists
    12 from anuga.utilities.polygon import read_polygon, number_mesh_triangles
     12from anuga.geometry.polygon import read_polygon, number_mesh_triangles
    1313
    1414import project

  • trunk/anuga_work/production/tweed_heads/project.py

    r7479 r7877  
    3232finaltime=100         # final time for simulation
    3333
    34 setup = 'final'         # This can be one of three values
     34setup = 'trial'         # This can be one of three values
    3535                        #    trial - coarsest mesh, fast
    3636                        #    basic - coarse mesh
    … …  
    143143# Environment variable names.
    144144# The inundation directory, not the data directory.
    145 ENV_INUNDATIONHOME = 'INUNDATIONHOME'
     145ENV_INUNDATIONHOME = '/home/james/Projects/anuga/anuga_work/production'
    146146
    147147# Path to MUX data
    148 ENV_MUXHOME = 'MUXHOME'
     148ENV_MUXHOME = '/home/james/Projects/anuga/anuga_work/production'
    149149
    150150#-------------------------------------------------------------------------------
    … …  
    167167
    168168# create paths generated from environment variables.
    169 home = join(os.getenv(ENV_INUNDATIONHOME), 'data') # Absolute path for data folder
    170 muxhome = os.getenv(ENV_MUXHOME)
     169home = ENV_INUNDATIONHOME # Absolute path for data folder
     170muxhome = ENV_MUXHOME
    171171   
    172172# check various directories/files that must exist

  • trunk/anuga_work/production/tweed_heads/setup_model.py

    r7479 r7877  
    1010
    1111from os.path import join, exists
    12 from anuga.utilities.polygon import read_polygon, number_mesh_triangles
    13 from anuga.shallow_water.data_manager import csv2polygons
     12from anuga.geometry.polygon import read_polygon, number_mesh_triangles
     13from anuga.file.csv_file import load_csv_as_polygons as csv2polygons
    1414import project
    1515
Note: See TracChangeset for help on using the changeset viewer.