Commit Graph

4462 Commits

Author SHA1 Message Date
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
Andreas Lauser
1d7ed18419 convert the examples and the tests to opm-parser 2014-04-25 14:25:54 +02:00
Andreas Lauser
3b2aa175d5 remove the import_rewrite example
that one was quite specific to the old parser and would thus require
more work to convert to the opm-parser than what it is worth the
effort. If you _really_ want to keep this tool, ping me and I'll port
it...
2014-04-25 14:25:54 +02:00
Andreas Lauser
7917295923 add opm-parser variants for the incompressible property classes 2014-04-25 14:25:54 +02:00
Andreas Lauser
6a90aa086a CornerPointChopper: add methods opm-parser'y methods 2014-04-25 14:25:53 +02:00
Andreas Lauser
a313dd86d6 convert the EclipseGridInspector to opm-parser
that one is completely unused in opm-core (*booo*!), but used quite a
bit in dune-cornerpoint and dune-porsol, so let's keep it for now...
2014-04-25 14:25:53 +02:00
Bård Skaflestad
a97db3f157 Merge pull request #581 from joakim-hove/GridManager-EclipseGrid-constructor
Grid manager eclipse grid constructor
2014-04-24 16:52:55 +02:00
Bård Skaflestad
e358ae569e Merge pull request #582 from atgeirr/fix-switch-fallthrough
Add missing break statements in switch, add default case.
2014-04-24 15:59:32 +02:00
Atgeirr Flø Rasmussen
c830211272 Add missing break statements in switch, add default case. 2014-04-24 15:43:54 +02:00
Joakim Hove
0fd91e0c16 Changed the data files used for testing:
1) Added RUNSPEC section
2) Replaces DEPTHZ keyword with TOPS keyword.
2014-04-24 15:26:39 +02:00
Bård Skaflestad
a51296a3b1 Merge pull request #574 from andlaus/allow_opm-parser_to_fail
allow the opm-parser test to fail
2014-04-23 19:51:09 +02:00
Joakim Hove
0c9212a605 ERT-601: Added GridManager() constructor which takes a Parser::EclipseGrid instance 2014-04-22 17:16:11 +02:00
Joakim Hove
b43b89063e Renamed struct EclipseGrid -> struct EclipseWriterGrid to avoid conflict
with class in opm-parser.
2014-04-22 15:14:10 +02:00
Joakim Hove
8260d945fa Added function grid_equal() to compare two UnstructuredGrid instances. 2014-04-22 15:13:54 +02:00
Atgeirr Flø Rasmussen
c62dfe5219 Merge pull request #576 from bska/sync-build
[buildsystem] Make dune-cornerpoint a suggestion.
2014-04-22 10:34:57 +02:00
Bård Skaflestad
3038f532ff Merge pull request #577 from andlaus/make_as_needed_optional
Make as needed optional
2014-04-22 10:29:18 +02:00
Bård Skaflestad
2f8bf41509 Merge pull request #580 from atgeirr/fix-external-warnings-option
Fix option name to match name in use in conditional.
2014-04-22 10:26:47 +02:00
Atgeirr Flø Rasmussen
773cbc96d2 Fix option name to match name in use in conditional.
Also add a useful doc string.
2014-04-22 09:50:29 +02:00
Bård Skaflestad
f9249b1d5d Merge pull request #572 from andlaus/add_tabdims_to_some_decks
add the missing TABDIMS keyword to the live oil and wet gas unit test data files
2014-04-16 13:48:56 +02:00
Andreas Lauser
a3d9ce9fbd make the "-Wl,--as-needed" flag optional
as there is not much harm done if it is not used but it may cause the
build to fail if it is present (read: it causes _my_ build to fail),
it defaults to OFF.
2014-04-16 12:05:29 +02:00
Andreas Lauser
8c8c7191cf do not add the "-Wl,--as-needed" linker flag in FindSuiteSparse.cmake
because if umfpack is fully linked but some other library is
underlinked, it causes the build to fail. This flag is better dealt
with in the "UseOnlyNeeded.cmake" module...
2014-04-16 12:00:56 +02:00
Andreas Lauser
e1cde4f4ab add the missing TABDIMS keyword to the live oil and wet gas unit test data files
these are required for the new parser. (without them, these files
would be invalid AFAICT, but I'm not an Eclipse file format expert...)
2014-04-16 11:16:58 +02:00
Markus Blatt
cd18b3e110 [buildsystem] Make dune-cornerpoint a suggestion. 2014-04-16 01:45:53 +02:00
Bård Skaflestad
d9c91ff5eb Merge pull request #555 from andlaus/add_ug_support
add support for the UG grid library
2014-04-16 00:31:16 +02:00
Bård Skaflestad
06b1611b26 Merge pull request #575 from atgeirr/suppress-external-warnings
Suppress external warnings
2014-04-15 22:28:56 +02:00
Bård Skaflestad
bcb4610bc4 Merge pull request #571 from atgeirr/suppress-warnings
Suppress warnings
2014-04-15 21:47:20 +02:00
Andreas Lauser
b82dd41b5e allow the opm-parser test to fail
since the module currently calls the tests for cJSON and boost with
the REQUIRED flag set, cmake aborts completely even if opm-parser is
not REQUIRED. For modules which depend on opm-core that's currently a
non-issue because core has a requirement on parser, but the parser may
be useful for external projects as well, so we play nice.

Also, with this patch the config.h variable HAVE_OPM_PARSER is set...
2014-04-15 20:42:49 +02:00
Atgeirr Flø Rasmussen
2a29deff1c Change option name and generated header names. 2014-04-15 20:21:10 +02:00
Atgeirr Flø Rasmussen
e04cafe57e Merge branch 'suppress-warnings' into suppress-external-warnings 2014-04-15 19:49:19 +02:00