OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2025-02-20 11:48:25 -06:00
Code Issues Packages Projects Releases Wiki Activity
4,770 Commits 24 Branches 102 Tags 90 MiB
5194cc5122
Commit Graph

4770 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Andreas Lauser
66decb4bda BlackoilPropsAdFromDeck: let the BlackOilFluidSystem manage the low level PVT objects 
this makes it easier to migrate code away from BlackoilPropsAdFromDeck.
 2017-01-02 13:19:25 +01:00
Andreas Lauser
ef731672c9 remove the BlackoilPropsAdInterface abstraction layer 
instead, directly use BlackoilPropsAdFromDeck.
 2017-01-02 13:19:23 +01:00
Atgeirr Flø Rasmussen
edf883e747 Merge pull request #996 from andlaus/no_eigen_in_VFP_and_FIP 
mostly eliminate Eigen in the FIP and VFP code
 2017-01-02 12:56:30 +01:00
Atgeirr Flø Rasmussen
d039fc6899 Merge pull request #994 from atgeirr/silence-ebos-warnings 
Silence warnings
 2017-01-02 09:36:04 +01:00
Atgeirr Flø Rasmussen
c3f93db74d Merge pull request #995 from andlaus/low_level_enums 
BlackoilModelEnums: don't use high-level classes
 2017-01-01 20:41:46 +01:00
Andreas Lauser
98b9e2ef58 remove the phase enums from BlackoilPropsAdInterface 
since the enums in BlackoilModelEnums.hpp are namespace-global this
does not require any code changes. (except replacing 'Liquid' by
'Oil', etc.)
 2016-12-30 14:15:14 +01:00
Andreas Lauser
fb770faca0 fix Dune 2.3 build issue 2016-12-30 11:46:27 +01:00
Andreas Lauser
c880efae5b mostly eliminate Eigen in the FIP and VFP code 
this code mostly used the Eigen vectors as arrays anyway, so let's use
`std::vector`.

also, this patch only "mostly eliminates" Eigen from from these parts
of the code because the source files of the VFP code still use
AutoDiffBlock; Unfortunately this cannot easily be changed because
`flow_legacy` depends on these methods. (`flow_ebos` does not use the
incriminating methods.)
 2016-12-30 11:46:27 +01:00
Andreas Lauser
ac4dcba7e0 BlackoilModelEnums: don't use high-level classes 
I consider the blackoil model enums to be pretty low level while the
"FluidProperties" code is IMO quite high level. this, using the latter
to define the former constitutes a layering violation IMO. note that
the fix is to simply use the enums from opm-core directly.
 2016-12-29 18:03:05 +01:00
Atgeirr Flø Rasmussen
b0633110af Silence unused argument warning. 2016-12-29 14:52:03 +01:00
Atgeirr Flø Rasmussen
ae1d78f505 Remove unused argument, silence warnings. 2016-12-29 14:34:16 +01:00
Atgeirr Flø Rasmussen
7777fe6918 Merge pull request #992 from babrodtk/fix_fip_output_units_ebos 
Fix for FIP output in ebos
 2016-12-22 14:56:11 +01:00
babrodtk
c82887585e Fix for FIP output in ebos 2016-12-22 13:45:31 +01:00
Atgeirr Flø Rasmussen
695522336e Merge pull request #991 from babrodtk/code_cleanup 
Removed unused variable / compilation fix Eigen 3.3.1
 2016-12-22 13:42:15 +01:00
babrodtk
5923f64322 Removed unused variable (which gave me compilation errors) 2016-12-22 13:00:51 +01:00
Atgeirr Flø Rasmussen
3e120d6e33 Merge pull request #964 from totto82/reuse_cache2 
Reuse cache revisited
 2016-12-20 14:46:00 +01:00
Jørgen Kvalsvik
d2b5327a72 RockCompressibility takes only EclipseState 2016-12-20 12:39:34 +01:00
Jørgen Kvalsvik
6e92374d34 Read ROCK from EclipseState, not Deck 2016-12-20 12:24:27 +01:00
Tor Harald Sandve
bb83504172 Let the simulator to re-assemble when iteration == minIter() 
Let the simulator re-assemble and re-calculate the residuls for the case
when the simultor is converged but it was forced to take one more
iteration due to iteration < minIter().
 2016-12-20 10:46:03 +01:00
Atgeirr Flø Rasmussen
6893aca90f Merge pull request #972 from GitPaean/fixing_polymer_omega 
fixing the calculation when polymer not fully mixed
 2016-12-19 13:22:48 +01:00
Atgeirr Flø Rasmussen
45fed6d591 Merge pull request #975 from totto82/clean_up_2p 
Use templates to avoid hardcoded typedef
 2016-12-19 13:01:05 +01:00
Atgeirr Flø Rasmussen
32c8303976 Merge pull request #978 from andlaus/flow_ebos-cleanups-1 
BlackoilDetails: split it in two
 2016-12-19 12:53:14 +01:00
Andreas Lauser
4020490a29 remove unused function Opm::detail::convergenceReduction() 2016-12-19 11:03:34 +01:00
Andreas Lauser
f29dae5409 BlackoilDetails: split it in two 
now we have BlackoilDetails.hpp which contains all stuff that is used
by flow_ebos as well as flow and which does not include anything from
Eigen, and we have BlackoilLegacyDetails.hpp which contains all stuff
that depends on Eigen (and is thus not required by flow_ebos)
 2016-12-19 11:03:34 +01:00
