Jørgen Kvalsvik
ef51e9a2eb
Well shared_ptr alias deprecated
...
The shared_ptr aliasing is deprecated, and in the Well case this has
been removed upstream.
2016-06-16 10:01:04 +02:00
Liu Ming
49fbf5e493
document function and switch implementation.
2016-06-16 14:02:34 +08:00
Liu Ming
8224e7cef9
switch function calling order.
2016-06-16 09:48:39 +08:00
Liu Ming
936cd8dc33
Add separate function for setup logging.
2016-06-15 15:24:05 +08:00
Liu Ming
969ce5ca53
add blank line before and after "Reading Parameters"
2016-06-13 13:43:50 +08:00
Joakim Hove
dd5d9b34a2
Merge pull request #688 from jokva/refactor-output-restart
...
Breaking opm-core dependency in opm-output; new summary implementation
2016-06-10 13:15:46 +02:00
Liu Ming
8f04300ce3
use default prefix.
2016-06-10 09:27:49 +02:00
Atgeirr Flø Rasmussen
ccde26143c
Merge pull request #709 from qilicun/add-new-type
...
Support new message type: Prtinfo
2016-06-08 11:35:31 +02:00
Liu Ming
7ca182f962
change Prtinfo to Note.
2016-06-08 09:18:10 +02:00
Markus Blatt
82d6d949db
Fix the parallel L-infinity norm calculation.
...
It was computing a global maximum before, which obviously is not the same thing.
2016-06-07 15:10:25 +02:00
Atgeirr Flø Rasmussen
5d38c77881
Merge pull request #707 from blattms/support-ignoreconvergencefailure-for-cpr
...
Make CPR preconditioner honor linear_solver_ignoreconvergencefailure
2016-06-07 14:13:52 +02:00
Liu Ming
b2c126f7c2
Support new message type: Prtinfo
2016-06-07 14:11:24 +02:00
Markus Blatt
82556ca1d0
Fix uninitialized value
2016-06-07 12:40:24 +02:00
Markus Blatt
1656836f00
Change variable name along recommendation.
2016-06-07 12:38:56 +02:00
Markus Blatt
af881e84b2
Fix whitespace.
2016-06-07 12:37:21 +02:00
Atgeirr Flø Rasmussen
f9ecbaeefe
Merge pull request #706 from andlaus/lad_to_dad
...
rename some variables from "Lad" to "Eval" (was: to "Dad")
2016-06-07 11:46:44 +02:00
Atgeirr Flø Rasmussen
bceaf56c7e
Merge pull request #703 from atgeirr/log-output
...
Log well control switching message.
2016-06-07 11:39:01 +02:00
Atgeirr Flø Rasmussen
50e8c5dbd8
Merge pull request #708 from totto82/fix_hydrocarbonstate
...
Adds has_disgas and has_vapoil flags to hydrocarbonstate initialization
2016-06-07 11:38:27 +02:00
Andreas Lauser
a8df55e02f
rename some variables from "*Lad" to "*Eval"
...
this was an involuntary omission in the "local AD" to "dense AD"
rename...
2016-06-07 11:12:33 +02:00
Jørgen Kvalsvik
71560b5fb2
BlackoilOutputWriter rewritten to use opm-output
...
Changes to BlackoilOutputWriter as mandated by the split and rewrite of
opm-output. Notable changes:
* BlackoilOutputWriter is no longer a child class of OutputWriter.
* Minor interface changes; writeTimeStep requires a Wells pointer
* restore requires a Wells* pointer
* VTK/Matlab support rewrites; no longer inherits OutputWriter
* WellStateFullyImplicitBlackoil::report added, to write its data to a
opm-output understood format
Relies on utility/Compat.hpp for quick conversion to the opm-output
defined formats.
2016-06-07 10:15:07 +02:00
Tor Harald Sandve
d035881a0a
Adds has_disgas and has_vapoil flags to hydrocarbonstate initialization
...
Gas saturation must be used as primalvariable if DISGAS and VAPOIL is
not used.
2016-06-07 08:23:47 +02:00
Atgeirr Flø Rasmussen
edae7da526
Merge pull request #705 from qilicun/use-debug-backend
...
Write debug information into a separate file.
2016-06-06 16:11:48 +02:00
Liu Ming
db1e0fa397
write all the messages into debug file.
2016-06-06 15:39:10 +02:00
Liu Ming
865577742f
write debug information into a separate file.
2016-06-06 12:20:41 +02:00
Markus Blatt
a1096f222c
Make CPR preconditioner honor linear_solver_ignoreconvergencefailure
2016-06-06 08:43:56 +00:00
Andreas Lauser
d45ba7732e
rename "local AD" to "dense AD"
2016-06-02 20:20:04 +02:00
Atgeirr Flø Rasmussen
cf5dbf292a
Log well control switching message.
...
Instead of writing to std::cout.
2016-05-30 10:26:20 +02:00
Robert Kloefkorn
7dd76cc967
NewtonIterationBlackoilInterleaved: added flag to allow to ignore solver convergence
...
failure.
2016-05-27 12:55:46 +02:00
Atgeirr Flø Rasmussen
decdd3185f
Merge pull request #698 from blattms/prevent-dereferencing-null-point-during-paralle-IO
...
Prevent dereferencing a null pointer during parallel output.
2016-05-26 07:53:28 +02:00
Atgeirr Flø Rasmussen
ab0df10354
Merge pull request #696 from blattms/distribute-hydrocarbonstate
...
Correctly distribute the hydro carbon state for parallel runs.
2016-05-26 07:49:10 +02:00
Markus Blatt
ecf4ab91c8
Fixes size in assrtion of BlackoilStateDatahandle::scatter
2016-05-25 14:36:33 +00:00
Markus Blatt
e9b8721d2a
Prevent dereferencing a null pointer during parallel output.
...
ParallelDebugOutput will always dereference its member variable
globalReservoirState_ even if it will not be used for any output.
In g++ this throws when using -D_GLIBCXX_DEBUG -DDEBUG -DGLIBCXX_FORCE_NEW.
I any case we will have a dangling reference into Nirvana in
PackUnPackSimulationDataContainer. This commit fixes this by always
initializing the pointer globalReservoirState_. In the case where the rank
does not perform any output its size will be zero.
2016-05-25 13:49:33 +00:00
Markus Blatt
8dd3794562
Fixes copy&paste bugs from resize code movement
2016-05-25 13:07:29 +00:00
Markus Blatt
c247652188
Moved resizing of BlackoilState members to the data handle.
...
Seems much less messy.
2016-05-25 12:47:24 +00:00
Markus Blatt
509cd6f0b1
Use correct size when resizing hydroCarbonState.
...
The size is the number of cells and not dependent on the number of phases.
This was a typical copy&paste mistake that wasted space.
Kudos to atgeirr for catching this.
2016-05-25 12:43:12 +00:00
Markus Blatt
22e71dff08
Correctly distribute the hydro carbon state for parallel runs.
...
This is needed since hydro carbon state is used to get the
primal variables since PR #687 , commit 9c771ab6
. Therefore we
now distribute the state along with rest of the black oil state
variable at the start of a parallel simulation.
This closes issue #695
2016-05-24 20:02:24 +00:00
Atgeirr Flø Rasmussen
0f290e3f6e
Separate non-neighbour and non-cartesian connections.
...
The non-cartesian connections are required by the output facilities,
while the truly non-neighbour connections (meaning those not in the grid)
should be used by all other code.
2016-05-24 11:54:17 +02:00
Kai Bao
0ebd25f66a
fixing the compilation error due to rebasing.
2016-05-23 15:42:05 +02:00
Kai Bao
d2d9bd8a80
moving depth difference calcualtion to init() for MultisegmentWells
...
instead of recalculating them for each iterations.
2016-05-23 15:11:52 +02:00
Kai Bao
c2bdaa1b92
fixing the calculation of volumeRatio.
...
due to the wrong use of parenthesis.
2016-05-23 15:11:52 +02:00
Kai Bao
879f127ae8
moving variableStateExtractWellsVars() from models to Well Models.
2016-05-23 15:11:52 +02:00
Kai Bao
fbe7143f54
using WellModel functions in BlackoilPolymerModel.
...
reducing some repeated code.
2016-05-23 15:11:52 +02:00
Kai Bao
846ff890de
refactoring the interface of computeWellPotentials()
...
to reduce the cost of makeConstantState when not calculating the
potentials.
2016-05-23 15:11:52 +02:00
Kai Bao
19a256dce0
some pure cleaning up.
2016-05-23 15:11:52 +02:00
Kai Bao
f2b7f2a56c
moving numWellVars from models to Wells.
2016-05-23 15:11:52 +02:00
Kai Bao
b3d1c0eabc
initializing the pointers to be nullptr in the Wells classes
2016-05-23 15:11:52 +02:00
Kai Bao
4527034f29
removing variableStateInitials() from BlackoilMultiSegmentModel
...
which is not helpful anymore.
2016-05-23 15:11:52 +02:00
Kai Bao
a102e934ac
removing baseSolveWellEq from BlackoilMultiSegmentModel
...
to solve the different interfaces of computeWellConnectionPressures for
StandardWells and MultisegmentWells, a function
computeWellConnectionPressures was introduced for the models.
2016-05-23 15:11:52 +02:00
Kai Bao
01328559e2
removing the updateWellState from the models.
2016-05-23 15:11:52 +02:00
Kai Bao
4e8099057e
small cleaning up for BlackoilMultiSegmentModel_impl
2016-05-23 15:11:51 +02:00