OilfieldToolsNet/opm-common
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
10,675 Commits 18 Branches 75 Tags
657f04cd289d933a7e167274858758b917c2d84d
Commit Graph

10675 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Joakim Hove
c087c725b6 Remove unused members wg_keys and udq_keys from UDQActive 2021-08-20 14:29:16 +02:00
Joakim Hove
c4896a0f49 Add missing this-> 2021-08-20 14:29:16 +02:00
Joakim Hove
e1ff4b4682 Rename UDQActive::Record -> UDQActive::OutputRecord 2021-08-20 14:29:16 +02:00
Joakim Hove
1ce143e479 Rename UDQActive::get_iuad() -> iuad() 2021-08-20 14:29:16 +02:00
Joakim Hove
a0ad7883c7 Remove unused size query functions 2021-08-20 14:29:14 +02:00
Joakim Hove
f5f3957177 Merge pull request #2617 from tskille/egrid_mapaxes 
Adding support for handling MAPAXES and MAPUNITS
 2021-08-20 13:12:15 +02:00
Bård Skaflestad
fe27c58b0b Merge pull request #2526 from bska/restart-load-analytic-aquifer 
Load Analytic Aquifer Objects From Restart File
 2021-08-19 22:29:36 +02:00
Bård Skaflestad
6db9e150e1 Merge pull request #2618 from joakim-hove/store-action-results 
Store action results
 2021-08-19 20:48:49 +02:00
Bård Skaflestad
0d35d64aea Load Analytic Aquifer Objects from Restart File 
This commit adds support for creating the analytic aquifer objects

    Opm::AquiferCT
    Opm::Aquifetp
    Opm::Aquancon
    Opm::AquiferConfig

from information stored in the restart vectors

    {I,S,X}AAQ
    {I,S}CAQ

We add a new helper class

    Opm::RestartIO::RstAquifer

which contain the same data members as the '*_data' structures of
the analytic aquifer objects.  Those analytic aquifer objects then
get friendship from the '*_data' structures in order to assign the
private members from the corresponding restart information.  We
finally add a gateway to EclipseState that consumes an RstAquifer
instance and overwrites the internal AquiferConfig object when the
restarted run contains analytic aquifers.

Update RstState constructor API to meet requirements of RstAquifer,
notably by adding an EclipseGrid parameter.  That in turn is needed
by the RstAquifer to translate connection (I,J,K) tuples to active
cell IDs.

Note that if an analytic aquifer does not have any connections then
this facility will not load said aquifer.  That may be a problem
when plotting summary curves, but we will address the issue later if
it comes up.
 2021-08-19 20:34:19 +02:00
Bård Skaflestad
d1b1cebdf5 Support Retrieving Non-Zero Restart Vector Occurrence 
Needed to load connection information for analytic aquifers (xCAQ).
 2021-08-19 20:34:19 +02:00
Bård Skaflestad
e4a485844f Load Numeric Aquifer Data From Restart File 
Needed to get continuous 'ANQT' curves in restarted runs.
 2021-08-19 20:34:19 +02:00
Joakim Hove
9862d88b12 Remove unused UDQActive::operator[] 2021-08-19 17:01:31 +02:00
Joakim Hove
ec66eeee17 Remove trailing whitespace 2021-08-19 16:21:27 +02:00
Joakim Hove
3c434b2d49 Use const ref 2021-08-19 16:21:27 +02:00
Joakim Hove
41ea258752 Use fmt to create error messages 2021-08-19 16:21:27 +02:00
Joakim Hove
86311f3735 Use stored Action result when updating ZWEL 2021-08-19 15:53:31 +02:00
Torbjørn Skille
445a329785 adding support for handling MAPAXES and MAPUNITS 2021-08-19 15:35:26 +02:00
Joakim Hove
957f540d17 The Action::State will store the last Action::Result instance 2021-08-19 15:29:15 +02:00
Joakim Hove
c6540d6f5b Add operator== to Action::Result 2021-08-19 15:28:47 +02:00
Joakim Hove
a63341db79 Implement optional semantics with std::optional 2021-08-19 14:28:17 +02:00
Joakim Hove
1940ab20a8 Add typedef for convenience 2021-08-19 14:15:14 +02:00
Arne Morten Kvarving
7f84696bc9 changed: default to asserts enabled in release mode 2021-08-19 13:03:25 +02:00
Arne Morten Kvarving
e291234e04 Merge pull request #2594 from akva2/fix_ndebug 
fixed: make WITH_NDEBUG cmake option work again
 2021-08-19 13:02:10 +02:00
Joakim Hove
ae8671455c Merge pull request #2613 from akva2/refactor_test_update_params 
changed: pass more information as parameters
 2021-08-19 10:08:38 +02:00
