Changeset 5242

Timestamp:

Apr 24, 2008, 7:30:33 PM (17 years ago)

Author:

steve

Message:

 

Files:

• anuga_core/source/anuga/abstract_2d_finite_volumes/domain.py (modified) (3 diffs)
• anuga_core/source/anuga/advection/__init__.py (modified) (1 diff)
• anuga_core/source/anuga/advection/advection.py (modified) (1 diff)
• anuga_core/source/anuga/advection/test_advection.py (modified) (1 diff)
• anuga_core/source/anuga_parallel/parallel_advection.py (modified) (1 diff)
• anuga_core/source/anuga_parallel/parallel_meshes.py (modified) (2 diffs)
• anuga_core/source/anuga_parallel/print_stats.py (modified) (1 diff)
• anuga_core/source/anuga_parallel/run_parallel_advection_prof.py (modified) (1 diff)
• anuga_work/publications/anuga_2007/anuga_validation.tex (modified) (10 diffs)

anuga_core/source/anuga/abstract_2d_finite_volumes/domain.py

@@ -166 +166 @@
         # =0 for ghost
         N = len(self) #number_of_elements
+        self.number_of_elements = N
         self.tri_full_flag = ones(N, Int)
         for i in self.ghost_recv_dict.keys():
@@ -173 +174 @@
         # Test the assumption that all full triangles are store before
         # the ghost triangles.
-        assert allclose(self.tri_full_flag[:self.number_of_full_nodes],1)
+        if not allclose(self.tri_full_flag[:self.number_of_full_nodes],1):
+            print 'WARNING:  Not all full triangles are store before ghost triangles'
                         
 
@@ -1415 +1417 @@
         # Protect against degenerate timesteps arising from isolated
         # triangles
+        # FIXME (Steve): This should be in shallow_water as it assumes x and y
+        # momentum
         if self.protect_against_isolated_degenerate_timesteps is True and\
                self.max_speed > 10.0: # FIXME (Ole): Make this configurable

anuga_core/source/anuga/advection/__init__.py

