OilfieldToolsNet/opm-core
4
0 Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
4,452 Commits 9 Branches 35 Tags
f0069c78683210df849d4e1f708eef75ff5730ad
Commit Graph
1907 Commits
Author SHA1 Message Date
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 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
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
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
Atgeirr Flø Rasmussen c830211272 Add missing break statements in switch, add default case. 2014-04-24 15:43:54 +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 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 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 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
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
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
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
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
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
Atgeirr Flø Rasmussen b07cd277a7 Merge pull request #561 from totto82/fix_viscosity_table 
Fix undersaturated viscosity table
 2014-04-04 22:41:11 +02:00
Atgeirr Flø Rasmussen a47c9c7330 Merge pull request #544 from osae/equil-init 
Equil init
 2014-04-04 22:39:37 +02:00
Markus Blatt ec789bc63a Removes unused parameter warnings in TransTpfa_impl.hpp. 2014-04-04 21:29:19 +02:00
Markus Blatt d83374e6b7 Merge remote-tracking branch 'upstream/master' into master-refactor-for-cpgrid-support 
Removed conflicts in
	opm/core/wells/WellsManager.cpp
that were due to the change
```diff
-                    pd.well_index = WellsManagerDetail::computeWellIndex(radius, cubical, cell_perm, completion->getDiameter());
+                    pd.well_index = WellsManagerDetail::computeWellIndex(radius, cubical, cell_perm, completion->getSkinFactor());
```
in  WellsManager::createWellsFromSpecs which moved from WellsManager.cpp to WellsManager_impl.hpp file in a previous commit.
 2014-04-04 21:21:22 +02:00