Atgeirr Flø Rasmussen
19f4cef6c1
Add new step() overload taking initial states separately.
2016-06-17 11:14:32 +02:00
Atgeirr Flø Rasmussen
fab64f5afb
Add non-const overload of model().
2016-06-17 11:14:21 +02:00
Atgeirr Flø Rasmussen
6fed5a50c3
Merge pull request #726 from atgeirr/const-preparestep
...
Use const reference parameters for prepareStep()
2016-06-17 09:21:27 +02:00
Atgeirr Flø Rasmussen
b21f4e16da
Merge pull request #725 from atgeirr/add-to-helperops
...
Add connection_cells member of HelperOps.
2016-06-17 09:03:26 +02:00
Atgeirr Flø Rasmussen
194288865b
Fix forgotten prepareStep() signatures.
2016-06-17 08:41:12 +02:00
Atgeirr Flø Rasmussen
bf5fecfe9a
Make prepareStep() parameters const.
2016-06-17 08:41:02 +02:00
Atgeirr Flø Rasmussen
5f51fea874
Add connection_cells member of HelperOps.
2016-06-16 16:21:37 +02:00
Joakim Hove
d6b3650160
Merge pull request #724 from jokva/eclipse-writer-nnc-constructor
...
Pass NNC to OutputWriter constructor
2016-06-16 15:56:14 +02:00
Jørgen Kvalsvik
dfac3adaea
Pass NNC to OutputWriter constructor
...
Keep up with an interface change in opm-output.
2016-06-16 13:34:29 +02:00
Atgeirr Flø Rasmussen
691969eb86
Merge pull request #721 from qilicun/minor-format-change
...
Add blank line before and after "Reading Parameters"
2016-06-16 08:57:55 +02:00
Liu Ming
49fbf5e493
document function and switch implementation.
2016-06-16 14:02:34 +08:00
Liu Ming
8224e7cef9
switch function calling order.
2016-06-16 09:48:39 +08:00
Atgeirr Flø Rasmussen
77562c8cbb
Merge pull request #718 from akva2/move_opm_output_upstream
...
update jenkins build scripts
2016-06-15 15:12:16 +02:00
Liu Ming
936cd8dc33
Add separate function for setup logging.
2016-06-15 15:24:05 +08:00
Joakim Hove
9c146eb611
Merge pull request #719 from joakim-hove/travis-reorg
...
Using build-all travis configuration.
2016-06-13 10:29:09 +02:00
Liu Ming
969ce5ca53
add blank line before and after "Reading Parameters"
2016-06-13 13:43:50 +08:00
Joakim Hove
56574d529a
Using build-all travis configuration.
2016-06-10 13:52:16 +02:00
Arne Morten Kvarving
07ef957352
update jenkins build scripts
...
update build order, opm-output moved in the dependency tree
2016-06-10 13:29:21 +02:00
Joakim Hove
dd5d9b34a2
Merge pull request #688 from jokva/refactor-output-restart
...
Breaking opm-core dependency in opm-output; new summary implementation
2016-06-10 13:15:46 +02:00
Atgeirr Flø Rasmussen
a8760654f7
Merge pull request #717 from qilicun/use-prefix
...
use default prefix.
2016-06-10 11:19:54 +02:00
Liu Ming
8f04300ce3
use default prefix.
2016-06-10 09:27:49 +02:00
Atgeirr Flø Rasmussen
ccde26143c
Merge pull request #709 from qilicun/add-new-type
...
Support new message type: Prtinfo
2016-06-08 11:35:31 +02:00
Liu Ming
7ca182f962
change Prtinfo to Note.
2016-06-08 09:18:10 +02:00
Atgeirr Flø Rasmussen
e861c495b8
Merge pull request #710 from blattms/use-real-parallel-l-infinity-norm
...
Fix the parallel L-infinity norm calculation.
2016-06-07 20:30:43 +02:00
Markus Blatt
82d6d949db
Fix the parallel L-infinity norm calculation.
...
It was computing a global maximum before, which obviously is not the same thing.
2016-06-07 15:10:25 +02:00
Atgeirr Flø Rasmussen
5d38c77881
Merge pull request #707 from blattms/support-ignoreconvergencefailure-for-cpr
...
Make CPR preconditioner honor linear_solver_ignoreconvergencefailure
2016-06-07 14:13:52 +02:00
Liu Ming
b2c126f7c2
Support new message type: Prtinfo
2016-06-07 14:11:24 +02:00
Markus Blatt
82556ca1d0
Fix uninitialized value
2016-06-07 12:40:24 +02:00
Markus Blatt
1656836f00
Change variable name along recommendation.
2016-06-07 12:38:56 +02:00
Markus Blatt
af881e84b2
Fix whitespace.
2016-06-07 12:37:21 +02:00
Atgeirr Flø Rasmussen
f9ecbaeefe
Merge pull request #706 from andlaus/lad_to_dad
...
rename some variables from "Lad" to "Eval" (was: to "Dad")
2016-06-07 11:46:44 +02:00
Atgeirr Flø Rasmussen
bceaf56c7e
Merge pull request #703 from atgeirr/log-output
...
Log well control switching message.
2016-06-07 11:39:01 +02:00
Atgeirr Flø Rasmussen
50e8c5dbd8
Merge pull request #708 from totto82/fix_hydrocarbonstate
...
Adds has_disgas and has_vapoil flags to hydrocarbonstate initialization
2016-06-07 11:38:27 +02:00
Andreas Lauser
a8df55e02f
rename some variables from "*Lad" to "*Eval"
...
this was an involuntary omission in the "local AD" to "dense AD"
rename...
2016-06-07 11:12:33 +02:00
Jørgen Kvalsvik
71560b5fb2
BlackoilOutputWriter rewritten to use opm-output
...
Changes to BlackoilOutputWriter as mandated by the split and rewrite of
opm-output. Notable changes:
* BlackoilOutputWriter is no longer a child class of OutputWriter.
* Minor interface changes; writeTimeStep requires a Wells pointer
* restore requires a Wells* pointer
* VTK/Matlab support rewrites; no longer inherits OutputWriter
* WellStateFullyImplicitBlackoil::report added, to write its data to a
opm-output understood format
Relies on utility/Compat.hpp for quick conversion to the opm-output
defined formats.
2016-06-07 10:15:07 +02:00
Tor Harald Sandve
d035881a0a
Adds has_disgas and has_vapoil flags to hydrocarbonstate initialization
...
Gas saturation must be used as primalvariable if DISGAS and VAPOIL is
not used.
2016-06-07 08:23:47 +02:00
Atgeirr Flø Rasmussen
edae7da526
Merge pull request #705 from qilicun/use-debug-backend
...
Write debug information into a separate file.
2016-06-06 16:11:48 +02:00
Liu Ming
db1e0fa397
write all the messages into debug file.
2016-06-06 15:39:10 +02:00
Andreas Lauser
87c7b2c720
Merge pull request #704 from andlaus/localad_to_densead
...
rename "local AD" to "dense AD"
2016-06-06 14:03:09 +02:00
Liu Ming
865577742f
write debug information into a separate file.
2016-06-06 12:20:41 +02:00
Markus Blatt
a1096f222c
Make CPR preconditioner honor linear_solver_ignoreconvergencefailure
2016-06-06 08:43:56 +00:00
Andreas Lauser
d45ba7732e
rename "local AD" to "dense AD"
2016-06-02 20:20:04 +02:00
Atgeirr Flø Rasmussen
cf5dbf292a
Log well control switching message.
...
Instead of writing to std::cout.
2016-05-30 10:26:20 +02:00
Atgeirr Flø Rasmussen
8a76adb658
Merge pull request #700 from dr-robertk/PR/flag-to-ignore-solverconv
...
Ignore linear solver convergence failure.
2016-05-27 13:21:01 +02:00
Robert Kloefkorn
93386b44ed
Merge remote-tracking branch 'upstream/master' into PR/flag-to-ignore-solverconv
2016-05-27 12:56:20 +02:00
Robert Kloefkorn
7dd76cc967
NewtonIterationBlackoilInterleaved: added flag to allow to ignore solver convergence
...
failure.
2016-05-27 12:55:46 +02:00
Atgeirr Flø Rasmussen
0659ae9356
Merge pull request #699 from blattms/add-missing-fstream-include
...
Fix incomplete type error for std::ofstream in examples
2016-05-27 11:15:47 +02:00
Markus Blatt
9bd2f7c1dc
Fix incomplete type error for std::ofstream in examples
...
On my system I got
```c++
error: variable ‘std::ofstream file’ has initializer but incomplete type
std::ofstream file(fname.str().c_str());
```
This is fixed with this commit by including fstream. Previously, this include might have happened implicitely.
2016-05-27 09:10:00 +00:00
Atgeirr Flø Rasmussen
decdd3185f
Merge pull request #698 from blattms/prevent-dereferencing-null-point-during-paralle-IO
...
Prevent dereferencing a null pointer during parallel output.
2016-05-26 07:53:28 +02:00
Atgeirr Flø Rasmussen
ab0df10354
Merge pull request #696 from blattms/distribute-hydrocarbonstate
...
Correctly distribute the hydro carbon state for parallel runs.
2016-05-26 07:49:10 +02:00