OilfieldToolsNet/opm-core
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
5,937 Commits 9 Branches 35 Tags 15 MiB
24f709f983
Commit Graph

5937 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Atgeirr Flø Rasmussen
f65739c718 Merge pull request #1121 from andlaus/fix_build 
add missing semicolon to fix the build
 2016-12-16 11:08:54 +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
Jørgen Kvalsvik
59cc0a1635 Use Density from EclipseState 2016-12-15 16:06:46 +01:00
Joakim Hove
e53b0a58fa Merge pull request #1119 from jokva/pvtw-from-eclipsestate 
Read PVTW from EclipseState
 2016-12-06 22:41:39 +01:00
Jørgen Kvalsvik
f0b4c4f390 Read PVTW from EclipseState 
Read the PVTW table entries from EclipseState rather than manually
through the Deck object.
 2016-12-06 14:53:41 +01:00
Bård Skaflestad
28a02f6953 Merge pull request #1118 from atgeirr/remove-redundant-tests 
Remove redundant tests.
 2016-12-05 13:43:05 +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
Andreas Lauser
078de1b039 Merge pull request #1116 from andlaus/SimulatorReport_fix_substep_output 
AdaptiveTimeStepping: fix stupid (but harmless) mistake in the sub-step info message
 2016-12-03 15:08:05 +01:00
Andreas Lauser
b5b3507cb0 AdaptiveTimeStepping: fix stupid (but harmless) mistake in the sub-step info message 
that was a copy-and-pasto: newton iterations = linearizations - 1
 2016-12-03 15:04:32 +01:00
Atgeirr Flø Rasmussen
87650a3819 Merge pull request #1115 from atgeirr/remove-more-grid-stuff 
Remove more files moved to opm-grid.
 2016-12-01 13:52:35 +01:00
Atgeirr Flø Rasmussen
f72f996008 Merge pull request #1112 from andlaus/improve_SimulatorReport 
Improve simulator report
 2016-11-30 19:33:55 +01:00
Atgeirr Flø Rasmussen
fd552926d8 Remove more files moved to opm-grid. 2016-11-30 14:29:37 +01:00
Andreas Lauser
ce02a4bb92 clean up and extend the SimulationReport class 
it now also accounts for assembly, linear solve, update and output
write time and indicates if an operation has converged.
 2016-11-30 11:27:49 +01:00
Atgeirr Flø Rasmussen
ebfcea125d Merge pull request #1114 from akva2/update_jenkins_grid 
update jenkins dependency graph
 2016-11-29 22:50:09 +01:00
Arne Morten Kvarving
868d008353 update jenkins dependency graph 
opm-grid is now an upstream
 2016-11-29 21:54:08 +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
ec85a922ac Update dune.module to reflect changed dependency graph. 2016-11-29 13:31:48 +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
Joakim Hove
647e005297 Merge pull request #1109 from jokva/get-ref-depth-timestep 
Ask for reference depth at timestep.
 2016-11-22 23:12:34 +01:00
Arne Morten Kvarving
1edcdbc055 Merge pull request #1110 from akva2/update_downstreams_ewoms 
update downstream list
 2016-11-22 16:03:28 +01:00