Kai Bao
|
c026503e91
|
more documents for BlackoilPolymerModel construction function.
|
2015-06-23 14:01:19 +02:00 |
|
Kai Bao
|
2100f10411
|
Merge branch 'master' into Adding_SHRATE_RELATED
|
2015-06-23 13:33:05 +02:00 |
|
Kai Bao
|
638c2da394
|
Merge branch 'master' into Adding_SHRATE_RELATED
|
2015-06-23 13:31:20 +02:00 |
|
Atgeirr Flø Rasmussen
|
f54e0d3992
|
Merge pull request #132 from atgeirr/fix-warnings
Fix warnings
|
2015-06-23 13:30:05 +02:00 |
|
Atgeirr Flø Rasmussen
|
f90afe5d38
|
Remove const on return type.
|
2015-06-23 13:25:52 +02:00 |
|
Atgeirr Flø Rasmussen
|
383322b760
|
Fix signed/unsigned comparisons.
|
2015-06-23 13:24:31 +02:00 |
|
Atgeirr Flø Rasmussen
|
eabe1986e6
|
Merge pull request #124 from GitPaean/Adding_PLYSHLOG_RELATED
Adding shear-thinning calculation with PLYSHLOG
|
2015-06-23 13:18:07 +02:00 |
|
Kai Bao
|
afb8feaafe
|
formatting the blank lines and a bracket.
|
2015-06-23 13:04:48 +02:00 |
|
Kai Bao
|
9c3c0cffce
|
correcting copyright information.
|
2015-06-23 13:02:05 +02:00 |
|
Atgeirr Flø Rasmussen
|
9128ef23f1
|
Merge pull request #131 from GitPaean/adaptation_split_addWellEq
change the parameter order addWellContributionToMassBalanceEq().
|
2015-06-23 11:38:13 +02:00 |
|
Kai Bao
|
d2602cc73f
|
Merge branch 'Adding_PLYSHLOG_RELATED' into Adding_SHRATE_RELATED
Conflicts:
opm/polymer/PolymerProperties.hpp
|
2015-06-23 10:27:25 +02:00 |
|
Kai Bao
|
5cdc677672
|
cleaning up commented codes and adding a few comments.
|
2015-06-22 15:44:14 +02:00 |
|
Kai Bao
|
39986c3363
|
adapting to the new refactoring in opm-autodiff#406.
replacing addWellEq() with seperated functions, which make the
incoropration of the shear-thinning much natural and easier.
|
2015-06-22 15:38:31 +02:00 |
|
Kai Bao
|
9cd52ca631
|
Merge branch 'adaptation_split_addWellEq' into Adding_PLYSHLOG_RELATED
Conflicts:
opm/polymer/fullyimplicit/BlackoilPolymerModel.hpp
|
2015-06-22 12:59:19 +02:00 |
|
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 |
|
Atgeirr Flø Rasmussen
|
9ed6ea1b31
|
Merge pull request #130 from qilicun/fix_param
Fix parameter errors.
|
2015-06-22 10:29:20 +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
|
c45907a41f
|
Merge pull request #128 from atgeirr/fix-polymer-well-contrib
Move polymer code from extraAddWellEq to addWellContributionToMassBalanceEq.
|
2015-06-18 15:03:08 +02:00 |
|
Atgeirr Flø Rasmussen
|
2319420f06
|
Move polymer code extraAddWellEq -> addWellContributionToMassBalanceEq.
|
2015-06-18 14:34:52 +02:00 |
|
Kai Bao
|
dd9669ae43
|
Merge pull request #127 from atgeirr/only-create-modelparams-once
Avoid parameter spamming in output.
|
2015-06-18 13:12:26 +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 |
|
Bård Skaflestad
|
bfd9071307
|
Merge pull request #125 from atgeirr/add-dummy-types
Satisfy interface requirements of SimulatorBase.
|
2015-06-10 13:52:28 +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 |
|