OilfieldToolsNet/opm-common
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1966 from joakim-hove/tran-calc-init

Browse Source 
Tran calc init
This commit is contained in:
Joakim Hove
2020-09-28 16:55:07 +02:00
committed by GitHub
parent 5fbf725ea8 8e55f3138b
commit f331add35b
6 changed files with 162 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
opm/parser/eclipse/EclipseState/Grid/FieldPropsManager.hpp
View File

@@ -35,30 +35,6 @@ class TableManager;
class FieldPropsManager {
struct MemInfo {
std::size_t global_size;
std::size_t active_size;
std::size_t int_fields;
std::size_t double_fields;
std::size_t total;
MemInfo(std::size_t gsize, std::size_t asize, std::size_t num_int, std::size_t num_double) :
global_size(gsize),
active_size(asize),
int_fields(num_int),
double_fields(num_double),
total(asize * sizeof(int) * num_int + // The integer fields like SATNUM and PVTNUM
asize * sizeof(double) * num_double + // The double fields like PORO and SWATINIT
asize * sizeof(double) * 2 + // Depth and volume of all active cells
asize * sizeof(unsigned char) * (num_int + num_double) + // The per cell value status flag
gsize * sizeof(int)) // The global ACTNUM mapping
{
};
};
public:
// The default constructor should be removed when the FieldPropsManager is mandatory
@@ -69,7 +45,6 @@ public:
const std::string& default_region() const;
virtual std::vector<int> actnum() const;
virtual std::vector<double> porv(bool global = false) const;
MemInfo meminfo( ) const;
/*
The number of cells in the fields managed by this FieldPropsManager.

3
opm/parser/eclipse/EclipseState/Grid/TranCalculator.hpp
View File

@@ -86,6 +86,9 @@ public:
case ScalarOperation::ADD:
kw_info.init(0);
break;
case ScalarOperation::EQUAL:
kw_info.init(0);
break;
case ScalarOperation::MAX:
kw_info.init(std::numeric_limits<double>::max());
break;

8
src/opm/parser/eclipse/EclipseState/Grid/FieldProps.cpp
View File

@@ -640,6 +640,12 @@ double FieldProps::getSIValue(const std::string& keyword, double raw_value) cons
double FieldProps::getSIValue(ScalarOperation op, const std::string& keyword, double raw_value) const {
if (op == ScalarOperation::MUL)
return raw_value;
return this->getSIValue(keyword, raw_value);
}
void FieldProps::handle_int_keyword(const Fieldprops::keywords::keyword_info<int>& kw_info, const DeckKeyword& keyword, const Box& box) {
@@ -1020,7 +1026,7 @@ void FieldProps::scanEDITSection(const EDITSection& edit_section) {
if (tran_iter!= this->tran.end()) {
auto& tran_calc = tran_iter->second;
auto unique_name = tran_calc.next_name();
Fieldprops::keywords::keyword_info<double> kw_info;
auto kw_info = tran_calc.make_kw_info(ScalarOperation::EQUAL);
this->handle_double_keyword(Section::EDIT, kw_info, keyword, unique_name, box);
tran_calc.add_action( Fieldprops::ScalarOperation::EQUAL, unique_name );
continue;

1
src/opm/parser/eclipse/EclipseState/Grid/FieldProps.hpp
View File

@@ -458,6 +458,7 @@ private:
void scanSOLUTIONSection(const SOLUTIONSection& solution_section);
void scanSCHEDULESection(const SCHEDULESection& schedule_section);
double getSIValue(const std::string& keyword, double raw_value) const;
double getSIValue(ScalarOperation op, const std::string& keyword, double raw_value) const;
template <typename T>
void erase(const std::string& keyword);

3
src/opm/parser/eclipse/EclipseState/Grid/FieldPropsManager.cpp
View File

@@ -36,9 +36,6 @@ void FieldPropsManager::reset_actnum(const std::vector<int>& actnum) {
this->fp->reset_actnum(actnum);
}
FieldPropsManager::MemInfo FieldPropsManager::meminfo( ) const {
return FieldPropsManager::MemInfo(this->fp->global_size, this->fp->active_size, this->fp->num_int(), this->fp->num_double());
}
template <typename T>
const std::vector<T>& FieldPropsManager::get(const std::string& keyword) const {

179
tests/parser/FieldPropsTests.cpp
View File

@@ -1948,12 +1948,12 @@ BOOST_AUTO_TEST_CASE(TRAN_Calculator) {
GRID
PORO
1000*0.10 /
300*0.10 /
EDIT
TRANX
1000*0.10 /
300*0.10 /
BOX
1 10 1 10 1 1 /
@@ -1982,10 +1982,10 @@ MINVALUE
)";
UnitSystem unit_system(UnitSystem::UnitType::UNIT_TYPE_METRIC);
auto to_si = [&unit_system](double raw_value) { return unit_system.to_si(UnitSystem::measure::transmissibility, raw_value); };
std::vector<int> actnum(1000, 1);
for (std::size_t i=0; i< 1000; i += 2)
std::vector<int> actnum(300, 1);
for (std::size_t i=0; i< 300; i += 2)
actnum[i] = 0;
EclipseGrid grid(EclipseGrid(10,10,10), actnum);
EclipseGrid grid(EclipseGrid(10,10,3), actnum);
Deck deck = Parser{}.parseString(deck_string);
FieldPropsManager fpm(deck, Phases{true, true, true}, grid, TableManager());
std::vector<double> tranx( grid.getNumActive() );
@@ -2000,32 +2000,34 @@ MINVALUE
fpm.apply_tran("TRANY", trany);
fpm.apply_tran("TRANZ", tranz);
for (std::size_t k=0; k < 3; k++) {
for (std::size_t j=0; j < 10; j++) {
for (std::size_t i=0; i < 10; i++) {
if (grid.cellActive(i,j,k)) {
auto a = grid.activeIndex(i,j,k);
for (std::size_t i=0; i < 50; i++)
BOOST_CHECK_EQUAL(tranx[i], to_si(0.20));
if (k==0)
BOOST_CHECK_EQUAL(tranx[a], to_si(0.20));
else
BOOST_CHECK_EQUAL(tranx[a], to_si(0.10));
for (std::size_t i=50; i < tranx.size(); i++)
BOOST_CHECK_EQUAL(tranx[i], to_si(0.10));
if (k == 0)
BOOST_CHECK_EQUAL(trany[a], to_si(2.0));
else if (k == 1)
BOOST_CHECK_EQUAL(trany[a], to_si(5.0));
else if (k == 2)
BOOST_CHECK_EQUAL(trany[a], to_si(2.0));
BOOST_CHECK_EQUAL(trany[0], to_si(2.0));
for (std::size_t i=0; i < 50; i++)
BOOST_CHECK_EQUAL(trany[i], to_si(2.0));
for (std::size_t i=50; i < 100; i++)
BOOST_CHECK_EQUAL(trany[i], to_si(5.0));
for (std::size_t i=100; i < trany.size(); i++)
BOOST_CHECK_EQUAL(trany[i], to_si(2.0));
for (std::size_t i=0; i < 50; i++)
BOOST_CHECK(tranz[i]<=to_si(0));
for (std::size_t i=50; i < 10; i++)
BOOST_CHECK(tranz[i]>=to_si(3));
for (std::size_t i=100; i < tranz.size(); i++)
BOOST_CHECK_EQUAL(tranz[i], to_si(1.0));
if (k==0)
BOOST_CHECK(tranz[a] <= to_si(0));
else if (k == 1)
BOOST_CHECK(tranz[a] >= to_si(3.0));
else if (k == 2)
BOOST_CHECK_EQUAL(tranz[a], to_si(1.0));
}
}
}
}
auto buffer = fpm.serialize_tran();
fpm.deserialize_tran(buffer);
@@ -2033,3 +2035,124 @@ MINVALUE
BOOST_CHECK(fpm.tran_active("TRANY"));
BOOST_CHECK(fpm.tran_active("TRANZ"));
}
BOOST_AUTO_TEST_CASE(TRAN2) {
std::string deck_string = R"(
GRID
PORO
1000*0.10 /
EDIT
EQUALS
TRANX 1 1 10 1 10 1 1 /
TRANX 2 1 10 1 10 2 2 /
TRANX 3 1 10 1 10 3 3 /
TRANX 4 1 10 1 10 4 4 /
TRANX 5 1 10 1 10 5 5 /
TRANX 6 1 10 1 10 6 6 /
TRANX 7 1 10 1 10 7 7 /
TRANX 8 1 10 1 10 8 8 /
TRANX 9 1 10 1 10 9 9 /
TRANX 10 1 10 1 10 10 10 /
TRANY 1 1 10 1 10 1 1 /
TRANY 2 1 10 1 10 2 2 /
TRANY 3 1 10 1 10 3 3 /
TRANY 4 1 10 1 10 4 4 /
TRANY 5 1 10 1 10 5 5 /
TRANY 6 1 10 1 10 6 6 /
TRANY 7 1 10 1 10 7 7 /
TRANY 8 1 10 1 10 8 8 /
TRANY 9 1 10 1 10 9 9 /
TRANY 10 1 10 1 10 10 10 /
TRANZ 1 1 10 1 10 1 1 /
TRANZ 2 1 10 1 10 2 2 /
TRANZ 3 1 10 1 10 3 3 /
TRANZ 4 1 10 1 10 4 4 /
TRANZ 5 1 10 1 10 5 5 /
TRANZ 6 1 10 1 10 6 6 /
TRANZ 7 1 10 1 10 7 7 /
TRANZ 8 1 10 1 10 8 8 /
TRANZ 9 1 10 1 10 9 9 /
TRANZ 10 1 10 1 10 10 10 /
/
MULTIPLY
TRANX 1 1 10 1 10 1 1 /
TRANX 2 1 10 1 10 2 2 /
TRANX 3 1 10 1 10 3 3 /
TRANX 4 1 10 1 10 4 4 /
TRANX 5 1 10 1 10 5 5 /
TRANX 6 1 10 1 10 6 6 /
TRANX 7 1 10 1 10 7 7 /
TRANX 8 1 10 1 10 8 8 /
TRANX 9 1 10 1 10 9 9 /
TRANX 10 1 10 1 10 10 10 /
TRANZ 1 1 10 1 10 1 1 /
TRANZ 2 1 10 1 10 2 2 /
TRANZ 3 1 10 1 10 3 3 /
TRANZ 4 1 10 1 10 4 4 /
TRANZ 5 1 10 1 10 5 5 /
TRANZ 6 1 10 1 10 6 6 /
TRANZ 7 1 10 1 10 7 7 /
TRANZ 8 1 10 1 10 8 8 /
TRANZ 9 1 10 1 10 9 9 /
TRANZ 10 1 10 1 10 10 10 /
TRANZ 1 1 10 1 10 1 1 /
TRANZ 2 1 10 1 10 2 2 /
TRANZ 3 1 10 1 10 3 3 /
TRANZ 4 1 10 1 10 4 4 /
TRANZ 5 1 10 1 10 5 5 /
TRANZ 6 1 10 1 10 6 6 /
TRANZ 7 1 10 1 10 7 7 /
TRANZ 8 1 10 1 10 8 8 /
TRANZ 9 1 10 1 10 9 9 /
TRANZ 10 1 10 1 10 10 10 /
/
MULTIPLY
TRANX 1 1 10 1 10 1 1 /
TRANX 2 1 10 1 10 2 2 /
TRANX 3 1 10 1 10 3 3 /
TRANX 4 1 10 1 10 4 4 /
TRANX 5 1 10 1 10 5 5 /
TRANX 6 1 10 1 10 6 6 /
TRANX 7 1 10 1 10 7 7 /
TRANX 8 1 10 1 10 8 8 /
TRANX 9 1 10 1 10 9 9 /
TRANX 10 1 10 1 10 10 10/
/
)";
UnitSystem unit_system(UnitSystem::UnitType::UNIT_TYPE_METRIC);
auto to_si = [&unit_system](double raw_value) { return unit_system.to_si(UnitSystem::measure::transmissibility, raw_value); };
std::vector<int> actnum(1000, 1);
for (std::size_t i=0; i< 1000; i += 2)
actnum[i] = 0;
EclipseGrid grid(EclipseGrid(10,10,10), actnum);
Deck deck = Parser{}.parseString(deck_string);
FieldPropsManager fpm(deck, Phases{true, true, true}, grid, TableManager());
std::vector<double> tranx( grid.getNumActive() );
std::vector<double> trany( grid.getNumActive() );
std::vector<double> tranz( grid.getNumActive() );
fpm.apply_tran("TRANX", tranx);
fpm.apply_tran("TRANY", trany);
fpm.apply_tran("TRANZ", tranz);
for (std::size_t k=0; k < 10; k++) {
for (std::size_t j=0; j < 10; j++) {
for (std::size_t i=0; i < 10; i++) {
if (grid.cellActive(i,j,k)) {
auto a = grid.activeIndex(i,j,k);
BOOST_CHECK_CLOSE( tranx[a], to_si( (k+1)*(k+1)*(k+1)) , 1e-6);
BOOST_CHECK_CLOSE( trany[a], to_si( k+1 ) , 1e-6);
BOOST_CHECK_CLOSE( tranz[a], to_si( (k+1)*(k+1)*(k+1) ), 1e-6);
}
}
}
}
}