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

3192 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Rohith Nair
c8e1734efd add test for aquancon object 2018-01-19 17:00:34 +01:00
Rohith Nair
26cdaa8598 clean up, moved items to constructor, facedir mod etc. 2018-01-18 09:43:40 +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
Joakim Hove
e4449b8129 Merge pull request #1183 from joakim-hove/dim-eror 
Added generated keyword test.
 2018-01-09 14:34:34 +01:00
Kai Bao
11e8202a38 adding keyword WSEGSICD 2018-01-08 17:19:35 +01:00
Joakim Hove
61cf4818ea Merge pull request #1182 from totto82/addPBDVandPDDV 
Add support for PDVD and PBVD
 2018-01-08 15:56:00 +01:00
Joakim Hove
9c9afc613a Added generated keyword test. 2018-01-08 15:20:39 +01:00
Tor Harald Sandve
867df8b7ce Add support for PDVD and PBVD 2018-01-08 14:17:37 +01:00
Andreas Lauser
98a61c67dc add the TOLCRIT keyword 2018-01-08 11:57:43 +01:00
Kai Bao
35ecd2e37a fixing WCONHIST. 2018-01-06 21:49:27 +01:00
Rohith Nair
531a531650 aquatab table object 2017-12-22 13:24:54 +01:00
Rohith Nair
9e3e41b79a Adds tablemanager scheme for aqutab + modifications to aquct and aquancon parsing 2017-12-22 10:54:59 +01:00
Rohith Nair
6361c12c65 Introduces an aqudims class and a test for the same 2017-12-21 15:10:32 +01:00
Arne Morten Kvarving
6ba3f2e695 put more stuff in the config file 
we cannot use the information from the imported targets as
it is incompatible with the rest of the opm build system setup.
 2017-12-19 16:04:02 +01:00
Joakim Hove
0be2a44fcd Merge pull request #1171 from andlaus/fix_rtempvd 
fix the TEMPI property if it is initialized using RTEMPVD
 2017-12-15 13:12:22 +01:00
Andreas Lauser
c01a1a9d79 fix the TEMPI property if it is initialized using RTEMPVD 
E100 seems to silently use equil region zero if EQLNUM was not
specified, and the data contained in the EQLNUM array uses
fortran-style indices.
 2017-12-13 11:23:57 +01:00
Andreas Lauser
87ec3c0c23 add more thermal keywords and the associated infrastructure 2017-12-11 10:37:27 +01:00
ReedMe
c9c6128bb4 add GRUPNET to group 2017-12-07 15:28:04 +01:00
Joakim Hove
2a7185baed Merge pull request #1165 from joakim-hove/new-sched-ctx 
New sched ctx
 2017-12-04 13:38:35 +01:00
Joakim Hove
56180285b3 Merge pull request #1164 from joakim-hove/one-arg-parsecontext 
Added one-argument ParseContext constructor.
 2017-12-04 13:38:09 +01:00
Joakim Hove
3f4f566c1e Added Schedule constructor which takes EclipseState arg. 2017-12-03 09:00:56 +01:00
Joakim Hove
6ef1bd7c25 Made ParseContext argument to Schedule constructor optional. 2017-12-03 09:00:02 +01:00
Joakim Hove
22074a46bf Added one-argument ParseContext constructor. 2017-12-03 08:38:27 +01:00
Sveinung Styve Rundhovde (IT SI SIB)
ff193322e4 Add support for WTHPH+WBHPH keywords 2017-12-01 13:20:31 +01:00
Joakim Hove
adb017aec4 Merge pull request #1158 from andlaus/thermal_stuff 
Thermal stuff
 2017-12-01 12:19:28 +01:00
Joakim Hove
56bd653e51 Added optional shift attribute in keyword size configuration. 2017-11-28 10:09:41 +01:00
Andreas Lauser
f353dcf745 add temperature to the well injection properties 
so far, this uses the WTEMP keyword. the WINJTEMP keyword is still to
do!
 2017-11-27 14:00:57 +01:00
Andreas Lauser
96c5843421 add an energy "phase" 
this is just like the solvent "phase" and the polymer "phase". Since
IMO this is a bit awkward, the Phases class should possibly be renamed to
something like "ConservedQuantities".
 2017-11-25 18:08:28 +01:00
Andreas Lauser
1f7cda4569 add the infrastructure for SPECROCK 
this is analogous to the SPECHEAT patch:

- fix the JSON definition
- add a table class
- wire the table class into TableManager
 2017-11-25 18:08:28 +01:00
Andreas Lauser
a5f334977c add the higher-level infrastructure for the SPECHEAT keyword 
This changes the JSON definition of the SPEHEAT keyword from a blob to
a table, adds a SpecHeatTable class and wires it into the
TableManager.
 2017-11-25 18:08:28 +01:00
Andreas Lauser
c2b204ab28 add some missing thermal keywords and grid properties 2017-11-25 18:08:28 +01:00
Andreas Lauser
62333f08a8 units: add energy 
an alternative is to add heat capacity, but this is more cumbersome
because some heat capacities are volumetric while others are mass
specific. (note that the "single division" shenengian of the unit
system's expression parser needs to be considered for most energy
related keywords.)
 2017-11-25 18:08:28 +01:00
Andreas Lauser
fa0d1ff4bd add a OILDENT keyword 
just like GASDENT, this keyword is OPM specific but it is exactly
analogous to WATDENT.
 2017-11-25 18:08:28 +01:00
Andreas Lauser
84c561b44c add a GASDENT keyword 
this keyword is OPM-specific and specifies the thermal expansion
of gas. it is completely analogous to WATDENT.
 2017-11-25 18:08:28 +01:00
Andreas Lauser
d2615a508e WATDENT: fix the defaults 
the old default values seemed to be the ones for imperial units, not
the metric ones.
 2017-11-25 18:08:28 +01:00
Andreas Lauser
b1cbddb18c fix the value returned by TableManager.rtemp() 
because everything in opm-parser uses SI units this needs to be
Kelvin, not degrees Celsius!
 2017-11-25 18:08:28 +01:00
Andreas Lauser
b83bbf89ca fix the JSON definition of the STCOND keyword 2017-11-25 18:08:28 +01:00
Andreas Lauser
94aafeb93c remove the configure wrapper script 
this used to provide autotools compatibility, but it has not been working for a while. Thus it is IMO better to remove it in order not to mislead people.
 2017-11-24 10:36:46 +01:00
Tor Harald Sandve
f90ed86124 Add TUNING_CHANGE event for TUNING 2017-11-23 14:22:36 +01:00
Tor Harald Sandve
b5d4959375 Use linear interpolation for kro columen in SOF2 Table 2017-11-23 10:49:22 +01:00
Tor Harald Sandve
7aaad448d4 Add support for WEFAC 2017-11-21 09:55:07 +01:00