Arne Morten Kvarving
7444f4ec32
re-add system eigen3 usage
2017-04-18 14:43:36 +02:00
Arne Morten Kvarving
d83f866c2a
add ewoms dependency to packaging
2017-04-18 14:43:29 +02:00
Andreas Lauser
6d9440d8e2
Merge pull request #1146 from andlaus/fix_bubble_dew_point_pressure_output
...
only output the bubble and dew point pressures if they are available
2017-04-18 12:39:34 +02:00
Andreas Lauser
e24d8c3a57
SimulatorFullyImplicitBlackoilOutput: print warnings instead of silently ignoring requests for bubble/dew point pressure output
2017-04-18 11:09:09 +02:00
Andreas Lauser
7e388376af
only output the bubble and dew point pressures if they are available
2017-04-18 10:21:26 +02:00
Andreas Lauser
2b0ebe0832
Change the version to 2017.10-pre
2017-04-13 12:57:04 +02:00
Andreas Lauser
d226b3e617
Merge pull request #1139 from blattms/fix-parallel-convergence-max
...
[bugfix,flow_ebos] Fix parallel convergence max
2017-04-13 12:56:22 +02:00
Markus Blatt
9f5a904382
Removes deadlocks in the case where only few processes have wells.
...
The problem was that updateWellControls was not called on all
processes. But this is mandatory as the well switching output
requires global communication.
2017-04-12 17:37:34 +02:00
Markus Blatt
b5612806ac
Revert to using standard algorithms instead of using masks.
...
This is now possible as the values stored for ghost/overlap elements
(minimum where we compute the maxiumum, zero where we sum up)
will not influence the result of the computation any more.
2017-04-12 13:42:02 +02:00
Markus Blatt
0db663fe51
Only compute convergence markers for interior elements.
2017-04-12 13:42:02 +02:00
Markus Blatt
b72a167c76
Correctly compute maximum in a parallel flow_ebos run.
2017-04-12 13:42:02 +02:00
Atgeirr Flø Rasmussen
f88e527a0c
Merge pull request #1138 from atgeirr/silence-warnings
...
Silence warnings
2017-04-12 13:01:26 +02:00
Atgeirr Flø Rasmussen
baa6104f39
Silence unused argument warnings.
2017-04-12 11:13:10 +02:00
Atgeirr Flø Rasmussen
246118d794
Silence sign mismatch warnings.
2017-04-12 11:12:34 +02:00
Atgeirr Flø Rasmussen
a17442f578
Remove unused variables.
2017-04-12 11:12:07 +02:00
Andreas Lauser
d334fc1c70
Merge pull request #1118 from GitPaean/calculating_well_potentials_for_each_timestep
...
[WIP] Changes to improve the StandardWellsDense
2017-04-12 10:33:57 +02:00
Atgeirr Flø Rasmussen
df3f763ec4
Merge pull request #1136 from joakim-hove/restart-optional-keys
...
Using optional restart loading instead of extra.
2017-04-12 07:13:29 +02:00
Joakim Hove
527c0a9e75
Using optional restart loading instead of extra.
2017-04-11 22:59:26 +02:00
Kai Bao
0700c8cf67
adding more checking for the potential values
...
during the well well potential calculation.
2017-04-11 16:51:16 +02:00
Kai Bao
ce0e580cee
fixing comments.
...
no functional change.
2017-04-11 16:51:16 +02:00
Kai Bao
dd95114e6d
fixing well potentials calculation after introducing the saturation table
...
The calculation of well potentials of newly added well failed after using the saturation
table. Here, we fix it using much smaller parameters to stablize the
calculation, while it slows down the iteration process.
TODO: improves the convergence rate by either introducing better
paramters or better iteration strategy.
2017-04-11 16:51:16 +02:00
Kai Bao
972b911495
fixing two warnings.
...
no function change.
2017-04-11 16:51:16 +02:00
Kai Bao
72e2b7c6c3
fixing errors resulting from the rebasing procedure.
2017-04-11 16:51:16 +02:00
Kai Bao
7a4d0bb8aa
slightly re-organizing prepareTimeStep()
...
should not impact the simulation results.
2017-04-11 16:51:16 +02:00
Kai Bao
7038b6eb57
recovering the running of flow_multsigement without group control
...
flow_multisegment should not be able to handel group control yet.
2017-04-11 16:51:16 +02:00
Kai Bao
e0d96b3410
removing compute_well_potentials_ from BlackoilModelParameters
2017-04-11 16:51:16 +02:00
Kai Bao
4ed95fcbf0
calculate well potentials based on requireWellPotentials()
...
from well_colllection. Not based on command line paramters anymore.
2017-04-11 16:51:16 +02:00
Kai Bao
181112491b
recovering group control for legacy_flow.
2017-04-11 16:51:16 +02:00
Kai Bao
8fa3c4b324
removing one unnecessary if condition
2017-04-11 16:51:16 +02:00
Kai Bao
e627f35176
removing well_potential_ from WellStateFullyImplicitBlackoil
2017-04-11 16:51:16 +02:00
Kai Bao
72d0d4ddb8
revising the computeWellPotentials in StandardWells
...
so it compute the potentials for each well instead of each perforation.
2017-04-11 16:51:16 +02:00
Kai Bao
8d96d835b3
removing the well potential from WellsManager constructor.
2017-04-11 16:51:16 +02:00
Kai Bao
1aff98c4f4
adding the extra template type from recent merged PR
2017-04-11 16:51:16 +02:00
Kai Bao
22b2217dd3
removing setWellSolutionsFromPrevState from WellStateFullyImplicitBlackoilDense
...
Not used anymore.
2017-04-11 16:51:16 +02:00
Kai Bao
032f9803be
cleaning up unuseful comments and code fragments.
2017-04-11 16:51:16 +02:00
Kai Bao
279fbad17c
removing the comments from the NonlinearSolver_impl
...
which is from the development process.
2017-04-11 16:51:16 +02:00
Kai Bao
ef7769b77e
tracking if wells are newly added in WellStateFullyImplicitBlackoil
...
For a newly added well, the initialized rate cans cause big problem when
applied to VFP interploation when THP control is involved.
2017-04-11 16:51:16 +02:00
Kai Bao
a8ae9276c5
adding computeWellPotentialWithTHP() to compute well potential
...
in an iterative way. When VFP interpolation is performed, the bhp and
rates are coupled together. Some iteration will be required to get the
consistent bhp and well potential.
2017-04-11 16:51:16 +02:00
Kai Bao
182c5897c8
adding leastStrictBhpFromBhpLimits()
...
to pick the least strict bhp limits in the well controls. It is used to
calculate the well potential when there is no thp limits there.
If there is thp limits there, it will be used for further chosing of the
bhp value for well potential calculation.
2017-04-11 16:51:16 +02:00
Kai Bao
402a5a125a
adding computeWellRatesWithBhp() to calculate well rates
...
for one well based on the give Bhp.
2017-04-11 16:51:16 +02:00
Kai Bao
7b2e6760e1
adding wellHasTHPConstraints() to decide if there is THP control
...
for a specific well.
2017-04-11 16:51:16 +02:00
Kai Bao
86dc231cc3
adding more things related to group control when restarting
...
with a new time step due to convergence failure.
2017-04-11 16:51:16 +02:00
Kai Bao
e39ffefb2e
performing prepareTimeStep in assemble for StandardWellsDense
...
instead of model->preppareStep()
to avoid segmenttation error from eclSimulator and also not intervening
with NonlinearSolver
2017-04-11 16:51:16 +02:00
Kai Bao
4a6dbbe0a7
updating the control index for both well state and well_controls struct
...
when applying VREP group controls.
2017-04-11 16:51:16 +02:00
Kai Bao
cb85319a72
set thp() value to zero when no THP constraints exist
...
in updateWellState()
2017-04-11 16:51:16 +02:00
Kai Bao
7a7dcdf3ba
correcting a comment in computeWellFlux() in StandardWellsDense
2017-04-11 16:51:16 +02:00
Kai Bao
d02f028260
not resetWellControlFromState in assemble() in StandardWellsDense
...
other places should gurantee the control indices from the well_state and
well_controls struct are the same.
And also, since the first element in wellSolutions() depends on the type
of the control, this function is complete yet.
2017-04-11 16:51:16 +02:00
Kai Bao
34385ee58f
synchronizing the control index at the beginning of assemble()
...
in StandardWellsDense class.
It takes effects after restarting from a previous unconverged solution.
2017-04-11 16:51:16 +02:00
Kai Bao
2bc1c8702e
copying the thp value from prevState.
2017-04-11 16:51:16 +02:00
Kai Bao
77ec45cdd2
recovering the well_controls if solveWellEq not convergent
...
since we are using the control index from both WellState and
well_controls.
2017-04-11 16:51:16 +02:00