Commit Graph

722 Commits

Author SHA1 Message Date
Atgeirr Flø Rasmussen
b918f20771 Add model() and relativeChange() methods. 2015-11-13 13:58:41 +01:00
Atgeirr Flø Rasmussen
bbf1862023 Update for new surfaceDensity() interface. 2015-11-13 13:30:01 +01:00
Atgeirr Flø Rasmussen
b2bf88e689 Silence warning about missing initializer. 2015-11-13 13:29:32 +01:00
Atgeirr Flø Rasmussen
09fe5725e1 Merge pull request #156 from atgeirr/use-moduleversion
Use moduleVersion() in startup message.
2015-10-28 16:27:32 +01:00
Atgeirr Flø Rasmussen
7d2b6481a0 Use moduleVersion() in startup message. 2015-10-28 16:26:12 +01:00
Atgeirr Flø Rasmussen
696c84fe99 Merge pull request #154 from GitPaean/correcting_plyrocktable_reading
Correcting plyrocktable reading typo
2015-10-26 09:09:36 +01:00
Kai Bao
0936917610 removing some white spaces. 2015-10-24 13:23:25 +02:00
Kai Bao
2b5f7c2b5c correcting the typo when reading PLYROCK table.
PlymaxTable was used instead.
2015-10-24 13:19:36 +02:00
dr-robertk
1ebe26f1bd Merge pull request #153 from atgeirr/bump-version
Bump version and unify format of dune.module.
2015-10-23 15:17:52 +02:00
Atgeirr Flø Rasmussen
d277cabfba Merge pull request #152 from akva2/update_redhat_packaging
update redhat packaging
2015-10-20 18:34:14 +02:00
Atgeirr Flø Rasmussen
02a9a27582 Merge pull request #150 from akva2/update_debian_packaging
update debian packaging
2015-10-20 10:20:27 +02:00
Atgeirr Flø Rasmussen
00056f7d07 Merge pull request #149 from GitPaean/silencing_warning_shrate
silencing a shadowing warning related to shrate.
2015-10-19 09:16:06 +02:00
paean
956b8fc633 silencing a shadowing warning related to shrate. 2015-10-19 07:53:27 +02:00
Atgeirr Flø Rasmussen
33aa9e468d Merge pull request #148 from andlaus/error_macros_to_opm_common
use the error macros from opm-common
2015-10-12 15:38:01 +02:00
Andreas Lauser
651bd91482 use the error macros from opm-common 2015-10-12 15:24:59 +02:00
Atgeirr Flø Rasmussen
0054c90e45 Merge pull request #146 from atgeirr/refactor-getconvergence
Refactor getConvergence()
2015-10-06 10:27:39 +02:00
Bård Skaflestad
8b31c8b946 Merge pull request #147 from joakim-hove/table-container
Using TableContainer.
2015-10-05 15:08:13 +02:00
Joakim Hove
1a0358d85a Using TableContainer. 2015-10-04 09:00:01 +02: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
6ef6dbcf5a Merge pull request #145 from bska/restore-build
Follow API update of BlackoilOutputWriter
2015-09-30 11:30:57 +02:00
Bård Skaflestad
13df018745 Follow API update of BlackoilOutputWriter
The constructor of class BlackoilOutputWriter gained a new parameter
in commit OPM/opm-autodiff@299b0aa (OPM/opm-autodiff#484).  Honour
new API requirement.
2015-09-30 11:01:01 +02:00
Atgeirr Flø Rasmussen
704ef9da2c Merge pull request #144 from akva2/fix_sibling_builds
fixed: make sure opm-common can be (re-)found
2015-09-16 16:27:45 +02:00
Bård Skaflestad
9390988f07 Merge pull request #143 from atgeirr/remove-args
Update for removed constructor args.
2015-09-14 17:08:09 +02:00
Atgeirr Flø Rasmussen
72509968b8 Update for changes in SaturationPropsFromDeck. 2015-09-14 15:07:45 +02:00
Atgeirr Flø Rasmussen
608ba47823 Update for removed constructor args. 2015-09-14 10:27:58 +02:00
Atgeirr Flø Rasmussen
8585843d69 Merge pull request #141 from akva2/rename_common
changed: sync with renaming to opm-common
2015-09-09 11:36:59 +02:00
Bård Skaflestad
854be06489 Merge pull request #142 from atgeirr/master
Update for opm-autodiff changes.
2015-09-08 10:07:14 +02:00
Atgeirr Flø Rasmussen
b324606084 Update to work with AutoDiffBlock::M now being AutoDiffMatrix. 2015-09-08 09:57:17 +02:00
Atgeirr Flø Rasmussen
6c00cddb35 Whitespace fix.
Made as a separate commit in order to make the next commit diff understandable.
2015-09-08 09:36:42 +02:00
Atgeirr Flø Rasmussen
0b316fc1db Merge pull request #139 from andlaus/satfunc_refactoring
AD simulators: include Evaluation.hpp before the other headers, only initialize the satfuncs once
2015-09-02 15:23:24 +02:00
Andreas Lauser
5eef205551 only initialize the satfuncs once
this makes the main files more similar to the primary simulator (i.e., flow.cpp)
2015-09-02 14:56:38 +02:00
Joakim Hove
d2cd65fe34 Merge pull request #140 from joakim-hove/table-refactor
Using TableManager to get tables.
2015-09-02 11:58:01 +02:00
Joakim Hove
86dfd557a0 Using TableManager to get tables. 2015-09-01 13:02:15 +02:00
Atgeirr Flø Rasmussen
ff16f9b3fe Merge pull request #138 from bska/fix-build
Restore build of flow_polymer
2015-08-25 15:20:54 +02:00
Bård Skaflestad
994e342d7b Restore build of flow_polymer
Function Opm::thresholdPressures() gained a new ParseMode parameter
in commit OPM/opm-core@09aa2b7 (PR OPM/opm-core#857).  Chase updated
call interface.
2015-08-25 09:30:44 +02:00
Atgeirr Flø Rasmussen
a57c4cf779 Merge pull request #137 from GitPaean/correcting_determination_in_range_velocity
correcting the determination of out-of-table-range velocity
2015-08-18 10:34:47 +02:00
Kai Bao
d9cb0066df correcting the determination of out-of-table-range velocity
comparing the location to the line instead of comparing the velocity
value directly.
2015-08-17 18:17:23 +02:00
Joakim Hove
fc2223605e Merge pull request #136 from joakim-hove/parsemode
Added ParseMode argument
2015-08-06 17:45:43 +02:00
Joakim Hove
71f3cc9c64 Added ParseMode argument 2015-07-27 13:53:11 +02:00
Atgeirr Flø Rasmussen
0c2c079bd9 Merge pull request #135 from atgeirr/update-for-api-change
Update to match changes in opm-autodiff.
2015-07-10 13:07:07 +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
Bård Skaflestad
8f46134861 Merge pull request #134 from GitPaean/companion_PR_autodiff_408
adapting to the change in autodiff#408
2015-07-01 14:41:41 +02:00
Kai Bao
c88b1d6a8b adapting to the change in autodiff#408 2015-06-24 14:23:25 +02:00
Atgeirr Flø Rasmussen
155ec16a3f Merge pull request #133 from GitPaean/Adding_SHRATE_RELATED
Adding shear-thinning effects based on keyword SHRATE
2015-06-23 15:15:32 +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
46edf7bb90 minor formatting for spaces for one if statement. 2015-06-23 14:02:57 +02:00
Kai Bao
c026503e91 more documents for BlackoilPolymerModel construction function. 2015-06-23 14:01:19 +02:00