OilfieldToolsNet/opm-common
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
10,300 Commits 18 Branches 75 Tags 73 MiB
1ffbfded8e
Commit Graph

10300 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Kai Bao
ea293b8353 make sure NNC is from low to high for numerical aquifers. 2021-04-14 21:11:10 +02:00
Kai Bao
9517d9bdae removing an unused function aquiferNNCs() 
and using std::make_move_iterator following review comments.
 2021-04-14 21:11:10 +02:00
Kai Bao
08539cdcd6 fixing AquiferTests 2021-04-14 21:11:10 +02:00
Kai Bao
67d56cd637 adding methond to set NNC for EclipseState 
it needs to be updated after grid processing.
 2021-04-14 21:11:10 +02:00
Kai Bao
36f714381d using pinched grid for numerical aquifer 2021-04-14 21:11:10 +02:00
Kai Bao
276530fcde neighborCellInsideReservoirAndActive function takes extra actnum 2021-04-14 21:11:10 +02:00
Joakim Hove
05366912fc
Merge pull request #2380 from bska/output-aquifer-to-restart 
Add Restart Output Facility for Analytic Aquifer Data
 2021-04-14 20:59:49 +02:00
Bård Skaflestad
ef5a74392e Address Review Comments 
Use SummaryState::get() with default, std::size instead of distance,
and a named constant for the aquifer model type.
 2021-04-14 20:58:19 +02:00
Bård Skaflestad
d43e358d01 Activate Aquifer Restart Output 
This commit hooks the aquifer restart output facility (output arrays
{I,S,X}AAQ and {I,S,A}CAQ) up to the general "RestartIO" module.  If
a simulation run uses analytic aquifers we construct an aquifer
output object at simulation start and store this in an optional<> in
the internal implementation object.  Otherwise the optional holds
nullopt.  We expand RestartIO::save() to take such an optional by
reference and aggregate/output aquifer information, directly after
the well information, if the optional holds a value.  Update callers
accordingly.
 2021-04-14 20:58:19 +02:00
Bård Skaflestad
a36b8bd4bb Centralise Aquifer Dimension Handling in INTEHEAD 
This commit switches the INTEHEAD factory function to passing
dimensions related to aquifers by means of the 'AquiferDims'
structure.  While here, also update description and names of a few
aquifer-related INTEHEAD items to reflect more recent understanding.
 2021-04-14 20:58:19 +02:00
Bård Skaflestad
0edf6673ba Add Restart Output Facility for Analytic Aquifer Data 
We support both Fetkovich and Carter-Tracy aquifers.  We presently
output trivial values only in the 'ACAQ' (per-connection, double
precision elements), but otherwise assemble reasonable values for
many items.

We leverage the fact that the aquifer connections do not change
throughout the simulation run.  The "Aggregate" API is therefore
constructed in such a way that most of the expensive operations
(e.g., mapping active cell IDs to their columnar counterparts)
happens once (in the constructor) and the per-aquifer operations are
performed for each restart output step.  We intend that one aquifer
output object be constructed at the start of the simulation run, if
needed, and that this object will live until simulation shutdown.
 2021-04-14 20:58:19 +02:00
