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

397 Commits

Author SHA1 Message Date
Kai Bao
dbf2a4c425 small fixes of the pvtables. 
some rules are from testing output.
 2018-03-07 08:31:00 +01:00
Arne Morten Kvarving
dbba64e5c3 Import opm-output 2018-03-05 10:30:59 +01:00
Arne Morten Kvarving
726ccd7fd7 Import opm-parser 2018-03-05 10:30:29 +01:00
Andreas Lauser
1083db48a3 test_LinearisedOutputTable: include config.h unconditionally 
this is already the case for the vast majority of the other OPM code.
 2018-03-03 13:23:37 +01:00
Andreas Lauser
2dc08dd0a7 include config.h in all unit tests 
in some it was already included, so let's fix that inconsistency The
Right Way (TM).
 2018-03-03 13:11:12 +01:00
Lars Petter Øren Hauge
800cc2af62 Support default construction uppon ADD/MULTIPLY 
Allow keywords that can be default constructed to do so when acted uppon
by MULTIPLY and ADD.

Setting the "MULTIPLY" keyword to act on "PORV" would throw an
exception:

"Program threw an exception: Fatal error processing MULTIPLY keyword.
Tried to scale not defined keyword PORV"

Now the initPORV is called if the MULTIPLY keyword is parsed with PORV.
Note that MULTIPLY for PORV will also work in the GRID section (which it
does not in eclipse), but will fail if it is placed prior to setting a
variable PORV depends on.

Commit authored by Sveinung Styve Rundhovde and Lars Petter Hauge
 2018-02-26 13:51:37 +01:00
Joakim Hove
7a2bf8a0b5 SummaryConfig: changed implementation for empty well/group keywords. 
Will never raise SUMMARY_UNKNOWN_WELL for empty well related summary keywords.
 2018-02-20 16:51:38 +01:00
Lars Petter Øren Hauge
fdb06aa77f Apply efficiency factors 
Efficiency factors are multiplied when specified at multiple levels of
the well/group hierarchy.

The factors are included as follows:

* Well Rate        - No efficiency factor
* Well Total       - WEFAC & GEFAC (whole hierarchy)
* Group Rate       - WEFAC & GEFAC (only subgroups)
* Group Total      - WEFAC & GEFAC (whole hierarchy)
* Field Rate       - WEFAC & GEFAC (whole hierarchy)
* Field Total      - WEFAC & GEFAC (whole hierarchy)
* Region Rate      - WEFAC & GEFAC (whole hierarchy)
* Region Total     - WEFAC & GEFAC (whole hierarchy)
* Completion Rate  - No efficiency factor
* Completion Total - WEFAC & GEFAC (whole hierarchy)

Authored by Sveinung Rundhovde and Lars Petter Hauge
 2018-02-20 10:26:54 +01:00
Lars Petter Øren Hauge
dde1ccaae0 Fix minor name error 2018-02-20 10:03:59 +01:00
Atgeirr Flø Rasmussen
05c904a04e Merge pull request #250 from totto82/MoveWell 
Some more cleaning in the output code  in opm-output, ewoms and opm-simulator
 2018-02-19 15:05:24 +01:00
Joakim Hove
c904c6bf98 Added action argument to ParseContext::addKey() 2018-02-19 14:52:21 +01:00
Joakim Hove
da650aa7ff Merge pull request #1177 from nairr/aquifer_obj 
Carter-Tracy aquifer object
 2018-02-15 17:47:17 +01:00
Joakim Hove
ce7654765c Merge pull request #1209 from GitPaean/not_turing_off_injector 
not turning off injector because of defaulted rates.
 2018-02-15 16:38:02 +01:00
Rohith Nair
57792f1316 Carter-Tracy aquifer object to collect items from keywords AQUCT and AQUTAB 
clean up

removed aquancon collection from Aquifer CT

clean up and unit test

clean up

Conflicts:
	lib/eclipse/CMakeLists.txt

Add reference to Van Everdingen and Hurst

remove cmakelists

added test in Cmake

Added aquiferct to cmake
 2018-02-15 12:01:19 +01:00
Arne Morten Kvarving
ae56723b7e Merge pull request #254 from akva2/dyn_boost_test_bs 
changed: let the build system handle the dynamic boost test defines
 2018-02-15 08:14:32 +01:00
Arne Morten Kvarving
03ab8fe400 changed: let the build system handle the dynamic boost test defines 2018-02-15 07:21:35 +01:00
Joakim Hove
1034c82fab Merge pull request #253 from GitPaean/adding_few_keywords 
adding a few summary keywords
 2018-02-14 21:37:13 +01:00
Arne Morten Kvarving
7f79101fb2 changed: let the build system handle the dynamic boost test defines 2018-02-14 16:03:57 +01:00
Atgeirr Flø Rasmussen
007007184a Merge pull request #1199 from akva2/old_is_the_new_new 
changed: switch to the shared opm build system
 2018-02-14 09:16:42 +01:00
Kai Bao
e76df698c6 changing the counting of the schecule in SCHEDULE_WELLS2 
basically, all the control keywords should be combined with the
TSTEP/DATES afterwards as a complete report step.
 2018-02-14 09:09:27 +01:00
