OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2026-09-05 04:40:19 -05:00
Code Issues Packages Projects Releases Wiki Activity
3,098 Commits 31 Branches 117 Tags
885e3aa56157ad4fa7f0c1bbaa4570a2aab43f18
Commit Graph
3098 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Atgeirr Flø Rasmussen 885e3aa561 Merge pull request #576 from andlaus/opm-material_PVT 
use the blackoil PVT classes from opm-material instead of the opm-core ones
 2016-02-11 22:39:38 +01:00
Andreas Lauser 13d2f35493 BlackoilPropsAdFromDeck: fix a few typos 
these definitively do not change the results.
 2016-02-11 17:07:24 +01:00
Atgeirr Flø Rasmussen 2d7b9f7663 Merge pull request #580 from atgeirr/master 
Fix minor issue with const POD requirements.
 2016-02-11 16:21:49 +01:00
Atgeirr Flø Rasmussen a356a100f7 Fix minor issue with const POD requirements. 
A user-defined default constructor is required in this situation
unless explicitly using the empty-brace-init syntax.

See discussion here:
http://stackoverflow.com/questions/7411515/why-does-c-require-a-user-provided-default-constructor-to-default-construct-a
 2016-02-11 16:17:17 +01:00
dr-robertk 00a6a6c9be Merge pull request #565 from chflo/OPM-188-restart 
Start Flow from restart file
 2016-02-10 15:04:39 +01:00
chflo 3fc8ea4c9c Added restart test 2016-02-10 14:47:56 +01:00
chflo 399b4f11c4 restart flow 2016-02-10 14:47:55 +01:00
Andreas Lauser 64c94aebc7 use the blackoil PVT classes from opm-material instead of the opm-core ones 2016-01-29 12:56:19 +01:00
Bård Skaflestad 2c9a727844 Merge pull request #574 from jokva/clean-up-header 
Improve includes from opm-parser
 2016-01-26 13:37:53 +01:00
Jørgen Kvalsvik 850f0884f1 Improve includes from opm-parser 
Adopting to opm-parser PR#661, add previously missing includes.

OPM/opm-parser#661
 2016-01-26 13:32:34 +01:00
Bård Skaflestad 00073dbf9f Merge pull request #573 from jokva/fix-header-include-parser656 
Fixes includes wrt opm-parser PR-656
 2016-01-21 10:32:54 +01:00
Jørgen Kvalsvik 087710df7d Fixes includes wrt opm-parser PR-656 
Several files stopped compiling due to relying on opm-parser headers doing
includes. From opm-parser PR-656 https://github.com/OPM/opm-parser/pull/656
this assumption is no longer valid.
 2016-01-20 15:11:30 +01:00
Joakim Hove b41f70cad0 Merge pull request #567 from joakim-hove/table-column 
Table column
 2016-01-08 15:29:21 +01:00
Atgeirr Flø Rasmussen 19c168caca Merge pull request #570 from atgeirr/fix-api-change 
Fix change in signature of extractPvtTableIndex() in solvent props.
 2016-01-08 14:49:50 +01:00
Atgeirr Flø Rasmussen 7e1af01ad7 Fix change in signature of extractPvtTableIndex() in solvent props. 2016-01-08 14:47:41 +01:00
Joakim Hove 24601480e3 Using new Table api. 2016-01-08 13:57:38 +01:00
Joakim Hove 833f5d053f Avoid using Deck. 
Removed incorrect use of Deck for polymer and solvent properties.
 2016-01-08 13:57:37 +01:00
Atgeirr Flø Rasmussen d47202b676 Merge pull request #569 from chflo/OPM-163 
OPM-163: Changed signature for method extractPvtTableIndex
 2016-01-08 13:36:22 +01:00
chflo 41b928a190 OPM-163: Changed signature for method extractPvtTableIndex 2016-01-07 16:43:38 +01:00
Bård Skaflestad d14de856fe Merge pull request #564 from atgeirr/improve-errmsg 
Improve threshold pressure mismatch error message.
 2016-01-04 10:54:41 +01:00
Atgeirr Flø Rasmussen 2505183887 Improve threshold pressure mismatch error message. 2015-12-28 09:22:53 +01:00
Atgeirr Flø Rasmussen 5315a0dfba Merge pull request #561 from atgeirr/refactor-extended-mains 
Refactor main functions of all Flow variants.
 2015-12-22 15:20:59 +01:00
Atgeirr Flø Rasmussen 6839b811f2 Make polymer solver use direct solver only. 
The interleaved solver should work for this case, but does not currently.
 2015-12-21 15:05:32 +01:00
Atgeirr Flø Rasmussen 8507427d83 Use correct syntax for logical not. 2015-12-21 14:55:33 +01:00
Atgeirr Flø Rasmussen dc4274f4a2 Include nncs in threshold pressures. 
This was left out when rebasing (it had been introduced in the flow etc. mains).

