Update links to plot_image.py.

diff --git a/assignments/archive/poisson/index.shtml.itex2MML b/assignments/archive/poisson/index.shtml.itex2MML
index 650b2b5557a2e6b4abf82ffea8be7360eadf6b9e..199768649febd9980f8d14ee236d8eaace9f48ac 100644 (file)
--- a/assignments/archive/poisson/index.shtml.itex2MML
+++ b/assignments/archive/poisson/index.shtml.itex2MML
@@ -41,7 +41,7 @@ with specified boundary conditions and source term $S(x,y)$.</p>
     (<a href="../../../content/domain_decomposition/src/poisson_1d/poisson_1d.tar.gz">poisson_1d.tar.gz</a>)
     codes as guides.</li>
   <li>Use MPE or a pipe in the Python graphic code
-    (<a href="../../../programming_strategies/src/plot_image.py">plot_image.py</a>)
+    (<a href="../../../src/plot_image/plot_image.py">plot_image.py</a>)
     to display the solution.</li>
   <li>Compare your solution (map image of $u(x,y)$) to the serial code
     solution as a rough check of the code.</li>

diff --git a/content/2D_Domain_Decomposition/index.shtml.itex2MML b/content/2D_Domain_Decomposition/index.shtml.itex2MML
index 5bf3ddb0d4972b4c7426a8d48c6cde1be3e61acf..5094a33303727226742df071e525c6b67f8860e9 100644 (file)
--- a/content/2D_Domain_Decomposition/index.shtml.itex2MML
+++ b/content/2D_Domain_Decomposition/index.shtml.itex2MML
@@ -94,16 +94,16 @@ implements the above scheme. The steps in the code are:</p>
 
 <pre>
 gcc poisson_2d.c -lm -o poisson_2d
-./poisson_2d N Nx Ny | ./plot_image.py -s Nx Ny -t "2d Poisson"
+./poisson_2d N Nx Ny | ./plot_image.py -s Nx,Ny -t "2d Poisson"
 </pre>
 
 <p>where <code>N</code>, <code>Nx</code> and <code>Ny</code> are the
 (arbitrary) maximum number of iterations and number of grid points
 (image size) respectively. Good numbers to use could be 10000, 300,
-300.  We
-introduced <a href="../programming_strategies/src/plot_image.py">plot_image.py</a>
-in <a href="../programming_strategies/#CI">Programming Strategies:
-Color Images</a>.</p>
+300.  We introduced <a
+href="../../src/plot_image/plot_image.py">plot_image.py</a> in <a
+href="../programming_strategies/#CI">Programming Strategies: Color
+Images</a>.</p>
 
 <p>The code stops once good convergence (parameter <code>EPS</code>)
 is obtained.</p>
@@ -115,7 +115,7 @@ is obtained.</p>
     <i>Numerical Receipes</i> for an optimum choice).</li>
   <li>The code is written in the simplest possible way.</li>
   <li>The code outputs the field values to pipe
-    into <a href="../programming_strategies/src/plot_image.py">plot_image.py</a>
+    into <a href="../../src/plot_image/plot_image.py">plot_image.py</a>
     for field display.</li>
 </ul>
 

diff --git a/content/game_of_life/index.shtml b/content/game_of_life/index.shtml
index 1f88f49965fd18338106bc475537c1d6325ccdd5..9158aadcad15ee486c50bfca12944e54ca929a77 100644 (file)
--- a/content/game_of_life/index.shtml
+++ b/content/game_of_life/index.shtml
@@ -77,10 +77,10 @@ universe. Each one of these generations defines an image, or a frame,
 from which we can generate a movie.</p>
 
 <p>The Python
-program <a href="src/display_frames_GTK.py">display_frames_GTK.py</a>
+program <a href="../../src/game_of_life/display_frames_GTK.py">display_frames_GTK.py</a>
 accepts the image content for each frame in the movie. It uses the
 same notation for each frame as that of the previously
-used <a href="../programming_strategies/src/plot_image.py">plot_image.py</a>
+used <a href="../../src/plot_image/plot_image.py">plot_image.py</a>
 for single image. It loops over the frames until the end of stream, at
 which point it crashes. The syntax to display the <em>Game of
 Life</em> above is:</p>

diff --git a/content/programming_strategies/index.shtml.itex2MML b/content/programming_strategies/index.shtml.itex2MML
index 3f7b4ebe085967c6aa6e0ee272dba6523d050a98..622f099650e91127ea717bbc2522df120b316aa9 100644 (file)
--- a/content/programming_strategies/index.shtml.itex2MML
+++ b/content/programming_strategies/index.shtml.itex2MML
@@ -193,10 +193,11 @@ must translate the function range to a <em>color palette</em>
 range. For our purpose, this tool must read in a 2-dimensional array
 containing the values of $f(x,y)$ on a 2-dimensional lattice and
 produce the color image. The Python script <a
-href="../../src/plot_image.py">plot_image.py</a> does precisely this. It is
-based on <a href="http://matplotlib.sourceforge.net/">matplotlib</a>
-(the tutorials, user's guide and examples found in the matplotlib site
-are easier to read with some previous knowledge of <a
+href="../../src/plot_image/plot_image.py">plot_image.py</a> does
+precisely this. It is based on <a
+href="http://matplotlib.sourceforge.net/">matplotlib</a> (the
+tutorials, user's guide and examples found in the matplotlib site are
+easier to read with some previous knowledge of <a
 href="http://www.python.org/">Python</a> and <a
 href="http://numpy.scipy.org/">Numerical Python</a>).</p>
 

diff --git a/src/poisson_2d/P_2d.c b/src/poisson_2d/P_2d.c
index d885818700811c3a4cd81ecff5a06c66d0bc0104..e16928b233180e2d847a7557e93949dc27461b16 100644 (file)
--- a/src/poisson_2d/P_2d.c
+++ b/src/poisson_2d/P_2d.c
@@ -16,7 +16,7 @@
 
 gcc poisson_2d.c -lm -o  poisson_2d
 
-./poisson_2d  N  N_x  N_y | plot_image.py -s N_x N_y -t "2d Poisson"
+./poisson_2d  N  N_x  N_y | plot_image.py -s N_x,N_y -t "2d Poisson"
 
 */
 

diff --git a/src/poisson_2d/poisson_2d.c b/src/poisson_2d/poisson_2d.c
index d885818700811c3a4cd81ecff5a06c66d0bc0104..e16928b233180e2d847a7557e93949dc27461b16 100644 (file)
--- a/src/poisson_2d/poisson_2d.c
+++ b/src/poisson_2d/poisson_2d.c
@@ -16,7 +16,7 @@
 
 gcc poisson_2d.c -lm -o  poisson_2d
 
-./poisson_2d  N  N_x  N_y | plot_image.py -s N_x N_y -t "2d Poisson"
+./poisson_2d  N  N_x  N_y | plot_image.py -s N_x,N_y -t "2d Poisson"
 
 */