Kai Bao
43cb8e5739 adding a few summary keywords 
WWVIR, WGVPR and WGVIR
 2018-02-13 19:39:30 +01:00
Arne Morten Kvarving
e81784c9eb fixed: libecl recently enforced stricter filename rules 
in particular, no mixed case. either all upper or all lower
 2018-02-12 15:06:13 +01:00
Arne Morten Kvarving
f7c288a3f4 changed: switch to the shared opm build system 2018-02-12 13:36:49 +01:00
Kai Bao
3c8c65b65c not turning of injector because of defaulted rates. 
it must be a limit to turn it off. The old implementation make it
impossible to have a injector with only bhp control.
 2018-02-12 12:27:44 +01:00
Tor Harald Sandve
e2e38ddc0c Add write/read test for data::wells 2018-02-12 11:42:59 +01:00
Tor Harald Sandve
206241c9ae Store global index instead of active index in well completions 
Fix bug in output of completion related stuff when run on mulitiple
cores.
 2018-02-08 14:11:04 +01:00
Andreas Lauser
038841a2ef move some infrastructure to opm-material 
These classes are only used by opm-material and its downstreams. The
reason for doing moving it there is that this allows more freedom in
reorganizing the lower-level OPM modules (i.e., opm-common,
opm-parser, opm-output) while still avoiding a hard dependency of the
thermodynamic and numerical framework modules on the ECL file parsing
libraries.
 2018-02-07 15:40:52 +01:00
Joakim Hove
cc4e56cc18 Merge pull request #1206 from joakim-hove/filter-completions 
Added ability to filter out completions from inactive cells.
 2018-02-07 15:06:19 +01:00
Tor Harald Sandve
55ed844438 Add cell data in perforation cells to data::well::completion 
With this no cell data is needed in opm-output
 2018-02-07 14:32:01 +01:00
Joakim Hove
3a590a0cab Added ability to filter out completions in inactive cells. 2018-02-07 11:22:35 +01:00
Joakim Hove
40fd922b6e Added iterator access to DynamicState<T> 2018-02-07 11:22:35 +01:00
Tor Harald Sandve
3f85198032 Fix merge conflict 2018-02-06 14:47:35 +01:00
Tor Harald Sandve
5822c362f5 Communicate well data 2018-02-06 14:47:35 +01:00
Tor Harald Sandve
cbf61996d7 Remove unused stuff 2018-02-06 14:47:35 +01:00
Tor Harald Sandve
06b7afc9be Remove data::Solution cells from Summary 2018-02-05 14:23:19 +01:00
Tor Harald Sandve
8a5062ae27 Pass pointers of region and block data to eclIO 2018-02-05 14:23:19 +01:00
Tor Harald Sandve
890b2226b2 Get Block values from simulator 
Avoids communication of the whole state
 2018-02-05 14:23:19 +01:00
Tor Harald Sandve
ba29cfa81e Remove unused stuff 2018-02-05 14:23:19 +01:00
Tor Harald Sandve
45267477b4 Get Region and Field values from simulator 
Avoid cell based computations in opm-output as it could slow down the
MPI run.
 2018-02-05 14:19:50 +01:00
Andreas Lauser
ce93d98b80 respect the fact that non-SI temperature may be offset from zero 
also, the UnitTests test was buggy.

V2: improve the accuracy of the °F->K offset, unit test all temperature measures
 2018-02-02 17:13:50 +01:00
Joakim Hove
cb5a3bdcea Revert "Revert "Res vol keywords (WVPR + WVPT & WVPRT+FVPRT)"" 2018-02-02 12:11:23 +01:00
Joakim Hove
2f332ed702 Revert "Revert "Add support for keywords (WVIT+GVIR+GVIT) "" 2018-02-02 10:41:35 +01:00
Joakim Hove
a88561b010 Revert "Add support for keywords (WVIT+GVIR+GVIT) " 2018-02-02 09:00:04 +01:00
Joakim Hove
6094552b55 Revert "Res vol keywords (WVPR + WVPT & WVPRT+FVPRT)" 2018-02-02 08:59:15 +01:00
Joakim Hove
494dda28a8 Revert "respect the fact that non-SI temperature may be offset from zero" 2018-02-01 15:08:12 +01:00
Atgeirr Flø Rasmussen
380490613e Silence unused argument warnings. 2018-02-01 09:57:28 +01:00
Joakim Hove
6a7412af7e Increased tolerance when testing TEMP in restart test. 2018-02-01 08:41:41 +01:00
Joakim Hove
d39ad3a865 Merge pull request #238 from lars-petter-hauge/res_vol_keywords 
Res vol keywords (WVPR + WVPT & WVPRT+FVPRT)
 2018-01-31 23:58:23 +01:00
Joakim Hove
a496158ed6 Merge pull request #1203 from andlaus/fix_measures 
respect the fact that non-SI temperature may be offset from zero
 2018-01-31 17:53:15 +01:00
Andreas Lauser
d6f4cb016e respect the fact that non-SI temperature may be offset from zero 
also, the UnitTests test was buggy.
 2018-01-31 13:17:06 +01:00