Commit Graph

122 Commits

Author SHA1 Message Date
Atgeirr Flø Rasmussen
578f467b59 Add free function vertexNeighbours() and test. 2014-11-27 14:49:32 +01:00
Alf B. Rustad
3180570262 This commit introduces mirror_grid
Fixed various nits
2014-11-27 12:28:29 +01:00
osae
b3b15188d9 Made hysteresis variant of gwseg consistent ...
... with the base gwseg behaviour.  Added test.
2014-11-05 17:00:11 +01:00
osae
830273db7a Forgot to list the DATA-files ... 2014-11-05 16:10:05 +01:00
osae
18c8927334 Added some tests for the endpoint scaled relperm.
- satfuncStandard: Unscaled curves, using standard version of the
Gwseg model.
- satfuncEPSBase: Unscaled curves, but using the EPS version of
the Gwseg model.  There are some differences between this and the
standard version of Gwseg for derivatives at critical saturations.
The scheme for calculating the derivatives should be discussed.
(Will file a separate issue on this.)
- satfuncEPS_A: Scaled curves.  Scaling parameters specified via
SWL family.
- satfuncEPS_B: Scaled curves.  Scaling parameters identical to _A
but this time specified via the ENPTVD table.  Test currently
suspended due problems with eclipse-state.
- satfuncEPS_C: Scaled curves.  Scaling parameters identical to _A
but this time specified via Norne-like syntax (EQUALS, COPY etc.).
2014-11-05 16:10:05 +01:00
Robert K
3f8d379c7f added new files. 2014-10-06 14:25:44 +02:00
Atgeirr Flø Rasmussen
c838f34dc6 Add new headers. 2014-09-20 10:36:10 +02:00
Bård Skaflestad
1a3f7b230f Merge pull request #639 from atgeirr/threshold-pressure
Threshold pressure function
2014-08-29 09:13:27 +02:00
Bård Skaflestad
37dfc4a3b5 Add facility for accessing active subset of global data array
This commit introduces a fairly general mechanism for accessing the
active subset of a global grid (property) array.  Essentially, this
takes on the role of translating the active cell index through the
"global_cell" mapping when accessing, e.g., the net-to-gross data
value.

The primary component is class template

    Opm::GridPropertyAccess::Compressed<DataArray,Tag>

which implements a read-only

    value_type operator[](const int c)

that encapsulates and performs the compressed-to-global cell index
translation.  Template parameter "DataArray" is intended as a policy
parameter that for instance wraps access to a "GridProperty<T>" from
module opm-parser (with a fall-back default value if the data is not
specified on input).  The "Tag" parameter is a provision for type
safety--e.g., to prevent passing a region ID into a function that
requires a porosity value.
2014-08-27 21:19:41 +02:00
Atgeirr Flø Rasmussen
c2f03bbc80 Add new file. 2014-08-27 18:09:27 +02:00
Atgeirr Flø Rasmussen
f74a0bb3e6 New class MinpvProcessor, and test. 2014-08-25 15:20:01 +02:00
osae
9b30660d1e Correcting the equil test. 2014-08-11 13:19:17 +02:00
Andreas Lauser
d8e9b5be21 EclipseWriter: add unit test 2014-07-16 10:41:25 +02:00
Bård Skaflestad
427e53b69b Disable "test_equil" test
This test breaks the Continuous Integration system (Jenkins).  While
we investigate the underlying causes it is better to restore the
build to pristine order.
2014-07-08 22:30:49 +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
Andreas Lauser
720acacad3 remove the EclipseGridParser class
RIP!
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
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
Joakim Hove
8260d945fa Added function grid_equal() to compare two UnstructuredGrid instances. 2014-04-22 15:13:54 +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
Atgeirr Flø Rasmussen
14e93aea75 Remove grdecl.h from file list. 2014-04-10 20:51:06 +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
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
Atgeirr Flø Rasmussen
4d5a92e3ff Add test data files needed for test_equil to the right cmake list. 2014-04-04 22:53:34 +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
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
Markus Blatt
3375e313e5 Merge remote-tracking branch 'upstream/master' into parallel-solver-support
Removed conflicts in:
	opm/core/linalg/LinearSolverIstl.cpp
2014-04-04 20:38:52 +02:00
Markus Blatt
8668ce7b71 Merge remote-tracking branch 'upstream/master' into master-refactor-for-cpgrid-support
Manually resolved conflicts:
	opm/core/io/eclipse/EclipseWriter.cpp
	opm/core/io/eclipse/EclipseWriter.hpp
	opm/core/props/BlackoilPropertiesFromDeck.cpp
	opm/core/simulator/initState_impl.hpp
	opm/core/wells/WellsManager.cpp
	opm/core/wells/WellsManager.hpp
2014-03-27 15:27:11 +01:00
Kai Bao
2a359b6457 Added the test and test data for the new SimulatorTimer
Added test_timer.cpp, TESTTIMER.DATA
2014-03-26 17:45:39 +01:00
osae
5df819d509 Merge branch 'master' of git://github.com/OPM/opm-core
Conflicts:
	CMakeLists_files.cmake
