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

10284 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bård Skaflestad
8eb9bee6ed Track AQUNUM Records for Restart Purposes 
When forming restart arrays for numerical aquifers (IAQN and RAQN)
we need to know the total number of records in the input AQUNUM
keyword as well as the record ID of each individual record.  This
commit adds a tracking mechanism for this information.

While here, also add unit tests that verify that we've correctly
interpreted the AQUNUM records.
 2021-05-18 21:17:33 +02:00
Joakim Hove
f58a314f6a Merge pull request #2476 from totto82/guideRateTypeRES 
Add support for guide rate type RES
 2021-05-18 21:15:29 +02:00
Joakim Hove
bf064812d3 Merge pull request #2478 from berland/extend_options_items 
Extend number of parameters to OPTIONS keyword.
 2021-05-18 20:42:15 +02:00
Håvard Berland
fb2d5dc620 Extend number of parameters to OPTIONS keyword. 
Eclipse 2019.1 reference manual goes to item number 319
 2021-05-18 14:02:46 +02:00
Tor Harald Sandve
a18866b355 Add support for guide rate type RES 2021-05-18 11:20:57 +02:00
Joakim Hove
147359c564 Merge pull request #2473 from bska/fix-smry-anx-all 
Output Summary for all Numeric Aquifers When ID Defaulted
 2021-05-17 07:11:08 +02:00
Bård Skaflestad
51cf551eac Output Summary for all Numeric Aquifers When ID Defaulted 
This commit extends the 'SummaryConfig' aquifer processing to
recognize numeric aquifer keywords without an explicit list of
aquifer IDs, i.e., summary keywords of the form

    ANQR
    /

We use the new functions '{analytic,numeric}AquiferIDs()' to form
lists of pertinent IDs once and then ensure that we create nodes
only for proper subsets of these ID sets.

Add unit tests to both the analytic and numeric configurations to
ensure that we generate these output sets or input errors when the
input file refers to IDs of incorrect type or out of range.
 2021-05-16 12:15:46 +02:00
Bård Skaflestad
79b1f97640 Provide Means of Linearising All Aquifer IDs in a Model 
This commit adds two helper functions

    std::vector<int> analyticAquiferIDs(const AquiferConfig&)
    std::vector<int> numericAquiferIDs(const AquiferConfig&)

which return the numeric IDs of the model's analytic and numeric
aquifers respectively.  These are useful for configuring aquifer
summary keywords of the form

    AAQR
    /

that do not list individual aquifer IDs and for identifying issues
in the input file when a summary keyword that does list its aquifer
IDs refers to an aquifer of incorrect category (e.g., ID of numeric
aquifer in an analytic aquifer summary keyword).

While here, also add more unit test coverage to the AquiferConfig
object.  In particular, add a unit test that includes aquifers at
all.
 2021-05-16 12:15:46 +02:00
Joakim Hove
f44b49338b Merge pull request #2474 from bska/deckkeyword-empty 
Add 'empty' Predicate to DeckKeyword Type
 2021-05-16 07:30:24 +02:00
Bård Skaflestad
b216c63921 Add 'empty' Predicate to DeckKeyword Type 
Makes logic statements more explicit and removes a number of
"signed vs. unsigned" comparison operations.
 2021-05-16 00:07:10 +02:00
Joakim Hove
98b49964f5 Merge pull request #2470 from vkip/master 
Adding support for DATES with time (HH:MM:SS.MICROSEC) in python/opm/utils/time_vector.py
 2021-05-14 08:03:23 +02:00
Vegard Kippe
e5987985be Removed pandas dep also from supporting files.. 2021-05-13 10:53:03 +02:00
Vegard Kippe
8a69023089 Removed the pandas dependency 2021-05-13 10:47:27 +02:00
Vegard Kippe
988ff7521b Add python3-pandas to debian/control 2021-05-12 14:49:28 +02:00
Vegard Kippe
62e78e0018 Adding pandas to requirements.txt 2021-05-12 12:36:42 +02:00
Vegard Kippe
fe5004685c Adding support for time (HH:MM:SS.MICROSEC) in time_vector. Updating tests accordingly. 2021-05-12 12:16:34 +02:00
Joakim Hove
dc207ae8c5 Merge pull request #2469 from atgeirr/optimize-for-large-nnc-case 
Optimize further for large NNC case
 2021-05-11 20:46:35 +02:00
Atgeirr Flø Rasmussen
521cd5610f Remove extra reserved item capacity in ParseRecord. 2021-05-11 15:56:54 +02:00
Atgeirr Flø Rasmussen
fef696d978 Make duplicate name of item check optional in DeckRecord constructor. 
This is for catching programmer error mostly, so it has been disabled
in the call path used in OPM Flow.
 2021-05-11 15:30:31 +02:00
Joakim Hove
12a41a7b1f Merge pull request #2467 from atgeirr/add-deck-move-constructor 
Add move constructor for Deck.
 2021-05-11 11:00:41 +02:00
