Manual Figures
Jeffrey Oldham
oldham at codesourcery.com
Fri Jan 25 03:05:26 UTC 2002
These are updates to the MetaPost figures for the POOMA manual.
2002-Jan-24 Jeffrey D. Oldham <oldham at codesourcery.com>
* doof2d.mp (210): Fix operator layout. Modify indices. Add
indices for lhs.
* introduction.mp (101): Add comments of unfinished work.
* macros.ltx: Add many new definitions.
* makefile: Several minor changes.
Thanks,
Jeffrey D. Oldham
oldham at codesourcery.com
-------------- next part --------------
Index: doof2d.mp
===================================================================
RCS file: /home/pooma/Repository/r2/docs/manual/figures/doof2d.mp,v
retrieving revision 1.3
diff -c -p -r1.3 doof2d.mp
*** doof2d.mp 2002/01/04 17:42:43 1.3
--- doof2d.mp 2002/01/25 02:53:47
*************** beginfig(210)
*** 127,134 ****
for t = 0 upto 2:
drawGrid(nuCells, unit, z[t]);
endfor
! label(btex = etex, z1 + unit*(-0.9operatorWidth, 0.5nuCells));
! label(btex + etex, z2 + unit*(-0.9operatorWidth, 0.5nuCells));
%% Label the grid cells' values.
% Label b(I,J) grid values.
--- 127,134 ----
for t = 0 upto 2:
drawGrid(nuCells, unit, z[t]);
endfor
! label(btex = etex, z1 + unit*(-0.6operatorWidth, 0.5nuCells));
! label(btex + etex, z2 + unit*(-0.6operatorWidth, 0.5nuCells));
%% Label the grid cells' values.
% Label b(I,J) grid values.
*************** beginfig(210)
*** 164,182 ****
%% Label the indices.
% Label b(I,J) grid indices.
! labelCellBottom(btex \footnotesize 1 etex, (0,0), z1);
! labelCellBottom(btex \footnotesize 2 etex, (1,0), z1);
! labelCellBottom(btex \footnotesize 3 etex, (2,0), z1);
! labelCellLeft(btex \footnotesize 1 etex, (0,0), z1);
! labelCellLeft(btex \footnotesize 2 etex, (0,1), z1);
! labelCellLeft(btex \footnotesize 3 etex, (0,2), z1);
% Label b(I+1,J-1) grid indices.
! labelCellBottom(btex \footnotesize 2 etex, (0,0), z2);
! labelCellBottom(btex \footnotesize 3 etex, (1,0), z2);
! labelCellBottom(btex \footnotesize 4 etex, (2,0), z2);
labelCellLeft(btex \footnotesize 0 etex, (0,0), z2);
labelCellLeft(btex \footnotesize 1 etex, (0,1), z2);
labelCellLeft(btex \footnotesize 2 etex, (0,2), z2);
%% Label the grids.
labelGrid(btex $b(I,J)+b(I+1,J-1)$ etex, nuCells, z0);
--- 164,189 ----
%% Label the indices.
% Label b(I,J) grid indices.
! labelCellBottom(btex \footnotesize 0 etex, (0,0), z1);
! labelCellBottom(btex \footnotesize 1 etex, (1,0), z1);
! labelCellBottom(btex \footnotesize 2 etex, (2,0), z1);
! labelCellLeft(btex \footnotesize 0 etex, (0,0), z1);
! labelCellLeft(btex \footnotesize 1 etex, (0,1), z1);
! labelCellLeft(btex \footnotesize 2 etex, (0,2), z1);
% Label b(I+1,J-1) grid indices.
! labelCellBottom(btex \footnotesize 0 etex, (0,0), z2);
! labelCellBottom(btex \footnotesize 1 etex, (1,0), z2);
! labelCellBottom(btex \footnotesize 2 etex, (2,0), z2);
labelCellLeft(btex \footnotesize 0 etex, (0,0), z2);
labelCellLeft(btex \footnotesize 1 etex, (0,1), z2);
labelCellLeft(btex \footnotesize 2 etex, (0,2), z2);
+ % Label b(I,J)+b(I+1,J-1) grid indices.
+ labelCellBottom(btex \footnotesize 0 etex, (0,0), z0);
+ labelCellBottom(btex \footnotesize 1 etex, (1,0), z0);
+ labelCellBottom(btex \footnotesize 2 etex, (2,0), z0);
+ labelCellLeft(btex \footnotesize 0 etex, (0,0), z0);
+ labelCellLeft(btex \footnotesize 1 etex, (0,1), z0);
+ labelCellLeft(btex \footnotesize 2 etex, (0,2), z0);
%% Label the grids.
labelGrid(btex $b(I,J)+b(I+1,J-1)$ etex, nuCells, z0);
Index: introduction.mp
===================================================================
RCS file: /home/pooma/Repository/r2/docs/manual/figures/introduction.mp,v
retrieving revision 1.2
diff -c -p -r1.2 introduction.mp
*** introduction.mp 2002/01/04 17:42:43 1.2
--- introduction.mp 2002/01/25 02:53:47
*************** etex
*** 18,23 ****
--- 18,26 ----
%% Relationship between science, computational science, and Pooma.
beginfig(101)
+ %% FIXME: Ensure the arrow labels are the same distance above the arrows.
+ %% FIXME: Ensure the boxes all have the same height.
+ %% FIXME: Ensure the arrowheads do not collide.
numeric unit; unit = 0.8cm;
numeric horizSpace; horizSpace = 8unit;
numeric vertSpace; vertSpace = unit;
Index: macros.ltx
===================================================================
RCS file: /home/pooma/Repository/r2/docs/manual/figures/macros.ltx,v
retrieving revision 1.1
diff -c -p -r1.1 macros.ltx
*** macros.ltx 2001/12/11 20:36:13 1.1
--- macros.ltx 2002/01/25 02:53:47
***************
*** 6,11 ****
--- 6,34 ----
%% Consistency between these macros and the DocBook/Jade output is desired.
+ % Mathematical Notation
+ \newcommand{\dimension}{\ensuremath{d}}%
+ % Produce a representation for a fixed number of dimensions.
+ % Requires no parameters.
+ \newcommand{\naturalNus}{\ensuremath{\boldsymbol{N}}}%
+ % Produce a representation for discrete space.
+ % Requires no parameters.
+ \newcommand{\maps}{\ensuremath{\rightarrow}}%
+ % Produce a representation for a map.
+ % Requires no parameters.
+ \newcommand{\real}{\ensuremath{\boldsymbol{R}}}%
+ % Produce a representation for continuous space.
+ % Requires no parameters.
+
+ % Other Notation
+ \newcommand{\pooma}{POOMA}%
+ % Produce "Pooma."
+ % Requires no parameters.
+
+ % Programming Notation
+ \newcommand{\statement}[1]{\texttt{#1}}%
+ % Produce a C++ (or other programming language) statement or fragment.
+ % Requires: 1. the statement.
\newcommand{\type}[1]{\texttt{#1}}%
% Produce a C++ (or other programming language) type.
% Requires: 1. the type's name.
Index: makefile
===================================================================
RCS file: /home/pooma/Repository/r2/docs/manual/figures/makefile,v
retrieving revision 1.1
diff -c -p -r1.1 makefile
*** makefile 2001/12/04 00:07:00 1.1
--- makefile 2002/01/25 02:53:47
*************** INDEXOPTIONS= -t 'Index' -i 'index' -g
*** 23,30 ****
CXXFLAGS= -g -Wall -pedantic -W -Wstrict-prototypes -Wpointer-arith -Wbad-function-cast -Wcast-align -Wconversion -Wnested-externs -Wundef -Winline -static
! all: outline.ps
%.all: %.ps %.pdf %.html
chmod 644 $*.ps $*.pdf
mv $*.ps $*.pdf $*
--- 23,34 ----
CXXFLAGS= -g -Wall -pedantic -W -Wstrict-prototypes -Wpointer-arith -Wbad-function-cast -Wcast-align -Wconversion -Wnested-externs -Wundef -Winline -static
! all: manual.ps
+ manual.dvi: manual.xml introduction.xml template.xml tutorial.xml \
+ concepts.xml arrays.xml data-parallel.xml glossary.xml \
+ bibliography.xml
+
%.all: %.ps %.pdf %.html
chmod 644 $*.ps $*.pdf
mv $*.ps $*.pdf $*
*************** all: outline.ps
*** 41,54 ****
%.pdf.ltx: %.ltx
sed -e 's/^%\\usepackage{times}/\\usepackage{times}/' $< > $@
! %.pdf: %.pdf.ps
! ps2pdf $< $@
# This rule assumes index creation.
%.dvi: %.xml genindex.sgm
! jade -D$(JADEDIR) -t sgml -d $(HTMLDOCBOOKDSL) -V html-index $(XML) $<
! perl collateindex.pl $(INDEXOPTIONS) -o genindex.sgm HTML.index
! jade -D$(JADEDIR) -t tex -d $(PRINTDOCBOOKDSL) $(XML) $< && jadetex $*.tex && jadetex $*.tex && jadetex $*.tex
genindex.sgm:
perl collateindex.pl $(INDEXOPTIONS) -N -o $@
--- 45,59 ----
%.pdf.ltx: %.ltx
sed -e 's/^%\\usepackage{times}/\\usepackage{times}/' $< > $@
! %.pdf: %.pdf.ltx
! pdflatex $<
! mv $@.pdf $@
# This rule assumes index creation.
%.dvi: %.xml genindex.sgm
! jade -D$(JADEDIR) -t sgml -d $(HTMLDOCBOOKDSL) -V html-index $(XML) $< && \
! perl collateindex.pl $(INDEXOPTIONS) -o genindex.sgm HTML.index && \
! jade -D$(JADEDIR) -t tex -d $(PRINTDOCBOOKDSL) -V tex-backend $(XML) $< && jadetex $*.tex && jadetex $*.tex && jadetex $*.tex
genindex.sgm:
perl collateindex.pl $(INDEXOPTIONS) -N -o $@
*************** mproof-%.ps: %.mp
*** 66,69 ****
detex $< > $@
clean:
! rm -f *.dvi *.aux *.log *.toc *.bak *.blg *.bbl *.glo *.idx *.lof *.lot *.htm *.mpx mpxerr.tex HTML.index outline.tex
--- 71,74 ----
detex $< > $@
clean:
! rm -f *.dvi *.aux *.log *.toc *.bak *.blg *.bbl *.glo *.idx *.lof *.lot *.htm *.mpx mpxerr.tex HTML.index manual.tex genindex.sgm
More information about the pooma-dev
mailing list