Mercurial > dive4elements > river
comparison artifacts/doc/conf/themes.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 | 145895212b3c |
| children | 6ecd1a28017f |
comparison
equal
deleted
inserted
replaced
| 9616:cedcee24a21a | 9617:1d4262a68f1f |
|---|---|
| 408 | 408 |
| 409 <!-- Mappings for S-INFO --> | 409 <!-- Mappings for S-INFO --> |
| 410 <mapping from="bedheight_min" to="SInfoBedHeightMin"/> | 410 <mapping from="bedheight_min" to="SInfoBedHeightMin"/> |
| 411 <mapping from="bedheight_max" to="SInfoBedHeightMax"/> | 411 <mapping from="bedheight_max" to="SInfoBedHeightMax"/> |
| 412 | 412 |
| 413 <mapping from="sinfo_facet_flow_depth_discharge" to="SInfoFlowDepthDischarge"/> | |
| 414 <mapping from="sinfo_facet_flow_depth_waterlevel" to="SInfoFlowDepthWaterlevel"/> | |
| 415 <mapping from="sinfo_facet_flow_depth_bedheight" to="SInfoFlowDepthBedheight"/> | |
| 416 <mapping from="sinfo_facet_flow_depth_bedheight_min" to="SInfoFlowDepthBedheightMin"/> | |
| 417 <mapping from="sinfo_facet_flow_depth_bedheight_max" to="SInfoFlowDepthBedheightMax"/> | |
| 413 <mapping from="sinfo_facet_flow_depth" to="SInfoFlowDepth"/> | 418 <mapping from="sinfo_facet_flow_depth" to="SInfoFlowDepth"/> |
| 414 <mapping from="sinfo_facet_flow_depth.filtered" to="SInfoFlowDepth"/> | 419 <mapping from="sinfo_facet_flow_depth.filtered" to="SInfoFlowDepth"/> |
| 415 <mapping from="sinfo_facet_flow_depth_with_tkh" to="SInfoFlowDepthWithTkh"/> | 420 <mapping from="sinfo_facet_flow_depth_with_tkh" to="SInfoFlowDepthWithTkh"/> |
| 416 <mapping from="sinfo_facet_flow_depth_with_tkh.filtered" to="SInfoFlowDepthWithTkh"/> | 421 <mapping from="sinfo_facet_flow_depth_with_tkh.filtered" to="SInfoFlowDepthWithTkh"/> |
| 417 <mapping from="sinfo_facet_flow_depth_min" to="SInfoFlowDepthMin"/> | 422 <mapping from="sinfo_facet_flow_depth_min" to="SInfoFlowDepthMin"/> |
| 438 <mapping from="sinfo_facet_flow_depth_development" to="SInfoFlowDepthDevelopment"/> | 443 <mapping from="sinfo_facet_flow_depth_development" to="SInfoFlowDepthDevelopment"/> |
| 439 <mapping from="sinfo_facet_flow_depth_development.filtered" to="SInfoFlowDepthDevelopment"/> | 444 <mapping from="sinfo_facet_flow_depth_development.filtered" to="SInfoFlowDepthDevelopment"/> |
| 440 <mapping from="sinfo_facet_flow_depth_development_per_year" to="SInfoFlowDepthDevelopmentPerYear"/> | 445 <mapping from="sinfo_facet_flow_depth_development_per_year" to="SInfoFlowDepthDevelopmentPerYear"/> |
| 441 <mapping from="sinfo_facet_flow_depth_development_per_year.filtered" to="SInfoFlowDepthDevelopmentPerYear"/> | 446 <mapping from="sinfo_facet_flow_depth_development_per_year.filtered" to="SInfoFlowDepthDevelopmentPerYear"/> |
| 442 <mapping from="sinfo_facet_waterlevel_difference.filtered" to="SInfoWaterlevelDifference"/> | 447 <mapping from="sinfo_facet_waterlevel_difference.filtered" to="SInfoWaterlevelDifference"/> |
| 448 <mapping from="sinfo_facet_waterlevel_difference" to="SInfoWaterlevelDifference"/> | |
| 443 <mapping from="sinfo_facet_bedheight_difference.filtered" to="SInfoBedHeightDifference"/> | 449 <mapping from="sinfo_facet_bedheight_difference.filtered" to="SInfoBedHeightDifference"/> |
| 450 <mapping from="sinfo_facet_bedheight_difference" to="SInfoBedHeightDifference"/> | |
| 444 | 451 |
| 445 <mapping from="sinfo_facet_collision_calc_count" to="SInfoCollisionCount"/> | 452 <mapping from="sinfo_facet_collision_calc_count" to="SInfoCollisionCount"/> |
| 446 <mapping from="sinfo_facet_collision_calc_count.2" to="SInfoCollisionCount2"/> | 453 <mapping from="sinfo_facet_collision_calc_count.2" to="SInfoCollisionCount2"/> |
| 447 <mapping from="sinfo_facet_collision_calc_count.3" to="SInfoCollisionCount3"/> | 454 <mapping from="sinfo_facet_collision_calc_count.3" to="SInfoCollisionCount3"/> |
| 448 | 455 |