diff --git a/Applications/Utils/MeshGeoTools/AssignRasterDataToMesh.cpp b/Applications/Utils/MeshGeoTools/AssignRasterDataToMesh.cpp
index aae941e20645045140cbf0854c90183bc58cf735..42f3f02340c7625d6d4426ec1f8c4bdbd9ad8504 100644
--- a/Applications/Utils/MeshGeoTools/AssignRasterDataToMesh.cpp
+++ b/Applications/Utils/MeshGeoTools/AssignRasterDataToMesh.cpp
@@ -80,9 +80,9 @@ int main(int argc, char* argv[])
std::unique_ptr<MeshLib::Mesh> const mesh(
MeshLib::IO::readMeshFromFile(mesh_name));
- if (mesh->getDimension() != 2)
+ if (mesh->getDimension() > 2)
{
- ERR("Method can only be applied to 2D meshes.");
+ ERR("Method can not be applied to 3D meshes.");
return EXIT_FAILURE;
}
diff --git a/Applications/Utils/Tests.cmake b/Applications/Utils/Tests.cmake
index f247044067f64772a1c6818712954f024a0775b4..7759bb3668ff857df03e6a4b0ec0326c57766929 100644
--- a/Applications/Utils/Tests.cmake
+++ b/Applications/Utils/Tests.cmake
@@ -436,7 +436,7 @@ AddTest(
)
AddTest(
- NAME AssignRasterDataToMesh_Test
+ NAME AssignRasterDataToMesh2D_Test
PATH MeshGeoToolsLib/Ammer
WORKING_DIRECTORY ${Data_SOURCE_DIR}/MeshGeoToolsLib/Ammer
EXECUTABLE AssignRasterDataToMesh
@@ -447,3 +447,16 @@ AddTest(
AmmerGWN.vtu AmmerGWN.vtu GWN GWN 0 0
AmmerGWN.vtu AmmerGWN.vtu GWN-2 GWN-2 0 0
)
+
+AddTest(
+ NAME AssignRasterDataToMesh1D_Test
+ PATH MeshGeoToolsLib/Ammer
+ WORKING_DIRECTORY ${Data_SOURCE_DIR}/MeshGeoToolsLib/Ammer
+ EXECUTABLE AssignRasterDataToMesh
+ EXECUTABLE_ARGS -i AmmerRivers.vtu -r AmmerGWN.asc -o ${Data_BINARY_DIR}/MeshGeoToolsLib/Ammer/AmmerRiversGWN.vtu -s GWN -c -n
+ REQUIREMENTS NOT OGS_USE_MPI
+ TESTER vtkdiff
+ DIFF_DATA
+ AmmerRiversGWN.vtu AmmerRiversGWN.vtu GWN GWN 0 0
+ AmmerRiversGWN.vtu AmmerRiversGWN.vtu GWN-2 GWN-2 0 0
+)
diff --git a/Tests/Data/MeshGeoToolsLib/Ammer/AmmerRivers.vtu b/Tests/Data/MeshGeoToolsLib/Ammer/AmmerRivers.vtu
new file mode 100644
index 0000000000000000000000000000000000000000..b92825be885de1a6c26139bcbcb3add4f54dfdea
--- /dev/null
+++ b/Tests/Data/MeshGeoToolsLib/Ammer/AmmerRivers.vtu
@@ -0,0 +1,48 @@
+<VTKFile type="UnstructuredGrid" version="1.0" byte_order="LittleEndian" header_type="UInt64">
+ <UnstructuredGrid>
+ <Piece NumberOfPoints="6" NumberOfCells="5">
+ <PointData>
+ </PointData>
+ <CellData Scalars="PolylineIDs">
+ <DataArray type="Int32" Name="PolylineIDs" format="ascii" RangeMin="0" RangeMax="4">
+ 0 1 2 3 4
+ </DataArray>
+ </CellData>
+ <Points>
+ <DataArray type="Float32" Name="Points" NumberOfComponents="3" format="ascii" RangeMin="6415010.609016309" RangeMax="6415307.25710424">
+ 3489381.75 5382989.5 399.30999755859375 3489500 5382985.5 398.57000732421875
+ 3489597 5382982 398.29998779296875 3489689.25 5383081.5 398.29998779296875
+ 3489796.75 5383074 396.57000732421875 3489888 5382985 394.2099914550781
+ <InformationKey name="L2_NORM_RANGE" location="vtkDataArray" length="2">
+ <Value index="0">
+ 6415010.609
+ </Value>
+ <Value index="1">
+ 6415307.2571
+ </Value>
+ </InformationKey>
+ <InformationKey name="L2_NORM_FINITE_RANGE" location="vtkDataArray" length="2">
+ <Value index="0">
+ 6415010.609
+ </Value>
+ <Value index="1">
+ 6415307.2571
+ </Value>
+ </InformationKey>
+ </DataArray>
+ </Points>
+ <Cells>
+ <DataArray type="Int64" Name="connectivity" format="ascii" RangeMin="0" RangeMax="5">
+ 0 1 1 2 2 3
+ 3 4 4 5
+ </DataArray>
+ <DataArray type="Int64" Name="offsets" format="ascii" RangeMin="2" RangeMax="10">
+ 2 4 6 8 10
+ </DataArray>
+ <DataArray type="UInt8" Name="types" format="ascii" RangeMin="3" RangeMax="3">
+ 3 3 3 3 3
+ </DataArray>
+ </Cells>
+ </Piece>
+ </UnstructuredGrid>
+</VTKFile>
diff --git a/Tests/Data/MeshGeoToolsLib/Ammer/AmmerRiversGWN.vtu b/Tests/Data/MeshGeoToolsLib/Ammer/AmmerRiversGWN.vtu
new file mode 100644
index 0000000000000000000000000000000000000000..4b4c43b0172b1f01b1306d056bf3b6742f322ef2
--- /dev/null
+++ b/Tests/Data/MeshGeoToolsLib/Ammer/AmmerRiversGWN.vtu
@@ -0,0 +1,25 @@
+<?xml version="1.0"?>
+<VTKFile type="UnstructuredGrid" version="1.0" byte_order="LittleEndian" header_type="UInt64">
+ <UnstructuredGrid>
+ <Piece NumberOfPoints="6" NumberOfCells="5" >
+ <PointData>
+ <DataArray type="Float64" Name="GWN" format="appended" RangeMin="174.8421" RangeMax="178.8937" offset="0" />
+ </PointData>
+ <CellData>
+ <DataArray type="Float64" Name="GWN-2" format="appended" RangeMin="174.8421" RangeMax="178.8937" offset="76" />
+ <DataArray type="Int32" Name="PolylineIDs" format="appended" RangeMin="0" RangeMax="4" offset="140" />
+ </CellData>
+ <Points>
+ <DataArray type="Float64" Name="Points" NumberOfComponents="3" format="appended" RangeMin="6415010.609" RangeMax="6415307.2571" offset="180" />
+ </Points>
+ <Cells>
+ <DataArray type="Int64" Name="connectivity" format="appended" RangeMin="" RangeMax="" offset="384" />
+ <DataArray type="Int64" Name="offsets" format="appended" RangeMin="" RangeMax="" offset="504" />
+ <DataArray type="UInt8" Name="types" format="appended" RangeMin="" RangeMax="" offset="568" />
+ </Cells>
+ </Piece>
+ </UnstructuredGrid>
+ <AppendedData encoding="base64">
+ _MAAAAAAAAADtDb4wmVxmQHQkl/+QPGZADAIrhxb5ZUDF/rJ78tplQIcW2c73E2ZAqRPQRNjsZUA=KAAAAAAAAADtDb4wmVxmQHQkl/+QPGZADAIrhxb5ZUDF/rJ78tplQKs+V1uxM2ZAFAAAAAAAAAAAAAAAAQAAAAIAAAADAAAABAAAAA==kAAAAAAAAAAAAADgMp9KQQAAAGDTiFRBAAAAwPX0eEAAAAAAbp9KQQAAAGDSiFRBAAAAwB7peEAAAACAnp9KQQAAAIDRiFRBAAAAwMzkeEAAAACgzJ9KQQAAAGDqiFRBAAAAwMzkeEAAAABgAqBKQQAAAIDoiFRBAAAAwB7JeEAAAAAAMKBKQQAAAEDSiFRBAAAAIFyjeEA=UAAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAQAAAAAAAAACAAAAAAAAAAIAAAAAAAAAAwAAAAAAAAADAAAAAAAAAAQAAAAAAAAABAAAAAAAAAAFAAAAAAAAAA==KAAAAAAAAAACAAAAAAAAAAQAAAAAAAAABgAAAAAAAAAIAAAAAAAAAAoAAAAAAAAABQAAAAAAAAADAwMDAw==
+ </AppendedData>
+</VTKFile>