Kai Bao
04a72bd325
Merge branch 'master' into Adding_PLYSHLOG_RELATED
2015-06-22 12:57:26 +02:00
Kai Bao
78775cd33e
parameter order change of addWellContributionToMassBalanceEq().
...
To follow the corresponding change in opm-autodiff.
2015-06-22 12:48:22 +02:00
Liu Ming
3898ecde96
Fix parameter errors.
2015-06-22 15:43:01 +08:00
Kai Bao
4807a90c35
moving the shear-thinning application out of the addWellEq()
...
So we still use the addWellEq() from the Base Class, without making a
new addWellEq() function in the BlackoilPolymerModel class.
2015-06-19 15:17:59 +02:00
Kai Bao
60494ac531
changing to adapt to the change in the autodiff.
2015-06-18 16:56:39 +02:00
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
Atgeirr Flø Rasmussen
32590ec072
Use solver_param_ from base class.
2015-06-18 11:09:57 +02:00
Atgeirr Flø Rasmussen
2b6163b5ff
Use the base class model_param_ and avoid recreating it.
2015-06-17 12:51:39 +02:00
Kai Bao
6745a2fb0a
Merge branch 'master' into Adding_PLYSHLOG_RELATED
2015-06-10 15:15:25 +02:00
Kai Bao
df3c6cb8d1
using Water Position instead of assuming it is 0.
2015-06-10 14:40:46 +02:00
Kai Bao
3bd59ab7e4
correcting the marco in the Point2D.hpp file.
...
the typo is resulted from a stash apply CONFLICT.
2015-06-10 14:14:03 +02:00
Kai Bao
81d9fe7a55
moving function computeShearMultLog to class PolymerProperties
2015-06-10 13:48:03 +02:00
Atgeirr Flø Rasmussen
8d47acd6bf
Satisfy interface requirements of SimulatorBase.
...
This is done with dummy types since the class in question
(SimulatorFullyImplicitCompressiblePolymer) does not use
a Model/Solver split.
2015-06-10 13:22:43 +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
eef30576fa
Adding the shear-rate calculation for wells.
2015-06-08 10:45:02 +02:00
Kai Bao
6807fc58b8
storing the wellbore diameters for model and simulators.
...
Will be used in the shear rate calculation.
2015-06-08 10:37:21 +02:00
Kai Bao
93cdeac34a
conversing the face water velocity to shear rate.
2015-06-05 15:30:49 +02:00
Kai Bao
f92459807c
adding flags for SHRATE to Model and Simulator.
2015-06-05 15:25:23 +02:00
Kai Bao
af3b78460b
adding SHRATE to PolymerPropsAd
2015-06-05 15:25:23 +02:00
Kai Bao
009addb142
adding the unit conversion when SHRATE present
2015-06-05 15:25:23 +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
11ad42ee22
unit conversion for the PLYSHLOG table.
...
insteading handling it in the opm-parser
2015-06-05 09:13:25 +02:00
Kai Bao
a897501521
Applying the shear-thinning effect with PLYSHLOG
2015-06-04 15:10:19 +02:00
Kai Bao
9b93579d00
Adding the shear-thinning factors member varaiables.
2015-06-03 11:26:38 +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
b22e6588b9
Adding PLYSHLOG related to PolymerPropsAd
2015-06-03 09:56:29 +02:00
Kai Bao
db420faf75
Adding PLYSHLOG related to PolymerProperies.
2015-06-03 09:56:29 +02:00
Kai Bao
1032f11d3d
added some comments that the current code is only for serial running.
2015-06-02 15:14:22 +02:00
Kai Bao
4f44c33c58
reserve() for wells_rep_radius and wells_perf_length
...
for more efficient push_back()
2015-06-02 15:10:09 +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
a4f456ab87
deleting unused solver files.
2015-06-01 12:46:44 +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
bd51ce8dbe
Merge pull request #116 from andlaus/simplify_simulator
...
Simplify simulator
2015-05-29 15:47:06 +02:00
Atgeirr Flø Rasmussen
a1709aad94
Use unique_ptr instead of shared_ptr.
2015-05-29 15:10:51 +02:00
Andreas Lauser
9c78d5ef00
do not use std::shared_ptr where it is deemed inappropriate by the maintainers
...
note that I don't agree with this change and will assume no
responsibility if something goes down the gutter.
2015-05-29 14:36:34 +02:00
Andreas Lauser
2b085e0062
fully implicit simulators: various cleanups
...
these are mostly stylistic: the function bodies of most new methods
have been moved to the _impl.hpp file and the Simulator classes are
now templated on the grid type, so it should be not too hard to switch
them to Dune::CpGrid.
2015-05-29 12:59:40 +02:00
Bård Skaflestad
3e12d739b5
Restore build on older compilers
...
Older compilers, e.g., GCC 4.4., do not understand the
"simple-type-specifier" syntax of C++11's "friend" declarations.
Typical responses are
error: a class-key must be used when declaring a friend
error: friend declaration does not name a class or function
Restore build on older compilers (e.g., GCC prior to 4.7) by
inserting the 'class' keyword.
2015-05-28 17:16:28 +02:00
Andreas Lauser
01555da823
remove the run() method from SimulatorFullyImplicitCompressiblePolymer
...
With this the simulator is basically done, but since
FullyImplicitCompressiblePolymerSolver has not yet been converted to
the NewtonSolver plus Model approach, the solver cannot be removed and
thus still contains quite a bit of copy-and-pasted code.
2015-05-28 13:56:07 +02:00
Andreas Lauser
d27fb2bc45
properly use the SimulatorBase class for SimulatorFullyImplicitBlackoilPolymer and SimulatorFullyImplicitCompressiblePolymer
2015-05-28 13:56:07 +02:00
Andreas Lauser
0f1a7a16d7
unify the run() methods and the constructors of the 2p-compressible and the flow_polymer with the one from flow
2015-05-28 13:56:07 +02:00