Bård Skaflestad
0aea5c1e20 Hook Aquifer Dimensions Up to 'Runspec' Constructor 
Forgotten in 796318409 (PR #2338).
 2021-04-14 20:58:19 +02:00
Bård Skaflestad
762e256d2b Make "WindowedArray" a Movable Type 
Needed to put such objects into standard containers.
 2021-04-14 20:58:19 +02:00
Bård Skaflestad
0e5a7a335b Order Aquifer Connections by Global Index 
We need a stable connection order for restart purposes.
 2021-04-14 20:58:19 +02:00
Bård Skaflestad
e477409373 Reduce Analytic Aquifer Compilation Overhead 
In particular, switch to using forward declarations instead of
transitive includes in headers and especially of 'Deck'-related
headers.
 2021-04-14 20:58:19 +02:00
Joakim Hove
39dab54321 Use std::optional<> in GuideRateConfig 2021-04-14 19:57:59 +02:00
Joakim Hove
a93c75ed2f
Merge pull request #2425 from joakim-hove/optional-topup-phase 
Return std::optional<Phase> for Group::topup_phase()
 2021-04-14 19:56:54 +02:00
Joakim Hove
4ab4f0407f Return std::optional<Phase> for Group::topup_phase() 2021-04-14 11:28:36 +02:00
Joakim Hove
a6bdda7b27
Merge pull request #2420 from tskille/fix_erst 
fixing bug for python bindings ERst
 2021-04-14 10:05:59 +02:00
Bård Skaflestad
bdd0c9d351
Merge pull request #2424 from tskille/vfp_iglr 
fixing ALQ Type IGLR
 2021-04-13 21:01:29 +02:00
Bård Skaflestad
2afb2ddd1e
Merge pull request #2421 from tskille/latest_emodel 
new python bindings class EModel
 2021-04-13 18:13:12 +02:00
Torbjørn Skille
5b73f17652 fixing ALQ Type IGLR 2021-04-13 11:21:27 +02:00
Torbjørn Skille
94e541ad60 new python bindings class EModel 2021-04-13 10:42:43 +02:00
Joakim Hove
7a372c2a43
Merge pull request #2423 from joakim-hove/export-volume 
Store the active volume with a mutable in the grid
 2021-04-13 07:14:09 +02:00
Markus Blatt
e215098122
Merge pull request #2418 from akva2/fix_lto_python 
Fix some python bindings issues
 2021-04-12 14:10:42 +02:00
Joakim Hove
97652c1313 Store the active volume with a mutable in the grid 2021-04-12 13:53:59 +02:00
Joakim Hove
877f82ef06
Merge pull request #2422 from joakim-hove/add-compile-guard 
Add missing compile guard
 2021-04-12 08:32:34 +02:00
Joakim Hove
524be4ca4f Add missing compile guard 2021-04-12 00:10:23 +02:00
Torbjørn Skille
6003736221 fixing bug for python bindings ERst 
> bug related to occurence parameter in function get_erst_vector(..)
 > additional python unittest related to this function
 2021-04-11 08:48:23 +02:00
Joakim Hove
71a7af3cae
Merge pull request #2419 from joakim-hove/pass-affected-wells 
Make sure the affected_wells variable is passed to applyWellopen()
 2021-04-10 17:16:43 +02:00
Joakim Hove
8a96d9a8d1 Make sure the affected_wells variable is passed to applyWellopen() 2021-04-10 14:10:44 +02:00
Bård Skaflestad
989c3a8396
Merge pull request #2417 from joakim-hove/import-general 
Refactor IMPORT handler to accept all data keywords
 2021-04-09 14:49:59 +02:00
Arne Morten Kvarving
9402db2421 fix building python bindings (with lto) 
need to set the define for header only library with internal libfmt,
and whatever flags are required by external libfmt
 2021-04-09 11:56:25 +02:00
Arne Morten Kvarving
5d13b9ed59 fixed: built builtin_pybind11.cpp in python bindings 
necessary with lto as symbols are not visible in main library
 2021-04-09 11:56:25 +02:00
Joakim Hove
adc52eb870 Refactor IMPORT handler to accept all data keywords 2021-04-09 10:34:16 +02:00
Joakim Hove
88f284ecab
Merge pull request #2408 from joakim-hove/rst-test-eclipsestate 
Add  EclipseState comparison to rst_test application
 2021-04-09 08:51:59 +02:00
Markus Blatt
9a0d26c398
Merge pull request #2386 from blattms/cmake-3.10 
Stop pretending that we support CMake 2.8
 2021-04-08 10:15:10 +02:00
Joakim Hove
b05da71c57 rst_test application will also compare EclipseState 2021-04-08 09:25:03 +02:00
Joakim Hove
d08d358e5d Add EclipseState::rst_cmp 2021-04-08 09:25:03 +02:00
Joakim Hove
1a1aaa724b Add comparison functions operator== and rst_cmp() to FieldProps 2021-04-08 09:25:03 +02:00
Joakim Hove
d75c704f26 Reformat #include 2021-04-08 09:15:16 +02:00
Joakim Hove
5e4e949d8d Add IOConfig::rst_cmp 2021-04-08 09:15:16 +02:00
Joakim Hove
8214f36b61 Add InitConfig::rst_cmp 2021-04-08 09:15:16 +02:00
Joakim Hove
acae9728df Add SimulationConfig::rst_cmp() 2021-04-08 09:15:16 +02:00
Joakim Hove
646e0cb60f FieldPropsmanager will have a copy of the tables 2021-04-08 09:15:16 +02:00
Joakim Hove
fe5761096d Add ThresholdPressure::rst_cmp() 2021-04-08 09:15:16 +02:00
Joakim Hove
6c71179fa1 Add UnitSystem::rst_cmp() 2021-04-08 09:15:16 +02:00
Joakim Hove
e1e1afccd4 Add Runspec::rst_cmp() 2021-04-08 09:15:16 +02:00
Arne Morten Kvarving
6058d2b4f2
Merge pull request #2415 from akva2/fix_redhat_man_pages 
fix redhat packaging
 2021-04-08 09:07:36 +02:00
Arne Morten Kvarving
b28eca17e8 fix redhat packaging 
handle the new man pages
 2021-04-08 09:06:38 +02:00