Tor Harald Sandve
4fdf57db04 Consider the timestep converged only when number of iteration > minIter 2016-12-19 10:55:28 +01:00
Tor Harald Sandve
a4bc2d455e Fix rebase 2016-12-19 10:55:28 +01:00
Tor Harald Sandve
ae5d812bc5 BUGFIX cache reuse. 
invalidate cachedQuantities when updated and when timestep fails
 2016-12-19 10:55:28 +01:00
Tor Harald Sandve
f65f5d2c3b Store whether timestep failed or not 
Used in flow ebos to tell the simulator to recalculate the cached
quantities for failed timesteps.
 2016-12-19 10:52:59 +01:00
Atgeirr Flø Rasmussen
7e2d46b9f0 Merge pull request #985 from blattms/log-failed-timesteps-on-one 
Only log messages about failed timesteps on one processes.
 2016-12-19 10:10:21 +01:00
Atgeirr Flø Rasmussen
7c88fad953 Merge pull request #987 from babrodtk/fix_fip_output_units 
Fixed missing unit conversion for total fluid in place
 2016-12-16 14:15:47 +01:00
babrodtk
841411037a Added throw if unsupported unit in deck for fluid in place 2016-12-16 13:40:20 +01:00
babrodtk
ccec17f81b Fixed missing unit conversion for total fluid in place 2016-12-16 13:15:22 +01:00
Markus Blatt
51dabf36f2 Only log messages about failed timesteps on one processes. 
This OPM_THROW was introduced lately and results in all processes
logging the failure. With this commit the message is logged only once.
 2016-12-16 11:30:04 +01:00
Kai Bao
b8e0cda83a putting update of water injection mobility to a separate function 
computeInjectionMobility() in BlackoilPolymerModel
 2016-12-16 08:56:35 +01:00
Kai Bao
4f3ce37b8e correcting one not helpful comments. 
which results from the re-organization of the code.
 2016-12-16 08:56:35 +01:00
Kai Bao
894bffd1b3 handling the injection mobility when mixing paramter not 1 
The treatment with shear-thinning is not well tested yet.
 2016-12-16 08:56:35 +01:00
Kai Bao
4f8ae4be73 putting the re-calculating wellflux inside if plyshlog 
it only happens when shear effect calculation is needed. No point to
re-calculate the well flux when no shear thinning needed.
 2016-12-16 08:56:35 +01:00
Kai Bao
9307a41fd5 using the polymer concentration in the polymer transport 
since we already introduce the polymer viscosity there, we should apply
the water and polymer viscosity ratio again.
 2016-12-16 08:56:35 +01:00
Atgeirr Flø Rasmussen
67374531e3 Merge pull request #880 from totto82/appelyard_fixes 
Fixes in the Appelyard in updateState and updateWellState
 2016-12-15 21:24:11 +01:00
Tor Harald Sandve
d856510b74 Merge pull request #980 from totto82/bugfix_flowebos_density 
BUGFIX pass pvtnum to density in convertResults() in FlowEbos
 2016-12-15 15:26:47 +01:00
Tor Harald Sandve
ad6b3f995f BUGFIX pass pvtnum to density in convertResults() in FlowEbos 2016-12-15 13:20:09 +01:00
Tor Harald Sandve
5cf9cf5c65 Merge pull request #979 from andlaus/flow_ebos-fix-initial-output 
FlowMainEbos: fix the output of the initial condition
 2016-12-15 12:26:23 +01:00
Andreas Lauser
2761df3791 FlowMainEbos: fix the output of the initial condition 
I probably did not see this warning when testing f7910af7d7 because
I'm currently flooded by deprecation warnings stemming from
Eigen. (these warnings are caused because I use Ubuntu 16.04 and an
old version of Eigen is cloned by the build system that is not system
installed.)
 2016-12-15 09:57:53 +01:00
Atgeirr Flø Rasmussen
381c1cfbd6 Merge pull request #971 from totto82/solvent_fixes3 
Fixes in solvent model related to handling vapoil in the well model
 2016-12-14 15:31:26 +01:00
Andreas Lauser
1510db4bf6 Merge pull request #974 from andlaus/fix_assert 
StandardWellsDense: fix assert for the 2p case
 2016-12-12 19:20:43 +01:00
Tor Harald Sandve
2bfa96fddf Templatize to avoid hardcoded typedef 
Prepare for changing the size of the blocks by templatize BVectors and
Evalution
 2016-12-12 14:52:30 +01:00
Andreas Lauser
34c4053c65 StandardWellsDense: fix assert for the 2p case 
this wasn't noticed earlier because it only bites in the water-oil
case and only if NDEBUG is not defined.
 2016-12-12 14:26:34 +01:00
Tor Harald Sandve
4ac69d51d1 Don't force rs<rsSat and rv<rvSat in updateState 2016-12-12 12:54:57 +01:00
Tor Harald Sandve
4f052e466b Fixes in solvent model related to handling vapoil in the well model 
Tested on SPE5 and Model2
 2016-12-12 10:12:39 +01:00
Andreas Lauser
c7807a99a2 Merge pull request #969 from andlaus/reset_locale 
flow*: reset the locale settings on startup
 2016-12-08 18:02:47 +01:00