Closed nairr closed 6 years ago
Will review properly later today
jenkins build this with downstreams please
ÒK - what is here is fine; apart from the use of std::shared_ptr<>
for the Aqudims
member variable. But as discussed previously I would prefer if the aquifer configuration was assembled in a separate object, as a starting point this could just be:
class Aquifer
private:
std::vector<Aquatable> aquifer_tables;
The existing Aquatable
implementation is fine, it is just a question of creating this tiny container class and collecting the Aquatable
instances in a std::vector<>
instead of a TableManager
. The reason I would like this is that the aquifer tables are semantically quite different - in particular the collection of them - from the other PVT/relperm tables.
I am not familiar with aquifer usage/requirements from the downstream code, it will be natural to extend the Aquifer
class when that is clear.
Don't forget to add a (very) small test for the new functionality.
Please rebase on current master - #1161 should have fixed the weird parsing requirements of AQUTAB
Is this in progress?
Is this in progress?
@joakim-hove - Thanks for the shifted tables fix. yes this is in progress.
Please follow the suggestion here of splitting the PR in three parts. Then we can complete and merge one-at-a-time; right now it is a bit unwieldy.
Closing since this PR has been split into 3 separate PR's
Added parser support for the AQUDIMS and the AQUTAB table. An example of the AQUTAB table is: