OilfieldToolsNet/opm-core
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
4,490 Commits 9 Branches 35 Tags 15 MiB
f5823d2ea2
Commit Graph

4490 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bård Skaflestad
f5823d2ea2 Merge pull request #603 from akva2/fix_cp_prereqs 
fixed: dune-cornerpoint (now) needs the dune-common version information
 2014-06-18 15:47:24 +02:00
Arne Morten Kvarving
1d506e49eb fixed: dune-cornerpoint (now) needs the dune-common version information 2014-06-18 15:36:31 +02:00
Bård Skaflestad
eb7c0eb75a Merge pull request #602 from akva2/add_files_hook 
added: hook for conditionally compiled files
 2014-06-16 14:53:20 +02:00
Arne Morten Kvarving
457ea2c44f added: hook for conditionally compiled files 
backport from opm-upscaling PR#100
 2014-06-16 14:40:52 +02:00
Atgeirr Flø Rasmussen
eed5892e98 Merge pull request #600 from bska/restore-build 
[buildsystem] Disable search for Boost in parser detection
 2014-06-13 13:04:56 +02:00
Bård Skaflestad
43c844b19f [buildsystem] Disable search for Boost in parser detection 
This changeset disables the effect of commit e9a5e82.  There appears
to be an unforeseen interaction between the calls to

    Find_Package (Boost)

that are implied by module 'opm-parser-prereqs.cmake' and the one
that's directly invoked in 'Findopm-parser.cmake'.  Until the
situation can be fully analysed and a complete solution implemented,
this is a temporary measure to restore the build of opm-core and
downstream OPM modules.
 2014-06-13 08:51:18 +02:00
Bård Skaflestad
97fe40c9c6 Merge pull request #599 from andlaus/add_ERT_to_opm-parser 
explicitly add the ERT libraries to the prerequisites of opm-parser
 2014-06-13 00:10:11 +02:00
Andreas Lauser
e9a5e82223 Findopm-parser.cmake: invoke FindBoost unconditionally 
even if boost was found previously, it might still miss a few
libraries. thanks to @akva2 for catching this.
 2014-06-12 21:46:18 +02:00
Bård Skaflestad
bc57bf1160 Merge pull request #598 from andlaus/enable_property_modifiers 
Glue in support for the grid property modifier keywords
 2014-06-11 22:45:59 +02:00
Andreas Lauser
47ba95d4eb Findopm-parser.cmake: make sure that the ERT libraries are available 
and some other minor cleanups to the module. For me it still works,
but this being the build system, I can't guarantee more...
 2014-06-11 22:24:34 +02:00
Andreas Lauser
0c47d27827 Glue in support for the grid property modifier keywords 
this basically means using Opm::EclipseState instead of the raw deck
for these keywords.

with this, property modifiers like ADD, MULT, COPY and friends are
supported for at least the PERM* keywords. If additional keywords are
required these can be added relatively easily as well.

no ctest regressions have been observed with this patch on my machine.
 2014-06-11 13:48:49 +02:00
Bård Skaflestad
6bac6159ee Merge pull request #596 from andlaus/fix_some_keyword_names 
Fix some keyword names
 2014-06-10 23:14:34 +02:00
Bård Skaflestad
95a4d991f0 Merge pull request #587 from andlaus/implement_multi-region_pvt_tables 
Implement multi-region PVT properties
 2014-06-06 14:38:36 +02:00
Andreas Lauser
31c97ca172 change item names used to query the PVCDO keyword 
That's similar to having fun with a vodoo doll...
 2014-06-06 13:18:57 +02:00
Andreas Lauser
80cb3265db fix some keyword names 
The queried keywords are unknown to the parser and after manual
inspection also to the Eclipse RM. There might be wrong keywords some
left, but these were to ones needed to get SPE9 started using
sim_fibo_ad...
 2014-06-05 16:07:31 +02:00
Andreas Lauser
93f7a47062 add missing include 
for some reason this seems to be only required by GCC 4.4
 2014-06-05 14:32:58 +02:00
Andreas Lauser
126ca8043f Eclipse does not have a PERM keyword 2014-06-05 08:36:53 +02:00
Andreas Lauser
f96dfc2e0f fix the equilibration test by using new values 
thanks to @bska for the hints.
 2014-06-04 13:26:37 +02:00
Andreas Lauser
947d1644bd add missing PVTW keywords to the decks used by the equil test 
the test still fails, but the errors seem to be due to differences in
the saturation functions...
 2014-06-04 11:35:24 +02:00
Andreas Lauser
8568f9f3f9 add an assert 2014-06-04 11:11:35 +02:00
Andreas Lauser
2545b423fc handle the case that the compressed to logically cartesian array is NULL 2014-06-04 11:11:35 +02:00
Andreas Lauser
cbb5910a93 incorperate the review comments/decisions for multi-region PVT 
the largest change is that all classes below opm/core/props/pvt take
the PVT region index as an argument, the higher-level ones (i.e.,
BlackoilProps*) take cell indices.
 2014-06-04 11:11:35 +02:00
Andreas Lauser
fbd8d42e8d Implement multi-region PVT for all property classes 
since they are not using a single PVT table anymore, their "Single"
prefix has been removed...
 2014-06-04 11:11:35 +02:00
Bård Skaflestad
8afa34db4d Merge pull request #583 from andlaus/remove_EclipseGridParser 
Remove eclipse grid parser
 2014-06-04 00:26:41 +02:00
Andreas Lauser
c1c3f9d2e0 remove the table_t type 
that was an artifact only required for the old parser
 2014-05-21 11:22:43 +02:00
Andreas Lauser
f96417e81c rename all "newParserDeck" objects to "deck" 
The "new" parser is now "the" parser...
 2014-05-21 11:22:43 +02:00
Andreas Lauser
720acacad3 remove the EclipseGridParser class 
RIP!
 2014-05-21 11:22:43 +02:00
Andreas Lauser
3941fbc5f1 remove EclipseGridParser compatibility methods from all classes 2014-05-21 11:22:43 +02:00
Andreas Lauser
099f22cf1f attic: remove all files which required EclipseGridParser 
since the attic is the place for bits to rot silently, I doubt that
this code would have been of much contemporary use anyway. Even if it
could be made to compile, porting it to opm-parser would hardly be
worth the effort. If you are nostalgic and want to see how things were
done in the olden days, use `git show $COMMIT` or `git log --stat` or
`git log -p` and search for "EclipseGridParser"...
 2014-05-21 11:22:43 +02:00
Atgeirr Flø Rasmussen
55427b2220 Merge pull request #592 from andlaus/convert_time_to_days_in_ecl_summary_output 
Eclipse summary output: always convert the simulation time to days
 2014-05-20 16:01:16 +02:00
Andreas Lauser
7c226478dd Eclipse summary output: always convert the simulation time to days 
this seems to have been forgotten in one place...
 2014-05-16 11:50:32 +02:00
Atgeirr Flø Rasmussen
d50b7ab4aa Merge pull request #589 from atgeirr/fix-comparison-warning 
Supress signed-unsigned comparison warning.
 2014-05-12 09:22:42 +02:00
Atgeirr Flø Rasmussen
9690ccc978 Supress signed-unsigned comparison warning. 2014-05-12 09:18:52 +02:00
Atgeirr Flø Rasmussen
a681bcf869 Merge pull request #573 from osae/test-eps 
Endpoint scaling - taking advantage of the new parser.
 2014-05-12 08:28:48 +02:00
Atgeirr Flø Rasmussen
7e9fbcba4f Merge pull request #586 from osae/equil-update 
EQLNUM in case of non-trivial ACTNUM
 2014-05-09 21:34:32 +02:00
osae
f0069c7868 Removing a few bugs ... 2014-05-06 18:15:03 +02:00
osae
57b694f66a Proper interpretation of ENDNUM and IMBNUM fields. 
Made consistent with grid discretization.
 2014-05-06 14:41:17 +02:00
osae
6cd46c5585 Initialisation of EGLNUM (analogous to e.g SATNUM) 2014-05-06 12:47:24 +02:00
osae
2beb0631b2 Inserted some documentation. 2014-05-05 11:27:10 +02:00
osae
c6a83df998 Fix to make EQLNUM consistent with ACTNUM. 
This should eventually be integrated in the parser.
 2014-05-05 11:23:43 +02:00
osae
7280ce2517 ENDNUM: changed default value and jtab-logic 
Default value changed from 'no scaling' to 'use table 1'.
Range of jtab changed to [-1,#tables-1].
 2014-05-05 10:33:04 +02:00
osae
61a52eee2e Reset gwseg as the model for endpoint scaling. 2014-05-05 10:33:04 +02:00
osae
7f04384b10 Make use of keywords SATOPTS and EHYSTR. 2014-05-05 10:33:04 +02:00
osae
003b37ad88 Use ENDNUM and prepare for IMBNUM. 2014-05-05 10:33:04 +02:00
osae
f7d2468d79 Added missing line (parser conversion). 2014-05-05 10:33:04 +02:00
Joakim Hove
85b300323a Merge pull request #584 from andlaus/adapt_to_opm-parser_renames 
adapt to the renames of the table classes in opm-parser
 2014-05-02 17:00:26 +02:00
Joakim Hove
c99cd947f2 Merge pull request #585 from joakim-hove/testdata-error 
Fixed error in testdata tests/CORNERPOPINT_ACTNUM.DATA
 2014-04-29 09:21:01 +02:00
Joakim Hove
a9d11675d4 Fixed error in testdata tests/CORNERPOPINT_ACTNUM.DATA 2014-04-29 09:19:07 +02:00
Andreas Lauser
89f4a6db5b adapt to the renames of the table classes in opm-parser 
basically, "Opm::SimpleTable" becomes "Opm::SingleRecordTable".
 2014-04-28 18:47:28 +02:00
Bård Skaflestad
6c1a9feed0 Merge pull request #579 from andlaus/move_to_opm-parser 
Move to opm parser
 2014-04-25 18:39:27 +02:00