Kai Bao
f3c98bc95a
Merge branch 'master' into Adding_PLYSHLOG_RELATED
...
Conflicts:
opm/polymer/fullyimplicit/BlackoilPolymerModel.hpp
2015-06-18 15:45:31 +02:00
Atgeirr Flø Rasmussen
2319420f06
Move polymer code extraAddWellEq -> addWellContributionToMassBalanceEq.
2015-06-18 14:34:52 +02:00
Kai Bao
df3c6cb8d1
using Water Position instead of assuming it is 0.
2015-06-10 14:40:46 +02:00
Kai Bao
81d9fe7a55
moving function computeShearMultLog to class PolymerProperties
2015-06-10 13:48:03 +02:00
Kai Bao
e44ef196ac
moving the intersection calculation to seperate point2D class.
...
under the namespae Opm::detail
2015-06-10 13:10:45 +02:00
Kai Bao
3e449a31d6
adjusting some spaces related to brackets.
...
No functions change.
2015-06-09 12:29:49 +02:00
Kai Bao
e217ca9928
using absolute value when comparing the velocity
...
To decide if the value is out of range.
2015-06-05 15:23:55 +02:00
Kai Bao
312fc60d13
obtaining the position of water phase directly
...
instead of finding the water phase through a for loop
when caculating the water velocity for faces.
2015-06-05 14:18:17 +02:00
Kai Bao
2b6a58b12c
fixing the injection wells when stopping polymer injection.
2015-06-05 13:44:57 +02:00
Kai Bao
a897501521
Applying the shear-thinning effect with PLYSHLOG
2015-06-04 15:10:19 +02:00
Kai Bao
1baa2eb06a
Adding the pre-shear-thinning water velocity for well performations.
2015-06-03 10:28:35 +02:00
Kai Bao
ec2d4ee6a5
Correcting location of several brackets.
2015-06-03 10:14:58 +02:00
Kai Bao
3b34356695
Adding pre-shear-thinning water velocity computing.
2015-06-03 10:09:21 +02:00
Kai Bao
587a0c747b
adding the function to compute shear-thinning effect based on PLYSHLOG
2015-06-03 09:56:29 +02:00
Kai Bao
a9f55128d4
adding the function to find the intersection point.
...
This apply to find the intersection point of the line and a line
segmention. Will be used in the shear multipler calculation of with
PLYSHLOG.
Solver is not the best place to put this function, while need suggestion
and fixed later.
2015-06-03 09:56:29 +02:00
Kai Bao
9cc4a5d371
making wells_rep_radius and wells_perf_length const when initializing.
2015-06-02 15:01:22 +02:00
Kai Bao
8205ad3303
calculating the representative radius and perf length
...
for all well perforations, to be used in shear-thinning calculation.
The calculation is approximated.
2015-06-02 11:09:56 +02:00
Kai Bao
c6e240daae
Adding the flag for PLYSHLOG keyword.
2015-06-01 10:52:49 +02:00
Atgeirr Flø Rasmussen
79b861db10
Silence multiple warnings.
2015-05-29 16:31:32 +02:00
Atgeirr Flø Rasmussen
1d5a67f2cd
Remove method computeResidualNorms(), use base version.
2015-05-26 17:10:16 +02:00
Atgeirr Flø Rasmussen
1dcffe4b18
Refactor computeMassFlux().
2015-05-26 17:04:33 +02:00
Atgeirr Flø Rasmussen
2ddfe91504
Make computeMassFlux() more like the base class version.
2015-05-26 16:49:25 +02:00
Atgeirr Flø Rasmussen
9cc01245f1
Adapt to rq_.head -> rq_.dh renaming in opm-autodiff.
2015-05-26 16:43:06 +02:00
Atgeirr Flø Rasmussen
a42c982628
Refactor updateState() to not copy base version code.
2015-05-26 15:31:45 +02:00
Atgeirr Flø Rasmussen
272947c99c
Use extraAddWellEq() to add well contrib to polymer equation.
...
This way of refactoring was chosen since the extra term depends
on a lot of context. Instead of recreating the context in the
polymer model (which would not reduce any complexity) the necessary
variables are passed to extraAddWellEq().
2015-05-26 14:04:35 +02:00
Atgeirr Flø Rasmussen
64da6ef184
Refactor computeAccum().
...
Extend base class version instead of copying.
2015-05-26 12:55:43 +02:00
Atgeirr Flø Rasmussen
c9c19d9253
Fix error and warning in assert() statements.
2015-05-26 12:08:30 +02:00
Atgeirr Flø Rasmussen
2cd5b672bf
Only deal with concentration if has_polymer_ is true.
2015-05-26 12:06:17 +02:00
Atgeirr Flø Rasmussen
2539fb935d
Refactor variableState().
...
Use base case where possible instead of copying it.
2015-05-26 11:49:10 +02:00
Atgeirr Flø Rasmussen
f2e5177594
Remove functions that are identical in BlackoilModelBase.
...
Also refactor some functions that are different to call the
base version and then do additional processing. However this
process has not been carried out on all methods at this point.
2015-05-26 01:46:34 +02:00
Atgeirr Flø Rasmussen
26484e91a5
Transform BlackoilPolymerModel to inherit BlackoilModelBase.
...
The class still contains surplus implementations though.
2015-05-26 00:12:37 +02:00
Atgeirr Flø Rasmussen
5c1e314cbb
Fix the same bug for the MPI case.
...
Note: not actually tested with MPI, written blindly!
2015-05-25 00:10:11 +02:00
Atgeirr Flø Rasmussen
5f6027ba01
Bugfix: we compute no well flux residual for polymer, do not try to use.
2015-05-25 00:06:17 +02:00
Atgeirr Flø Rasmussen
59bd1391a8
Update polymer solver with convergence features from opm-autodiff.
...
Original patches by Tor Harald Sandve and Markus Blatt.
2015-05-21 16:29:01 +02:00
Atgeirr Flø Rasmussen
d7de9894e0
Follow minor API changes in opm-autodiff.
2015-05-21 09:50:54 +02:00
Atgeirr Flø Rasmussen
b7ef3b7f57
Minor changes to make BlackoilPolymerModel more like BlackoilModel.
...
No behaviour changes, only renaming etc. to reduce the diff.
2015-05-20 08:48:54 +02:00
Atgeirr Flø Rasmussen
65e7a934a9
Make BlackoilPolymerModel usable with NewtonSolver from opm-autodiff.
2015-05-19 21:29:14 +02:00
Atgeirr Flø Rasmussen
300f236cef
Copied FullyImplicitBlackoilPolymerSolver to BlackoilPolymerModel.
2015-05-19 14:40:38 +02:00
