Changeset 8552

Timestamp:

Sep 3, 2012, 8:29:56 PM (12 years ago)

Author:

steve

Message:

Sped up neighbour_mesh

Location:

trunk/anuga_core

Files:

• source/anuga/abstract_2d_finite_volumes/neighbour_mesh.py (modified) (1 diff)
• validation_tests/Tests/Benchmarks/Okushiri/compare_timeseries_with_measures.py (modified) (1 diff)
• validation_tests/Tests/Benchmarks/Okushiri/results.tex (modified) (3 diffs)
• validation_tests/Tests/Simple/steep_slope/results.tex (modified) (3 diffs)
• validation_tests/readme.txt (modified) (1 diff)
• validation_tests/report.tex (modified) (1 diff)

trunk/anuga_core/source/anuga/abstract_2d_finite_volumes/neighbour_mesh.py

@@ -333 +333 @@
 
         N = len(self) #Number of triangles
-        for i in xrange(N):
-            #Find all neighbouring volumes that are not boundaries
-            for k in xrange(3):
-                if self.neighbours[i, k] < 0:
-                    self.surrogate_neighbours[i, k] = i #Point this triangle
-                else:
-                    self.surrogate_neighbours[i, k] = self.neighbours[i, k]
+#        for i in xrange(N):
+#            #Find all neighbouring volumes that are not boundaries
+#            for k in xrange(3):
+#                if self.neighbours[i, k] < 0:
+#                    self.surrogate_neighbours[i, k] = i #Point this triangle
+#                else:
+#                    self.surrogate_neighbours[i, k] = self.neighbours[i, k]
+
+        tmp_range = num.arange(N)
+        for k in xrange(3):
+            self.surrogate_neighbours[:,k] = \
+              num.where(self.neighbours[:,k]<0, tmp_range, self.neighbours[:, k])
 
 

trunk/anuga_core/validation_tests/Tests/Benchmarks/Okushiri/compare_timeseries_with_measures.py

@@ -223 +223 @@
         ylabel('stage (m)')    
         legend(('Observed', 'Modelled'), shadow=True, loc='upper left')
-        savefig(name, dpi = 300)        
+        #savefig(name, dpi = 300)
+        savefig(name)
 
 

trunk/anuga_core/validation_tests/Tests/Benchmarks/Okushiri/results.tex

@@ -30 +30 @@
 \begin{center}
 \includegraphics[width=0.9\textwidth]{Boundary.png}
+\end{center}
 \caption{Stage at boundary gauge}
 \label{okushiri:boundary}
-\end{center}
 \end{figure}
+
+
 
 \begin{figure}[h]
 \begin{center}
 \includegraphics[width=0.9\textwidth]{ch5.png}
+\end{center}
 \caption{Stage at gauge station 5}
 \label{okushiri:ch:five}
-\end{center}
 \end{figure}
 
@@ -46 +48 @@
 \begin{center}
 \includegraphics[width=0.9\textwidth]{ch7.png}
+\end{center}
 \caption{Stage at at gauge station 7}
 \label{okushiri:ch_seven}
-\end{center}
 \end{figure}
 
@@ -54 +56 @@
 \begin{center}
 \includegraphics[width=0.9\textwidth]{ch9.png}
+\end{center}
 \caption{Stage at at gauge station 9}
 \label{okushiri:ch_nine}
-\end{center}
 \end{figure}
 

trunk/anuga_core/validation_tests/Tests/Simple/steep_slope/results.tex

@@ -7 +7 @@
 \begin{figure}[h]
 \begin{center}
-\includegraphics[width=0.9\textwidth]{final_depth_v2.png}
+\includegraphics[width=0.8\textwidth]{final_depth_v2.png}
 \caption{Depth in the downstream direction}
 \label{depthdownchan}
@@ -17 +17 @@
 \begin{figure}[h]
 \begin{center}
-\includegraphics[width=0.9\textwidth]{x_velocity_v2.png}
+\includegraphics[width=0.8\textwidth]{x_velocity_v2.png}
 \caption{x-velocity along the cross-section x=50 (i.e. a cross-section with constant bed elevation)}
 \label{xvelscrosschan}
@@ -25 +25 @@
 \begin{figure}[h]
 \begin{center}
-\includegraphics[width=0.9\textwidth]{y_velocity_v2.png}
+\includegraphics[width=0.8\textwidth]{y_velocity_v2.png}
 \caption{y-velocity along the cross-section x=50 (i.e. a cross-section with constant bed elevation)}
 \label{yvelscroschan}

trunk/anuga_core/validation_tests/readme.txt

@@ -10 +10 @@
 to the parameters.py file. THis would usually mean changing the flow_algorithm 
 parameter.
+
+You need to add the directory containing validation_tests to your PYTHONPATH
+
+Ie
+
+export PYTHONPATH=/home/steve/anuga_core:$PYTHONPATH

trunk/anuga_core/validation_tests/report.tex

@@ -81 +81 @@
 
 
-\section{Specifiying different algorithm}
-One  way to allow the system to run with different algorithms is to 
-add the following
-into your run routines.
+\section{Algorithm Parameters}
+Parameters can be communicated from the \verb|parameters.py|
+file in the \verb|validation_tests| directory.
+
+In particular the
+values of \verb|alg| (flow algorithm) and \verb|cfl| (CFL Condition)
+are passed as command options when calling \verb|produce_results.py| in the
+test directories.
+
+You can pass though the parameters straight from the \verb|parameters.py| file as follows
 \begin{verbatim}
-#--------------------------------
-# Setup Default values for basic
-# algorithm parameters.
-#--------------------------------
-import argparse
-parser = argparse.ArgumentParser(description='produce results')
-parser.add_argument('-cfl', type=float, default=1.0,
-                   help='cfl condition')
-parser.add_argument('-alg', type=str, default = "1_5",
-                   help='flow algorithm')
-args = parser.parse_args()
-
-cfl = args.cfl
-alg = args.alg
+from validation_tests.parameters import alg
+from validation_tests.parameters import cfl
 \end{verbatim}
 
-Then in the \texttt{produce\_results.py} you can 
+\section{Generic form of \texttt{produce\_results.py}}
+
+The \texttt{produce\_results.py} files in the test directories should have the
+following general form
+
+\begin{verbatim}
+from fabricate import *
+from validation_tests.utilities import run_validation_script
+
+# Setup the python scripts which produce the output for this
+# validation test
+def build():
+    run_validation_script('run_problem.py')
+    run_validation_script('plot_problem.py')
+    pass
+
+def clean():
+    autoclean()
+
+main()
+\end{verbatim}
+This script uses \texttt{fabricate} which automatically determines dependences
+and only runs the command if the parameters alg and cfl have changed,
+or input/output or source files have changed. (\texttt{fabricate} is a replacement for
+standard \texttt{make})
+
 
 \end{document}