Bård Skaflestad
0c61f63900
Merge pull request #1265 from GitPaean/fixing_test_wellmodel
...
not using std::make_unique in test_wellmodel
Closes #1264
2017-09-04 17:33:45 +02:00
Kai Bao
f982faed05
not using std::make_unique in test_wellmodel
...
to avoid using C++14 specific functions.
2017-09-04 15:50:01 +02:00
Atgeirr Flø Rasmussen
77f3bdaeda
Merge pull request #1257 from totto82/add_invert4x4
...
Add invert4x4 specialization for invertMatrix()
2017-09-04 09:08:32 +02:00
Atgeirr Flø Rasmussen
a162d883bf
Merge pull request #1261 from GitPaean/recovering_model2_running
...
not throwing when encountering multisegment wells.
2017-08-29 11:21:45 +02:00
Tor Harald Sandve
210f1edf25
Add test for invert 4x4 matrix specialization
2017-08-29 11:01:20 +02:00
Kai Bao
b4538af164
not throwing when encountering multisegment wells.
2017-08-29 10:01:31 +02:00
Atgeirr Flø Rasmussen
160314424e
Merge pull request #1250 from GitPaean/refactoring_well_model_June_2017_rebase
...
well refactoring for flow_ebos
2017-08-28 14:36:18 +02:00
Kai Bao
9accb56c86
adding a test for well model.
...
It is just test for StandardWell.
2017-08-25 14:09:26 +02:00
Kai Bao
355be6c26c
collecting the NaN and too large well residuals
...
make sure all the processes will throw if there is any of the processes
found abnormal residual values.
2017-08-25 14:09:26 +02:00
Kai Bao
8abe48a693
making destructor of WellInterface virtual
...
to avoid memory leaking.
2017-08-25 14:09:26 +02:00
Kai Bao
a60a969257
fixing one memory-leaking for flow_ebos running 2p case.
2017-08-25 14:09:26 +02:00
Kai Bao
96340a23ff
computePerfRate and crossFlowAllowed protected in StandardWell
2017-08-25 14:09:26 +02:00
Kai Bao
bc78553686
renaming well_solutions_ and well_variables
...
to give slightly easier understanding.
2017-08-25 14:09:26 +02:00
Kai Bao
25869026e5
renaming a few functions
...
to reflect the functions better. No functional change.
2017-08-25 14:09:26 +02:00
Kai Bao
9a4a9a2bcc
using well name and allow_cf form well_ecl.
2017-08-25 14:09:26 +02:00
Kai Bao
a908bd7cf1
makding createWellContainer a static function.
2017-08-25 14:09:26 +02:00
Kai Bao
f9b7094075
fixing of some comments
...
no functional change.
2017-08-25 14:09:26 +02:00
Kai Bao
a04d1a9393
correcting a typo in CMakeLists_files.cmake.
2017-08-25 14:09:26 +02:00
Kai Bao
52af70ad0e
adding debugging output for solveWellEq
...
to tell if the solveWellEq is successful.
2017-08-25 14:09:26 +02:00
Kai Bao
a29be796e7
adding comments about function calculateBhpFromThp.
2017-08-25 14:09:26 +02:00
Kai Bao
277d26df8a
cleaning up well residual related in BlackoilModelEbos
...
TODO: how to output the information for debugging well iteration
process.
2017-08-25 14:09:26 +02:00
Kai Bao
7a9fc2132e
more cleaning up of StandardWellsDense.
...
not functional change.
2017-08-25 14:09:26 +02:00
Kai Bao
68edfd7235
removing several unused variables.
2017-08-25 14:09:26 +02:00
Kai Bao
fe3d2f91e0
adding functions to calcuate between thp and bhp
...
to reduce some code duplication in StandardWell
2017-08-25 14:09:26 +02:00
Kai Bao
8a12ec677f
more cleaning up
...
not funtional change.
2017-08-25 14:09:26 +02:00
Kai Bao
66b5226039
removing some unused variables
...
to reduce warnings.
2017-08-25 14:09:26 +02:00
Kai Bao
f1c0e84878
cleaning up for StandardWellsDense.
2017-08-25 14:09:26 +02:00
Kai Bao
49df0c12f6
cleaing up and fixing the error from rebasing.
2017-08-25 14:09:26 +02:00
Kai Bao
af6155d15a
updating the well group status before updating targets.
...
This recovers the running with group control.
2017-08-25 14:09:26 +02:00
Kai Bao
31ce880ba7
fixing the prallel running.
...
It needs WellSwitchingLogger for all the processes even there are not
wells in some of the processes.
2017-08-25 14:09:26 +02:00
Kai Bao
5cb0a5109e
adding setWellSolutions to StandardWellsDense.
...
the function will calculate the well_solutions_ based on well_state.
It will be used when we recover the well_state from a failed iteration,
then we should also update well_solutions_ for consistence.
2017-08-25 14:09:26 +02:00
Kai Bao
5af15fa63f
removing well_soltutions_ from WellStateFullyImplicitBlackoilDense
...
adding function setWellSolutions() to StandardWell.
The class WellStateFullyImplicitBlackoilDense is ready to be removed
now, while the only thing can go wrong compred with the original version
is the group control, which is not tested yet.
2017-08-25 14:09:26 +02:00
Kai Bao
8441eb77bd
not using wellSolutions() from WellState
...
while not sure whether we can remove it totally because of the comments
related to group control.
2017-08-25 14:09:26 +02:00
Kai Bao
6dcb0dfba1
fixing the vfp running with flow_ebos.
2017-08-25 14:09:26 +02:00
Kai Bao
78dd9d1d16
more cleaning up of the interface of WellInterface and StandardWell
2017-08-25 14:09:26 +02:00
Kai Bao
1550fb7600
WIP in cleaning up the interfaces of WellInterface and StandardWell
...
commiting now to save some changes.
2017-08-25 14:09:26 +02:00
Kai Bao
d4f26ad47a
recovering the running of flow_ebos for 2p + dummy phase.
2017-08-25 14:09:26 +02:00
Kai Bao
c43505d007
cleaning up some interface in WellInterface.
2017-08-25 14:09:26 +02:00
Kai Bao
6bbbe5061d
adding the copyright information.
2017-08-25 14:09:26 +02:00
Kai Bao
3e26a8b467
using different size of block size of well and reservoir
2017-08-25 14:09:26 +02:00
Kai Bao
894529be57
small cleaning up.
2017-08-25 14:09:26 +02:00
Kai Bao
f19dd03387
using Base to represent WellInterface<TypeTag>
...
for better readability.
2017-08-25 14:09:26 +02:00
Kai Bao
bd84e3c9f3
making a trival way to reduce the covergence of the wells.
...
to be improved later.
2017-08-25 14:09:26 +02:00
Kai Bao
4f716a633d
using legacyDepth_ for the perfoation depth
...
for StandardWell. It turns out that it can be different with the
grid.getCellDepth() from the parser.
2017-08-25 14:09:26 +02:00
Kai Bao
6e0da756dc
fixing the running of flow_ebos_2p.
...
by not adding the dummy phase.
2017-08-25 14:09:26 +02:00
Kai Bao
c1ee941195
adding shear calculation to the polymer simulation.
2017-08-25 14:09:26 +02:00
Kai Bao
d4fa8c06f1
adding computeRepRadiusPerfLength() to WellInterface.
2017-08-25 14:09:26 +02:00
Kai Bao
d1727d0183
correcting the injectivity with polymer injection.
2017-08-25 14:09:26 +02:00
Kai Bao
d470edfb0b
correct an assertion error in getWellConvergence in StandardWell
...
and adding comments why it is the case for polymer case.
2017-08-25 14:09:26 +02:00
Kai Bao
5ed9f4d497
incorporting polymer except the parts related to PLYSHLOG
2017-08-25 14:09:26 +02:00