From 7dfb45067b0bef77d5284b24beb1634ba8b168fd Mon Sep 17 00:00:00 2001 From: Arne Morten Kvarving Date: Mon, 27 Jan 2020 15:33:18 +0100 Subject: [PATCH] don't use templated get and has interface from fieldpropsmanager it is now private --- ebos/equil/initstateequil.hh | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/ebos/equil/initstateequil.hh b/ebos/equil/initstateequil.hh index 289925dbf..d19ce6db5 100644 --- a/ebos/equil/initstateequil.hh +++ b/ebos/equil/initstateequil.hh @@ -902,11 +902,11 @@ equilnum(const Opm::EclipseState& eclipseState, { std::vector eqlnum(grid.size(0), 0); - if (eclipseState.fieldProps().has("EQLNUM")) { + if (eclipseState.fieldProps().has_int("EQLNUM")) { const int nc = grid.size(/*codim=*/0); eqlnum.resize(nc); - const auto& e = eclipseState.fieldProps().get_global("EQLNUM"); + const auto& e = eclipseState.fieldProps().get_global_int("EQLNUM"); const int* gc = Opm::UgGridHelpers::globalCell(grid); for (int cell = 0; cell < nc; ++cell) { const int deckPos = (gc == NULL) ? cell : gc[cell]; @@ -942,8 +942,8 @@ public: if (applySwatInit) { const int nc = grid.size(/*codim=*/0); - if (eclipseState.fieldProps().has("SWATINIT")) { - const std::vector& swatInitEcl = eclipseState.fieldProps().get_global("SWATINIT"); + if (eclipseState.fieldProps().has_double("SWATINIT")) { + const std::vector& swatInitEcl = eclipseState.fieldProps().get_global_double("SWATINIT"); const int* gc = Opm::UgGridHelpers::globalCell(grid); swatInit_.resize(nc); for (int c = 0; c < nc; ++c) { @@ -1082,7 +1082,7 @@ private: void updateInitialTemperature_(const Opm::EclipseState& eclState) { // Get the initial temperature data - std::vector tempiData = eclState.fieldProps().get_global("TEMPI"); + std::vector tempiData = eclState.fieldProps().get_global_double("TEMPI"); temperature_ = tempiData; } @@ -1105,7 +1105,7 @@ private: std::vector cellPvtRegionIdx(numCompressed); //Get the PVTNUM data - const auto pvtnumData = eclState.fieldProps().get_global("PVTNUM"); + const auto pvtnumData = eclState.fieldProps().get_global_int("PVTNUM"); // Convert PVTNUM data into an array of indices for compressed cells. Remember // that Eclipse uses Fortran-style indices which start at 1 instead of 0, so we // need to subtract 1.