OilfieldToolsNet/opm-upscaling
4
0
Fork 0
mirror of https://github.com/OPM/opm-upscaling.git synced 2025-02-25 18:45:23 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #210 from bska/chase-deckitem-api-update

Browse Source 
Bring CornerpointChopper Up-To-Date With DeckItem API

Merging on Maintainer Approval
This commit is contained in:
Bård Skaflestad 2016-11-11 12:36:03 +01:00 committed by GitHub
commit 76b8e47d0a
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
opm/upscaling/CornerpointChopper.hpp
View File

@ -263,11 +263,11 @@ namespace Opm
Opm::DeckKeyword specGridKw("SPECGRID"); Opm::DeckKeyword specGridKw("SPECGRID");
Opm::DeckRecord specGridRecord; Opm::DeckRecord specGridRecord;
auto nxItem = Opm::DeckItem::make< int >("NX"); auto nxItem = Opm::DeckItem("NX", int());
auto nyItem = Opm::DeckItem::make< int >("NY"); auto nyItem = Opm::DeckItem("NY", int());
auto nzItem = Opm::DeckItem::make< int >("NZ"); auto nzItem = Opm::DeckItem("NZ", int());
auto numresItem = Opm::DeckItem::make< int >("NUMRES"); auto numresItem = Opm::DeckItem("NUMRES", int());
auto coordTypeItem = Opm::DeckItem::make< std::string >("COORD_TYPE"); auto coordTypeItem = Opm::DeckItem("COORD_TYPE", std::string());
nxItem.push_back(new_dims_[0]); nxItem.push_back(new_dims_[0]);
nyItem.push_back(new_dims_[1]); nyItem.push_back(new_dims_[1]);
@ -360,7 +360,7 @@ namespace Opm
Opm::DeckKeyword dataKw(keywordName); Opm::DeckKeyword dataKw(keywordName);
Opm::DeckRecord dataRecord; Opm::DeckRecord dataRecord;
auto dataItem = Opm::DeckItem::make< double >("DATA"); auto dataItem = Opm::DeckItem("DATA", double());
for (size_t i = 0; i < data.size(); ++i) { for (size_t i = 0; i < data.size(); ++i) {
dataItem.push_back(data[i]); dataItem.push_back(data[i]);
@ -383,7 +383,7 @@ namespace Opm
Opm::DeckKeyword dataKw(keywordName); Opm::DeckKeyword dataKw(keywordName);
Opm::DeckRecord dataRecord; Opm::DeckRecord dataRecord;
auto dataItem = Opm::DeckItem::make< int >("DATA"); auto dataItem = Opm::DeckItem("DATA", int());
for (size_t i = 0; i < data.size(); ++i) { for (size_t i = 0; i < data.size(); ++i) {
dataItem.push_back(data[i]); dataItem.push_back(data[i]);