Changeset 1178
- Timestamp:
- 09/02/18 09:22:33 (3 years ago)
- Location:
- CMIP6dreqbuild/trunk/src/framework
- Files:
-
- 10 edited
-
budgets.xls (modified) (previous)
-
tex/reservoirs.aux (modified) (1 diff)
-
tex/reservoirs.log (modified) (8 diffs)
-
tex/reservoirs.out (modified) (1 diff)
-
tex/reservoirs.pdf (modified) (previous)
-
tex/reservoirs.tex (modified) (1 diff)
-
tex/reservoirs3.log (modified) (5 diffs)
-
tex/reservoirs3.pdf (modified) (previous)
-
tex/reservoirs3.tex (modified) (2 diffs)
-
tikz.py (modified) (6 diffs)
Legend:
- Unmodified
- Added
- Removed
-
CMIP6dreqbuild/trunk/src/framework/tex/reservoirs.aux
r1174 r1178 18 18 \providecommand\HyField@AuxAddToCoFields[2]{} 19 19 \@writefile{toc}{\contentsline {section}{\numberline {1}Land Nitrogen Budget}{1}{section.1}} 20 \@writefile{toc}{\contentsline {section}{\numberline {2}Ice-Sheet Water Budget}{1}{section.2}} 21 \@writefile{toc}{\contentsline {section}{\numberline {3}Land Water Budget}{1}{section.3}} 22 \@writefile{toc}{\contentsline {section}{\numberline {4}Sea-Ice Water Budget}{2}{section.4}} 23 \@writefile{lof}{\contentsline {figure}{\numberline {1}{\ignorespaces Land Nitrogen Budget}}{3}{figure.1}} 24 \@writefile{lof}{\contentsline {figure}{\numberline {2}{\ignorespaces Fluxes of water in the land-ice realm.}}{4}{figure.2}} 25 \@writefile{lof}{\contentsline {figure}{\numberline {3}{\ignorespaces Land water budget}}{5}{figure.3}} 26 \@writefile{lof}{\contentsline {figure}{\numberline {4}{\ignorespaces Fluxes of water in the sea-ice realm.}}{6}{figure.4}} 20 \@writefile{lof}{\contentsline {figure}{\numberline {1}{\ignorespaces Land Nitrogen Budget}}{1}{figure.1}} 21 \@writefile{toc}{\contentsline {section}{\numberline {2}Sea-Ice Water Budget}{2}{section.2}} 22 \@writefile{lof}{\contentsline {figure}{\numberline {2}{\ignorespaces Fluxes of water in the sea-ice realm.}}{3}{figure.2}} -
CMIP6dreqbuild/trunk/src/framework/tex/reservoirs.log
r1174 r1178 1 This is pdfTeX, Version 3.14159265-2.6-1.40.16 (TeX Live 2015/Debian) (preloaded format=pdflatex 2017. 8.23) 8 FEB 2018 14:071 This is pdfTeX, Version 3.14159265-2.6-1.40.16 (TeX Live 2015/Debian) (preloaded format=pdflatex 2017.10.12) 9 FEB 2018 09:20 2 2 entering extended mode 3 3 restricted \write18 enabled. … … 555 555 File: tikzlibrarypositioning.code.tex 2008/10/06 v3.0.1a (rcs-revision 1.7) 556 556 ) 557 (/usr/share/texlive/texmf-dist/tex/generic/pgf/frontendlayer/tikz/libraries/tik 558 zlibrarybackgrounds.code.tex 559 File: tikzlibrarybackgrounds.code.tex 2013/07/18 v3.0.1a (rcs-revision 1.3) 560 \pgf@layerbox@background=\box57 561 \pgf@layerboxsaved@background=\box58 562 ) (./tikzlibrarypositioning-plus.code.tex 563 (/usr/share/texlive/texmf-dist/tex/generic/pgf/frontendlayer/tikz/libraries/tik 564 zlibraryfit.code.tex 565 File: tikzlibraryfit.code.tex 2013/07/12 v3.0.1a (rcs-revision 1.5) 566 )) (./tikzlibrarynode-families.code.tex) 557 567 558 568 LaTeX Warning: Unused global option(s): … … 562 572 \openout1 = `reservoirs.aux'. 563 573 564 LaTeX Font Info: Checking defaults for OML/cmm/m/it on input line 16.565 LaTeX Font Info: ... okay on input line 16.566 LaTeX Font Info: Checking defaults for T1/cmr/m/n on input line 16.567 LaTeX Font Info: ... okay on input line 16.568 LaTeX Font Info: Checking defaults for OT1/cmr/m/n on input line 16.569 LaTeX Font Info: ... okay on input line 16.570 LaTeX Font Info: Checking defaults for OMS/cmsy/m/n on input line 16.571 LaTeX Font Info: ... okay on input line 16.572 LaTeX Font Info: Checking defaults for OMX/cmex/m/n on input line 16.573 LaTeX Font Info: ... okay on input line 16.574 LaTeX Font Info: Checking defaults for U/cmr/m/n on input line 16.575 LaTeX Font Info: ... okay on input line 16.576 LaTeX Font Info: Checking defaults for PD1/pdf/m/n on input line 16.577 LaTeX Font Info: ... okay on input line 16.574 LaTeX Font Info: Checking defaults for OML/cmm/m/it on input line 31. 575 LaTeX Font Info: ... okay on input line 31. 576 LaTeX Font Info: Checking defaults for T1/cmr/m/n on input line 31. 577 LaTeX Font Info: ... okay on input line 31. 578 LaTeX Font Info: Checking defaults for OT1/cmr/m/n on input line 31. 579 LaTeX Font Info: ... okay on input line 31. 580 LaTeX Font Info: Checking defaults for OMS/cmsy/m/n on input line 31. 581 LaTeX Font Info: ... okay on input line 31. 582 LaTeX Font Info: Checking defaults for OMX/cmex/m/n on input line 31. 583 LaTeX Font Info: ... okay on input line 31. 584 LaTeX Font Info: Checking defaults for U/cmr/m/n on input line 31. 585 LaTeX Font Info: ... okay on input line 31. 586 LaTeX Font Info: Checking defaults for PD1/pdf/m/n on input line 31. 587 LaTeX Font Info: ... okay on input line 31. 578 588 ABD: EveryShipout initializing macros 579 589 (/usr/share/texlive/texmf-dist/tex/context/base/supp-pdf.mkii … … 581 591 \scratchcounter=\count117 582 592 \scratchdimen=\dimen156 583 \scratchbox=\box5 7593 \scratchbox=\box59 584 594 \nofMPsegments=\count118 585 595 \nofMParguments=\count119 … … 605 615 e 606 616 )) 607 \AtBeginShipoutBox=\box 58608 Package hyperref Info: Link coloring OFF on input line 16.617 \AtBeginShipoutBox=\box60 618 Package hyperref Info: Link coloring OFF on input line 31. 609 619 610 620 (/usr/share/texlive/texmf-dist/tex/latex/hyperref/nameref.sty … … 616 626 \c@section@level=\count123 617 627 ) 618 LaTeX Info: Redefining \ref on input line 16.619 LaTeX Info: Redefining \pageref on input line 16.620 LaTeX Info: Redefining \nameref on input line 16.628 LaTeX Info: Redefining \ref on input line 31. 629 LaTeX Info: Redefining \pageref on input line 31. 630 LaTeX Info: Redefining \nameref on input line 31. 621 631 622 632 (./reservoirs.out) (./reservoirs.out) … … 624 634 \openout4 = `reservoirs.out'. 625 635 636 \pgf@layerbox@child=\box61 637 \pgf@layerboxsaved@child=\box62 638 \pgf@layerbox@parent=\box63 639 \pgf@layerboxsaved@parent=\box64 640 \pgf@layerbox@grandp=\box65 641 \pgf@layerboxsaved@grandp=\box66 626 642 (./pic1g.itex 627 Overfull \hbox (82.59125pt too wide) in paragraph at lines 47--48 643 Missing character: There is no c in font nullfont! 644 Missing character: There is no h in font nullfont! 645 Missing character: There is no i in font nullfont! 646 Missing character: There is no l in font nullfont! 647 Missing character: There is no d in font nullfont! 648 Missing character: There is no p in font nullfont! 649 Missing character: There is no a in font nullfont! 650 Missing character: There is no r in font nullfont! 651 Missing character: There is no e in font nullfont! 652 Missing character: There is no n in font nullfont! 653 Missing character: There is no t in font nullfont! 654 Missing character: There is no c in font nullfont! 655 Missing character: There is no h in font nullfont! 656 Missing character: There is no i in font nullfont! 657 Missing character: There is no l in font nullfont! 658 Missing character: There is no d in font nullfont! 659 660 Overfull \hbox (56.61806pt too wide) in paragraph at lines 49--50 628 661 [][] 629 662 [] 630 663 631 632 LaTeX Warning: Float too large for page by 207.39807pt on input line 49. 633 634 635 LaTeX Warning: `h' float specifier changed to `ht'. 636 637 LaTeX Font Info: Try loading font information for OMS+aer on input line 54. 638 (/usr/share/texmf/tex/latex/R/tex/latex/omsaer.fd 664 LaTeX Font Info: Try loading font information for OMS+aer on input line 56. 665 (/usr/share/texlive/texmf-dist/tex/latex/ae/omsaer.fd 639 666 File: omsaer.fd 1999/12/27 640 667 ) 641 668 LaTeX Font Info: Font shape `OMS/aer/m/n' in size <10> not available 642 (Font) Font shape `OMS/cmsy/m/n' tried instead on input line 54. 643 644 Overfull \hbox (182.17583pt too wide) in paragraph at lines 113--114 669 (Font) Font shape `OMS/cmsy/m/n' tried instead on input line 56. 670 [1 671 672 {/var/lib/texmf/fonts/map/pdftex/updmap/pdftex.map}] 673 Missing character: There is no c in font nullfont! 674 Missing character: There is no h in font nullfont! 675 Missing character: There is no i in font nullfont! 676 Missing character: There is no l in font nullfont! 677 Missing character: There is no d in font nullfont! 678 Missing character: There is no c in font nullfont! 679 Missing character: There is no h in font nullfont! 680 Missing character: There is no i in font nullfont! 681 Missing character: There is no l in font nullfont! 682 Missing character: There is no d in font nullfont! 683 684 Overfull \hbox (25.67244pt too wide) in paragraph at lines 114--115 645 685 [][] 646 686 [] … … 649 689 LaTeX Warning: `h' float specifier changed to `ht'. 650 690 651 652 Overfull \hbox (125.27034pt too wide) in paragraph at lines 168--169653 [][]654 []655 656 657 LaTeX Warning: `h' float specifier changed to `ht'.658 659 [1660 661 {/var/lib/texmf/fonts/map/pdftex/updmap/pdftex.map}]662 Overfull \hbox (25.67244pt too wide) in paragraph at lines 225--226663 [][]664 []665 666 667 LaTeX Warning: `h' float specifier changed to `ht'.668 669 691 ) [2] 670 Package atveryend Info: Empty hook `BeforeClearDocument' on input line 27.671 [3] [4] [5] [6]672 Package atveryend Info: Empty hook `AfterLastShipout' on input line 27.692 Package atveryend Info: Empty hook `BeforeClearDocument' on input line 48. 693 [3] 694 Package atveryend Info: Empty hook `AfterLastShipout' on input line 48. 673 695 (./reservoirs.aux) 674 Package atveryend Info: Executing hook `AtVeryEndDocument' on input line 27.675 Package atveryend Info: Executing hook `AtEndAfterFileList' on input line 27.696 Package atveryend Info: Executing hook `AtVeryEndDocument' on input line 48. 697 Package atveryend Info: Executing hook `AtEndAfterFileList' on input line 48. 676 698 Package rerunfilecheck Info: File `reservoirs.out' has not changed. 677 (rerunfilecheck) Checksum: 49AEEAB821456A39BB0EA8CC8DEEAB79;219.678 Package atveryend Info: Empty hook `AtVeryVeryEnd' on input line 27.699 (rerunfilecheck) Checksum: 7DDA68BE0C2810CAD52E19B611EEAD23;110. 700 Package atveryend Info: Empty hook `AtVeryVeryEnd' on input line 48. 679 701 ) 680 702 Here is how much of TeX's memory you used: 681 18 048strings out of 493029682 3 67846 string characters out of 6136234683 508088words of memory out of 5000000684 21 268 multiletter control sequences out of 15000+600000703 18122 strings out of 493029 704 372159 string characters out of 6136233 705 461449 words of memory out of 5000000 706 21338 multiletter control sequences out of 15000+600000 685 707 13576 words of font info for 30 fonts, out of 8000000 for 9000 686 708 1141 hyphenation exceptions out of 8191 687 55i,1 0n,67p,412b,961s stack positions out of 5000i,500n,10000p,200000b,80000s709 55i,11n,67p,412b,1000s stack positions out of 5000i,500n,10000p,200000b,80000s 688 710 </usr/share/texlive/texmf-dist/fonts/type1/public/amsfonts/cm/cmbx10.pfb></us 689 711 r/share/texlive/texmf-dist/fonts/type1/public/amsfonts/cm/cmbx12.pfb></usr/shar 690 712 e/texlive/texmf-dist/fonts/type1/public/amsfonts/cm/cmr10.pfb></usr/share/texli 691 713 ve/texmf-dist/fonts/type1/public/amsfonts/cm/cmsy10.pfb> 692 Output written on reservoirs.pdf ( 6 pages, 74398bytes).714 Output written on reservoirs.pdf (3 pages, 64709 bytes). 693 715 PDF statistics: 694 76PDF objects out of 1000 (max. 8388607)695 63 compressed objects within 1 object stream696 15named destinations out of 1000 (max. 500000)697 45words of extra memory for PDF output out of 10000 (max. 10000000)698 716 53 PDF objects out of 1000 (max. 8388607) 717 43 compressed objects within 1 object stream 718 8 named destinations out of 1000 (max. 500000) 719 29 words of extra memory for PDF output out of 10000 (max. 10000000) 720 -
CMIP6dreqbuild/trunk/src/framework/tex/reservoirs.out
r1174 r1178 1 1 \BOOKMARK [1][-]{section.1}{Land Nitrogen Budget}{}% 1 2 \BOOKMARK [1][-]{section.2}{Ice-Sheet Water Budget}{}% 2 3 \BOOKMARK [1][-]{section.3}{Land Water Budget}{}% 3 4 \BOOKMARK [1][-]{section.4}{Sea-Ice Water Budget}{}% 4 2 \BOOKMARK [1][-]{section.2}{Sea-Ice Water Budget}{}% 2 -
CMIP6dreqbuild/trunk/src/framework/tex/reservoirs.tex
r1174 r1178 10 10 11 11 \usetikzlibrary{arrows,positioning,shapes.geometric} 12 \usetikzlibrary{backgrounds, 13 positioning-plus,node-families,calc} 12 14 13 15 \tikzset{ 16 header node/.style = { 17 font = \strut, 18 text depth = +0pt, 19 fill = white, 20 draw}, 21 header/.style = {% 22 inner ysep = +1.5em, 23 append after command = { 24 \pgfextra{\let\TikZlastnode\tikzlastnode} 25 node [header node] (header-\TikZlastnode) at (\TikZlastnode.north east) {#1} 26 } 27 }, 28 } 14 29 15 30 16 31 \begin{document} 32 33 \pgfdeclarelayer{child} 34 \pgfdeclarelayer{parent} 35 \pgfdeclarelayer{grandp} 36 \pgfsetlayers{grandp,parent,child} 37 17 38 18 39 %%\begin{tikzpicture}[>=latex'] -
CMIP6dreqbuild/trunk/src/framework/tex/reservoirs3.log
r1174 r1178 1 This is pdfTeX, Version 3.14159265-2.6-1.40.16 (TeX Live 2015/Debian) (preloaded format=pdflatex 2017. 8.23) 8 FEB 2018 12:241 This is pdfTeX, Version 3.14159265-2.6-1.40.16 (TeX Live 2015/Debian) (preloaded format=pdflatex 2017.10.12) 8 FEB 2018 18:07 2 2 entering extended mode 3 3 restricted \write18 enabled. … … 582 582 \openout1 = `reservoirs3.aux'. 583 583 584 LaTeX Font Info: Checking defaults for OML/cmm/m/it on input line 17.585 LaTeX Font Info: ... okay on input line 17.586 LaTeX Font Info: Checking defaults for T1/cmr/m/n on input line 17.587 LaTeX Font Info: ... okay on input line 17.588 LaTeX Font Info: Checking defaults for OT1/cmr/m/n on input line 17.589 LaTeX Font Info: ... okay on input line 17.590 LaTeX Font Info: Checking defaults for OMS/cmsy/m/n on input line 17.591 LaTeX Font Info: ... okay on input line 17.592 LaTeX Font Info: Checking defaults for OMX/cmex/m/n on input line 17.593 LaTeX Font Info: ... okay on input line 17.594 LaTeX Font Info: Checking defaults for U/cmr/m/n on input line 17.595 LaTeX Font Info: ... okay on input line 17.596 LaTeX Font Info: Checking defaults for PD1/pdf/m/n on input line 17.597 LaTeX Font Info: ... okay on input line 17.584 LaTeX Font Info: Checking defaults for OML/cmm/m/it on input line 32. 585 LaTeX Font Info: ... okay on input line 32. 586 LaTeX Font Info: Checking defaults for T1/cmr/m/n on input line 32. 587 LaTeX Font Info: ... okay on input line 32. 588 LaTeX Font Info: Checking defaults for OT1/cmr/m/n on input line 32. 589 LaTeX Font Info: ... okay on input line 32. 590 LaTeX Font Info: Checking defaults for OMS/cmsy/m/n on input line 32. 591 LaTeX Font Info: ... okay on input line 32. 592 LaTeX Font Info: Checking defaults for OMX/cmex/m/n on input line 32. 593 LaTeX Font Info: ... okay on input line 32. 594 LaTeX Font Info: Checking defaults for U/cmr/m/n on input line 32. 595 LaTeX Font Info: ... okay on input line 32. 596 LaTeX Font Info: Checking defaults for PD1/pdf/m/n on input line 32. 597 LaTeX Font Info: ... okay on input line 32. 598 598 599 599 ABD: EveryShipout initializing macros … … 627 627 )) 628 628 \AtBeginShipoutBox=\box59 629 Package hyperref Info: Link coloring OFF on input line 17.629 Package hyperref Info: Link coloring OFF on input line 32. 630 630 631 631 (/usr/share/texlive/texmf-dist/tex/latex/hyperref/nameref.sty … … 637 637 \c@section@level=\count126 638 638 ) 639 LaTeX Info: Redefining \ref on input line 17.640 LaTeX Info: Redefining \pageref on input line 17.641 LaTeX Info: Redefining \nameref on input line 17.639 LaTeX Info: Redefining \ref on input line 32. 640 LaTeX Info: Redefining \pageref on input line 32. 641 LaTeX Info: Redefining \nameref on input line 32. 642 642 643 643 (./reservoirs3.out) (./reservoirs3.out) … … 645 645 \openout4 = `reservoirs3.out'. 646 646 647 (./pic1f.itex) [1 648 649 {/var/lib/texmf/fonts/map/pdftex/updmap/pdftex.map}] 650 Package atveryend Info: Empty hook `BeforeClearDocument' on input line 28. 651 Package atveryend Info: Empty hook `AfterLastShipout' on input line 28. 652 (./reservoirs3.aux) 653 Package atveryend Info: Executing hook `AtVeryEndDocument' on input line 28. 654 Package atveryend Info: Executing hook `AtEndAfterFileList' on input line 28. 655 Package rerunfilecheck Info: File `reservoirs3.out' has not changed. 656 (rerunfilecheck) Checksum: D41D8CD98F00B204E9800998ECF8427E;0. 657 ) 647 \pgf@layerbox@child=\box60 648 \pgf@layerboxsaved@child=\box61 649 \pgf@layerbox@parent=\box62 650 \pgf@layerboxsaved@parent=\box63 651 \pgf@layerbox@grandp=\box64 652 \pgf@layerboxsaved@grandp=\box65 653 (./pic1g.itex 654 655 ! LaTeX Error: Something's wrong--perhaps a missing \item. 656 657 See the LaTeX manual or LaTeX Companion for explanation. 658 Type H <return> for immediate help. 659 ... 660 661 l.1 \section 662 {Land Nitrogen Budget} 663 ? x 664 658 665 Here is how much of TeX's memory you used: 659 1 8151 strings out of 493029660 36 9932 string characters out of 6136234661 4 53790words of memory out of 5000000662 21 375multiletter control sequences out of 15000+600000663 8933 words of font info for 23fonts, out of 8000000 for 9000666 17991 strings out of 493029 667 366777 string characters out of 6136233 668 443461 words of memory out of 5000000 669 21227 multiletter control sequences out of 15000+600000 670 5135 words of font info for 15 fonts, out of 8000000 for 9000 664 671 1141 hyphenation exceptions out of 8191 665 55i,9n,67p,413b,875s stack positions out of 5000i,500n,10000p,200000b,80000s 666 </usr/share/texlive/texmf-dist/fonts/type1/public/amsfonts/cm/cmbx10.pfb></us 667 r/share/texlive/texmf-dist/fonts/type1/public/amsfonts/cm/cmr10.pfb> 668 Output written on reservoirs3.pdf (1 page, 30529 bytes). 672 55i,0n,67p,413b,86s stack positions out of 5000i,500n,10000p,200000b,80000s 673 No pages of output. 669 674 PDF statistics: 670 24PDF objects out of 1000 (max. 8388607)671 1 8compressed objects within 1 object stream672 2named destinations out of 1000 (max. 500000)673 1 3words of extra memory for PDF output out of 10000 (max. 10000000)674 675 6 PDF objects out of 1000 (max. 8388607) 676 1 compressed objects within 1 object stream 677 0 named destinations out of 1000 (max. 500000) 678 1 words of extra memory for PDF output out of 10000 (max. 10000000) 679 -
CMIP6dreqbuild/trunk/src/framework/tex/reservoirs3.tex
r1175 r1178 14 14 15 15 16 17 16 \tikzset{ 17 header node/.style = { 18 font = \strut, 19 text depth = +0pt, 20 fill = white, 21 draw}, 22 header/.style = {% 23 inner ysep = +1.5em, 24 append after command = { 25 \pgfextra{\let\TikZlastnode\tikzlastnode} 26 node [header node] (header-\TikZlastnode) at (\TikZlastnode.north east) {#1} 27 } 28 }, 29 } 18 30 19 31 … … 30 42 %%} 31 43 32 \input{pic1 f.itex}44 \input{pic1g.itex} 33 45 34 46 %%\end{tikzpicture} -
CMIP6dreqbuild/trunk/src/framework/tikz.py
r1176 r1178 57 57 self.tnode.nclass = 'reservoirptx' 58 58 self.title = '' 59 self.decTitle = ''59 ##self.decTitle = '' 60 60 self.var = None 61 61 if 'dx' in self.__dict__ and self.dx not in [None,'',0.]: … … 106 106 107 107 nodeTmpl = ''' \\node at (%(x)s,%(y)s) [%(nclass)s%(ncx)s] (%(label)s) {%(decTitle)s} ;\n''' 108 parentNodeTmpl = ''' \\node [%(nclass)s%(ncx)s, parentLabel=%(decTitle)sfit={%(childList)s}] (%(label)s) {} ;\n'''108 parentNodeTmpl = ''' \\node [%(nclass)s%(ncx)s, header=%(decTitle)s, fit={%(childList)s}] (%(label)s) {} ;\n''' 109 109 flxTmpl = ''' (%(ffrom)s) edge %(pathDec)s %(flxLabel)s (%(tto)s) \n''' 110 110 flxLabelTmpl = ''' node[below,align=center]{\\bf %s} ''' … … 213 213 def write(self,oo): 214 214 for mip in sorted( list( self.mips ) ): 215 if mip in ['ISMIP6','SIMIP','LS3MIP','C4MIP']: 215 ##if mip in ['ISMIP6','SIMIP','LS3MIP','C4MIP']: 216 if mip in ['SIMIP','C4MIP']: 216 217 oo.write( '\\section{%s}\n' % self.sections['fluxDiagram'][mip][1] ) 217 218 oo.write( '''\\begin{figure}[h] … … 228 229 every path/.style={ draw, line width=4pt, }, 229 230 reservoir/.style={draw=blue!80, thick, fill=rcolor, shape=rectangle,rounded corners=1.5em,align=center,minimum width=2cm,minimum height=1cm}, 230 reservoirp/.style={draw=blue!80, thick, fill=rpcolor, shape=rectangle,rounded corners=.5em,align=center,minimum width=11cm,minimumheight=2.5cm},231 reservoirp/.style={draw=blue!80, thick, fill=rpcolor, shape=rectangle,rounded corners=.5em,align=center,minimum height=2.5cm}, 231 232 reservoirpp/.style={draw=blue!80, thick, fill=rppcolor, shape=rectangle,rounded corners=.5em,align=center,minimum width=14cm,minimum height=5.cm}, 232 233 reservoirptx/.style={draw=blue!80, thick, fill=rptxcolor, dotted, shape=rectangle,rounded corners=.5em,align=center,minimum width=3cm,minimum height=2cm} … … 255 256 256 257 vars = set() 257 oo.write( '\\begin{pgfonlayer}{child}\n' )258 258 if mip in self.reservoirs: 259 oo.write( '\\begin{pgfonlayer}{child}\n' ) 260 #for this in self.reservoirs[mip] + self.reservoirs['all']: 261 # if this.isParent: 262 # oo.write( nodeTmpl % this.__dict__ ) 263 # vars.add( this.var ) 264 265 np = 0 259 266 for this in self.reservoirs[mip] + self.reservoirs['all']: 260 267 this.dec() 261 268 if this.isParent: 262 oo.write( nodeTmpl % this.__dict__ ) 263 vars.add( this.var ) 264 265 for this in self.reservoirs[mip] + self.reservoirs['all']: 266 if this.isParent: 267 oo.write( nodeTmpl % this.tnode.__dict__ ) 268 vars.add( this.tnode.var ) 269 np += 1 270 pass 271 ##oo.write( parentNodeTmpl % this.__dict__ ) 272 ##vars.add( this.var ) 269 273 else: 270 274 oo.write( nodeTmpl % this.__dict__ ) 271 275 vars.add( this.var ) 272 oo.write( '\\end{pgfonlayer}{child}\n' ) 276 oo.write( '\\end{pgfonlayer}{child}\n' ) 277 if np > 0: 278 oo.write( '\\begin{pgfonlayer}{parent}\n' ) 279 280 for this in self.reservoirs[mip] + self.reservoirs['all']: 281 this.dec() 282 if this.isParent: 283 oo.write( parentNodeTmpl % this.__dict__ ) 284 vars.add( this.var ) 285 oo.write( '\\end{pgfonlayer}{parent}\n' ) 273 286 274 287 275 288 276 289 if mip in self.fluxes: 290 oo.write( '\\begin{pgfonlayer}{child}\n' ) 277 291 cll = collections.defaultdict( list ) 278 292 ll = [] … … 312 326 oo.write( l ) 313 327 oo.write( ';' ) 328 oo.write( '\\end{pgfonlayer}{child}\n' ) 314 329 315 330 self.vars = vars
Note: See TracChangeset
for help on using the changeset viewer.
