Changeset 5242


Ignore:
Timestamp:
Apr 24, 2008, 7:30:33 PM (16 years ago)
Author:
steve
Message:
 
Files:
9 edited

Legend:

Unmodified
Added
Removed
  • anuga_core/source/anuga/abstract_2d_finite_volumes/domain.py

    r5162 r5242  
    166166        # =0 for ghost
    167167        N = len(self) #number_of_elements
     168        self.number_of_elements = N
    168169        self.tri_full_flag = ones(N, Int)
    169170        for i in self.ghost_recv_dict.keys():
     
    173174        # Test the assumption that all full triangles are store before
    174175        # the ghost triangles.
    175         assert allclose(self.tri_full_flag[:self.number_of_full_nodes],1)
     176        if not allclose(self.tri_full_flag[:self.number_of_full_nodes],1):
     177            print 'WARNING:  Not all full triangles are store before ghost triangles'
    176178                       
    177179
     
    14151417        # Protect against degenerate timesteps arising from isolated
    14161418        # triangles
     1419        # FIXME (Steve): This should be in shallow_water as it assumes x and y
     1420        # momentum
    14171421        if self.protect_against_isolated_degenerate_timesteps is True and\
    14181422               self.max_speed > 10.0: # FIXME (Ole): Make this configurable
  • anuga_core/source/anuga/advection/__init__.py

    r3592 r5242  
    22"""
    33
    4 pass
     4# Add path of package to PYTHONPATH to allow C-extensions to be loaded
     5import sys
     6sys.path += __path__
     7
     8# Make selected classes available directly
     9from advection import Domain,\
     10    Transmissive_boundary, Dirichlet_boundary
    511
    612
    713
    8 
  • anuga_core/source/anuga/advection/advection.py

    r4978 r5242  
    157157
    158158        import advection_ext           
    159         self.timestep = advection_ext.compute_fluxes(self, Stage, huge_timestep, max_timestep)
     159        self.flux_timestep = advection_ext.compute_fluxes(self, Stage, huge_timestep, max_timestep)
    160160
    161161
  • anuga_core/source/anuga/advection/test_advection.py

    r4978 r5242  
    143143
    144144
    145     def FIXME_test_advection_example(self):
     145    def test_advection_example(self):
    146146        #Test that system can evolve
    147147
  • anuga_core/source/anuga_parallel/parallel_advection.py

    r3579 r5242  
    2222    pass
    2323
    24 from anuga.abstract_2d_finite_volumes.advection_vtk import *
     24from anuga.advection import *
    2525from Numeric import zeros, Float, Int, ones, allclose, array
    2626import pypar
  • anuga_core/source/anuga_parallel/parallel_meshes.py

    r3579 r5242  
    1515
    1616import sys
    17 from Numeric import array, zeros, Float, Int
     17from Numeric import array, zeros, Float, Int, ones, sum
    1818
    1919import pypar
    2020
    2121from anuga.config import epsilon
     22
     23
     24
    2225
    2326
     
    181184        ghost_recv_dict[(processor+1)%numproc] = [Idgr, Idgr]
    182185
     186
     187
     188       
     189   
    183190    return  points, elements, boundary, full_send_dict, ghost_recv_dict
    184191
  • anuga_core/source/anuga_parallel/print_stats.py

    r3954 r5242  
    5050        for id in ghost_recv_dict[i][0]:
    5151            tri_full_flag[id] = 0
     52       
    5253
    5354    return tri_full_flag
  • anuga_core/source/anuga_parallel/run_parallel_advection_prof.py

    r3579 r5242  
    7676                         full_send_dict, ghost_recv_dict, velocity=[1.0, 0.0])
    7777
    78 # Turn on the visualisation
    79 
    80 # rect = [0.0, 0.0, 1.0, 1.0]
    81 # domain.initialise_visualiser(rect=rect)
    82 
    8378# Boundaries
    8479
  • anuga_work/publications/anuga_2007/anuga_validation.tex

    r5235 r5242  
    33\documentclass[12pt,a4paper]{article}
    44
    5 % create a pdf of this doc by using pdflatex 
     5% create a pdf of this doc by using pdflatex
    66% Do \emph{not} change the width nor the height of the text from the
    77% defaults set by this document class.
     
    2222\usepackage{amsfonts}
    2323\usepackage{underscore}
     24\usepackage{epstopdf}
    2425% Avoid loading unused packages (as done by some \LaTeX\ editors).
    2526
     
    3435\textsc{Australia}. \protect\url{mailto:Duncan.Gray@ga.gov.au}}\footnotemark[1]
    3536\and
    36 T.~Baldock\thanks{University of Queensland, Brisbane, \textsc{Australia}. 
     37T.~Baldock\thanks{University of Queensland, Brisbane, \textsc{Australia}.
    3738\protect\url{mailto:tom.baldock@uq.edu.au}}\footnotemark[2]
    3839\and
    3940O.~M.~Nielsen\footnotemark[1]
    40 \and 
     41\and
    4142M.~J.~Sexton\footnotemark[1]
    4243\and
     
    8485The core of \ANUGA{} is a \Python{} implementation of a finite-volume method
    8586for solving the conservative form of the Shallow Water Wave equation.
    86 In this paper we describe the model, the architecture and a range of 
    87 validations that have been carried out to establish confidence in the model. 
     87In this paper we describe the model, the architecture and a range of
     88validations that have been carried out to establish confidence in the model.
    8889
    8990
     
    142143described in section~\ref{sec:fvm}.  A more complete discussion of the
    143144method can be found in \cite{modsim2005} where the model and solution
    144 technique is validated on a standard tsunami benchmark data set 
     145technique is validated on a standard tsunami benchmark data set
    145146or in \cite{Roberts2007} where parallelisation of ANUGA is discussed.
    146147This modelling capability is part of
     
    148149understand the potential impact from natural hazards in order to
    149150reduce their impact on Australian communities (see \cite{Nielsen2006}).
    150 \ANUGA{} is currently being trialled for flood 
     151\ANUGA{} is currently being trialled for flood
    151152modelling (see \cite{Rigby2008}).
    152153
     
    482483wave specifications. The dataset also contained water depth time
    483484series from three wave gauges situated offshore from the simulated
    484 inundation area. The \ANUGA{} model comprised $41404$ triangles 
    485 and took about $2000$ s to run on a standard PC or $1500$ s 
    486 on a 64-bit Opteron 2000 series Linux server. 
     485inundation area. The \ANUGA{} model comprised $41404$ triangles
     486and took about $2000$ s to run on a standard PC or $1500$ s
     487on a 64-bit Opteron 2000 series Linux server.
    487488
    488489Figure~\ref{fig:val} compares the observed wave tank and modelled
     
    501502This successful replication of the tsunami wave tank simulation on a
    502503complex 3D beach is a positive first step in validating the \ANUGA{}
    503 modelling capability. 
     504modelling capability.
    504505
    505506\subsection{Manning's Friction Model Validation}
    506  
     507
    507508% Validation UQ friction
    508509% at X:\anuga_validation\uq_friction_2007
     
    515516\end{figure}
    516517
    517  The bed friction is modelled in ANUGA using the Manning's 
     518 The bed friction is modelled in ANUGA using the Manning's
    518519 model. Validation of this model was carried out by comparing results
    519520 from ANUGA against experimental results from flume wave tanks. The
    520521experiments were carried out at the Gordon McKay Hydraulics Laboratory
    521522at St Lucia, University of Queensland.
    522  
    523 %The Manning's friction model is 
    524 
    525 %To validate the friction model 
     523
     524%The Manning's friction model is
     525
     526%To validate the friction model
    526527
    527528\subsection{Stage and Velocity Validation in a Flume}
     
    566567Figure~\ref{fig:uq-flume-depth} show that ANUGA predicts the actual
    567568water depth very well, with the exception of the fluid tip-region. The
    568 water velocity is also predicted accurately. 
     569water velocity is also predicted accurately.
    569570
    570571\subsection{Runup of Solitary wave on circular island wavetank validation}
Note: See TracChangeset for help on using the changeset viewer.