OilfieldToolsNet/opm-common
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
3,230 Commits 18 Branches 75 Tags 73 MiB
ac56621759
Commit Graph

3230 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Atgeirr Flø Rasmussen
ac56621759 Silence warning. 
Unlike returning const references, returning const values is no different
from returning a non-const value.
 2018-02-20 14:11:18 +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
Joakim Hove
65be35d488 Merge pull request #1211 from GitPaean/adding_some_summary_keywords 
adding a few summary keywords
 2018-02-14 18:30:05 +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
bedf0dd257 adding a few summary keywords 
add WWVIR, WGVPR and WGVIR, and removing WOVPR
 2018-02-13 15:07:46 +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
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
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
Andreas Lauser
c9291f165c address review comments 2018-02-05 10:38:57 +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
494dda28a8 Revert "respect the fact that non-SI temperature may be offset from zero" 2018-02-01 15:08:12 +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
Joakim Hove
5ca0792801 Merge pull request #1200 from andlaus/cp_to_cv 
rename c_p to c_v in specrock and specheat table classes
 2018-01-31 17:51:00 +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
Atgeirr Flø Rasmussen
36afd2c99e Silence sign comparison warnings. 2018-01-30 15:02:58 +01:00
Andreas Lauser
8a95794277 rename c_p to c_v in specrock and specheat table classes 
even though the official documentation does not seem to specify
whether the specified heat capacities of the SPECROCK and SPECHEAT
keywords are for constant pressure or for constant volume, the
implicitly seem to be for the latter: pressure dependent heat
capacites cannot be specified, yet the enthalpy for an incompressible
fluid *is* pressure dependent, so the specified heat capacities must
be for constant volume and they specify the internal energy instead of
the enthalpy.
 2018-01-30 12:06:58 +01:00
Joakim Hove
53d8d65c7b Merge pull request #1190 from nairr/aquancon_object 
Aquancon object
 2018-01-25 14:38:37 +01:00
Rohith Nair
9552d24f77 clean up test 2018-01-25 10:46:14 +01:00
Ove Sævareid
ec83e0fc18 Support for kw MAXVALUE/MINVALUE. 2018-01-24 16:01:09 +01:00
Arne Morten Kvarving
0c9ceedc08 changed: remove duplicated test 2018-01-24 11:29:04 +01:00
Rohith Nair
4c0514a5f4 edit 2018-01-19 17:03:06 +01:00
Rohith Nair
c8e1734efd add test for aquancon object 2018-01-19 17:00:34 +01:00
Joakim Hove
3a03c2226c Added support for defaults in the in-keyword boxes. 2018-01-18 12:58:32 +01:00
Joakim Hove
e1d0b39733 Added accessor functions to Box class 2018-01-18 12:58:32 +01:00
Joakim Hove
972979c931 Added nine argument(!) constructor for Box class 2018-01-18 10:50:04 +01:00
Rohith Nair
26cdaa8598 clean up, moved items to constructor, facedir mod etc. 2018-01-18 09:43:40 +01:00
Joakim Hove
b9f8bb4730 Merge pull request #1187 from stefoss23/handle_extra_records 
WIP: Added ParseContext::IGNORE_EXTRA_RECORDS
 2018-01-17 14:15:52 +01:00
Steinar Foss
5d9f529637 PARSE_EXtRA_RECORDS: added more info to error msg. 2018-01-17 10:27:37 +01:00
Joakim Hove
e46d1115ca Removed travis integration from opm-parser. 2018-01-16 20:10:52 +01:00
Steinar Foss
ab716c6036 added extra test function Handle_extra_records_2. 2018-01-16 17:15:37 +01:00
Steinar Foss
41dc44345e parseState.lastSizeType initialized during construction. 2018-01-16 16:58:30 +01:00
Steinar Foss
56d1291898 parseState.lastStizeType default to SLASH_TERMINATED. 2018-01-16 16:58:30 +01:00
Steinar Foss
24dd4e664e changed check order in ParserState::handleRandomText. 2018-01-16 16:58:30 +01:00
Steinar Foss
5ef8d22a48 IGNORE_EXTRA_RECORDS changed to PARSE_EXTRA_RECORDS. 
...
 2018-01-16 16:58:29 +01:00
Steinar Foss
e85162703e Added ParseContext::IGNORE_EXTRA_RECORDS 
...

...

...

...

...
 2018-01-16 16:58:29 +01:00
Rohith Nair
5068acb29c Aquancon object 
Aquancon object

Reorganized and changed the way the aqurecord object works

Working aquancon object. Still need to implement better logic. Also added test case

Changed indexing bug

Fixed the correct indices for the collate function

Made a private function for getting the record index matching the aquifer id

Reformatted the private function for readibility

Added logic to find unique global cell indices

Collate function done... Now need to apply logic to these entries...

clean up

Conflicts:
	lib/eclipse/EclipseState/Aquancon.cpp

edit object definition
 2018-01-16 15:47:40 +01:00
Rohith Nair
1edd7cbd92 Carter-Tracy aquifer object to collect items from keywords AQUCT, AQUTAB and AQUANCON 2018-01-16 15:32:36 +01:00
Joakim Hove
2b4fa833ea Updated test. 2018-01-16 11:24:09 +01:00
Joakim Hove
61c5bb3721 Merge pull request #1134 from atgeirr/fix-test 
[WIP] Minor fix for test program.
 2018-01-16 10:48:44 +01:00
Tor Harald Sandve
8a98cd4963 Add keywords to required fields map 2018-01-16 10:38:32 +01:00
Joakim Hove
d0565a317d Merge pull request #1186 from akva2/pass_const_ref 
changed: pass by const ref
 2018-01-11 13:54:03 +01:00
Arne Morten Kvarving
120ad9e4fa changed: pass by const ref 
quells a static analyzer warning
 2018-01-11 13:18:41 +01:00
Kai Bao
b2cc783f43 adding keyword FRICTION 2018-01-11 09:50:34 +01:00
Joakim Hove
7f063e3ead Merge pull request #1179 from GitPaean/fixing_history_matching_well_1 
Fixing history matching wells part 1
 2018-01-09 14:36:57 +01:00
Joakim Hove
0118b8ac3e Merge pull request #1181 from GitPaean/adding_keywords_wsegsicd 
adding keyword WSEGSICD
 2018-01-09 14:35:19 +01:00