Rohith Nair
c8e1734efd
add test for aquancon object
2018-01-19 17:00:34 +01:00
Arne Morten Kvarving
a3a0f90811
check for the existence of a opmmodule_prepare target
...
if it exists, add this as a dependecy for satellites
2018-01-19 16:33:13 +01:00
Arne Morten Kvarving
5b6dcfa619
fixed: allow more than two build types for jenkins
2018-01-19 16:21:21 +01:00
Arne Morten Kvarving
2b8ee5a82d
changed: check for existing target before importing
...
to aid use of a super project for opm
2018-01-19 14:35:58 +01:00
Arne Morten Kvarving
4e9f15dec3
changed: use ${project}. to aid use of a super-project for opm
2018-01-19 14:35:58 +01:00
Arne Morten Kvarving
fdb0ec1e71
fixed: add missing project declaration
2018-01-19 14:35:58 +01:00
Markus Blatt
3681fe0800
Support dune-uggrid (successor of UG).
2018-01-18 22:39:40 +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
Atgeirr Flø Rasmussen
27204e3439
Merge pull request #318 from akva2/remove_opm_core
...
remove opm-core from downstream list
2018-01-17 21:14:00 +01:00
Arne Morten Kvarving
9e72f17453
Merge pull request #317 from akva2/fix_mpi
...
fixed: we need to do mpi disabling earlier
2018-01-17 17:39:44 +01:00
Arne Morten Kvarving
4340691ff8
added: handle QuadMath support like MPI
2018-01-17 15:57:48 +01:00
Arne Morten Kvarving
de7f4e168d
fixed: we need to do mpi disabling earlier
...
if not, prereqs do not see this file, and the option ends
up not being operational for prereqs looking for MPI.
2018-01-17 15:57:16 +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
Atgeirr Flø Rasmussen
14888816f6
Merge pull request #316 from akva2/stfu_static_analyzer
...
Fix some static analyzer errors
2018-01-17 12:41:44 +01:00
Arne Morten Kvarving
b59eaea633
remove opm-core from downstream list
2018-01-17 11:50:23 +01:00
Steinar Foss
5d9f529637
PARSE_EXtRA_RECORDS: added more info to error msg.
2018-01-17 10:27:37 +01:00
Arne Morten Kvarving
6f174d910c
prefer prefix operators for non-primitives
2018-01-17 10:23:54 +01:00
Arne Morten Kvarving
5bd7d4c6b6
mark constructors explicit
2018-01-17 10:21:46 +01:00
Arne Morten Kvarving
63a308f9f3
remove unused variables
2018-01-17 10:21:10 +01:00
Joakim Hove
da70718beb
Merge pull request #230 from lars-petter-hauge/support_fprp
...
Add support for FPRP
2018-01-17 09:03:39 +01:00
Lars Petter Øren Hauge
37709e9e04
Add support for FPRP
2018-01-17 08:54:38 +01:00
Joakim Hove
d0a973738b
Merge pull request #315 from joakim-hove/remove-travis
...
Removed travis scripts.
2018-01-16 20:27:38 +01:00
Joakim Hove
fdea1b4ef0
Removed travis scripts.
2018-01-16 20:18:02 +01:00
Joakim Hove
c4346cd065
Removed travis integration.
2018-01-16 20:12:42 +01:00
Joakim Hove
e46d1115ca
Removed travis integration from opm-parser.
2018-01-16 20:10:52 +01:00
Atgeirr Flø Rasmussen
f4bc748329
Merge pull request #314 from akva2/import_more_utilities
...
Import more utilities from opm-core
2018-01-16 17:44: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
Atgeirr Flø Rasmussen
4c0333ce2b
Merge pull request #311 from akva2/mark_explicit
...
changed: mark single-parameter constructor explicit
2018-01-16 14:37:09 +01:00
Arne Morten Kvarving
0e2c558501
add imported utility classes to build system
2018-01-16 13:57:17 +01:00
Arne Morten Kvarving
fdfda315d3
Import some more generic utilities from opm-core
2018-01-16 13:56:25 +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
Atgeirr Flø Rasmussen
bbf700b404
Merge pull request #312 from akva2/import_utilities
...
Import some generic utility classes from opm-core
2018-01-12 10:42:55 +01:00
Arne Morten Kvarving
af80986d97
add imported utility classes to build system
2018-01-11 16:59:10 +01:00
Arne Morten Kvarving
95f7d62e9e
Import some generic utility classes from opm-core
2018-01-11 16:55:53 +01:00
Atgeirr Flø Rasmussen
d16842646e
Make constructor generic.
...
This supports std::vector and Opm::TableColumn (from opm-parser) as before,
but without requiring any OPM includes, making the class independent.
2018-01-11 15:00:49 +01:00
Atgeirr Flø Rasmussen
9419997a16
Remove unused boost include.
2018-01-11 15:00:20 +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