Atgeirr Flø Rasmussen
07d9ec135b
Make Main a non-template class again, simplify.
2020-04-16 11:35:01 +02:00
Håkon Hægland
ba625b0cb6
Refactor away flow_tag.hpp.
...
Refactors away flow_tag.hpp by having flow_blackoil_dunecpr.cpp,
flow_onephase.cpp, and flow_onephase_energy.cpp use the updated Main.hpp
from a previous pull request. This will eliminate the previous code
duplication in Main.hpp and flow_tag.hpp discussed in PR #2521 .
2020-04-15 15:05:56 +02:00
Håkon Hægland
3624725885
Merge flow_tag.hpp into Main.hpp.
...
Addresses the comments in PR #2521 regarding code duplication in
Main.hpp and flow_tag.hpp. This PR merges the code in flow_tag.hpp
into Main.hpp such that flow_tag.hpp can be eliminated (will be done
in the next PR).
2020-04-14 14:53:48 +02:00
Håkon Hægland
8c1a951e09
First PR in a splitting up of PR #2516 .
...
According to private discussion with @joakim-hove PR #2516 is splitted into
smaller parts to facilitate review and a quicker merge into master.
As mentioned in PR #2516 , main() in flow.cpp is refactored to address
the comments on PR #2127 and as preparation for implementing the Python
bindings described in PR #2403 .
2020-04-03 14:53:45 +02:00
Bård Skaflestad
022ba52200
Merge pull request #2514 from akva2/fix_filesystem_gcc9
...
changed: avoid calling parent_path on paths that has none
2020-04-03 12:41:14 +02:00
Arne Morten Kvarving
57d5eefd26
changed: avoid calling parent_path on paths that has none
...
causes a throw on gcc-9
2020-04-03 11:27:47 +02:00
Atgeirr Flø Rasmussen
0c8ce54b71
Merge pull request #2498 from blattms/cherry-pick-hnil-flexible-clean-interface-rebased
...
Cleaned up flexible solver improvements.
2020-04-02 15:28:10 +02:00
Markus Blatt
2e4824cbc7
Change default configuration to "ilu0".
...
The previous was "file" which resulted in runtime errors
like
Program threw an exception: No linear-solver-configuration-json-file given for linear-solver-configuration=file
2020-03-31 16:49:37 +02:00
hnil
2388a9b551
Added simple defaults for flexible solver: current options added ilu0, cpr_quasiimpes, cpr_trueimpes, file (genneal configuration)
...
This commit 0c62c8442
cherry-picked and slightly cleaned up and
adapted to recent changes.
2020-03-31 16:49:37 +02:00
Joakim Hove
d6a1d3029e
Use std::shared_ptr for Python handle to Schedule
2020-03-31 12:28:07 +02:00
Joakim Hove
f425758c25
Merge pull request #2501 from joakim-hove/add-python-arg
...
Add Python argument to Schedule constructor
2020-03-27 13:44:09 +01:00
Joakim Hove
30216212c4
Add Python argument to Schedule constructor
2020-03-26 10:15:07 +01:00
Arne Morten Kvarving
b698fe2c90
prune some unnecessary includes
2020-03-25 09:42:02 +01:00
Arne Morten Kvarving
a2d840a5f7
changed: put eclipse state broadcast in separate compilation unit
...
to avoid compiling several times for each flow variant
2020-03-19 09:31:52 +01:00
Arne Morten Kvarving
d9ab0e7522
remove old serialization support for ASTNode
2020-03-19 09:31:07 +01:00
Arne Morten Kvarving
7389959b88
remove old serialization support for WListManager
2020-03-19 09:31:07 +01:00
Arne Morten Kvarving
13f3b31bd6
add missing includes
2020-03-16 20:52:17 +01:00
Markus Blatt
09c2cb2107
Make flow variants use ParallelEclipseState just as flow
2020-03-16 10:09:26 +01:00
Arne Morten Kvarving
05286d8900
changed: simplify mpi setup
...
no need for a separate reference to the parallel state any longer
2020-03-16 08:20:44 +01:00
Arne Morten Kvarving
3389db4f4c
fixed: consistently use #if MPI instead of #ifdef MPI
2020-03-16 08:20:44 +01:00
Arne Morten Kvarving
38023fac21
changed: use EclMpiSerializer for Schedule
2020-03-16 08:20:44 +01:00
Arne Morten Kvarving
c40c733a57
fixed: build without MPI
2020-03-13 17:52:37 +01:00
Joakim Hove
4dfa22e6a2
Allow flow to continue with --sched-restart=false
2020-03-12 15:20:39 +01:00
Arne Morten Kvarving
e1bf6ed4a6
use eclmpiserializer for SummaryConfig broadcast
2020-03-10 10:01:26 +01:00
Joakim Hove
42f96ca039
Add commandline switch --sched-restart to control restart init
2020-03-04 15:44:32 +01:00
Arne Morten Kvarving
293612265e
fix build without MPI
2020-02-28 13:03:16 +01:00
Arne Morten Kvarving
05c0c4b6e8
Use the ParallelEclipseState and ParallelFieldPropsManager
...
with these in place, we now only parse the deck on the root process.
2020-02-28 10:26:55 +01:00
Arne Morten Kvarving
68a9d17de1
changed: pass/store deck as a pointer
...
and remove asserts for null-ptr. preparatory step for only
having deck on root mpi process
2020-02-28 10:26:55 +01:00
Joakim Hove
2e18107097
Add disabled functionality to init wells and group from restart file
2020-02-25 09:49:26 +01:00
Joakim Hove
d3bfa83c7c
Merge pull request #2343 from joakim-hove/move-rstconfig
...
RestartConfig has moved from EclipseState to Schedule
2020-02-20 07:07:37 +01:00
Arne Morten Kvarving
abc439d336
remove last usage of boost::filesystem
2020-02-18 08:54:37 +01:00
Joakim Hove
5ad4936025
RestartConfig has moved from EclipseState to Schedule
2020-02-17 21:48:12 +01:00
Arne Morten Kvarving
11e0e5b549
Merge pull request #2326 from akva2/fix_dune_fem
...
fixed: build with dune-fem enabled
2020-02-17 09:03:04 +01:00
Atgeirr Flø Rasmussen
5fe48dab8b
Merge pull request #2327 from akva2/bump_dune
...
Bump required dune version to 2.6
2020-02-11 09:41:44 +01:00
Robert Kloefkorn
e04bb6e91a
[feature][flow_blackoil] Added a variant to compile the blackoil option
...
only for faster development.
2020-02-10 12:11:30 +01:00
Arne Morten Kvarving
f4bc377996
fixed: build with dune-fem enabled
...
in that case we do not have an 'instance' of the static mpi helper
class.
2020-02-07 15:19:09 +01:00
Arne Morten Kvarving
4978e72039
bump required dune version to 2.6
...
remove compatiblity code with older versions
2020-02-06 16:24:39 +01:00
Bård Skaflestad
73a58c4599
Merge pull request #2287 from akva2/avoid_deck_for_phases
...
avoid instancing a new Runspec from deck to obtain active phases
2020-01-17 16:22:26 +01:00
Arne Morten Kvarving
8a14d70f97
avoid instancing a new Runspec from deck to obtain active phases
...
this is already available in the eclipseState.
in particular, this is preparing for the case where only the
root-process has a deck instance.
2020-01-17 15:36:30 +01:00
Arne Morten Kvarving
3fca2ae631
changed: avoid using deck setting up schedule on non-root processes
2020-01-17 10:29:46 +01:00
Tor Harald Sandve
ada7c9d90b
fix various extentions
2020-01-09 14:14:38 +01:00
Trine S. Mykkeltvedt
99e7785fb5
renamed saltwater-->brine and removed keywords from missingFeatures
2020-01-09 14:14:38 +01:00
Trine S. Mykkeltvedt
5749615bd8
addd simple salt/brine implementation
2020-01-09 14:14:38 +01:00
Arne Morten Kvarving
227ff00730
avoid usage of deck on all processes setting up SummaryConfig
2020-01-08 10:30:57 +01:00
Atgeirr Flø Rasmussen
cab0724a26
Merge pull request #2119 from blattms/fix-multiple-usage-printing-parallel
...
Only print usage information on one processes.
2019-11-22 15:23:27 +01:00
Arne Morten Kvarving
dd2a360e10
Merge pull request #2118 from blattms/fix-one-phase-namespace
...
Move BlackOilOnePhaseIndices to Opm namespace
2019-10-30 09:29:01 +01:00
Markus Blatt
e44f0445c4
Fixed indentation of a2db252
2019-10-30 08:55:05 +01:00
Markus Blatt
a2db252271
Move BlackOilOnePhaseIndices to Opm namespace
...
to make it consistent with the rest. OPM/opm-models#530 development
must have been started before the renaming in OPM/opm-models#532
and somehow the old namespace survived.
downstream PR of OPM/opm-models#577
2019-10-29 17:04:37 +01:00
Markus Blatt
10db57f66b
Only print usage information on one processes.
...
No matter whether requested via --help or printed due to a wrong
command line parameter.
Closes #2012 .
2019-10-29 17:00:24 +01:00
Joakim Hove
252829850e
Pass ParseContext settings in constructor
2019-10-25 14:30:13 +02:00