Commit Graph

1297 Commits

Author SHA1 Message Date
Andreas Lauser
aeb17403a7 GridPropertyInitializers: fix signedness comparison warning 2014-12-08 18:28:19 +01:00
Joakim Hove
f9b1fc56c8 Merge pull request #377 from joakim-hove/BUILD_TESTING
Build testing
2014-12-08 16:17:16 +01:00
Joakim Hove
ac299e62bc Removed unused Deck argument in method 2014-12-08 15:55:44 +01:00
Joakim Hove
ec6d22c9c2 Changed backtics to single ticks in string literal. 2014-12-08 15:55:20 +01:00
Joakim Hove
3604350847 Added if (BUILD_TESTING) ... around tests. 2014-12-08 15:54:34 +01:00
Joakim Hove
5ce2c11d94 Merge pull request #375 from dr-robertk/PR/add-keyword-SOF2-SWFN
Added keywords SOF2 and SWFN to allow for different saturation functions.
2014-12-08 15:46:18 +01:00
Joakim Hove
b81e23cd7b Merge pull request #376 from dr-robertk/PR/add-keyword-FULLIMP-IMPES
added keywords FULLIMP and IMPES.
2014-12-08 15:27:03 +01:00
Robert K
f9f819beff added keywords FULLIMP and IMPES. 2014-12-08 14:38:03 +01:00
Robert K
01ddb76075 Added keywords SOF2 and SWFN to allow for different saturation functions. 2014-12-08 14:13:34 +01:00
Joakim Hove
b9545b865c FindERT.cmake: Look for libecl_well library 2014-12-08 13:06:16 +01:00
Joakim Hove
bb9cf64776 Merge pull request #372 from chflo/OPM_139_write_ecl_restart_wellinfo
OPM-139: Added methods to Schedule
2014-12-08 09:59:45 +01:00
chflo
82243d0ec1 OPM-139: Added methods to Schedule to support opm-core in writing wellinfo to restart files 2014-12-05 12:59:53 +01:00
Joakim Hove
a2bc01ac64 Merge pull request #370 from andlaus/basic_temperature_support
Basic temperature support
2014-12-03 20:38:01 +01:00
Andreas Lauser
ad7f915a3e add a grid property for TEMPI
by default it is initialized using the temperature vs depth table...
2014-12-03 18:51:00 +01:00
Andreas Lauser
9ab4897587 add a table for RTEMPVD 2014-12-03 18:51:00 +01:00
Andreas Lauser
fdd66d911c add the keywords required to specify the initial reservoir temperature
E100 does not know about TEMPI, but it is wise not to use the
geothermal gradient directly, but to go over the "temperature at
cell-center" detour as specified by the E300 TEMPI keyword. The depth
vs. temperature table is given by the RTEMPVD keyword. The intend is
that if TEMPI stays unspecified the temperature is calculated at each
cell center and the result is put into TEMPI from where it gets picked
up by the simulator.

(Note that E300 says that TEMPVD is an alias for RTEMPVD even though
the possible sections of these two do not exhibit any overlap, WTF?)
2014-12-03 16:56:25 +01:00
Andreas Lauser
b1de0bf338 unit system: add temperature
this requires the possibility of specifying an offset for the SI
conversion because Eclipse in its eternal wisdom chooses to specify
temperatures using degrees Celsius and degrees Fahrenheit instead of
using Kelvin an Rankine...
2014-12-03 16:56:25 +01:00
Joakim Hove
00dc724aba Merge pull request #368 from qilicun/wpolymer
add WPOLYMER to schedule section.
2014-12-02 12:21:40 +01:00
Liu Ming
5b3a92159a add unit test for WPOLYMER. 2014-11-21 13:21:24 +08:00
Liu Ming
81be71cac8 throw if group polymer/salt concentration is set. 2014-11-20 17:23:12 +08:00
Liu Ming
94974f0454 add WPOLYMER to schedule section. 2014-11-20 16:20:54 +08:00
Joakim Hove
cc9fd8e3f7 Merge pull request #361 from flikka/keyword-folder
Put keywords in subfolders
2014-11-19 14:55:30 +01:00
Arne Morten Kvarving
51de1faa85 fixed: compile cjson object into libopm-json
i see no reason to keep the separate library and this circumvents
shared vs static linking issues.

an alternative fix is to fix the opm buildsystems to prioritize config
mode. that would be more involved.
2014-11-18 13:19:25 +01:00
Kristian Flikka
83a1016aaf Changed behaviour when same keyword occurs again, delete existing entry, replace with new. 2014-11-18 11:51:35 +01:00
Arne Morten Kvarving
870cf4514b added: cmake config mode and pkgconfig 2014-11-18 11:10:07 +01:00
Arne Morten Kvarving
303b9bc885 changed: cjson handling
- probe only for system lib (i.e. only probe in prefix paths)
old code ended up not installing the json lib due to finding a copy
in the build folder if a reconfiguration was performed.