2014-03-26 14:51:06 +01:00
Markus Blatt
1e205adcf1 Added support for the parallel solvers of dune-istl.
To support this the solveSystem methods of the LinearSolverInterface gets
an optional additional template parameter of type boost::any. It can hold any
copy constructable object. In our case it is used to pass the information about
the parallelization into the solvers of dune-istl without the compiler needing to know
their type. Inside of LinearSolverIstl::solveSystem we check whether the type stored inside of
boost::any is the new ParallelIstlInformation. If this is the case we extract the information
and use the parallel solvers if available, otherwise we solve serial/sequential.

The new ParallelIstlInformation is needed as the OwnerOverlapCopyCommunication is not copy
constructable. This is indeed a design flaw that should and will fixed upstream, but for the
time being we need ParallelIstlInformation to transfer the ParallelIndexSet and RemoteIndices
objects.
2014-03-20 21:59:29 +01:00
Markus Blatt
7281a9567f Added a test for the linear solver interface.
This test sets up a simple laplace problem and solves it with the available
solvers. It assume that either dune-istl or UMFPack is present, which is
assume to be safe.
2014-03-19 21:48:07 +01:00
Atgeirr Flø Rasmussen
a58faea9ab Added simple program example for initialisation. 2014-02-27 13:55:15 +01:00
Atgeirr Flø Rasmussen
7cc0802f3e Add test for live oil initialisation.
The test is not finished or verified yet.
2014-02-27 08:31:51 +01:00
Markus Blatt
5199f784d7 Added new implementation header to list of header files. 2014-02-25 17:54:21 +01:00
Markus Blatt
02847f06c1 Made trans_tpfa usable with grids apart from UnstructuredGrid. 2014-02-25 15:05:30 +01:00
Atgeirr Flø Rasmussen
4a8c0dd955 Moved equilibration utilities to separate file. 2014-02-24 16:09:04 +01:00
Atgeirr Flø Rasmussen
34595ae225 Move RegionMapping class to its own header, add test.
Class now resides in opm/core/utility/RegionMapping.hpp.
2014-02-24 15:19:04 +01:00
Atgeirr Flø Rasmussen
2b8deb20fd Add test case with overlapping transitions.
Capillary pressure functions and contact depths
have been modified to ensure a large overlap.
2014-02-21 14:50:45 +01:00
Atgeirr Flø Rasmussen
4408ea669b Add another test deck for initialisation.
This deck includes capillary functions.
2014-02-20 15:39:15 +01:00
Markus Blatt
3aad1a6cc5 Merge remote-tracking branch 'origin/opm-parser-integrate' into refactor-for-cpgrid-support
Resolved Conflicts:
	opm/core/props/BlackoilPropertiesFromDeck.cpp
	opm/core/props/rock/RockFromDeck.hpp
	opm/core/props/satfunc/SaturationPropsFromDeck.hpp
	opm/core/props/satfunc/SaturationPropsFromDeck_impl.hpp
2014-02-19 15:22:18 +01:00
Markus Blatt
8da99e11c5 Refactored parts needed for Blackoil in autodiff to get rid of UG dependency.
This patch refactors (hopefully) all parts of opm-core that are needed
by the fully implicite black oil solver in opm-autodiff and that inherently
relied on UnstructuredGrid.

We added a new simple grid interface consisting out of free functions
that will allow us to use CpGrid without copying it to an UnstructuredGrid
by the means of the GridAdapter. Using this interface we have add methods that
allow specifying the grid information (global_cell, cartdims, etc.) wherever
possible to prevent introducing grid parameters for the type of the grid.
Unfortunately this was not possible everywhere.
2014-02-17 13:23:01 +01:00
Kristian Flikka
36348a8f8a Create WellsGroupInterface from opm-parser Well/Group objects 2014-02-12 15:39:57 +01:00
Kristian Flikka
6a1183dc33 Added support for creation of WellsGroup objects from new parser Well and Group objects 2014-02-11 14:12:36 +01:00
Atgeirr Flø Rasmussen
b3ac9529c8 Merge branch 'master' into initialisation 2014-02-10 13:24:35 +01:00
Kristian Flikka
8cdaf7d05d Removed WELOPEN from constructor, added throwing on non OPEN/SHUT statuses 2014-02-06 16:31:35 +01:00
Joakim Hove
4ecd1dbe0e Merge remote-tracking branch 'upstream/master' into opm-parser-integrate 2014-02-05 15:58:56 +01:00
osae
25b5f23f37 Added SatFuncBase.hpp to CMakeLists_files.cmake 2014-02-05 12:22:50 +01:00
Atgeirr Flø Rasmussen
562b00effb Add (unfinished) test case. 2014-02-03 15:36:20 +01:00
Atgeirr Flø Rasmussen
48f210ebbd Merge remote-tracking branch 'bska/initialisation' into initialisation 2014-01-31 15:41:58 +01:00