Atgeirr Flø Rasmussen
395bb1ca90 Add move constructor for Deck. 2021-05-11 08:10:18 +02:00
Bård Skaflestad
fea7bbce6d Merge pull request #2466 from jalvestad/rst-file_corrections 
Some corrections / improvements to the eclipse - compatible restart file
 2021-05-10 22:00:03 +02:00
Jostein Alvestad
26cc7897c6 correction to SWEL for prediction mode wells 2021-05-10 09:54:25 +02:00
Jostein Alvestad
777de0673f Added correction for IH[ROCKOPTS_TTYP] 2021-05-10 09:54:23 +02:00
Jostein Alvestad
68fbc5f51b further changes/corrections 2021-05-10 09:54:20 +02:00
Jostein Alvestad
184bff2e6b correction to ZACN - include Field props rhs.quantities [ind+1] 2021-05-10 09:54:18 +02:00
Jostein Alvestad
2e6fa4468b Correction for change of dimension of INOBR array v. 2019 2021-05-10 09:54:16 +02:00
Joakim Hove
3a4a8c91c6 Merge pull request #2465 from joakim-hove/wg-events-has 
Add method WellGroupEvents::has(wgname)
 2021-05-10 08:47:06 +02:00
Joakim Hove
14885372d2 Add method WellGroupEvents::has(wgname) 2021-05-09 16:32:07 +02:00
Joakim Hove
c1442803bd Merge pull request #2463 from joakim-hove/get_events 
Add method WellGroupEvents.at() to get individual events
 2021-05-09 13:52:22 +02:00
Joakim Hove
65edae0b2e Add method WellGroupEvents.at() to get individual events 2021-05-09 11:44:11 +02:00
Joakim Hove
d50b5852e0 Merge pull request #2464 from akva2/no_more_python3.5 
changed: python 3.5 is no longer support in pypi
 2021-05-08 20:13:10 +02:00
Arne Morten Kvarving
04ae012638 changed: python 3.5 is no longer support in pypi 2021-05-08 19:25:06 +02:00
Bård Skaflestad
65dc2e0942 Merge pull request #2462 from joakim-hove/keyword-generator-default-precision 
Make sure precision is retained in very small default values

Closes #2448
 2021-05-07 12:45:16 +02:00
Joakim Hove
f1c3c66996 Merge pull request #2461 from atgeirr/add-missing-include 
Add missing <sstream> include.
 2021-05-06 15:45:24 +02:00
Joakim Hove
e2572ed89e Merge pull request #2460 from joakim-hove/clear-events 
Add clearEvent() method to consume events
 2021-05-06 15:45:09 +02:00
Joakim Hove
b21fd3e3e8 Make sure precision is retained in very small default values 2021-05-06 15:33:21 +02:00
Atgeirr Flø Rasmussen
d3c32d1906 Add missing <sstream> include. 2021-05-06 11:34:47 +02:00
Bård Skaflestad
25db0ec1db Merge pull request #2458 from joakim-hove/mapaxes 
Mapaxes
 2021-05-05 20:33:17 +02:00
Joakim Hove
05fee1fd12 Add small class to handle MAPAXES & MAPUNITS 2021-05-05 16:09:58 +02:00
Joakim Hove
4372354174 Merge pull request #2361 from bska/dont-copy-wells-for-smry-eval 
Don't Copy Well Objects During Summary Vector Evaluation
 2021-05-05 16:07:23 +02:00
Joakim Hove
881da80e96 Add clearEvent() method to consume events 2021-05-05 13:40:50 +02:00
Joakim Hove
6509da9b66 Merge pull request #2459 from akva2/no_opm_in_opm 
fixed: do not use Opm:: prefix when inside namespace Opm
 2021-05-05 13:10:49 +02:00
Arne Morten Kvarving
978150d78f fixed: do not use Opm:: prefix when inside namespace Opm 
this is at best bad practice and can lead to confusing
errors because compiler will interpret it as Opm:: if there
is no 'foo' symbol available in the Opm namespace and give
confusing 'no symbol Opm::Opm::foo' error messages.
 2021-05-05 09:43:07 +02:00
Bård Skaflestad
3a5934a09e Don't Copy Well Objects During Summary Vector Evaluation 
This commit makes the 'find_wells()' helper function return a vector
of (const) Well pointers instead of fully fledged Well objects.
This, in turn, eliminates quite a bit of the overhead of evaluating
well-based summary vectors (i.e., well, group, field, and connection
level vectors).
 2021-05-04 13:17:52 +02:00
Joakim Hove
6650369970 Fix dimension handling for MAPAXES / MAPUNITS 2021-05-04 13:15:40 +02:00
Joakim Hove
2ca78faf3c Configure MAPAXES as DATA keyword to enable loading from IMPORT 2021-05-04 13:15:40 +02:00
Joakim Hove
2da2b28159 Merge pull request #2457 from joakim-hove/remove-get-mapaxes 
Remove getMAPAXES from EclipseGrid public api
 2021-05-04 13:14:54 +02:00
Joakim Hove
a093251235 Remove unused mapaxes argument in constructor / init 2021-05-04 10:39:48 +02:00
Joakim Hove
d3f2f593eb Remove public method EclipseGrid::getMAPUNITS() 2021-05-04 07:48:23 +02:00