Adapted according to review : Renamed Layers in 1D and 2D definition in Xsds and adapted the belonging code as well as the test file. Also renamed function names.Related to Issue [MWDAM-1076]
Mark tests for calculation with Category("Calculation"), so they can be excluded from the test run on Teamcity.They can be enabled, when the Dam engine is connectedRelated to Issue [MWDAM-1030]