Merge pull request #2621 from rinkk/createIntermediateRasters

[util] create intermediate rasters

Merge pull request #2621 from rinkk/createIntermediateRasters
4ebb423b · Tom Fischer · GitHub · 4b54b4f8 · 608b599b · 4ebb423b
Unverified Commit 4ebb423b authored 5 years ago by Tom Fischer Committed by GitHub 5 years ago
--- a/Applications/Utils/MeshGeoTools/CMakeLists.txt
+++ b/Applications/Utils/MeshGeoTools/CMakeLists.txt
-set(TOOLS computeSurfaceNodeIDsInPolygonalRegion constructMeshesFromGeometry
+set(TOOLS
-          identifySubdomains)
+    computeSurfaceNodeIDsInPolygonalRegion
+    constructMeshesFromGeometry
+    createIntermediateRasters
+    identifySubdomains
+)
 foreach(TOOL ${TOOLS})
    add_executable(${TOOL} ${TOOL}.cpp)
    target_link_libraries(${TOOL}

--- a/Applications/Utils/MeshGeoTools/createIntermediateRasters.cpp
+++ b/Applications/Utils/MeshGeoTools/createIntermediateRasters.cpp
+/**
+ * \file
+ *
+ * \copyright
+ * Copyright (c) 2012-2019, OpenGeoSys Community (http://www.opengeosys.org)
+ *            Distributed under a Modified BSD License.
+ *              See accompanying file LICENSE.txt or
+ *              http://www.opengeosys.org/LICENSE.txt
+ */
+#include <memory>
+#include <string>
+#include <tclap/CmdLine.h>
+#include "InfoLib/GitInfo.h"
+#include "BaseLib/FileTools.h"
+#include "Applications/ApplicationsLib/LogogSetup.h"
+#include "Applications/FileIO/AsciiRasterInterface.h"
+#include "GeoLib/Raster.h"
+int main(int argc, char* argv[])
+{
+    ApplicationsLib::LogogSetup logog_setup;
+    TCLAP::CmdLine cmd(
+        "Takes two DEMs located at the exact same spatial position (but at "
+        "different elevation) and calculates n raster DEMs located at "
+        "equidistant intervals between them (i.e. for n=1, one new raster "
+        "located precisely in the middle will be created).\n\n"
+        "OpenGeoSys-6 software, version " +
+            GitInfoLib::GitInfo::ogs_version +
+            ".\n"
+            "Copyright (c) 2012-2019, OpenGeoSys Community "
+            "(http://www.opengeosys.org)",
+        ' ', GitInfoLib::GitInfo::ogs_version);
+    TCLAP::ValueArg<std::string> input1_arg(
+        "", "file1", "First DEM-raster file", true, "", "file1.asc");
+    cmd.add(input1_arg);
+    TCLAP::ValueArg<std::string> input2_arg(
+        "", "file2", "Second DEM-raster file", true, "", "file2.asc");
+    cmd.add(input2_arg);
+    TCLAP::ValueArg<std::string> output_arg("o", "output-file",
+                                            "Raster output file (*.asc)", true,
+                                            "", "output.asc");
+    cmd.add(output_arg);
+    TCLAP::ValueArg<std::size_t> number_arg(
+        "n", "number", "number of rasters to be calculated", false, 1, "int");
+    cmd.add(number_arg);
+    cmd.parse(argc, argv);
+    std::unique_ptr<GeoLib::Raster> dem1(
+        FileIO::AsciiRasterInterface::readRaster(input1_arg.getValue()));
+    std::unique_ptr<GeoLib::Raster> dem2(
+        FileIO::AsciiRasterInterface::readRaster(input2_arg.getValue()));
+    if (dem1 == nullptr || dem2 == nullptr)
+        return 1;
+    GeoLib::RasterHeader const& h1 = dem1->getHeader();
+    GeoLib::RasterHeader const& h2 = dem2->getHeader();
+    bool errors_found(false);
+    if (h1.origin[0] != h2.origin[0])
+    {
+        ERR("Origin x-coordinate is not the same in both raster files.\n");
+        errors_found = true;
+    }
+    if (h1.origin[1] != h2.origin[1])
+    {
+        ERR("Origin y-coordinate is not the same in both raster files.\n");
+        errors_found = true;
+    }
+    if (h1.cell_size != h2.cell_size)
+    {
+        ERR("Cellsize is not the same in both raster files.\n");
+        errors_found = true;
+    }
+    if (h1.n_cols != h2.n_cols)
+    {
+        ERR("Raster width is not the same in both raster files.\n");
+        errors_found = true;
+    }
+    if (h1.n_rows != h2.n_rows)
+    {
+        ERR("Raster height is not the same in both raster files.\n")
+        errors_found = true;
+    }
+    if (errors_found)
+        return 2;
+    std::size_t const n = number_arg.getValue();
+    std::vector<std::vector<double>> raster;
+    for (std::size_t i = 0; i < n; ++i)
+    {
+        std::vector<double> r;
+        r.reserve(h1.n_cols * h1.n_rows);
+        raster.push_back(r);
+    }
+    auto it2 = dem2->begin();
+    for (auto it1 = dem1->begin(); it1 != dem1->end(); ++it1)
+    {
+        if (it2 == dem2->end())
+        {
+            ERR("Error: File 2 is shorter than File 1.");
+            return 3;
+        }
+        if (*it1 == h1.no_data || *it2 == h2.no_data)
+        {
+            for (std::size_t i = 0; i < n; ++i)
+                raster[i].push_back(h1.no_data);
+        }
+        else
+        {
+            double const min = std::min(*it1, *it2);
+            double const max = std::max(*it1, *it2);
+            double const step = (max - min) / static_cast<double>(n + 1);
+            for (std::size_t i = 0; i < n; ++i)
+                raster[i].push_back(min + ((i+1) * step));
+        }
+        it2++;
+    }
+    if (it2 != dem2->end())
+    {
+        ERR("Error: File 1 is shorter than File 2.");
+        return 3;
+    }
+    std::string const filename = output_arg.getValue();
+    for (std::size_t i = 0; i < n; ++i)
+    {
+        std::string const basename = BaseLib::dropFileExtension(filename);
+        std::string const ext = BaseLib::getFileExtension(filename);
+        GeoLib::Raster r(h1, raster[i].begin(), raster[i].end());
+        FileIO::AsciiRasterInterface::writeRasterAsASC(r, basename + std::to_string(i) + "." + ext);
+        INFO("Layer %d written.", i+1);
+    }
+    return EXIT_SUCCESS;
+}
--- a/Applications/Utils/Tests.cmake
+++ b/Applications/Utils/Tests.cmake
@@ -264,3 +264,13 @@ AddTest(
    Top-Lower-Shaly.vtu Top-Lower-Shaly.vtu Reshape_Thickness Reshape_Thickness 1e-16 0
    Top-Lower-Shaly.vtu Top-Lower-Shaly.vtu Measured_Depth Measured_Depth 1e-16 0
 )
+AddTest(
+    NAME createIntermediateRasters_test
+    PATH MeshGeoToolsLib/Hamburg
+    EXECUTABLE createIntermediateRasters
+    EXECUTABLE_ARGS --file1 layer04.asc --file2 layer17.asc -o ${Data_BINARY_DIR}/MeshGeoToolsLib/Hamburg/output.asc
+    REQUIREMENTS NOT OGS_USE_MPI
+    TESTER diff
+    DIFF_DATA output0.asc
+)
--- a/GeoLib/Raster.h
+++ b/GeoLib/Raster.h
@@ -54,7 +54,7 @@ public:
     * @param end input iterator pointing to the last element of the data, end have to be reachable from begin
     */
    template <typename InputIterator>
-    Raster(RasterHeader&& header, InputIterator begin, InputIterator end)
+    Raster(RasterHeader header, InputIterator begin, InputIterator end)
        : _header(std::move(header)),
          _raster_data(new double[_header.n_cols * _header.n_rows])
    {

--- a/Tests/Data/MeshGeoToolsLib/Hamburg/layer04.asc
+++ b/Tests/Data/MeshGeoToolsLib/Hamburg/layer04.asc
+ncols         31
+nrows         22
+xllcorner     559328.046880
+yllcorner     5928784.596700
+cellsize      250.000000
+NODATA_value  -9999
+-9999 -9999 -9999 26.895249 28.406324 28.066619 18.472416 8.127696 6.143145 9.320178 11.376940 10.012142 10.040367 5.219558 -1.100021 -2.565916 -0.776278 3.753560 5.483654 4.904663 3.049230 1.351687 -1.532601 -8.784401 -13.743341 -14.346511 -14.608389 -14.634644 -15.001549 -14.880803 -14.436890 
+-9999 -9999 -9999 27.543252 28.782638 27.090124 21.510210 8.984298 5.942652 9.815232 15.473474 9.189259 6.114100 1.804231 -2.975454 -5.452519 -4.145552 9.240876 6.492296 5.553138 4.079171 -0.248184 -2.880335 -12.622516 -16.492130 -16.752196 -16.003590 -17.122643 -18.189086 -17.174306 -16.282439 
+-9999 -9999 10.932058 29.072971 34.092489 23.090766 26.998300 8.416910 17.184916 23.066108 15.188417 5.602565 1.984530 -3.228612 -6.862450 -7.628251 -6.655077 1.535556 -0.162480 2.805542 12.025092 -7.374262 -11.445673 -19.926431 -21.462271 -21.753294 -21.561298 -22.978319 -22.837856 -15.775445 -18.687256 
+-9999 -9999 -0.221720 1.301703 6.475477 16.216287 1.162989 -6.141730 -6.351208 -0.189217 -1.652621 -2.422652 -8.404507 -5.954284 -6.459565 -10.555459 -17.915459 -18.773450 -19.286577 -20.980909 -23.609679 -25.507763 -23.546853 -23.753061 -19.468448 -20.166676 -23.703128 -23.753655 -23.250039 -20.264561 -20.380721 
+-9999 -17.740709 -14.116273 -15.612822 -19.111398 -19.630363 -19.948590 -17.015342 -21.267125 -24.182580 -23.736254 -15.896407 -9.733605 -18.338798 -20.998891 -22.708055 -23.889850 -24.414939 -24.588955 -25.260872 -24.806210 -25.680984 -25.568731 -23.552384 -21.394449 -21.579265 -23.086366 -23.729528 -24.200679 -22.255340 -22.168584 
+-9999 -21.261329 -19.373966 -22.004416 -24.360799 -26.790948 -26.725157 -25.287780 -25.125077 -26.366130 -26.155905 -14.827122 -20.229123 -26.441828 -28.878243 -27.225406 -24.593655 -23.426391 -23.308502 -23.624989 -23.255170 -24.879450 -24.953297 -23.852392 -22.599580 -23.087596 -23.140327 -22.825941 -24.602493 -23.516939 -23.269858 
+-25.407139 -25.014898 -27.020176 -29.082971 -26.758351 -26.129162 -25.084978 -25.768930 -25.890439 -27.437012 -28.558641 -26.565807 -25.424029 -26.512532 -27.361294 -26.108735 -22.464798 -22.999938 -22.571369 -23.193445 -22.427730 -23.765194 -23.065380 -23.081240 -22.272835 -23.107913 -22.803013 -23.093775 -24.530005 -24.634042 -23.597018 
+-26.722459 -26.876244 -29.837148 -28.971638 -26.541433 -25.720725 -25.024598 -24.494124 -24.926629 -26.076794 -25.332625 -22.750472 -20.533283 -22.083689 -24.369400 -23.656436 -22.481358 -23.537520 -22.430304 -22.365021 -22.893229 -23.286548 -20.769007 -21.077164 -21.831539 -21.957346 -21.458915 -22.426655 -23.362720 -22.072852 -23.476568 
+-26.363738 -26.973113 -27.808369 -29.205211 -27.577593 -24.451411 -23.905684 -23.815161 -23.550268 -23.206057 -21.385252 -19.824070 -19.244282 -21.281179 -24.090506 -23.274913 -21.698229 -22.052839 -22.804763 -22.465972 -22.809117 -21.885813 -20.280716 -21.171198 -22.526378 -23.007811 -21.679368 -21.728221 -22.687740 -21.844148 -9999 
+-24.689697 -22.952609 -24.735906 -27.381287 -24.997589 -23.192347 -22.851590 -23.806187 -24.402275 -23.110350 -20.668501 -21.741186 -22.106356 -24.859657 -23.726903 -22.205146 -20.522342 -20.076802 -18.451299 -20.527850 -21.678283 -23.234496 -20.657873 -21.847593 -22.380495 -21.489632 -21.165507 -21.736137 -22.308473 -9999 -9999 
+-9999 -22.362261 -23.820937 -21.445347 -22.465808 -22.809506 -24.584573 -24.794831 -24.492945 -22.796358 -23.286228 -25.156958 -26.733431 -25.244424 -24.805768 -24.926546 -23.993914 -23.096984 -20.274486 -17.514807 -21.044161 -22.061713 -20.943683 -22.070798 -22.370646 -22.007017 -21.356681 -9999 -9999 -9999 -9999 
+-9999 -21.794384 -22.433404 -21.705851 -23.369574 -24.039314 -25.601108 -24.963754 -24.744674 -23.085548 -21.905281 -23.577806 -24.447253 -24.308858 -25.269100 -25.224235 -25.518412 -25.223859 -22.672865 -21.586234 -21.242310 -20.712384 -21.084559 -21.519174 -21.014712 -21.421902 -9999 -9999 -9999 -9999 -9999 
+-9999 -22.393824 -22.395186 -21.702842 -23.120517 -25.198688 -24.643506 -18.383982 -26.243369 -26.937951 -18.382698 -19.908024 -24.143492 -24.009177 -24.165571 -24.378456 -24.842567 -26.025057 -24.063475 -22.558945 -22.410120 -21.231191 -20.635315 -20.923486 -20.523365 -9999 -9999 -9999 -9999 -9999 -9999 
+-9999 -22.572974 -22.335128 -22.441537 -23.995242 -23.919397 -22.004284 -17.475414 -24.481236 -28.338786 -20.924565 -20.993830 -24.199734 -24.202027 -21.114650 -18.364943 -23.832761 -23.854586 -24.113376 -22.441847 -21.498596 -22.198135 -20.672343 -9999 -9999 -9999 -9999 -9999 -9999 -9999 -9999 
+-9999 -22.355875 -21.166331 -21.183686 -22.931734 -21.714757 -19.933793 -19.622586 -24.246450 -26.546832 -26.832545 -24.609400 -25.618321 -24.390700 -16.989273 -19.423067 -23.544361 -21.858643 -23.619029 -22.131955 -20.726720 -21.512294 -9999 -9999 -9999 -9999 -9999 -9999 -9999 -9999 -9999 
+-9999 -9999 -24.141644 -23.467660 -22.005229 -20.162603 -20.895944 -21.672077 -25.336691 -27.942851 -28.401465 -27.688883 -28.567039 -27.222372 -26.708149 -26.680171 -28.050491 -25.574801 -23.838404 -22.787746 -9999 -9999 -9999 -9999 -9999 -9999 -9999 -9999 -9999 -9999 -9999 
+-9999 -9999 -23.644795 -22.926764 -18.481377 -19.377801 -20.100531 -21.934857 -24.039027 -25.146295 -24.938599 -26.571910 -25.713543 -25.537932 -24.220599 -24.120079 -25.425004 -25.113274 -25.531900 -9999 -9999 -9999 -9999 -9999 -9999 -9999 -9999 -9999 -9999 -9999 -9999 
+-9999 -9999 -18.058855 -18.450565 -18.742401 -18.453768 -20.045605 -23.078228 -23.644310 -22.326443 -22.158046 -21.826324 -21.081227 -20.845912 -18.886364 -20.059689 -22.495386 -22.911596 -9999 -9999 -9999 -9999 -9999 -9999 -9999 -9999 -9999 -9999 -9999 -9999 -9999 
+-9999 -9999 -15.997768 -16.310740 -19.016060 -18.807218 -20.436784 -22.868593 -22.992560 -22.071597 -20.913851 -20.058332 -18.123888 -16.857975 -14.628866 -17.345018 -9999 -9999 -9999 -9999 -9999 -9999 -9999 -9999 -9999 -9999 -9999 -9999 -9999 -9999 -9999 
+-9999 -9999 -15.420029 -14.890621 -16.703524 -17.853852 -19.766314 -20.134005 -20.338181 -20.361235 -19.272934 -15.939549 -20.027187 -16.712120 -15.672378 -9999 -9999 -9999 -9999 -9999 -9999 -9999 -9999 -9999 -9999 -9999 -9999 -9999 -9999 -9999 -9999 
+-9999 -9999 -9999 -16.495315 -17.921837 -18.060379 -18.820221 -18.654675 -18.741483 -18.454280 -17.964282 -18.106652 -20.251335 -9999 -9999 -9999 -9999 -9999 -9999 -9999 -9999 -9999 -9999 -9999 -9999 -9999 -9999 -9999 -9999 -9999 -9999 
+-9999 -9999 -9999 -9999 -9999 -9999 -9999 -9999 -9999 -9999 -9999 -9999 -9999 -9999 -9999 -9999 -9999 -9999 -9999 -9999 -9999 -9999 -9999 -9999 -9999 -9999 -9999 -9999 -9999 -9999 -9999 
--- a/Tests/Data/MeshGeoToolsLib/Hamburg/layer17.asc
+++ b/Tests/Data/MeshGeoToolsLib/Hamburg/layer17.asc
+ncols         31
+nrows         22
+xllcorner     559328.046880
+yllcorner     5928784.596700
+cellsize      250.000000
+NODATA_value  -9999
+-9999 -9999 -9999 -294.751462 -296.241502 -299.147362 -302.489101 -306.685638 -311.684200 -316.523481 -319.514623 -320.156667 -320.485062 -320.591694 -319.964918 -319.665925 -321.030802 -323.280354 -324.530726 -325.252690 -324.909810 -322.970925 -319.226833 -313.464964 -305.945963 -297.330087 -289.715064 -284.312783 -278.895371 -271.301902 -266.852458 
+-9999 -9999 -9999 -302.655697 -305.446664 -306.276793 -309.227040 -312.350418 -317.763907 -322.722928 -321.473619 -323.118021 -322.452431 -324.619352 -323.209658 -322.718804 -323.775778 -324.870146 -325.912340 -326.181925 -325.098339 -322.578646 -319.529959 -313.748987 -306.881205 -296.690316 -289.254193 -283.427790 -278.200837 -272.280854 -267.713061 
+-9999 -9999 -334.292908 -323.876886 -319.313720 -322.713040 -322.012747 -325.096005 -330.493826 -332.427789 -332.731399 -330.978994 -331.337042 -330.675746 -329.885563 -328.685922 -328.310736 -328.920339 -329.293424 -327.296280 -326.216388 -322.907848 -318.111984 -311.776110 -304.933118 -294.019637 -287.080515 -281.975030 -277.766075 -271.592033 -267.944436 
+-9999 -9999 -341.990359 -331.709290 -338.036537 -333.758999 -338.625126 -341.531929 -342.322095 -344.043552 -342.181675 -340.334507 -340.118754 -340.838232 -337.653769 -335.970056 -335.686535 -335.706737 -332.730287 -330.663399 -327.368063 -323.832765 -315.388024 -308.903669 -301.189877 -292.955340 -284.098617 -278.284442 -274.139637 -268.955098 -265.132912 
+-9999 -365.824927 -358.361319 -354.619291 -355.959040 -355.472009 -359.369303 -350.731994 -359.316303 -358.831527 -350.384113 -350.599101 -349.526088 -348.139765 -346.456779 -342.248011 -343.723414 -341.107030 -337.992468 -333.024907 -329.254984 -324.052685 -318.829835 -310.105426 -302.487473 -291.518860 -283.435488 -275.807801 -267.635077 -264.718589 -261.522076 
+-9999 -373.203508 -373.355614 -372.743069 -376.064663 -374.042450 -371.267916 -374.163077 -373.380716 -369.673068 -364.825540 -360.983030 -359.483234 -356.489144 -354.069813 -351.455378 -349.225770 -345.696214 -341.198812 -335.901709 -331.854737 -325.336673 -319.131853 -311.159346 -303.156655 -293.344476 -284.190961 -274.072681 -264.179449 -259.764345 -258.777288 
+-383.580620 -386.002721 -389.373784 -387.636227 -389.069634 -388.712073 -387.913579 -383.881430 -382.175041 -378.483122 -374.104722 -369.978918 -367.227144 -364.826915 -360.733955 -355.813590 -352.568845 -348.891747 -344.185157 -338.978270 -332.753339 -327.503957 -320.949410 -313.690101 -303.879072 -294.279712 -282.704259 -273.452294 -265.011812 -259.111915 -257.953425 
+-383.127466 -388.736318 -393.175640 -392.906103 -392.507875 -390.905947 -388.954107 -385.809375 -383.488959 -380.610654 -375.378479 -371.822768 -368.296306 -366.223339 -362.526896 -357.918011 -353.207895 -349.210029 -344.733290 -340.026570 -333.620391 -328.604570 -323.280383 -314.642889 -303.662640 -290.463111 -280.844453 -273.540420 -265.030753 -260.883606 -258.445810 
+-383.726973 -387.418957 -390.405409 -390.355578 -389.021438 -386.281536 -383.521193 -380.414098 -378.069463 -375.876614 -373.693877 -369.048386 -366.226791 -363.243855 -358.728611 -356.175320 -351.513251 -347.506355 -343.156576 -339.381817 -330.516944 -325.523847 -321.602654 -312.413371 -301.391726 -290.935923 -280.195327 -272.602989 -265.786686 -263.570079 -9999 
+-384.779635 -387.327327 -388.631300 -387.649359 -384.408271 -382.078115 -378.492479 -375.683350 -373.631393 -372.943436 -371.046798 -368.317614 -364.651099 -359.818519 -355.607379 -351.761028 -348.271543 -344.251554 -340.880814 -334.382056 -328.287757 -322.804236 -317.296087 -309.624079 -299.707575 -286.609913 -276.682378 -269.198556 -268.293620 -9999 -9999 
+-9999 -390.581055 -390.328873 -387.875596 -383.837988 -380.239799 -376.857434 -375.215301 -374.552391 -373.589774 -372.809963 -369.427561 -364.245618 -359.175466 -353.582941 -347.623668 -343.660147 -339.466316 -334.482045 -327.071775 -323.523296 -318.980634 -314.549484 -305.406290 -296.001200 -280.440635 -279.296046 -9999 -9999 -9999 -9999 
+-9999 -396.861743 -393.962885 -389.189317 -385.868969 -381.980910 -378.877743 -377.787001 -377.265838 -376.347291 -376.474840 -372.920873 -367.558062 -361.007386 -353.121896 -346.315674 -341.548602 -335.438713 -327.946104 -323.890175 -319.875219 -315.983854 -311.816694 -303.228167 -293.196427 -284.808942 -9999 -9999 -9999 -9999 -9999 
+-9999 -400.625912 -400.224671 -396.046937 -392.198550 -386.583638 -381.362208 -379.176818 -379.066975 -379.449208 -377.431986 -374.637030 -370.052110 -362.943520 -355.396208 -344.520423 -339.710982 -331.916282 -327.259672 -321.720762 -317.330521 -314.163785 -307.755561 -301.774135 -296.853497 -9999 -9999 -9999 -9999 -9999 -9999 
+-9999 -406.602673 -405.368346 -401.794482 -397.991168 -392.980727 -386.556980 -380.988721 -379.442616 -379.045102 -377.177241 -374.080930 -370.436055 -365.888388 -353.315690 -344.886538 -339.660830 -331.611117 -325.877986 -319.575949 -315.018363 -309.161023 -308.834459 -9999 -9999 -9999 -9999 -9999 -9999 -9999 -9999 
+-9999 -408.615930 -408.165323 -404.858211 -401.204122 -394.935849 -390.251012 -383.949307 -380.607440 -378.945180 -376.993075 -373.582264 -370.560933 -365.021779 -356.332154 -347.008347 -340.518121 -331.941432 -323.960802 -319.250326 -312.660645 -311.213805 -9999 -9999 -9999 -9999 -9999 -9999 -9999 -9999 -9999 
+-9999 -9999 -406.502283 -404.096641 -400.889790 -395.960262 -390.300377 -386.730244 -383.089011 -379.978415 -377.975038 -374.085716 -369.474077 -364.050232 -356.132239 -348.194765 -339.283505 -329.719736 -319.057311 -319.971360 -9999 -9999 -9999 -9999 -9999 -9999 -9999 -9999 -9999 -9999 -9999 
+-9999 -9999 -405.071320 -402.766081 -399.817364 -396.680092 -392.716423 -388.318470 -384.239209 -381.588569 -377.448240 -373.808301 -367.250664 -360.707285 -354.221070 -347.785021 -336.632142 -327.527347 -323.061412 -9999 -9999 -9999 -9999 -9999 -9999 -9999 -9999 -9999 -9999 -9999 -9999 
+-9999 -9999 -402.323001 -401.130339 -398.929768 -395.160385 -392.248106 -388.197627 -385.339759 -382.277578 -376.050494 -369.693368 -361.216879 -354.846658 -349.291162 -345.155768 -336.990138 -332.263962 -9999 -9999 -9999 -9999 -9999 -9999 -9999 -9999 -9999 -9999 -9999 -9999 -9999 
+-9999 -9999 -399.673762 -398.875242 -396.568807 -392.943453 -390.722718 -387.985115 -384.455081 -380.817304 -373.904833 -366.470505 -356.225951 -349.226719 -338.977417 -342.808434 -9999 -9999 -9999 -9999 -9999 -9999 -9999 -9999 -9999 -9999 -9999 -9999 -9999 -9999 -9999 
+-9999 -9999 -398.022298 -395.490969 -392.129103 -390.074005 -387.993640 -385.796037 -382.341230 -378.012924 -370.705076 -362.036616 -352.691381 -343.067785 -341.240691 -9999 -9999 -9999 -9999 -9999 -9999 -9999 -9999 -9999 -9999 -9999 -9999 -9999 -9999 -9999 -9999 
+-9999 -9999 -9999 -391.365599 -387.473902 -385.105322 -384.259962 -382.898708 -378.915315 -373.251659 -364.533606 -358.012313 -357.461659 -9999 -9999 -9999 -9999 -9999 -9999 -9999 -9999 -9999 -9999 -9999 -9999 -9999 -9999 -9999 -9999 -9999 -9999 
+-9999 -9999 -9999 -9999 -9999 -9999 -9999 -9999 -9999 -9999 -9999 -9999 -9999 -9999 -9999 -9999 -9999 -9999 -9999 -9999 -9999 -9999 -9999 -9999 -9999 -9999 -9999 -9999 -9999 -9999 -9999 
--- a/Tests/Data/MeshGeoToolsLib/Hamburg/output0.asc
+++ b/Tests/Data/MeshGeoToolsLib/Hamburg/output0.asc
+ncols 31
+nrows 22
+xllcorner 559328
+yllcorner 5.92878e+06
+cellsize 250
+NODATA_value -9999
+-9999 -9999 -9999 -133.928 -133.918 -135.54 -142.008 -149.279 -152.771 -153.602 -154.069 -155.072 -155.222 -157.686 -160.532 -161.116 -160.904 -159.763 -159.524 -160.174 -160.93 -160.81 -160.38 -161.125 -159.845 -155.838 -152.162 -149.474 -146.948 -143.091 -140.645 
+-9999 -9999 -9999 -137.556 -138.332 -139.593 -143.858 -151.683 -155.911 -156.454 -153 -156.964 -158.169 -161.408 -163.093 -164.086 -163.961 -157.815 -159.71 -160.314 -160.51 -161.413 -161.205 -163.186 -161.687 -156.721 -152.629 -150.275 -148.195 -144.728 -141.998 
+-9999 -9999 -161.68 -147.402 -142.611 -149.811 -147.507 -158.34 -156.654 -154.681 -158.771 -162.688 -164.676 -166.952 -168.374 -168.157 -167.483 -163.692 -164.728 -162.245 -157.096 -165.141 -164.779 -165.851 -163.198 -157.886 -154.321 -152.477 -150.302 -143.684 -143.316 
+-9999 -9999 -171.106 -165.204 -165.781 -158.771 -168.731 -173.837 -174.337 -172.116 -171.917 -171.379 -174.262 -173.396 -172.057 -173.263 -176.801 -177.24 -176.008 -175.822 -175.489 -174.67 -169.467 -166.328 -160.329 -156.561 -153.901 -151.019 -148.695 -144.61 -142.757 
+-9999 -191.783 -186.239 -185.116 -187.535 -187.551 -189.659 -183.874 -190.292 -191.507 -187.06 -183.248 -179.63 -183.239 -183.728 -182.478 -183.807 -182.761 -181.291 -179.143 -177.031 -174.867 -172.199 -166.829 -161.941 -156.549 -153.261 -149.769 -145.918 -143.487 -141.845 
+-9999 -197.232 -196.365 -197.374 -200.213 -200.417 -198.997 -199.725 -199.253 -198.02 -195.491 -187.905 -189.856 -191.465 -191.474 -189.34 -186.91 -184.561 -182.254 -179.763 -177.555 -175.108 -172.043 -167.506 -162.878 -158.216 -153.666 -148.449 -144.391 -141.641 -141.024 
+-204.494 -205.509 -208.197 -208.36 -207.914 -207.421 -206.499 -204.825 -204.033 -202.96 -201.332 -198.272 -196.326 -195.67 -194.048 -190.961 -187.517 -185.946 -183.378 -181.086 -177.591 -175.635 -172.007 -168.386 -163.076 -158.694 -152.754 -148.273 -144.771 -141.873 -140.775 
+-204.925 -207.806 -211.506 -210.939 -209.525 -208.313 -206.989 -205.152 -204.208 -203.344 -200.356 -197.287 -194.415 -194.154 -193.448 -190.787 -187.845 -186.374 -183.582 -181.196 -178.257 -175.946 -172.025 -167.86 -162.747 -156.21 -151.152 -147.984 -144.197 -141.478 -140.961 
+-205.045 -207.196 -209.107 -209.78 -208.3 -205.366 -203.713 -202.115 -200.81 -199.541 -197.54 -194.436 -192.736 -192.263 -191.41 -189.725 -186.606 -184.78 -182.981 -180.924 -176.663 -173.705 -170.942 -166.792 -161.959 -156.972 -150.937 -147.166 -144.237 -142.707 -9999 
+-204.735 -205.14 -206.684 -207.515 -204.703 -202.635 -200.672 -199.745 -199.017 -198.027 -195.858 -195.029 -193.379 -192.339 -189.667 -186.983 -184.397 -182.164 -179.666 -177.455 -174.983 -173.019 -168.977 -165.736 -161.044 -154.05 -148.924 -145.467 -145.301 -9999 -9999 
+-9999 -206.472 -207.075 -204.66 -203.152 -201.525 -200.721 -200.005 -199.523 -198.193 -198.048 -197.292 -195.49 -192.21 -189.194 -186.275 -183.827 -181.282 -177.378 -172.293 -172.284 -170.521 -167.747 -163.739 -159.186 -151.224 -150.326 -9999 -9999 -9999 -9999 
+-9999 -209.328 -208.198 -205.448 -204.619 -203.01 -202.239 -201.375 -201.005 -199.716 -199.19 -198.249 -196.003 -192.658 -189.195 -185.77 -183.534 -180.331 -175.309 -172.738 -170.559 -168.348 -166.451 -162.374 -157.106 -153.115 -9999 -9999 -9999 -9999 -9999 
+-9999 -211.51 -211.31 -208.875 -207.66 -205.891 -203.003 -198.78 -202.655 -203.194 -197.907 -197.273 -197.098 -193.476 -189.781 -184.449 -182.277 -178.971 -175.662 -172.14 -169.87 -167.697 -164.195 -161.349 -158.688 -9999 -9999 -9999 -9999 -9999 -9999 
+-9999 -214.588 -213.852 -212.118 -210.993 -208.45 -204.281 -199.232 -201.962 -203.692 -199.051 -197.537 -197.318 -195.045 -187.215 -181.626 -181.747 -177.733 -174.996 -171.009 -168.258 -165.68 -164.753 -9999 -9999 -9999 -9999 -9999 -9999 -9999 -9999 
+-9999 -215.486 -214.666 -213.021 -212.068 -208.325 -205.092 -201.786 -202.427 -202.746 -201.913 -199.096 -198.09 -194.706 -186.661 -183.216 -182.031 -176.9 -173.79 -170.691 -166.694 -166.363 -9999 -9999 -9999 -9999 -9999 -9999 -9999 -9999 -9999 
+-9999 -9999 -215.322 -213.782 -211.448 -208.061 -205.598 -204.201 -204.213 -203.961 -203.188 -200.887 -199.021 -195.636 -191.42 -187.437 -183.667 -177.647 -171.448 -171.38 -9999 -9999 -9999 -9999 -9999 -9999 -9999 -9999 -9999 -9999 -9999 
+-9999 -9999 -214.358 -212.846 -209.149 -208.029 -206.408 -205.127 -204.139 -203.367 -201.193 -200.19 -196.482 -193.123 -189.221 -185.953 -181.029 -176.32 -174.297 -9999 -9999 -9999 -9999 -9999 -9999 -9999 -9999 -9999 -9999 -9999 -9999 
+-9999 -9999 -210.191 -209.79 -208.836 -206.807 -206.147 -205.638 -204.492 -202.302 -199.104 -195.76 -191.149 -187.846 -184.089 -182.608 -179.743 -177.588 -9999 -9999 -9999 -9999 -9999 -9999 -9999 -9999 -9999 -9999 -9999 -9999 -9999 
+-9999 -9999 -207.836 -207.593 -207.792 -205.875 -205.58 -205.427 -203.724 -201.444 -197.409 -193.264 -187.175 -183.042 -176.803 -180.077 -9999 -9999 -9999 -9999 -9999 -9999 -9999 -9999 -9999 -9999 -9999 -9999 -9999 -9999 -9999 
+-9999 -9999 -206.721 -205.191 -204.416 -203.964 -203.88 -202.965 -201.34 -199.187 -194.989 -188.988 -186.359 -179.89 -178.457 -9999 -9999 -9999 -9999 -9999 -9999 -9999 -9999 -9999 -9999 -9999 -9999 -9999 -9999 -9999 -9999 
+-9999 -9999 -9999 -203.93 -202.698 -201.583 -201.54 -200.777 -198.828 -195.853 -191.249 -188.059 -188.856 -9999 -9999 -9999 -9999 -9999 -9999 -9999 -9999 -9999 -9999 -9999 -9999 -9999 -9999 -9999 -9999 -9999 -9999 
+-9999 -9999 -9999 -9999 -9999 -9999 -9999 -9999 -9999 -9999 -9999 -9999 -9999 -9999 -9999 -9999 -9999 -9999 -9999 -9999 -9999 -9999 -9999 -9999 -9999 -9999 -9999 -9999 -9999 -9999 -9999