Commit Graph
432 Commits
Author SHA1 Message Date
Jørgen Kvalsvik 1057e6d3d0 Update to shared_ptr-less parser interface. 2016-10-20 10:14:41 +02:00
Andreas Lauser 07707ecc30 consolidate the unit system to opm-parser
since the unit code within opm-parser is now a drop-in replacement,
this simplifies things and make them less error-prone.

unfortunately, this requires quite a few PRs. (most are pretty
trivial, though.)
2016-10-10 17:50:26 +02:00
Jørgen Kvalsvik 29ba3465b4 Schedule::getGroup returns reference, not pointer 2016-10-05 15:24:14 +02:00
Joakim Hove 8666c8b687 UgGridHelpers::createEclipseGrid( )
- A new function createEclipsegrid has been added to the UgGridHelpers
  namespace.

- The UnstructuredGrid C structure has been augmented with a new member:
  double * zcorn which can be used to hold a copy of the zcorn
  value *after* minpv induced modifications.
2016-09-07 10:56:29 +02:00
Joakim Hove b7bb01b77e shared_ptr<EclipseGrid> -> const EclipseGrid& 2016-09-03 17:49:46 +02:00
Pål Grønås Drange 77a93abcac Minor tweaks and updates in test blackoilstate 2016-08-08 15:58:17 +02:00
Pål Grønås Drange 2a773b735e transmult and initconfig are ref's, use ref for EclipseState constructor 2016-08-08 10:02:53 +02:00
Pål Grønås Drange f1024bb210 Added DX/DY/DZ to norne_pvt.data 2016-06-21 16:10:32 +02:00
Joakim Hove c686ec69d7 Merge pull request #1041 from jokva/removal-shared_ptr-well
WellPtr and GroupPtr deprecated
2016-06-20 14:57:10 +02:00
Jørgen Kvalsvik 6e2099d293 WellPtr and GroupPtr deprecated
shared_ptr aliases are considered deprecated and has largely been
removed upstream (and replaced by raw pointers).
2016-06-16 09:33:43 +02:00
Atgeirr Flø Rasmussen 291b13c2d4 Avoid ambiguous calls to abs with unsigned integers. 2016-06-15 10:55:42 +02:00
Markus Blatt 324e60171c Added utilities to compute a real L-infinity norm in parallel. 2016-06-07 15:00:57 +02:00
Liu Ming 3028e819c6 remove internal counter. 2016-05-19 09:47:57 +08:00
Pål Grønås Drange 973438128c Using getInputGrid API from Parser, changed GridManager to no longer accept Deck in constructor 2016-04-20 08:51:10 +02:00
Pål Grønås Drange 668cd14755 Fixed major indentation issue---whole file indented arbitrarily 2016-04-19 15:20:34 +02:00
Atgeirr Flø Rasmussen 165b17564d Merge pull request #997 from totto82/Fix_guiderates
Bugfix in setup guiderates
2016-04-15 08:46:17 +02:00
Tor Harald Sandve 972c55ea52 Add COMPDAT to wells_group.data
Without COMPDAT the wells will be shut and thus not added to the well
collection.
2016-04-15 08:32:38 +02:00
Atgeirr Flø Rasmussen 78a927c859 Update CMake list with deleted files. 2016-04-14 11:29:17 +02:00
jokva eacbd4f214 Merge pull request #994 from pgdr/use-eclipse3dproperties
@bska We're merging as-is for now, and we've made a note to replace `shared_ptr` and maintain (and document!) this property. Those changes will obviously be internal and you won't notice a difference.
2016-04-13 11:01:43 +02:00
Pål Grønås Drange fee514375d Using API get3DProperties() 2016-04-11 15:13:38 +02:00
Pål Grønås Drange 9dbae15cc9 uses new api, made reference instead of copy 2016-04-08 16:31:59 +02:00
Liu Ming 88d41057c0 refactor relperm diagnostics using OpmLog functions. 2016-04-01 12:27:03 +08:00
Joakim Hove c360079926 Replaced SimulatorState -> SimulationDatacontainer
Have removed the SimulatorState base class, and instead replaced with
the SimulationDatacontainer class from opm-common. The SimulatorState
objects were typcially created with a default constructor, and then
explicitly initialized with a SimulatorState::init() method. For the
SimulationDataContainer RAII is employed; the init( ) has been removed -
and there is no default constructor.
2016-03-29 10:44:49 +02:00
Liu Ming 81f6c2dd8e rename ParseMode as ParseContext. 2016-03-17 09:57:59 +08:00
Andreas Lauser 23088f987f replace the blackoil PVT classes by the ones of opm-material
the opm-material classes are the ones which are now used by
opm-autodiff and this patch makes it much easier to keep the opm-core
and opm-autodiff results consistent. Also, the opm-material classes
seem to be a bit faster than the opm-core ones (see
https://github.com/OPM/opm-autodiff/pull/576)

I ran the usual array of tests with `flow`: SPE1, SPE3, SPE9 and Norne
all produce the same results at the identical runtime (modulo noise)
and also "Model 2" seems to work.
2016-03-05 19:11:44 +01:00
Jørgen Kvalsvik 27a240ae7f Remove Equil + EquilWrapper, replace with upstream
Upstream (opm-parser) now provides a better Equil + EquilRecord, and
simultaneously deprecated EquilWrapper. This patch fixes the resulting
breakage.

One important note: The new Equil does not expose integers for live
oil/wet gas initialization procedure methods, but rather booleans
through constRs/constRv methods. This is how the variable behaves
according to the Eclipse reference manual (EQUIL keyword section).

Code has been updated to reflect this.
2016-03-01 09:59:54 +01:00
Jørgen Kvalsvik b8edc8b5b4 Change Deck access methods/types to references
opm-parser#677 changes the return types for the Deck family of classes.
This patch fixes all broken code from that patch set.

https://github.com/OPM/opm-parser/pull/677
2016-02-18 08:50:26 +01:00
Joakim Hove 5172652e73 Removed opm_memcmp_double() - use cmp from common. 2016-02-14 21:41:51 +01:00
Jørgen Kvalsvik 697763a4b9 Improve includes from opm-parser
Adopting to opm-parser PR#661, add previously missing includes.

https://github.com/OPM/opm-parser/pull/661
2016-01-26 13:30:58 +01:00
Jørgen Kvalsvik c7349b5586 Fixes includes wrt opm-parser PR-656
Several files stopped compiling due to relying on opm-parser headers
doing includes. From opm-parser PR-656
https://github.com/OPM/opm-parser/pull/656 this assumption is no longer
valid.
2016-01-21 09:42:51 +01:00
dr-robertk b26eb3827f Merge pull request #937 from chflo/OPM_251_support_restart
OPM-251: Prepare for restart
2016-01-15 14:44:06 -07:00
Liu Ming 5d50776d1b fix relperm diagnostics tests issue. 2016-01-11 16:05:33 +08:00
Joakim Hove 65ff9bb75b Removed erroneous test data. 2016-01-05 11:47:20 +01:00
chflo c003900145 OPM-251: Support for restart 2016-01-04 16:11:21 +01:00
Atgeirr Flø Rasmussen 576d24a070 Silence warnings in test programs. 2015-12-14 15:25:27 +01:00
Atgeirr Flø Rasmussen 125c27462d Merge pull request #928 from totto82/minpv_pinch
compatibility of MINPV and PINCH
2015-12-14 11:33:20 +01:00
Tor Harald Sandve 8827ca0794 Bugfix. Fix face direction in the pinchprocessor 2015-12-14 10:48:26 +01:00
Tor Harald Sandve 43abdf5946 Adapt to changes in the NNC class 2015-12-08 13:03:15 +01:00
Tor Harald Sandve 97525de43a Adapt to changed API in the pinch-processor 2015-12-08 09:25:35 +01:00
Tor Harald Sandve 97466d988b Fix to account for the combination of minpv and pinch 2015-12-08 09:21:51 +01:00
Tor Harald Sandve dec23df301 Add option for not including the removed volume in the MinpvProcessor
The volume in cells with pore volume less than the minpv threshold is
removed if minpvMode is ECLStd while it is added to the underlying cell
if minpvMode is OpmFil
2015-12-08 09:21:51 +01:00
Liu Ming ef203a1d04 Merge remote branch 'remotes/opm/master' into relpermDiagnostics
Conflicts:
	CMakeLists_files.cmake
2015-12-08 16:08:02 +08:00
Joakim Hove 1de19dd47d Added out-of-range tests. 2015-12-03 16:19:43 +01:00
Joakim Hove 130f222cb0 Added regression test for norne PvtLiveOil PVT. 2015-12-03 14:16:04 +01:00
Liu Ming 4790c2a2eb Add simple tests. 2015-12-02 10:59:13 +08:00
Andreas Lauser 4cded211b0 fix build for newish boost versions
my boost is 1.58. once more, boost seemed to have become more picky on
where a semicolon must be placed and where not.
2015-11-27 16:09:01 +01:00
Atgeirr Flø Rasmussen 8a455fbde8 Remove unused arguments in PinchProcessor methods.
This silences warnings. It also makes it clear that
the cell thicknesses are not used in the current
algorithm, the doc comment has been updated to
reflect this.
2015-10-21 11:52:31 +02:00
Atgeirr Flø Rasmussen f2d735cacb Merge pull request #892 from qilicun/pinchprocessor
PinchProcessor
2015-10-19 10:22:44 +02:00
Atgeirr Flø Rasmussen d78e14c1c6 Merge pull request #897 from totto82/crossflow
Add boolean flag to determine whether crossflow is allowed in a well
2015-10-14 09:36:27 +02:00
Atgeirr Flø Rasmussen a8e042aeb6 Merge pull request #902 from joakim-hove/rename-memcmp-double
Renamed memcmp_double -> opm_memcmp_double
2015-10-14 09:32:45 +02:00