Merge pull request #2729 from joakim-hove/netbalan-commits

Netbalan commits
This commit is contained in:
Joakim Hove 2021-10-04 13:42:58 +02:00 committed by GitHub
commit 0074364560
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 23 deletions

View File

@ -9,12 +9,14 @@
{
"name": "TIME_INTERVAL",
"value_type": "DOUBLE",
"default": 0
"default": 0,
"dimension" : "Time"
},
{
"name": "PRESSURE_CONVERGENCE_LIMT",
"name": "PRESSURE_CONVERGENCE_LIMIT",
"value_type": "DOUBLE",
"default": 1e-05
"default": 1e-05,
"dimension" : "Pressure"
},
{
"name": "MAX_ITER",
@ -34,16 +36,19 @@
{
"name": "TARGET_BALANCE_ERROR",
"value_type": "DOUBLE",
"default": 1e+20
"default": 1e+20,
"dimension" : "Pressure"
},
{
"name": "MAX_BALANCE_ERROR",
"value_type": "DOUBLE",
"default": 1e+20
"default": 1e+20,
"dimension" : "Pressure"
},
{
"name": "MIN_TIME_STEP",
"value_type": "DOUBLE"
"value_type": "DOUBLE",
"dimension" : "Time"
}
]
}

View File

@ -4422,23 +4422,6 @@ END
}
sched.shut_well("P1", 0);
// The checks below should be activated again when wells are fully implemented with ScheduleState
//{
// const auto& well = sched.getWell("P1", 0);
// BOOST_CHECK( well.getStatus() == Well::Status::SHUT);
//}
//{
// const auto& well = sched.getWell("P1", 1);
// BOOST_CHECK( well.getStatus() == Well::Status::SHUT);
//}
//{
// const auto& well = sched.getWell("P1", 2);
// BOOST_CHECK( well.getStatus() == Well::Status::SHUT);
//}
//{
// const auto& well = sched.getWell("P1", 5);
// BOOST_CHECK( well.getStatus() == Well::Status::OPEN);
//}
}
bool compare_dates(const time_point& t, int year, int month, int day) {