From 9ff5e9e7faf4b4d036066f60528364c5564a2aeb Mon Sep 17 00:00:00 2001
From: Karsten Rink <karsten.rink@ufz.de>
Date: Tue, 11 Nov 2014 10:24:06 +0100
Subject: [PATCH] changes based on pr comments
Conflicts:
MeshLib/MeshGenerators/LayeredVolume.cpp
---
MeshLib/MeshGenerators/LayeredVolume.cpp | 4 ++--
MeshLib/MeshGenerators/MeshLayerMapper.cpp | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/MeshLib/MeshGenerators/LayeredVolume.cpp b/MeshLib/MeshGenerators/LayeredVolume.cpp
index 43ea43b0189..cc36b1e7453 100644
--- a/MeshLib/MeshGenerators/LayeredVolume.cpp
+++ b/MeshLib/MeshGenerators/LayeredVolume.cpp
@@ -57,8 +57,8 @@ bool LayeredVolume::createRasterLayers(const MeshLib::Mesh &mesh, const std::vec
// map each layer and attach to subsurface mesh
const std::size_t nRasters (rasters.size());
- for (int i=nRasters-2; i>=0; --i)
- this->addLayerToMesh(*top, nRasters-i-1, *rasters[i]);
+ for (std::size_t i=1; i<nRasters; ++i)
+ this->addLayerToMesh(*top, i, *rasters[i]);
// close boundaries between layers
this->addLayerBoundaries(*top, nRasters);
diff --git a/MeshLib/MeshGenerators/MeshLayerMapper.cpp b/MeshLib/MeshGenerators/MeshLayerMapper.cpp
index f255189eea6..aaf22cb0d25 100644
--- a/MeshLib/MeshGenerators/MeshLayerMapper.cpp
+++ b/MeshLib/MeshGenerators/MeshLayerMapper.cpp
@@ -109,7 +109,7 @@ MeshLib::Mesh* MeshLayerMapper::createStaticLayers(MeshLib::Mesh const& mesh, st
bool MeshLayerMapper::createRasterLayers(MeshLib::Mesh const& mesh, std::vector<GeoLib::Raster const*> const& rasters, double noDataReplacementValue)
{
const std::size_t nLayers(rasters.size());
- if (nLayers < 1 || mesh.getDimension() != 2)
+ if (nLayers < 2 || mesh.getDimension() != 2)
{
ERR("MeshLayerMapper::createRasterLayers(): A 2D mesh and at least two rasters required as input.");
return nullptr;
--
GitLab