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

4421 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
Bård Skaflestad
f3ebd78296 Merge pull request #538 from blattms/parallel-solver-support 
Added support for parallel dune-istl solvers
 2014-04-08 00:17:35 +02:00
Markus Blatt
94c9a69bfb Merge pull request #1 from bska/no-mpi 
Fix build issues in !HAVE_MPI case
 2014-04-07 23:26:56 +02:00
Bård Skaflestad
ce687039b2 Don't reference OwnerOverlap* unless MPI is available 
The class OwnerOverlapCopyCommunication is not defined unless MPI is
avilable.  Therefore, we cannot reference the type unless we know
that MPI is available in the current translation unit.
 2014-04-07 20:01:18 +02:00
Bård Skaflestad
e434000f4e Search for MPI support 
The build system depends on knowing if MPI is available.  Explicitly
search for MPI to honour that requirement.  Don't rely on ISTL's
transitive searching for the same.
 2014-04-07 20:01:18 +02:00
Bård Skaflestad
1fca44fb03 Explicitly group conditions 
For some reason I was unable to produce correct criteria without
inserting explicit parentheses.  I don't know why that is, but
better safe than sorry.
 2014-04-07 20:01:18 +02:00
Bård Skaflestad
a154887a2b Exclude "test_parallel_linearsolver" from non-MPI builds 
The "sources_hook" runs after "OpmFiles" in "OpmLibMain".
Therefore, we must search the "tests_SOURCES" to exclude particular
tests from the build.

This fixes a build problem in the non-MPI case.
 2014-04-07 20:01:18 +02:00
Bård Skaflestad
18119e0cb4 Merge pull request #564 from atgeirr/add_compi_producers 
Add Wells::comp_frac for producers
 2014-04-07 18:16:17 +02:00
Atgeirr Flø Rasmussen
59bdd5f31e Changed documentation of Wells::comp_frac to match reality. 2014-04-06 23:45:08 +02:00
Atgeirr Flø Rasmussen
3d98f7a77e Use preferred phase of producer well to set comp_fraction. 
This replaces the previous hack, that set comp_fraction to (0,1,0) always.
 2014-04-06 23:33:43 +02:00
osae
498555fcdd New parser; proper handling of ENPTVD/ENKRVD. 2014-04-05 10:56:30 +02:00
Atgeirr Flø Rasmussen
954924064f Merge remote-tracking branch 'totto82/add_compi_producers' into add_compi_producers 2014-04-05 00:18:38 +02:00
Atgeirr Flø Rasmussen
c0ecf0bc77 Merge pull request #559 from andlaus/EclipseWriter_fix_summary_output 
Eclipse writer fix summary output
 2014-04-04 23:30:31 +02:00
Atgeirr Flø Rasmussen
55fe6b5b69 Merge pull request #558 from andlaus/EclipseWriter_refactor_writeInit_semantics 
Eclipse writer refactor write init semantics
 2014-04-04 23:24:48 +02:00
Bård Skaflestad
2ffc5a0480 Merge pull request #562 from atgeirr/add-testfiles-to-list 
Add test data files needed for test_equil to the right cmake list.
 2014-04-04 23:08:52 +02:00
Atgeirr Flø Rasmussen
4f330ea07b Merge pull request #557 from andlaus/EclipseWriter_remove_old_parser 
Eclipse writer remove old parser
 2014-04-04 23:02:24 +02:00