OilfieldToolsNet/opm-core
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
6,108 Commits 9 Branches 35 Tags 15 MiB
529278d2b9
Commit Graph

6108 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tor Harald Sandve
7579f2bdb9 Do not extrapolate initial rs and rv values in the depth tables 2017-03-16 12:57:56 +01:00
Atgeirr Flø Rasmussen
7bf6da1953 Merge pull request #1146 from GitPaean/putting_wells_under_group_control 
putting wells under immidatel group control when specified with GRUP
 2017-03-10 10:18:39 +01:00
Kai Bao
70b19780b4 putting wells under immidatel group control when specified 
with GRUP.
 2017-03-07 12:48:30 +01:00
Atgeirr Flø Rasmussen
03e005bb76 Merge pull request #1143 from GitPaean/fixing_thp_initialization 
Fixing thp initialization
 2017-03-02 15:51:38 +01:00
Atgeirr Flø Rasmussen
aecfa0e448 Merge pull request #1144 from totto82/output_initial_rs 
Do not set rs=rsSat and rv=rvSat for the saturated case
 2017-02-23 09:13:40 +01:00
Tor Harald Sandve
70b6a6e5ef Do not set rs=rsSat and rv=rvSat for the saturated case 2017-02-22 15:57:53 +01:00
Kai Bao
b97c585519 do not assign non-zero THP value when no THP involved. 2017-02-17 13:45:55 +01:00
Kai Bao
6ca48313ca correcting the confusing indent in WellState init 2017-02-17 13:28:29 +01:00
Atgeirr Flø Rasmussen
6d01c29686 Merge pull request #1142 from GitPaean/output_thp 
adding thp to the report for summary output.
 2017-02-16 13:16:14 +01:00
Kai Bao
8198c256a9 adding thp to the report for summary output. 2017-02-13 10:15:58 +01:00
Atgeirr Flø Rasmussen
d5a9f27e5e Merge pull request #1141 from akva2/remove_adaptive_time_stepping 
remove AdaptiveTimeStepping class
 2017-02-10 15:16:56 +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
Atgeirr Flø Rasmussen
119b5b1a3a Merge pull request #1140 from andlaus/fix_gcc7_warnings 
fix a GCC 7 warning
 2017-02-10 10:31:13 +01:00
Arne Morten Kvarving
61e8c0b8d3 Merge pull request #1139 from akva2/fipnum_in_adaptive 
changed: pass fipnum array into adaptive time stepping loop
 2017-02-09 12:06:39 +01:00
Arne Morten Kvarving
1e25b6fcfb changed: pass fipnum array into adaptive time stepping loop 
needed as substep summary reports requires FIP data to be available.
add calculation of this data if output is requested and summary
config holds relevant keywords.
 2017-02-09 09:33:32 +01:00
Andreas Lauser
8ef2a923ec fix a GCC 7 warning 
GCC 7 warns

```
dynamic exception specifications are deprecated in C++11; use ‘noexcept’ instead [-Wdeprecated]
```

here.
 2017-02-07 12:55:26 +01:00
Atgeirr Flø Rasmussen
c5a80e97a2 Merge pull request #1138 from andlaus/refactor_well_permeability 
do not explicitly pass the permeability to the well model anymore
 2017-01-27 13:15:50 +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
Atgeirr Flø Rasmussen
5aa5ac89c5 Merge pull request #1137 from GitPaean/group_ebos_vrep 
set the VREP control as current control when applying VREP control
 2017-01-27 11:11:42 +01:00
Kai Bao
78bf488a2a set the VREP control as current control when applying VREP control 
for the first time

Not sure it is always the better things to do here, while it can help
the consistence of the two current controls in the well_controls and
well_state.
 2017-01-25 14:11:37 +01:00
Atgeirr Flø Rasmussen
5e67765229 Merge pull request #1136 from andlaus/update_dune.module 
update the dune.module file
 2017-01-20 13:58:48 +01:00
Andreas Lauser
24f709f983 update the dune.module file 2017-01-20 13:26:26 +01:00
Atgeirr Flø Rasmussen
674d97c660 Merge pull request #1134 from GitPaean/group_ebos 
updating the group control limit for individual control wells
 2017-01-18 14:08:33 +01:00
Kai Bao
cb84571540 considering effieciency factor when calculating production rate. 2017-01-16 16:13:44 +01:00
Kai Bao
9fe6d80f99 adding groupTargetConverged() to WellCollection 2017-01-16 15:55:35 +01:00
Kai Bao
3a06a2dd50 adding groupProdTargetConverged() to WellsGroup 
When the group is producing its target, we consider it is converged.
When the group is not producing its target, while the group can not
produce more based on its own limits, we also consider it is converged.

When the group is not producing its target, while the group can
potentially produce more, we consider it is not converged.
 2017-01-16 14:19:52 +01:00
