diff artifacts/doc/conf/artifacts/sinfo.xml @ 9617:1d4262a68f1f

#12 Minuend/Subtrahend + MergeConflict #19 CollisionCalculation
author dnt_bjoernsen <d.tironi@bjoernsen.de>
date Thu, 10 Oct 2019 15:29:02 +0200
parents f8308db94634
children 6ecd1a28017f
line wrap: on
line diff
--- a/artifacts/doc/conf/artifacts/sinfo.xml	Wed Oct 09 19:25:55 2019 +0200
+++ b/artifacts/doc/conf/artifacts/sinfo.xml	Thu Oct 10 15:29:02 2019 +0200
@@ -69,6 +69,10 @@
             <facet name="sinfo_facet_flow_depth.filtered" description="flow depth, filtered by current zoom state" />
             <facet name="sinfo_facet_flow_depth" description="flow depth" />
 
+            <facet name="sinfo_facet_flow_depth_bedheight" description="mean bedheight" />
+            <facet name="sinfo_facet_flow_depth_waterlevel" description="waterlevel" />
+            <facet name="sinfo_facet_flow_depth_discharge" description="discharge" />
+
             <facet name="sinfo_facet_flow_depth_with_tkh.filtered" description="flow depth including tkh, filtered by current zoom state" />
             <facet name="sinfo_facet_flow_depth_with_tkh" description="flow depth including tkh" />
 
@@ -126,10 +130,14 @@
             <facet name="sinfo_facet_flow_depth_min" description="min flow depth" />
             <facet name="sinfo_facet_flow_depth_max.filtered" description="max flow depth" />
             <facet name="sinfo_facet_flow_depth_max" description="max flow depth" />
-
+            <facet name="sinfo_facet_flow_depth_bedheight_min" description="min bedheight" />
+            <facet name="sinfo_facet_flow_depth_bedheight_max" description="max bedheight" />
+            <facet name="sinfo_facet_flow_depth_waterlevel" description="waterlevel" />
+            <facet name="sinfo_facet_flow_depth_discharge" description="discharge" />
+            
             <facet name="longitudinal_section.annotations" description="facet.longitudinal_section.annotations" />
-            
-            <facet name="sinfo_flow_depth_minmax.manualpoints" description="Manual Points" />            
+
+            <facet name="sinfo_flow_depth_minmax.manualpoints" description="Manual Points" />
           </facets>
         </outputmode>
 
@@ -189,7 +197,9 @@
             <facet name="sinfo_facet_flow_depth_development" description="flow depth development" />
 
             <facet name="sinfo_facet_waterlevel_difference.filtered" description="waterlevel difference" />
+            <facet name="sinfo_facet_waterlevel_difference" description="waterlevel difference (raw)" />
             <facet name="sinfo_facet_bedheight_difference.filtered" description="bed level difference" />
+            <facet name="sinfo_facet_bedheight_difference" description="bed level difference (raw)" />
 
             <facet name="sinfo_facet_flow_depth_current.filtered" description="flow depth current" />
             <facet name="sinfo_facet_flow_depth_current" description="flow depth current" />
@@ -197,8 +207,8 @@
             <facet name="sinfo_facet_flow_depth_historical" description="flow depth historical" />
 
             <facet name="longitudinal_section.annotations" description="facet.longitudinal_section.annotations" />
-            
-            <facet name="sinfo_flow_depth_development.manualpoints" description="Manual Points" />            
+
+            <facet name="sinfo_flow_depth_development.manualpoints" description="Manual Points" />
           </facets>
         </outputmode>
 
@@ -208,8 +218,8 @@
             <facet name="sinfo_facet_flow_depth_development_per_year" description="flow depth development per year" />
 
             <facet name="longitudinal_section.annotations" description="facet.longitudinal_section.annotations" />
-            
-            <facet name="sinfo_flow_depth_development_peryear.manualpoints" description="Manual Points" />            
+
+            <facet name="sinfo_flow_depth_development_peryear.manualpoints" description="Manual Points" />
           </facets>
         </outputmode>
 
@@ -228,9 +238,6 @@
       </outputmodes>
     </state>
 
-
-
-
     <!-- Calculation Mode: Grundberührungen -->
 
     <transition transition="org.dive4elements.river.artifacts.transitions.ValueCompareTransition">
@@ -246,7 +253,7 @@
     </transition>
 
     <state id="state.sinfo.year_epoch" description="state.sinfo.year_epoch" state="org.dive4elements.river.artifacts.sinfo.collision.YearChoice" helpText="help.state.sinfo.collisions.year_epoch_choice">
-      <data name="ye_select" type="String" /> 
+      <data name="ye_select" type="String" />
     </state>
 
 
@@ -470,6 +477,9 @@
 
             <facet name="sinfo_facet_flow_depth.filtered" description="mean flow depth" />
             <facet name="sinfo_facet_flow_depth" description="mean flow depth" />
+            <facet name="sinfo_facet_flow_depth_discharge" description="discharge" />
+            <facet name="sinfo_facet_flow_depth_waterlevel" description="waterlevel" />
+            <facet name="sinfo_facet_flow_depth_bedheight" description="mean bedheight" />
 
             <facet name="sinfo_facet_velocity" description="Velocity" />
             <facet name="sinfo_facet_d50" description="D50" />

http://dive4elements.wald.intevation.org