Skip to content
Snippets Groups Projects
Commit e7aedb8d authored by Karsten Rink's avatar Karsten Rink Committed by Lars Bilke
Browse files

fixing mac warnings

parent 1a792624
No related branches found
No related tags found
No related merge requests found
...@@ -9,8 +9,11 @@ set(TOOLS ...@@ -9,8 +9,11 @@ set(TOOLS
TecPlotTools TecPlotTools
GocadSGridReader GocadSGridReader
GocadTSurfaceReader GocadTSurfaceReader
Mesh2Raster Mesh2Raster)
NetCdfConverter)
if(OGS_USE_NETCDF)
list(APPEND TOOLS NetCdfConverter)
endif()
if(OGS_BUILD_GUI) if(OGS_BUILD_GUI)
if(Shapelib_FOUND) if(Shapelib_FOUND)
......
...@@ -175,8 +175,8 @@ void flipRaster(std::vector<double>& data, std::size_t width, ...@@ -175,8 +175,8 @@ void flipRaster(std::vector<double>& data, std::size_t width,
bool canConvert(NcVar const& var) bool canConvert(NcVar const& var)
{ {
bool ret(true); bool ret(var.getDimCount() < 2);
if (ret = (var.getDimCount() < 2)) if (ret)
ERR("Only 2+ dimensional variables can be converted into OGS Meshes.\n"); ERR("Only 2+ dimensional variables can be converted into OGS Meshes.\n");
return !ret; return !ret;
} }
...@@ -187,7 +187,8 @@ std::string arraySelectionLoop(NcFile const& dataset) ...@@ -187,7 +187,8 @@ std::string arraySelectionLoop(NcFile const& dataset)
std::size_t const idx = std::size_t const idx =
parseInput("Enter data array index: ", dataset.getVarCount(), true); parseInput("Enter data array index: ", dataset.getVarCount(), true);
if (idx == dataset.getVarCount() || !canConvert(dataset.getVar(names[idx]))) if (static_cast<int>(idx) == dataset.getVarCount() ||
!canConvert(dataset.getVar(names[idx])))
return arraySelectionLoop(dataset); return arraySelectionLoop(dataset);
return names[idx]; return names[idx];
...@@ -246,7 +247,7 @@ bool dimensionSelectionLoop(NcVar const& var, ...@@ -246,7 +247,7 @@ bool dimensionSelectionLoop(NcVar const& var,
" " + dim_comment[i - start_idx] + ": "); " " + dim_comment[i - start_idx] + ": ");
std::size_t const idx = parseInput(request_str, var.getDimCount(), true); std::size_t const idx = parseInput(request_str, var.getDimCount(), true);
if (idx == var.getDimCount()) if (static_cast<int>(idx) == var.getDimCount())
{ {
showArraysDims(var); showArraysDims(var);
i--; i--;
...@@ -262,7 +263,6 @@ std::pair<std::size_t, std::size_t> timestepSelectionLoop(NcFile const& dataset, ...@@ -262,7 +263,6 @@ std::pair<std::size_t, std::size_t> timestepSelectionLoop(NcFile const& dataset,
NcVar const& var, NcVar const& var,
std::size_t dim_idx) std::size_t dim_idx)
{ {
NcVar const& dim_var = getDimVar(dataset, var, dim_idx);
std::size_t const n_time_steps = var.getDim(dim_idx).getSize(); std::size_t const n_time_steps = var.getDim(dim_idx).getSize();
std::pair<std::size_t, std::size_t> bounds( std::pair<std::size_t, std::size_t> bounds(
std::numeric_limits<std::size_t>::max(), std::numeric_limits<std::size_t>::max(),
...@@ -488,8 +488,6 @@ bool convert(NcFile const& dataset, NcVar const& var, ...@@ -488,8 +488,6 @@ bool convert(NcFile const& dataset, NcVar const& var,
bool const use_single_file, MeshLib::MeshElemType const elem_type) bool const use_single_file, MeshLib::MeshElemType const elem_type)
{ {
std::unique_ptr<MeshLib::Mesh> mesh; std::unique_ptr<MeshLib::Mesh> mesh;
std::size_t const temp_offset = (is_time_dep) ? 1 : 0;
std::size_t const n_dims = (var.getDimCount());
std::vector<std::size_t> length; std::vector<std::size_t> length;
std::size_t const array_length = getLength(var, is_time_dep, length); std::size_t const array_length = getLength(var, is_time_dep, length);
for (std::size_t i = time_bounds.first; i <= time_bounds.second; ++i) for (std::size_t i = time_bounds.first; i <= time_bounds.second; ++i)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment