Commit Graph

1485 Commits

Author SHA1 Message Date
Atgeirr Flø Rasmussen
72ec98f94b Merge pull request #343 from atgeirr/fix-flow-cp
Bugfix: distribute only if comm size is strictly > 1.
2015-04-08 10:18:30 +02:00
Atgeirr Flø Rasmussen
656e5de331 Bugfix: distribute only if comm size is strictly > 1. 2015-04-08 10:16:25 +02:00
Atgeirr Flø Rasmussen
62d3f37b1d Merge pull request #342 from dr-robertk/PR/some-improvemnts-on-solvers
More parameter for solvers.
2015-03-31 18:00:40 +02:00
Atgeirr Flø Rasmussen
170dbb58eb Merge pull request #341 from andlaus/use_EclipseState_for_summary_units
Revert "also pass the deck to the output writer"
2015-03-31 17:45:17 +02:00
Robert Kloefkorn
1b23de0b1c CPR: add verbosity as a parameter. 2015-03-31 12:54:26 +02:00
Robert Kloefkorn
632bc7a809 CPR: FastAMG seems not to be faster, so use regular AMG. 2015-03-31 12:42:58 +02:00
Robert Kloefkorn
adac4a7995 CPRPreconditioner: added tolerance and max iter as a parmeter.
Parameters are now a separate class to avoid long constructor parameter list.
2015-03-31 12:15:54 +02:00
Andreas Lauser
ba4fca5a77 Revert "also pass the deck to the output writer"
This reverts commit 88730e855f.
2015-03-31 12:11:45 +02:00
Robert Kloefkorn
90a7faf1a8 FullyIBOS: added parameter for minimal number of newton iterations, default stays at 0.
Also, don't throw an exception when the solver did not converge, just return -1
indicating that there was a problem.
2015-03-31 11:16:44 +02:00
Robert Kloefkorn
20316e0a8e NewtonBOCPR: allow to use either GMRes or BiCGStab. This will be revised once the new
linear solver interface is in place.
2015-03-31 11:04:31 +02:00
Atgeirr Flø Rasmussen
05bee313d3 Merge pull request #339 from andlaus/use_deck_units_for_summary_output
also pass the deck to the output writer
2015-03-27 12:30:20 +01:00
Andreas Lauser
88730e855f also pass the deck to the output writer 2015-03-26 17:33:13 +01:00
Atgeirr Flø Rasmussen
061e1bcbd7 Merge pull request #324 from andlaus/implement_temperature_dependent_density
Implement temperature dependent density
2015-03-26 15:10:28 +01:00
Atgeirr Flø Rasmussen
c524be454a Merge pull request #338 from flikka/add-output-header-file
Added SimulatorFullyImplicitBlackoilOutput.hpp to public headers, now us...
2015-03-25 12:54:03 +01:00
Kristian Flikka
fd2023a60f Added SimulatorFullyImplicitBlackoilOutput.hpp to public headers, now used by opm-polymer 2015-03-25 12:17:13 +01:00
Bård Skaflestad
7fa2d53db5 Merge pull request #337 from atgeirr/improve-helpers
Add new vertcatCollapseJacs() helper and use it
2015-03-24 17:13:47 +01:00
Atgeirr Flø Rasmussen
059bfaf036 Fix error in test for vertcatCollapseJacs(). 2015-03-24 15:05:05 +01:00
Atgeirr Flø Rasmussen
9af3296aa9 Add test for vertcatCollapseJacs().
The test case is non-trivial in that it concatenates elements with a mix of
empty() and non-empty jacobian vectors.
2015-03-24 09:50:34 +01:00
Atgeirr Flø Rasmussen
eb9b62697e Make vertcatCollapseJacs() handle constants properly.
With this, any or all of the input vector element may have
an empty jacobian vector. Any element with a non-empty
jacobian vector must still have the same block pattern.
2015-03-24 09:48:31 +01:00
Atgeirr Flø Rasmussen
085c279a0a Use vertcatCollapseJacs() for improved performance. 2015-03-20 11:19:42 +01:00
Atgeirr Flø Rasmussen
07258f0249 Add function vertcatCollapsJacs(). 2015-03-20 11:19:42 +01:00
dr-robertk
f288719e07 Merge pull request #334 from atgeirr/use-move-semantics
Use move semantics to gain performance
2015-03-20 10:47:07 +01:00
Atgeirr Flø Rasmussen
ad3da1d946 Re-add copying overload of AutoDiffBlock::function(). 2015-03-19 11:46:48 +01:00
Andreas Lauser
f0c3a6f892 add glue code needed for thermal gas PVT 2015-03-17 13:34:29 +01:00
Andreas Lauser
924818f445 add glue code needed for thermal oil PVT 2015-03-17 13:34:29 +01:00
Andreas Lauser
debb8a1a04 add glue code needed for thermal water PVT 2015-03-17 13:34:29 +01:00
Atgeirr Flø Rasmussen
0a76af1b14 Include <utility> for std::move(). 2015-03-17 09:46:15 +01:00
Atgeirr Flø Rasmussen
f0ba4a5797 Use swap() and move() to reduce copying in formEllipticSystem(). 2015-03-16 14:22:32 +01:00
Atgeirr Flø Rasmussen
5ff65b40e1 Fix bug added when adapting to new API.
Avoid using invalidated 'jacs', make copy.
2015-03-16 14:22:32 +01:00
Atgeirr Flø Rasmussen
a4a3505fae Remove unused method computeRelPermWells(). 2015-03-16 14:22:32 +01:00
Atgeirr Flø Rasmussen
04b255a03f Make more use of move semantics in AD code.
This makes some API changes to AutoDiffBlock.
 - Add overload for the constant() constructor taking rvalue ref.
 - Add overload for the variable() constructor taking rvalue ref.
 - Make the function() constructor *require* rvalue refs.
 - Add a swap() function.