@@ -2 +2 @@
 """
 
-pass
+# Add path of package to PYTHONPATH to allow C-extensions to be loaded
+import sys
+sys.path += __path__
+
+# Make selected classes available directly
+from advection import Domain,\
+    Transmissive_boundary, Dirichlet_boundary
 
 
 
-

anuga_core/source/anuga/advection/advection.py

@@ -157 +157 @@
 
         import advection_ext            
-        self.timestep = advection_ext.compute_fluxes(self, Stage, huge_timestep, max_timestep)
+        self.flux_timestep = advection_ext.compute_fluxes(self, Stage, huge_timestep, max_timestep)
 
 

anuga_core/source/anuga/advection/test_advection.py

@@ -143 +143 @@
 
 
-    def FIXME_test_advection_example(self):
+    def test_advection_example(self):
         #Test that system can evolve
 

anuga_core/source/anuga_parallel/parallel_advection.py

@@ -22 +22 @@
     pass
 
-from anuga.abstract_2d_finite_volumes.advection_vtk import *
+from anuga.advection import *
 from Numeric import zeros, Float, Int, ones, allclose, array
 import pypar

anuga_core/source/anuga_parallel/parallel_meshes.py

@@ -15 +15 @@
 
 import sys
-from Numeric import array, zeros, Float, Int
+from Numeric import array, zeros, Float, Int, ones, sum
 
 import pypar
 
 from anuga.config import epsilon
+
+
+
 
 
@@ -181 +184 @@
         ghost_recv_dict[(processor+1)%numproc] = [Idgr, Idgr]
 
+
+
+        
+    
     return  points, elements, boundary, full_send_dict, ghost_recv_dict
 

anuga_core/source/anuga_parallel/print_stats.py

@@ -50 +50 @@
         for id in ghost_recv_dict[i][0]:
             tri_full_flag[id] = 0
+        
 
     return tri_full_flag

anuga_core/source/anuga_parallel/run_parallel_advection_prof.py

@@ -76 +76 @@
                          full_send_dict, ghost_recv_dict, velocity=[1.0, 0.0])
 
-# Turn on the visualisation
-
-# rect = [0.0, 0.0, 1.0, 1.0]
-# domain.initialise_visualiser(rect=rect)
-
 # Boundaries
 

anuga_work/publications/anuga_2007/anuga_validation.tex

@@ -3 +3 @@
 \documentclass[12pt,a4paper]{article}
 
-% create a pdf of this doc by using pdflatex 
+% create a pdf of this doc by using pdflatex
 % Do \emph{not} change the width nor the height of the text from the
 % defaults set by this document class.
@@ -22 +22 @@
 \usepackage{amsfonts}
 \usepackage{underscore}
+\usepackage{epstopdf}
 % Avoid loading unused packages (as done by some \LaTeX\ editors).
 
@@ -34 +35 @@
 \textsc{Australia}. \protect\url{mailto:Duncan.Gray@ga.gov.au}}\footnotemark[1]
 \and
-T.~Baldock\thanks{University of Queensland, Brisbane, \textsc{Australia}. 
+T.~Baldock\thanks{University of Queensland, Brisbane, \textsc{Australia}.
 \protect\url{mailto:tom.baldock@uq.edu.au}}\footnotemark[2]
 \and
 O.~M.~Nielsen\footnotemark[1]
-\and 
+\and
 M.~J.~Sexton\footnotemark[1]
 \and
@@ -84 +85 @@
 The core of \ANUGA{} is a \Python{} implementation of a finite-volume method
 for solving the conservative form of the Shallow Water Wave equation.
-In this paper we describe the model, the architecture and a range of 
-validations that have been carried out to establish confidence in the model. 
+In this paper we describe the model, the architecture and a range of
+validations that have been carried out to establish confidence in the model.
 
 
@@ -142 +143 @@
 described in section~\ref{sec:fvm}.  A more complete discussion of the
 method can be found in \cite{modsim2005} where the model and solution
-technique is validated on a standard tsunami benchmark data set 
+technique is validated on a standard tsunami benchmark data set
 or in \cite{Roberts2007} where parallelisation of ANUGA is discussed.
 This modelling capability is part of
@@ -148 +149 @@
 understand the potential impact from natural hazards in order to
 reduce their impact on Australian communities (see \cite{Nielsen2006}).
-\ANUGA{} is currently being trialled for flood 
+\ANUGA{} is currently being trialled for flood
 modelling (see \cite{Rigby2008}).
 
@@ -482 +483 @@
 wave specifications. The dataset also contained water depth time
 series from three wave gauges situated offshore from the simulated
-inundation area. The \ANUGA{} model comprised $41404$ triangles 
-and took about $2000$ s to run on a standard PC or $1500$ s 
-on a 64-bit Opteron 2000 series Linux server.  
+inundation area. The \ANUGA{} model comprised $41404$ triangles
+and took about $2000$ s to run on a standard PC or $1500$ s
+on a 64-bit Opteron 2000 series Linux server.
 
 Figure~\ref{fig:val} compares the observed wave tank and modelled
@@ -501 +502 @@
 This successful replication of the tsunami wave tank simulation on a
 complex 3D beach is a positive first step in validating the \ANUGA{}
-modelling capability. 
+modelling capability.
 
 \subsection{Manning's Friction Model Validation}
- 
+
 % Validation UQ friction
 % at X:\anuga_validation\uq_friction_2007
@@ -515 +516 @@
 \end{figure}
 
- The bed friction is modelled in ANUGA using the Manning's 
+ The bed friction is modelled in ANUGA using the Manning's
  model. Validation of this model was carried out by comparing results
  from ANUGA against experimental results from flume wave tanks. The
 experiments were carried out at the Gordon McKay Hydraulics Laboratory
 at St Lucia, University of Queensland.
- 
-%The Manning's friction model is 
-
-%To validate the friction model 
+
+%The Manning's friction model is
+
+%To validate the friction model
 
 \subsection{Stage and Velocity Validation in a Flume}
@@ -566 +567 @@
 Figure~\ref{fig:uq-flume-depth} show that ANUGA predicts the actual
 water depth very well, with the exception of the fluid tip-region. The
-water velocity is also predicted accurately. 
+water velocity is also predicted accurately.
 
 \subsection{Runup of Solitary wave on circular island wavetank validation}