This also fixes a bug: the nnc thresholds should be inserted at the end of the
vector to be consistent with the operators, not at the beginning.
 2015-12-21 11:12:55 +01:00
Atgeirr Flø Rasmussen 78dbb79ea4 Fix compile error for in-class member init. 
Reported by Kai Bao.
 2015-12-21 11:12:01 +01:00
Atgeirr Flø Rasmussen bfcbd09488 Create and use FlowMainPolymer class. 2015-12-18 13:58:13 +01:00
Atgeirr Flø Rasmussen b420cccfc3 Add warning about simulating without WPOLYMER. 
Warning was in the main() of flow_polymer.cpp,
but will disappear from there after refactoring.
 2015-12-18 13:58:13 +01:00
Atgeirr Flø Rasmussen b156ce0b55 Create and use FlowMainSolvent class. 2015-12-18 13:58:13 +01:00
Atgeirr Flø Rasmussen 39900761a8 Transform FlowMain to use CRTP. 
Main content is now in FlowMainBase, which takes Implementation as
a template parameter. FlowMain inherits from FlowMainBase with itself
as Implementation template parameter. Only the createSimulator() method
is implemented in FlowMain (as opposed to in FlowMainBase). All subclasses
must implement createSimulator().
 2015-12-18 13:58:13 +01:00
Atgeirr Flø Rasmussen bb49ddbfc4 Improve comments. 2015-12-18 13:58:13 +01:00
Atgeirr Flø Rasmussen 4d31a99f5b Moved content of warnIfUnusedParams() into runSimulator(). 2015-12-18 13:58:13 +01:00
Atgeirr Flø Rasmussen 4711fd3dfe Complete refactoring of FlowMain. 2015-12-18 13:58:13 +01:00
Atgeirr Flø Rasmussen 7a536570dc Split out readDeckInput() method. 2015-12-18 13:58:13 +01:00
Atgeirr Flø Rasmussen 4fae28f3d3 Split out setupOutput() method. 2015-12-18 13:58:13 +01:00
Atgeirr Flø Rasmussen 64eef0609a Split out setupParameters() method. 2015-12-18 13:58:12 +01:00
Atgeirr Flø Rasmussen 966ace2c53 Split out printStartupMessage() method. 2015-12-18 13:58:12 +01:00
Atgeirr Flø Rasmussen c1bd7670c6 Refine OpenMP number-of-threads output. 
Now each MPI rank will report, making it easier to see how
MPI and OpenMP interacts w.r.t. processes and threads.
 2015-12-18 13:58:12 +01:00
Atgeirr Flø Rasmussen f7c96b4fc5 Split out function setupParallelism(). 2015-12-18 13:58:12 +01:00
Atgeirr Flø Rasmussen e3ceac44a6 Renamed flowMain.hpp -> FlowMain.hpp. 2015-12-18 13:58:12 +01:00
Atgeirr Flø Rasmussen abf5443f33 Replace flowMain() function with FlowMain class. 2015-12-18 13:58:12 +01:00
Atgeirr Flø Rasmussen 8e2cb4161a Merge pull request #553 from atgeirr/refactor-flow-main 
Minor refactoring in flow.cpp
 2015-12-18 13:47:24 +01:00
Atgeirr Flø Rasmussen b10b028aa1 Documented flowMain(). 2015-12-14 16:11:35 +01:00
Atgeirr Flø Rasmussen 29d18261c6 Make multisegment flow variants use flowMain(). 2015-12-14 16:11:35 +01:00
Atgeirr Flø Rasmussen f02fd71404 Use Simulator::ReservoirState in flowMain(). 2015-12-14 16:11:06 +01:00
Atgeirr Flø Rasmussen 460f0cb451 Use the new flowMain() function. 
Also add it to the CMake file list.
 2015-12-14 16:11:06 +01:00
Atgeirr Flø Rasmussen 51a03e6212 Extract content of flow main() to separate template function. 
The function is templated on grid and simulator class, so this allows
flow and flow_mpi to be implemented without any macro tricks, instead
simply including and using different grid types.
 2015-12-14 16:07:47 +01:00
Atgeirr Flø Rasmussen be9b6a3cd2 Unconditionally instantiate the (possibly fake) MPI helper. 
This reduces the difference between flow and flow_mpi. For builds
without MPI, the fake helper from Dune is instantiated, which has
the same interface.
 2015-12-14 16:07:47 +01:00
Atgeirr Flø Rasmussen 7c5256031c Use GridInit in flow.cpp. 2015-12-14 16:07:47 +01:00
Atgeirr Flø Rasmussen af980ed93c Creates GridInit template class. 2015-12-14 16:07:46 +01:00