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
3,113 Commits 24 Branches 102 Tags
c85f10046c26df22ac146ad4639b7564490af21c
Commit Graph

42 Commits

Author SHA1 Message Date
Tor Harald Sandve
c85f10046c Density and viscosity as inputs instead of computed in computeMassFlux 
Density and viscosity are given as input instead of calculated inside
computeMassFlux. This allow for modifying the properties prior to
calling computeMassFlux which avoids code duplication in the solvent
implementation.
 2016-02-12 10:42:26 +01:00
Tor Harald Sandve
e3393c5ee9 Handle combination of threshold_pressure and nnc 
The nncs threshold pressures are calculated and appended to the face
threshold pressures
 2015-12-08 11:03:05 +01:00
Atgeirr Flø Rasmussen
058e4326ca Remove unused functions. 2015-10-01 10:47:13 +02:00
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
c026503e91 more documents for BlackoilPolymerModel construction function. 2015-06-23 14:01:19 +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
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
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
f92459807c adding flags for SHRATE to Model and Simulator. 2015-06-05 15:25:23 +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
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
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
Atgeirr Flø Rasmussen
1d5a67f2cd Remove method computeResidualNorms(), use base version. 2015-05-26 17:10:16 +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
2539fb935d Refactor variableState(). 
Use base case where possible instead of copying it.
 2015-05-26 11:49:10 +02:00
Atgeirr Flø Rasmussen
da98f18f80 Use base class version of parameter accessors. 2015-05-26 02:00:46 +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
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
6984ca52e4 Update docs. 2015-05-19 21:36:40 +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