Kai Bao
8f658a92f2 adding canProdueMore() function to wellsGroup 
to indicate whether the group can produce more to match the group target
when they are not producing enough compared with the group target.
 2017-01-16 11:25:23 +01:00
Kai Bao
713c833b0a updating the group control limit for individual control wells 
to provide a better standard for the wells under individual control to
return to group control. For example, some wells get really big group
control limit and switch to individual control, it is very difficult for
them to return to group control with that kind of unreasonable fixed
group limit.
 2017-01-12 15:44:44 +01:00
Atgeirr Flø Rasmussen
7830083e9b Merge pull request #1133 from blattms/parallel-accumulate 
Added an accumulate method that allows to switch off non-owner entries.
 2017-01-11 15:16:48 +01:00
Markus Blatt
ac6965de2e Added an accumulate method that allows to switch off overlap entries. 
It does using a mask vector with entries 0 or 1. If that is not provided
it falls back to std::accumulate.
 2017-01-11 12:18:39 +01:00
Atgeirr Flø Rasmussen
8851f072a3 Merge pull request #1132 from atgeirr/throw-on-solvent 
Throw if solvent phase injected.
 2017-01-10 08:28:16 +01:00
Atgeirr Flø Rasmussen
00dad30432 Throw if solvent phase injected. 2017-01-09 16:33:03 +01:00
Atgeirr Flø Rasmussen
7ef8971be4 Merge pull request #1120 from jokva/density-from-eclipsestate 
Use Density from EclipseState
 2017-01-09 10:38:30 +01:00
Atgeirr Flø Rasmussen
8daa0f440c Merge pull request #1125 from jokva/reduce-deck-use-relperm-diagnostics 
Don't rely on Deck for checkTable and checkPhase
 2017-01-09 09:35:25 +01:00
Atgeirr Flø Rasmussen
e2023ed38e Merge pull request #1124 from jokva/read-rock-from-eclipsestate 
Read ROCK from EclipseState, not Deck
 2017-01-09 09:33:47 +01:00
Atgeirr Flø Rasmussen
898ca1b7e0 Merge pull request #1131 from atgeirr/increase-iters-for-equil 
Increase max iterations for capillary curve inversion.
 2017-01-09 09:31:14 +01:00
Atgeirr Flø Rasmussen
be26c072e1 Increase max iterations for capillary curve inversion. 
Triggered by a new two-phase case.
 2017-01-06 15:24:08 +01:00
Atgeirr Flø Rasmussen
3e3a76d37d Merge pull request #1129 from totto82/test_swatinit_fix 
Make it optinal to apply SWATINIT
 2017-01-06 10:23:39 +01:00
Tor Harald Sandve
d5e2e5d2e5 Add test for swatinit 2017-01-05 09:09:25 +01:00
Tor Harald Sandve
5ac89ad8a7 Make it optinal to apply SWATINIT 
The reasoning behind this to make it possible to initialize the case
without SWATINIT in order to compute the same defaulted THPRES values as
Ecl. The initialization needs to be re-computed to account for SWATINIT
in the simulations.
 2017-01-02 15:10:09 +01:00
Andreas Lauser
cf9f37169d Merge pull request #1128 from atgeirr/remove-unused-deck-arg 
Remove unused Deck function argument.
 2017-01-02 11:01:43 +01:00
Atgeirr Flø Rasmussen
fdd81eacaa Remove unused Deck function argument. 2017-01-02 09:47:57 +01:00
Andreas Lauser
d89b48689b Merge pull request #1127 from atgeirr/silence-warning 
Fix order of initialization.
 2016-12-29 14:05:41 +01:00
Atgeirr Flø Rasmussen
2e49273da7 Fix order of initialization. 2016-12-29 13:55:42 +01:00
Jørgen Kvalsvik
bca5c8e8de Don't rely on Deck for checkTable and checkPhase 
Prefer using EclipseState over Deck.
 2016-12-20 14:08:58 +01:00
Jørgen Kvalsvik
ad4033b9dc Read ROCK from EclipseState, not Deck 2016-12-20 12:24:27 +01:00
jokva
ec060d513b Merge pull request #1123 from jokva/read-pressure-swat-sgas-from-es 
Read RS,RV,PRESSURE,SWAT,SGAS from EclipseState
 2016-12-20 10:01:13 +01:00
Jørgen Kvalsvik
8cc624fd0d Read RS,RV,PRESSURE,SWAT,SGAS from EclipseState 
Prefer reading these values from EclipseState rather than the Deck type.
 2016-12-19 14:26:27 +01:00
Atgeirr Flø Rasmussen
4ea6611ecc Merge pull request #1117 from totto82/storeIfTimeStepFails 
Store whether timestep failed or not
 2016-12-19 12:21:31 +01:00
Tor Harald Sandve
2a3a825895 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