The remaining changes in this commit are follow-ups especially
to the third change (adding std::move in many places), and
some removal of unnecessary block pattern arguments from calls to
the constant() static method.
2015-03-16 14:22:32 +01:00
Atgeirr Flø Rasmussen
635f3db814 Use references in computeRelperm(). 2015-03-16 14:22:32 +01:00
Atgeirr Flø Rasmussen
5d5ab267d2 Use std::move() in variableState(). 2015-03-16 14:22:31 +01:00
Bård Skaflestad
531bc7fd73 Merge pull request #333 from atgeirr/reduce-recalculation
Reduce recalculation of phase pressures
2015-03-11 09:20:51 +01:00
Bård Skaflestad
5ae25819f1 Merge pull request #331 from dr-robertk/PR/eclipsewriter-only-summary-in-substeps
SimFullyImplBO: write simulation state at all report step and in the end.
2015-03-10 12:32:11 +01:00
Robert Kloefkorn
11ef164865 SimFullyImplBO: write simulation state at all report step and in the end when adaptive
TS is enabled.
2015-03-10 12:12:31 +01:00
Atgeirr Flø Rasmussen
f6b28b0f66 Add helper computeGasPress(), use to improve performance.
This avoids excessive calling of constantState().
2015-03-09 10:56:35 +01:00
Atgeirr Flø Rasmussen
ec9f5c1634 Move initial term computation to assemble(). 2015-03-09 10:56:35 +01:00
Atgeirr Flø Rasmussen
8f91296974 Eliminate extra computePressure() calls.
The function still gets called more than necessary,
but that is due to its use in variableState() and that
constantState() calls variableState().
2015-03-09 10:56:35 +01:00
Bård Skaflestad
50fd23bffe Merge pull request #330 from atgeirr/simplify-props
Further simplify properties
2015-03-09 10:25:56 +01:00
Atgeirr Flø Rasmussen
818b653c15 Removed extra overload of relperm(). 2015-03-09 09:40:30 +01:00
Atgeirr Flø Rasmussen
a347e35304 Removing extra overloads of rsSat() and rvSat().
Also a few minor fixes to docs and indentation while in the area.
2015-03-09 09:40:30 +01:00
Atgeirr Flø Rasmussen
64769f1062 Merge pull request #332 from atgeirr/fix-compile-error
Fix compile error instroduced by merging #275.
2015-03-09 09:39:02 +01:00
Atgeirr Flø Rasmussen
ae31c034b6 Fix compile error instroduced by merging #275.
Moved output directory code near top again, changed rank query
to use Dune::MPIHelper instead of the grid.
2015-03-09 09:37:16 +01:00
Joakim Hove
8e9cc4728e Merge pull request #275 from joakim-hove/use-OpmLog
Using OpmLog instead of explicit logger
2015-03-09 08:08:07 +01:00
Joakim Hove
9b7d84bd9f ERT-830: Using OpmLog instead of explicit logger 2015-03-09 08:00:13 +01:00
Bård Skaflestad
eed6b0a4a3 Merge pull request #329 from atgeirr/fix-rateconverter-test
Fix for test failures after #327.
2015-03-05 16:27:28 +01:00
Atgeirr Flø Rasmussen
17117e7a0e Avoid storing return value in reference.
Normally this is OK for by-value returns, but here the right hand side
was changed to call ADB::value(), which returns by reference.
2015-03-05 16:07:04 +01:00
Atgeirr Flø Rasmussen
17b2a0e726 Merge pull request #327 from atgeirr/simplify-props
Simplify properties
2015-03-05 14:01:41 +01:00
Atgeirr Flø Rasmussen
d9d3554cb7 Merge pull request #328 from dr-robertk/PR/tolerance-wells
Output Newton and Lienar solver iterations
2015-03-05 11:32:47 +01:00