Mercurial > dive4elements > river
changeset 7419:cae7c0625436
Datacage: Consequently call macro 'longitudinal-section-user-prototype' in all longitudinal sections of old calculation. Moved asymmeterical stuff to prototype. This may crash!
| author | Sascha L. Teichmann <teichmann@intevation.de> |
|---|---|
| date | Wed, 23 Oct 2013 11:28:25 +0200 |
| parents | 6665d0e3d795 |
| children | daa04d2f42ed |
| files | artifacts/doc/conf/meta-data.xml |
| diffstat | 1 files changed, 38 insertions(+), 40 deletions(-) [+] |
line wrap: on
line diff
--- a/artifacts/doc/conf/meta-data.xml Wed Oct 23 11:04:06 2013 +0200 +++ b/artifacts/doc/conf/meta-data.xml Wed Oct 23 11:28:25 2013 +0200 @@ -354,11 +354,10 @@ <dc:call-macro name="duration-curve"/> </dc:when> <dc:when test="$out = 'differenceable'"> - <dc:call-macro name="differenceable-fix"/> - <dc:call-macro name="differences"/> + <dc:call-macro name="longitudinal-section-user-prototype"/> </dc:when> <dc:when test="$out = 'waterlevels'"> - <dc:call-macro name="waterlevels-fix"/> + <dc:call-macro name="longitudinal-section-user-prototype"/> </dc:when> <dc:when test="$out = 'floodmap'"> <dc:call-macro name="flood-map"/> @@ -367,42 +366,25 @@ <dc:call-macro name="flood-map"/> </dc:when> <dc:when test="$out = 'bedheight_middle'"> - <dc:call-macro name="waterlevels-discharge"/> - <dc:call-macro name="differenceable-fix"/> - <dc:call-macro name="differences"/> + <dc:call-macro name="longitudinal-section-user-prototype"/> </dc:when> <dc:when test="$out = 'floodmap-hws'"> <dc:call-macro name="floodmap-hws-user"/> </dc:when> <dc:when test="$out = 'flow_velocity'"> - <dc:call-macro name="bedquality-bed"/> - <dc:call-macro name="bedquality-load"/> + <dc:call-macro name="longitudinal-section-user-prototype"/> </dc:when> <dc:when test="$out = 'bed_longitudinal_section'"> - <dc:call-macro name="bedquality-bed"/> - <dc:call-macro name="bedquality-load"/> - <dc:call-macro name="bedquality-density"/> - <dc:call-macro name="bedquality-porosity"/> + <dc:call-macro name="longitudinal-section-user-prototype"/> </dc:when> <dc:when test="$out = 'sedimentload_ls'"> - <dc:call-macro name="differences"/> - <dc:call-macro name="bedheight_differences"/> - <dc:call-macro name="flow-velocity"/> - <dc:call-macro name="sediment-load"/> + <dc:call-macro name="longitudinal-section-user-prototype"/> </dc:when> <dc:when test="$out = 'bed_difference_year'"> - <dc:call-macro name="waterlevels-discharge"/> - <dc:call-macro name="bedheight_differences"/> - <dc:call-macro name="differences"/> - <dc:call-macro name="waterlevels-fix"/> - <dc:call-macro name="delta-wt-ls"/> + <dc:call-macro name="longitudinal-section-user-prototype"/> </dc:when> <dc:when test="$out = 'bed_difference_epoch'"> - <dc:call-macro name="waterlevels-discharge"/> - <dc:call-macro name="bedheight_differences"/> - <dc:call-macro name="differences"/> - <dc:call-macro name="waterlevels-fix"/> - <dc:call-macro name="delta-wt-ls"/> + <dc:call-macro name="longitudinal-section-user-prototype"/> </dc:when> <dc:when test="starts-with($out, 'sq_relation')"> <dc:call-macro name="sqrelations_user"/> @@ -1311,20 +1293,36 @@ </dc:macro> <dc:macro name="longitudinal-section-user-prototype"> - <dc:comment> WINFO/DIFF/FIX </dc:comment> - <dc:call-macro name="longitudinal"/> - <dc:call-macro name="differences"/> - <dc:call-macro name="waterlevels-discharge"/> - <dc:call-macro name="longitudinal-section-fix"/> - <dc:call-macro name="delta-wt-ls"/> - <dc:comment> MINFO </dc:comment> - <dc:call-macro name="bedheight_differences"/> - <dc:call-macro name="bedquality-bed"/> - <dc:call-macro name="bedquality-load"/> - <dc:call-macro name="flow-velocity"/> - <dc:call-macro name="sediment-load"/> - <dc:call-macro name="bedquality-density"/> - <dc:call-macro name="bedquality-porosity"/> + <dc:comment> WINFO/DIFF/FIX </dc:comment> + <dc:call-macro name="longitudinal"/> + <dc:call-macro name="differences"/> + <dc:call-macro name="waterlevels-discharge"/> + <dc:call-macro name="longitudinal-section-fix"/> + <dc:call-macro name="delta-wt-ls"/> + <dc:comment> MINFO </dc:comment> + <dc:call-macro name="bedheight_differences"/> + <dc:call-macro name="bedquality-bed"/> + <dc:call-macro name="bedquality-load"/> + <dc:call-macro name="flow-velocity"/> + <dc:call-macro name="sediment-load"/> + <dc:call-macro name="bedquality-density"/> + <dc:call-macro name="bedquality-porosity"/> + <dc:comment> UNSORTED </dc:comment> + <dc:comment> From 'differenceable' </dc:comment> + <dc:call-macro name="differenceable-fix"/> + <dc:comment> From 'waterlevels' </dc:comment> + <dc:call-macro name="waterlevels-fix"/> + <dc:comment> From 'bedheight_middle' </dc:comment> + <dc:call-macro name="waterlevels-discharge"/> + <dc:call-macro name="differenceable-fix"/> + <dc:comment> From 'flow_velocity' </dc:comment> + <dc:call-macro name="bedquality-bed"/> + <dc:call-macro name="bedquality-load"/> + <dc:comment> From 'bed_longitudinal_section' </dc:comment> + <dc:comment> From 'sedimentload_ls' </dc:comment> + <dc:comment> From 'bed_difference_year' </dc:comment> + <dc:call-macro name="waterlevels-fix"/> + <dc:comment> From 'bed_difference_epoch' </dc:comment> </dc:macro>