Joakim Hove
66de0ed235 Merge pull request #2608 from joakim-hove/skiprest-nug 
Skiprest bug
 2021-08-18 18:26:37 +02:00
Bård Skaflestad
51ee6ffd16 Merge pull request #2611 from akva2/fix_proximate 
fix build with gcc7
 2021-08-18 17:53:20 +02:00
Joakim Hove
658e14667d Merge pull request #2614 from joakim-hove/use-summary-get-well-var 
Use SummaryState::get_well_var() with default
 2021-08-18 17:08:52 +02:00
Joakim Hove
69c9faefcc Use SummaryState::get_well_var() with default 2021-08-18 16:17:55 +02:00
Arne Morten Kvarving
2f3733b615 fix build with gcc7 
the filesystem ts did not include proximate. implement
a poor man's version (copied from libstdc++, slightly modified)
and use this when necessary
 2021-08-18 15:33:02 +02:00
Arne Morten Kvarving
91816c2b53 changed: pass more information as parameters 
the use of environment variables makes it less flexible
 2021-08-18 13:48:53 +02:00
Joakim Hove
d37389720f Fix bug for time-stepping when loading restart deck 2021-08-18 13:40:21 +02:00
Joakim Hove
719b05e93b Improve error message when scanning past restart date 2021-08-18 13:40:21 +02:00
Joakim Hove
34f9d88c32 Renamed test deck 2021-08-18 13:40:21 +02:00
Joakim Hove
a646794882 Merge pull request #2612 from bska/restore-group-quant 
Load Active Constraints and Guide Rates at Group Level
 2021-08-18 13:11:02 +02:00
Joakim Hove
a53a1d871e Load Active Constraints and Guide Rates at Group Level 
Needed to initialise restarted runs.
 2021-08-18 09:37:42 +02:00
Bård Skaflestad
a1619543f3 Refactor Group Cumulative Loading 
Reduces duplication.
 2021-08-18 09:33:38 +02:00
Joakim Hove
8acda9b023 Merge pull request #2610 from joakim-hove/skiprest-bug-trivial 
Skiprest bug trivial
 2021-08-17 11:30:13 +02:00
Joakim Hove
8c43916751 Updates to Schedule logger utility class 2021-08-17 10:35:21 +02:00
Joakim Hove
b8565ee46c Add info message when adding group and well from restart file 2021-08-17 09:22:36 +02:00
Joakim Hove
f25c71b8f3 Merge pull request #2597 from bska/rptonly 
Add Support for RPTONLY and RPTONLYO
 2021-08-17 09:21:02 +02:00
Bård Skaflestad
d216de77ea Add Support for RPTONLY and RPTONLYO 
This former restricts summary output events to coincide with the
report step while the latter (*O) turns off this restriction and
makes summary output for every timestep.
 2021-08-16 20:50:08 +02:00
Bård Skaflestad
114eec30c5 Merge pull request #2609 from tskille/fix_ExtESmry 
fixing bug in ExtESmry
 2021-08-16 20:46:42 +02:00
Torbjørn Skille
3f1a89069d fixing bug in ExtESmry 
- segfault when loading more that one vector
 - test ExtESmry updated, now failing without this fix
 2021-08-16 19:47:59 +02:00
Joakim Hove
2cf17408e9 Merge pull request #2605 from bska/report-siunits-guiderates 
Add Guiderate Value Accessor for SI Units
 2021-08-16 16:51:30 +02:00
Bård Skaflestad
2a374fc53b Add Guiderate Value Accessor for SI Units 
This is mostly for reporting purposes if the calling code knows that
the values stored in the GuideRate container are in output units.
The output layer, and particularly the Summary facility, expects
that its input values are strictly SI.
 2021-08-16 12:26:09 +02:00
Bård Skaflestad
612cbf749c Merge pull request #2607 from akva2/janitoring 
Some more SCA warning cleanup
 2021-08-16 12:24:56 +02:00
Joakim Hove
52acaa3757 Merge pull request #2603 from bska/protect-import-container-from-multiple-inclusion 
Add Include Guards to Protect From Multiple Inclusion
 2021-08-16 11:34:27 +02:00
Arne Morten Kvarving
f7a143c604 pass by const ref 2021-08-16 11:06:00 +02:00
Bård Skaflestad
210e09f981 Add Include Guards to Protect From Multiple Inclusion 
While here, also use a more efficient way of forming a
vector<double> from a vector<float> source.
 2021-08-16 11:03:38 +02:00
Arne Morten Kvarving
e25667dc71 mark constructor explicit 2021-08-16 10:57:22 +02:00