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

4436 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Atgeirr Flø Rasmussen
f0692b14e9 Make function in header file inline. 2014-04-15 19:47:04 +02:00
Atgeirr Flø Rasmussen
138f4f7aba Added more warnings to suppression list, sorted list. 2014-04-15 19:46:16 +02:00
Atgeirr Flø Rasmussen
bfd3246d33 Fix access to keywords, while still silencing warning. 
Previous fix was wrong because it called getKeyword() outside the
hasKeyword() check. Current version (like original code) uses the
short-circuiting behaviour of && to ensure this.
 2014-04-15 14:52:21 +02:00
Atgeirr Flø Rasmussen
c603103a3d Merge remote-tracking branch 'akva2/quell_dune_warnings' into suppress-external-warnings 2014-04-15 14:35:01 +02:00
Atgeirr Flø Rasmussen
ef5a21d710 Add (all-zero) initialisation of new EquilRecord fields. 2014-04-15 13:41:10 +02:00
Atgeirr Flø Rasmussen
6b2bc6c4d6 Avoid signed/unsigned warning. 2014-04-15 13:40:50 +02:00
Atgeirr Flø Rasmussen
3ec1e22f21 Comment out unused function argument. 2014-04-15 13:40:15 +02:00
Atgeirr Flø Rasmussen
049df8bc60 Avoid signed/unsigned mismatch. 2014-04-15 13:39:44 +02:00
Atgeirr Flø Rasmussen
0aa72eda5d Comment or add (void) usage of unused arguments. 2014-04-15 13:39:03 +02:00
Bård Skaflestad
04704de376 Merge pull request #518 from blattms/master-refactor-for-cpgrid-support 
refactor for cpgrid support to apply to master
 2014-04-15 00:02:31 +02:00
Markus Blatt
9afa1d3834 Merge pull request #2 from bska/master-refactor-for-cpgrid-support 
Fix build in !HAVE_DUNE_CORNERPOINT case
 2014-04-14 23:12:19 +02:00
Bård Skaflestad
0ced59db4a Merge pull request #570 from andlaus/pvdco_to_pvcdo 
fix typo: it's PVCDO, not PVDCO
 2014-04-11 17:40:50 +02:00
Andreas Lauser
693ac17aed fix typo: it's PVCDO, not PVDCO 
(since the parser did not have a definition for this keyword until
_very_ recently, I severly doubt that these code paths have been used
recently...)
 2014-04-11 11:56:27 +02:00
Atgeirr Flø Rasmussen
f1b4321d28 Merge pull request #569 from atgeirr/fix-incomplete-removal 
Remove grdecl.h from file list.
 2014-04-10 20:54:54 +02:00
Atgeirr Flø Rasmussen
14e93aea75 Remove grdecl.h from file list. 2014-04-10 20:51:06 +02:00
Atgeirr Flø Rasmussen
53690a448f Merge pull request #568 from andlaus/remove_grdecl_h 
remove second grdecl.h header file
 2014-04-10 20:47:54 +02:00
Andreas Lauser
07d0196466 remove second grdecl.h header file 
that one was completely unused and the "grdecl" struct defined in
there collided name-wise with the one defined in "GridManager.hpp".
trying to link code which used the version of the grdecl.h header with
code that used the one from GridManager.hpp would have resulted in _a
lot_ hilarity...
 2014-04-10 18:06:05 +02:00
Bård Skaflestad
18624766f2 Declare initBlackoilStateFromDeck(DeckConstPtr) 
This was missing in commit 4c2120c and produced some build failures
that were hard to analyse.  I'm not convinced that the underlying
problem is solved, but this does at least restore the build.
 2014-04-10 00:51:28 +02:00
Bård Skaflestad
89f282f19f Implement Dune::CpGrid operations when needed only 
The functions

    multiplyFaceNormalWithArea
    maybeFreeFaceNormal

operating on Dune::CpGrids must not be implemented unless they are
actually used.  Otherwise we get link failures if (e.g.,)
opm-autodiff is being built without CpGrid support.

Hide the definitions behind "#ifdef HAVE_DUNE_CORNERPOINT".
 2014-04-10 00:03:10 +02:00
Bård Skaflestad
51c664800f Prefer C++ headers 
Also, remove a couple of headers that were no longer needed.
 2014-04-10 00:00:14 +02:00
Bård Skaflestad
4fe22ea137 Don't include "config.h" in public header 
That's always an error.  Presumably, this was a left-over from
conversion to templates.
 2014-04-09 23:58:34 +02:00
Markus Blatt
4c2120c770 Added missing variant of initBlackoilStateFromDeck with new parser and without UG. 2014-04-09 14:34:04 +02:00
Markus Blatt
0dcd0351fc Removed superfluous parameter cartdims from initStateFromDeck. 
The parameter was unused and would cause trouble in initBlackoilStateFromDeck.
 2014-04-09 14:33:35 +02:00
Markus Blatt
fdd19fd3f6 Reintroduce lifetime guarantees for UnstructuredGrid used. 
In this pull requested we resorted to storing the data items (e.g. cart_dims, global_cell,
etc.) instead of the UnstructuredGrid. Unfortunately, this is a change of the lifetime
guarantees: Previously, a shared_ptr to the Unstructuredgrid was stored. Thus the data members
were available for the lifetime of the EclipseWriter. With the previous changes the grid could
actually have been destroyed before the writer.

Therefore we no store a shared_ptr to the UnstructuredGrid again (in addition to the datamembers).
Thus at least for UnstructuredGrid the old guarantees still hold.
 2014-04-09 10:31:46 +02:00
Markus Blatt
ebc86bc624 Merge remote-tracking branch 'upstream/master' into master-refactor-for-cpgrid-support 
Manually resolved conflicts in:
	opm/core/io/eclipse/EclipseWriter.cpp
	opm/core/io/eclipse/EclipseWriter.hpp
	opm/core/props/satfunc/SaturationPropsFromDeck_impl.hpp
 2014-04-08 21:50:00 +02:00
Atgeirr Flø Rasmussen
f0c334a901 Merge pull request #563 from osae/testEPS 
New parser; proper handling of ENPTVD/ENKRVD.
 2014-04-08 13:51:43 +02:00