OilfieldToolsNet/opm-core
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
5,833 Commits 9 Branches 35 Tags 15 MiB
24acbd1c23
Commit Graph

5833 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jørgen Kvalsvik
24acbd1c23 Use new DeckItem constructor interface. 2016-11-07 15:07:04 +01:00
Atgeirr Flø Rasmussen
76bdc081c0 Merge pull request #1099 from atgeirr/bump-version 
dune.module: change version to 2017.04-pre
 2016-11-04 12:30:17 +01:00
Atgeirr Flø Rasmussen
be462f6c3a dune.module: change version to 2017.04-pre 2016-11-04 12:26:59 +01:00
Joakim Hove
e348baa6c7 Merge pull request #1098 from jokva/phase-in-runspec 
Read phase information from EclipseState.runspec
 2016-11-02 11:52:24 +01:00
Andreas Lauser
5376fb618d Merge pull request #1096 from andlaus/Evaluation_accessors 
use accessor methods to access the value and derivatives of Evaluation objects
 2016-11-01 13:16:05 +01:00
Jørgen Kvalsvik
23ef9dce5c Read phase information from EclipseState.runspec 2016-11-01 11:37:27 +01:00
Atgeirr Flø Rasmussen
5d33f0d900 Merge pull request #1095 from atgeirr/fix-diag-twophase 
Fix saturation family diagnostics for two-phase case.
 2016-10-28 10:41:17 +02:00
Atgeirr Flø Rasmussen
e0dc670604 Merge pull request #1097 from totto82/initialTimestep 
Make it possible to set initial timestep
 2016-10-28 10:26:31 +02:00
Tor Harald Sandve
d96b7193ee Make it possible to set initial timestep 
Default is kept at -1.0. I.e. this PR does not change the current
behaviour.
 2016-10-28 09:03:29 +02:00
Andreas Lauser
1387c5f834 use accessor methods to access the value and derivatives of Evaluation objects 2016-10-27 16:53:52 +02:00
Atgeirr Flø Rasmussen
1ce4c47b09 Fix saturation family diagnostics for two-phase case. 2016-10-27 11:58:50 +02:00
Atgeirr Flø Rasmussen
5963dd0027 Merge pull request #1094 from atgeirr/completion-data-changes 
Adapt to changed data::Wells API.
 2016-10-25 13:58:37 +02:00
Atgeirr Flø Rasmussen
9dfd16cffb Adapt to changed data::Wells API. 2016-10-25 10:41:16 +02:00
Atgeirr Flø Rasmussen
125d1696d6 Merge pull request #1093 from dr-robertk/PR/fix-wellmanager-constructor 
Make WellsManager compile with c++-11.
 2016-10-23 07:36:08 +02:00
Atgeirr Flø Rasmussen
ad5d98664c Merge pull request #1075 from jokva/output-data-wells-sans-vectors 
WIP: Restore from data::Wells without vector dumps
 2016-10-21 14:58:10 +02:00
Robert Kloefkorn
d082d977fd Merge remote-tracking branch 'upstream/master' into PR/fix-wellmanager-constructor 2016-10-21 13:55:21 +02:00
Atgeirr Flø Rasmussen
cc72693348 Merge pull request #1090 from atgeirr/convergence-failure-problem-not-error 
Convergence failure is "problem" not "error"
 2016-10-21 12:49:10 +02:00
Robert Kloefkorn
044d47b9fb [bugfix] Make WellsManager compile with c++-11. 2016-10-21 10:43:32 +02:00
Andreas Lauser
c884b5c1d5 Merge pull request #1087 from andlaus/implement_JFUNC 
RelpermDiagnostics: fix the build
 2016-10-21 10:05:54 +02:00
Atgeirr Flø Rasmussen
069b65a635 Add option to enable logging (default true). 
This makes it possible to avoid logging from this class in a parallel setting.
 2016-10-20 22:39:08 +02:00
Atgeirr Flø Rasmussen
e38b9ffcb7 Classify convergence failure as a "problem" not "error". 2016-10-20 22:36:20 +02:00
Atgeirr Flø Rasmussen
8e8b624d4c Ensure logging only on first rank. 2016-10-20 22:36:20 +02:00
Andreas Lauser
7d9097490b RelpermDiagnostics: fix the build 
this broke because EclEpsScalingPointsInfo::extractScaled() now
requires the deck and the EclipseState as additional parameters.
 2016-10-20 20:01:03 +02:00
jokva
f4586f5380 Merge pull request #1089 from jokva/remove-shared-ptr 
The great shared_ptr purge
 2016-10-20 19:18:41 +02:00
Jørgen Kvalsvik
e98d6204ad Restore from data::Wells without vector dumps 
opm-output's data::Wells interface changed to no longer just accept a
dump of opm-core's WellState object. Update WellState to restore itself
from this new interface rather than reading the dumped vectors as-is.
 2016-10-20 16:36:47 +02:00
