Commit Graph

472 Commits

Author SHA1 Message Date
Kai Bao
0d96749d4d fixing a test related to history mode. 2018-01-08 09:08:05 +01:00
Atgeirr Flø Rasmussen
c9c4c81661
Merge pull request #1188 from totto82/handleWEFAC
Handle WEFAC
2017-12-05 08:37:44 +01:00
Arne Morten Kvarving
97098ac190 remove files moved to opm-simulators from build system 2017-12-04 16:25:27 +01:00
Tor Harald Sandve
1b13f44e12 Handle WEFAC
Added test combining WEFAC and GEFAC
2017-11-30 13:45:05 +01:00
Tor Harald Sandve
729d6cf30e Adress PR review issues 2 2017-11-24 10:52:57 +01:00
Tor Harald Sandve
bce19d87dc Adress PR review issues 2017-11-22 08:31:57 +01:00
Tor Harald Sandve
833b019413 Remove the usage of partition_unif_idx() from opm-core 2017-11-21 15:01:52 +01:00
Tor Harald Sandve
3486e98ae3 Cleaning the initialization code
-remove whitespaces
-fix documentation
2017-11-21 12:52:07 +01:00
Tor Harald Sandve
e613f2b8c5 Use &ref not shared_pointer to MaterialLawManager 2017-11-21 12:08:10 +01:00
Tor Harald Sandve
12108d57ab Remove blackoilPhases and phaseUsage from the initialization code
Note 1: The initialization code now always consider 3 phases.
For 2-phase cases a trivial (0) state is returned.
Note 2: The initialization code does not compute a BlackoilStats,
but instead pass the initialization object with the initial state.
2017-11-21 12:08:10 +01:00
Tor Harald Sandve
8def11ff93 Remove BlackoilProps from equil initalization code
Use FluidSystem and materialLaw from opm-material
directly not via the BlackoilProps in opm-core
2017-11-21 12:08:10 +01:00
Arne Morten Kvarving
acc631f504 remove ParameterGroup code
moved to opm-common
2017-11-17 13:55:07 +01:00
Atgeirr Flø Rasmussen
18e230a18b
Merge pull request #1122 from atgeirr/fix-type-bug-in-equil
Fix type bug in equil
2017-11-14 14:40:47 +01:00
Joakim Hove
210364ecde Schedule no longer part of EclipseState. 2017-10-24 20:38:15 +02:00
Atgeirr Flø Rasmussen
1e0135c9bd Update swatinit tests to account for bugfix. 2017-10-12 14:27:32 +02:00
Atgeirr Flø Rasmussen
ac9a20da20 Update equil regression reference after bugfix.
Also reduce some very coarse tolerances to more reasonable levels.
2017-10-12 14:27:32 +02:00
Atgeirr Flø Rasmussen
e4a8fad29c Merge pull request #1180 from blattms/cleanup-version-ifs
[cleanup] Removes unnecessary if clauses for unsupported DUNE versions.
2017-10-12 13:28:50 +02:00
Markus Blatt
a46e2c7121 [cleanup] Removes unnecessary if clauses for unsupported DUNE versions.
We are targetting DUNE 2.4.* and 2.5.* currently. Therefore this commit removes
the if checks for lower versions to cleanup the code.
2017-10-11 21:25:18 +02:00
Tor Harald Sandve
75657ff482 Update the swatinit test base on fix in opm-material#248 2017-10-11 09:39:12 +02:00
Joakim Hove
8a3fe0a3f6 Updated NNC() constructor. 2017-09-26 14:30:50 +02:00
Arne Morten Kvarving
f5999e3fcb changed: remove embedded 'parameters' namespace in ParamGroup
inconsistent and unnecessary.

this is purely a cosmetic change, the only exception was a function with
the generic name 'split', which was renamed to splitParam to avoid confusion.
2017-04-28 15:34:11 +02:00
Arne Morten Kvarving
a59ce6581f changed: remove XML support for ParameterGroup 2017-04-28 11:26:38 +02:00
Tor Harald Sandve
a8261b62da Add sat table id to well struct 2017-04-06 13:52:27 +02:00
Tor Harald Sandve
e289c8f35b Enable swatinit equil test 2017-03-22 10:26:03 +01:00
Tor Harald Sandve
77b9311f2c FIX swatinit test in test_equil
The capillarySwatinit.DATA is updated to make it possible to run in Ecl.
Referance solutions is updated accordingly.
2017-03-22 10:20:59 +01:00
Joakim Hove
b55ce6b53e Temporarily disabled EQUIL + SWATINIT test. 2017-03-21 16:49:14 +01:00
Arne Morten Kvarving
e6cad074c2 Remove adaptive time stepping and simulator timer classes and tests/examples
They have been moved to opm-simulators
2017-02-10 14:53:22 +01:00
Andreas Lauser
c5a0ea7524 do not explicitly pass the permeability to the well model anymore
this information is already part of the EclipseState. The reason why
this should IMO be avoided is that this enforces an implementation
(ordering of the permeability matrices) the simulator on the well
model. If this needs to be done for performance reasons, IMO it would
be smarter to pass an array of matrices, instead of passing a raw
array of doubles.  I doubt that this is necessary, though: completing
the full Norne deck takes about 0.25 seconds longer on my machine,
that's substantially less than 0.1% of the total runtime.

in order to avoid code duplication, the permeability extraction
function of the RockFromDeck class is now made a public static
function and used as an implementation detail of the WellsManager.

finally, the permfield_valid_ attribute is removed from the
RockFromDeck class because this data was unused and not accessible via
the class' public API.
2017-01-27 12:51:12 +01:00
Tor Harald Sandve
d5e2e5d2e5 Add test for swatinit 2017-01-05 09:09:25 +01:00
Andreas Lauser
62c56ff716 add missing semicolon to fix the build
some versions of boost seem to be more picky about this than others...
2016-12-16 10:29:52 +01:00
Atgeirr Flø Rasmussen
dec5bdf7c4 Remove redundant tests.
The unit constant test has been added to opm-parser since the
unit support has been moved there. The parser test is simply
redundant.
2016-12-05 12:55:37 +01:00
Atgeirr Flø Rasmussen
fd552926d8 Remove more files moved to opm-grid. 2016-11-30 14:29:37 +01:00
Atgeirr Flø Rasmussen
8d129d7172 Merge pull request #1113 from atgeirr/remove-grid-stuff
Move grid things to opm-grid.
2016-11-29 21:04:14 +01:00
Atgeirr Flø Rasmussen
c7cc24385a Remove files moved to opm-grid. 2016-11-29 13:25:22 +01:00
Atgeirr Flø Rasmussen
602f3252e6 Merge pull request #1103 from GitPaean/fixing_warning
warning fixed related to petsc
2016-11-23 12:37:31 +01:00
Atgeirr Flø Rasmussen
3c35e767d4 Remove tests that were moved to opm-output. 2016-11-17 09:47:58 +01:00
Kai Bao
fda1016532 warning fixed related to petsc 2016-11-16 15:35:35 +01:00
Joakim Hove
df920e4970 Merge pull request #1101 from jokva/changes-in-grouptree
GroupTree interface changed upstream
2016-11-16 13:26:58 +01:00
Jørgen Kvalsvik
48cbbdee19 GroupTree interface changed upstream
Updates to the slightly modified GroupTree interface from opm-parser.
2016-11-09 13:04:33 +01:00
Jørgen Kvalsvik
24acbd1c23 Use new DeckItem constructor interface. 2016-11-07 15:07:04 +01:00
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