- build internal copy static and bundle in libopm-json.so
no reason to install this as a shared library. if it is updated
originating from opm, the entire parser library is updated anyways.
2014-11-18 10:27:03 +01:00
Arne Morten Kvarving
a42b503bac fixed: properly encapsulate cjson 2014-11-18 10:27:03 +01:00
Joakim Hove
84f49e6e92 Merge pull request #362 from akva2/fix_shared_libs
Fix shared libs
2014-11-17 16:28:38 +01:00
Arne Morten Kvarving
019f3e6672 changed: always build helper library static 2014-11-17 14:58:40 +01:00
Arne Morten Kvarving
85934aa769 fixed: add missing object in parserBuilder library 2014-11-17 14:58:33 +01:00
Kristian Flikka
71e8321d7c Created folders for keywords, these will be read in an alphanumerical sorted order. To enable organization and override of keywords. 2014-11-17 13:37:00 +01:00
Kristian Flikka
b8f87a1eb1 Prints a warning if a keyword that has already been added, occurs again. Next step, process keywords from several ordered, top-level folders 2014-11-17 13:37:00 +01:00
Kristian Flikka
94306e6fdc Changed the KeywordMap to use keyword and not path as key, to enable check for existing keyword 2014-11-17 13:37:00 +01:00
Kristian Flikka
86d2fd2907 Removed unused variable 2014-11-17 13:37:00 +01:00
Joakim Hove
b2fbbfc8a7 Added small method to check if cell is active. 2014-11-16 20:07:03 +01:00
Joakim Hove
56b7f4e8c0 Removed emacs config 2014-11-16 19:08:10 +01:00
Andreas Lauser
f7fcd65f9f .dir-locals.el: remove Statoil developer setup specific commands
my emacs always asks me whether I want to apply these settings as it
consideres them unsafe. Furthermore, I use a different directory
structure, so these settings are useless to harmful for me.

If you want to keep these settings around, please move them to ~/.emacs
2014-11-11 12:11:54 +01:00
Joakim Hove
bae5a0cb46 Merge pull request #353 from joakim-hove/EclipsestateNoGrid
Eclipsestate no grid
2014-11-11 11:00:58 +01:00
Joakim Hove
456d36ccba Added test of EQUALS keyword auto creation. 2014-11-10 17:07:56 +01:00
Joakim Hove
ad75b870a5 Changes to emacs file . 2014-11-10 17:07:56 +01:00
Joakim Hove
5f7a7d8083 Removed EclipseState::hasGrid() method 2014-11-10 17:07:56 +01:00
Joakim Hove
cf5a839d97 Removed unnecessary default values. 2014-11-10 17:07:55 +01:00
Joakim Hove
ffce0408c4 Removed unused dummy grids in test deck. 2014-11-10 17:07:55 +01:00
Joakim Hove
52883c9e69 Check that exception is raised if PORV is initialized without grid. 2014-11-10 00:17:10 +01:00
Joakim Hove
24cb9944c6 EclipseGrid - check content of c_ptr before use
This commit contains quite large changes to the EclipseGrid. The main
functional change is that the access to the ecl_grid_type pointer is
protected. In addition there are 'white space' changes due to methods
moving around and some methods have been marked static.
2014-11-10 00:14:55 +01:00
Joakim Hove
6f4b353fe5 Using shared_ptr<EclipseGrid> instead of bare EclipseGrid * 2014-11-09 23:46:56 +01:00
Joakim Hove
39bca17ce0 Split EclipseGrid in dimensions and cell info.
In many cases the only required information in an EclipseGrid instance
is the cartesian dimensions. To facilitate simpler testing - and not
have to create a full dummy grid the dimensions have been internalized
as a separate nx,ny,nz triplet. With this commit it is possible to
instantiate a grid with only dimensions, and no underlying ecl_grid_type
pointer.
2014-11-09 23:31:53 +01:00
Andreas Lauser
a7ba8af558 EclipseState: make specifying anything which requires a grid an error if no grid could be instantiated 2014-11-09 17:37:32 +01:00
Andreas Lauser
4e293ee3e6 EclipseState: make it instantiable without a grid
instead of throwing, we now add a warning to the parser log...
2014-11-08 23:55:25 +01:00
Andreas Lauser
ead7e0a8c9 make the parser case-insensitive
i.e., make keywords ALL_UPPERCASE before using them because Eclipse
seems to be case-insensitive (although this is one of its undocumented
features...)
2014-11-07 14:24:12 +01:00