updates

Author: sveinlin

doc/.src/chapters/softeng2/softeng2.do.txt

@@ -1128,20 +1128,19 @@ The C version of our function `advance` can be coded as follows.
 
 idx{`wave2D_u0_loop_c.c`} idx{`wave2D_u0_loop_c.h`}
 
-All the code above appears in a file "`wave2D_u0_loop_c.c`":
-"${src_wave}//wave2D_u0/wave2D_u0_loop_c.c".
+All the code above appears in the file
+"`wave2D_u0_loop_c.c`": "${src_softeng2}/wave2D_u0_loop_c.c".
 We need to compile this file together with C wrapper code such that
 `advance` can be called from Python. Cython can be used to generate
 appropriate wrapper code.
 The relevant Cython code for interfacing C is
-placed in a file with extension `.pyx`. Here this file, called
-"`wave2D_u0_loop_c_cy.pyx`":
-"${src_wave}/wave2D_u0/wave2D_u0_loop_c_cy.pyx", looks like
+placed in a file with extension `.pyx`. This file, called
+"`wave2D_u0_loop_c_cy.pyx`": "${src_softeng2}/wave2D_u0_loop_c_cy.pyx", looks like
 
 @@@CODE src-softeng2/wave2D_u0_loop_c_cy.pyx
 We first declare the C functions to be interfaced.
-These must also appear in a C header file, "`wave2D_u0_loop_c.h`":
-"${src_wave}/wave2D_u0/wave2D_u0_loop_c.h",
+These must also appear in a C header file,
+"`wave2D_u0_loop_c.h`": "${src_softeng2}/wave2D_u0_loop_c.h",
 
 @@@CODE src-softeng2/wave2D_u0_loop_c.h
 The next step is to write a Cython function with Python objects as arguments.

doc/.src/chapters/wave/wave1D_fd2.do.txt

@@ -4,9 +4,9 @@ label{wave:pde2:Neumann}
 The boundary condition $u=0$ in a wave equation reflects the wave, but
 $u$ changes sign at the boundary, while the condition $u_x=0$ reflects
 the wave as a mirror and preserves the sign, see a "web page":
-"${doc_notes}/pub/wave/html/mov-wave/demo_BC_gaussian/index.html" or a
+"${doc_notes}/mov-wave/demo_BC_gaussian/index.html" or a
 "movie file":
-"${doc_notes}/pub/wave/html/mov-wave/demo_BC_gaussian/movie.flv" for
+"${docraw}/mov-wave/demo_BC_gaussian/movie.flv" for
 demonstration.
 
 # #ifdef EXTRA
@@ -158,9 +158,9 @@ The modification of the scheme at the boundary is also required for
 the special formula for the first time step. How the stencil moves
 through the mesh and is modified at the boundary can be illustrated by
 an animation in a "web page":
-"${doc_notes}/pub/wave/html/mov-wave/N_stencil_gpl/index.html"
+"${doc_notes}/mov-wave/N_stencil_gpl/index.html"
 or a "movie file":
-"${doc_notes}/pub/wave/html/mov-wave/N_stencil_gpl/movie.ogg".
+"${docraw}/mov-wave/N_stencil_gpl/movie.ogg".
 
 
 

doc/.src/chapters/wave/wave1D_prog.do.txt

@@ -373,7 +373,7 @@ calling `viz` in this application goes as follows:
 The associated program has the name "`wave1D_u0.py`":
 "${src_wave}/wave1D/wave1D_u0.py". Run
 the program and watch the "movie of the vibrating string":
-"${doc_notes}/pub/wave/html/mov-wave/guitar_C0.8/movie.html".
+"${doc_notes}/mov-wave/guitar_C0.8/movie.html".
 The string should ideally consist of straight segments, but these are
 somewhat wavy due to numerical approximation. Run the case with the
 `wave1D_u0.py` code and $C=1$ to see the exact solution.

doc/pub/book/pdf/fdm-book-4print.pdf

@@ -0,0 +1,3 @@
+extern void advance(double* u, double* u_n, double* u_nm1, double* f,
+		    double Cx2, double Cy2, double dt2,
+		    int Nx, int Ny);