Jørgen Kvalsvik
1057e6d3d0 Update to shared_ptr-less parser interface. 2016-10-20 10:14:41 +02:00
Atgeirr Flø Rasmussen
518c9849ff Merge pull request #1092 from andlaus/fix_make_install 
fix `make install`
 2016-10-20 09:44:16 +02:00
Andreas Lauser
4ae5f16cb3 fix make install 
some CMakeLists_files.txt needed some adaptation after the recent unit
changes. this is analogous to OPM/opm-parser#943
 2016-10-19 15:22:41 +02:00
Atgeirr Flø Rasmussen
1fe0ee77c6 Merge pull request #1091 from atgeirr/fix-compile 
Undo premature API change adaption.
 2016-10-18 15:37:40 +02:00
Atgeirr Flø Rasmussen
33872cfb4a Undo premature API change adaption. 2016-10-18 15:34:53 +02:00
Atgeirr Flø Rasmussen
f72832dbd6 Merge pull request #1085 from andlaus/opm-parser_units 
consolidate the units code to opm-parser
 2016-10-18 15:25:20 +02:00
Joakim Hove
99d8ab73f4 Merge pull request #1081 from joakim-hove/celldata-container 
Header file moved in opm-output.
 2016-10-17 11:46:33 +02:00
Arne Morten Kvarving
35ffd9b647 Merge pull request #1086 from akva2/update_packaging_devtoolset 
update redhat6 packaging
 2016-10-12 15:53:47 +02:00
Arne Morten Kvarving
d25cefa011 update redhat6 packaging 
build using devtoolset-3
 2016-10-12 14:15:15 +02:00
Arne Morten Kvarving
7a295747de Merge pull request #1084 from akva2/update_packaging_dep_tree 
update packaging to reflect new dependency tree
 2016-10-12 14:14:48 +02:00
Andreas Lauser
07707ecc30 consolidate the unit system to opm-parser 
since the unit code within opm-parser is now a drop-in replacement,
this simplifies things and make them less error-prone.

unfortunately, this requires quite a few PRs. (most are pretty
trivial, though.)
 2016-10-10 17:50:26 +02:00
Arne Morten Kvarving
f91cb76086 update packaging to reflect new dependency tree 2016-10-10 09:39:24 +02:00
Joakim Hove
5fdb868526 Header file moved in opm-output. 2016-10-06 14:23:47 +02:00
Pål Grønås Drange
edb57704f9 Merge pull request #1082 from jokva/remove-shared-ptrs-from-schedule 
Schedule::getGroup returns reference, not pointer
 2016-10-06 13:01:19 +02:00
Jørgen Kvalsvik
29ba3465b4 Schedule::getGroup returns reference, not pointer 2016-10-05 15:24:14 +02:00
Atgeirr Flø Rasmussen
df24d28671 Merge pull request #1077 from blattms/quiet-opm-throw 
Log the message of exceptions in the catch clause of adaptive time stepper
 2016-10-04 12:34:26 +02:00
Markus Blatt
a44500623a Log the message of exceptions in the catch clause of adaptive time stepper. 2016-10-04 10:33:56 +02:00
Atgeirr Flø Rasmussen
22f7d1ec32 Merge pull request #1078 from andlaus/fix_initial_rs_and_rv 
set the Rv and Rs factors to the saturated values for cells which have no gas and no oil
 2016-09-30 14:40:06 +02:00
Atgeirr Flø Rasmussen
dda280fcf9 Merge pull request #1080 from akva2/units_constexpr 
changed: generate unit type conversion constants on compile-time
 2016-09-30 13:42:37 +02:00
Atgeirr Flø Rasmussen
227b5851b8 Merge pull request #1076 from totto82/start_using_TUNING2 
Add contructor for adaptiveTimeStepper that uses values from TUNING
 2016-09-30 13:02:50 +02:00
Arne Morten Kvarving
04fe79aa23 changed: generate unit type conversion constants on compile-time 
as a bonus it avoids unused variable warnings in compile
units only using parts of the conversion units.
 2016-09-30 11:35:28 +02:00
Tor Harald Sandve
f202f2948c Add initalizer for adaptiveTimeStepper that uses values from TUNING 
Some of the tuning values from the TUNING keywords is used to tune the
timestepping.
 2016-09-30 10:36:30 +02:00
Atgeirr Flø Rasmussen
a6995fdf3e Merge pull request #1073 from blattms/only-write-substeps-in-adaptive-time-stepper 
Only call writeTimeStep for real sub steps.
 2016-09-29 17:48:12 +02:00
Atgeirr Flø Rasmussen
fe19c589c4 Merge pull request #1071 from totto82/moveBlackoilstate 
Remove Compat.hpp
 2016-09-29 17:32:57 +02:00
Atgeirr Flø Rasmussen
98402c2e8d Merge pull request #1079 from akva2/update_petsc 
update petsc code
 2016-09-29 16:49:03 +02:00