OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2025-02-25 18:55:30 -06:00
Code Issues Packages Projects Releases Wiki Activity
5,279 Commits 24 Branches 102 Tags
78dd9d1d16a58f747e7a3699314240dc732518a1
Commit Graph

107 Commits

Author SHA1 Message Date
Atgeirr Flø Rasmussen
b885c8e454 Add "Polymer" material and disable custom getConvergence(). 2015-09-30 14:49:15 +02:00
Atgeirr Flø Rasmussen
834d607d57 Update to match changes in opm-autodiff. 
BlackoilModelBase now requires an EclipseState constructor argument.
Also silenced two minor warnings.
 2015-07-10 12:57:30 +02:00
Kai Bao
c88b1d6a8b adapting to the change in autodiff#408 2015-06-24 14:23:25 +02:00
Kai Bao
f00f7c38b6 using size_t to avoid signed/unsigned comparison. 2015-06-23 14:39:04 +02:00
Kai Bao
1f36eaa27e constructing vector directly instead of using std::copy. 2015-06-23 14:33:02 +02:00
Kai Bao
8f51065abf using .data() instead of obtaining the address of first element. 2015-06-23 14:19:35 +02:00
Kai Bao
2100f10411 Merge branch 'master' into Adding_SHRATE_RELATED 2015-06-23 13:33:05 +02:00
Atgeirr Flø Rasmussen
383322b760 Fix signed/unsigned comparisons. 2015-06-23 13:24:31 +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
78775cd33e parameter order change of addWellContributionToMassBalanceEq(). 
To follow the corresponding change in opm-autodiff.
 2015-06-22 12:48:22 +02: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
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
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
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