Alf Birger Rustad
673328a4e1
Remove WSEGAICD from missing features
2020-12-18 11:23:26 +01:00
Tor Harald Sandve
6b7c0e630a
report pre/post time
2020-12-10 13:40:41 +01:00
Tor Harald Sandve
73439070f7
Merge pull request #2963 from totto82/extbo_conv
...
add convergence check for extended blackoil model
2020-12-09 08:51:11 +01:00
Atgeirr Flø Rasmussen
6a376b3212
Merge pull request #2922 from atgeirr/make-new-well-rate-init-default
...
Make --alternative-well-rate-init=true the default.
2020-12-08 16:25:12 +01:00
Tor Harald Sandve
21fd76ccf6
add convergence check for extended blackoil model
2020-12-08 13:09:58 +01:00
Arne Morten Kvarving
7d19091cb3
changed: make member variables constexpr
...
may as well use the compile time information to eliminate
unnecessary code
2020-12-07 12:16:04 +01:00
Arne Morten Kvarving
bbf0f7d6af
remove unused members
2020-12-07 12:09:33 +01:00
Bård Skaflestad
d06b7f9ec2
Record Basic Support for WELPI
...
Remove 'WELPI' keyword from MissingFeatures.
2020-12-04 15:16:25 +01:00
Bård Skaflestad
3ac2f02f4f
Merge pull request #2839 from akva2/remove_liftopt_missing
...
remove LIFTOPT and WLIFTOPT from missing features
2020-12-04 13:52:09 +01:00
Paul Egberts
877c0b723d
fix missing argument for BlackoilTwophaseIndices
2020-12-03 09:04:11 +01:00
Paul Egberts
d0421582e1
add gas-water simulator
2020-12-03 09:04:11 +01:00
Alf Birger Rustad
b651469f34
Removed supported keywords from list
2020-11-19 09:36:30 +01:00
Ove Sævareid
0f7e66e151
Alternative solvent extension for the black oil model.
2020-11-17 12:33:19 +01:00
Atgeirr Flø Rasmussen
f967d82ad5
Make --alternative-well-rate-init=true the default.
2020-11-17 11:56:02 +01:00
Tor Harald Sandve
fbccdbf68e
Make a flow version that uses the polyhedreal grid
...
Currently the simulator creats the polyhedreal grid from an eclGrid from opm-common
TODO
- make it possible to create the grid directly from DGF or MRST format
- fix issue on norne.
2020-11-10 15:49:59 +01:00
Cintia Goncalves Machado
9695de9e8c
Delete some radial keywords from Missing Features
...
They are implemented in the SpyderWeb grid.
2020-11-06 14:26:59 +01:00
Håkon Hægland
7011a6c0b7
Restore cwd after each unittest.
...
Restores the original cwd after each unittest in test_basic.py. Also
simplifies add_test() in python/simulators/CMakeLists.txt such that the
Bash script wrapper run-python-tests.sh is no longer needed to run the
tests.
2020-11-04 13:51:36 +01:00
Håkon Hægland
648bab7108
Implements access to the porosity from Python.
...
Implements access (read/write) to the porosity from Python.
2020-11-03 17:18:14 +01:00
Håkon Hægland
53cbe0c57e
Initialize boolean variables in-class.
...
Initialize the boolean variables hasRunInit_ and hasRunCleanup_ in
the class instead of in the constructor.
2020-11-03 16:17:52 +01:00
Håkon Hægland
0403d4e6e7
Implements a Python step_cleanup() method.
...
Continues the work in #2735 on implementing Python bindings for the flow
simulator.
2020-11-03 16:12:12 +01:00
Cintia Goncalves Machado
27a00b3c59
Delete WEIR and WEIT
2020-10-28 19:17:53 +01:00
Atgeirr Flø Rasmussen
24b2393334
Add parameter --alternative-well-rate-init.
...
With this, a slightly more sophisticated procedure is used for well rate intialization.
Since it changes existing results, it defaults to false, giving the existing behaviour.
2020-10-15 17:56:11 +02:00
Arne Morten Kvarving
440cfdd38b
remove LIFTOPT and WLIFTOPT from missing features
2020-10-06 13:55:10 +02:00
Alf Birger Rustad
885c182b7e
Added one more decimal for hundreds of a second.
2020-10-02 15:13:41 +02:00
Alf Birger Rustad
a081394f32
Fixed alignement
2020-10-02 14:06:25 +02:00
Alf Birger Rustad
d36069c759
Remove confusing progress message.
2020-10-02 09:04:26 +02:00
Arne Morten Kvarving
36a42c0685
remove unused variables
2020-09-30 10:12:33 +02:00
Joakim Hove
0092ef0cf0
Pass location to ParseContext.handleError()
2020-09-28 16:58:37 +02:00
Atgeirr Flø Rasmussen
e8460b384e
Merge pull request #2804 from totto82/updateAndInvalid
...
Invalidate and update the intensive quantities at the same time
2020-09-28 09:02:25 +02:00
Atgeirr Flø Rasmussen
b5c5c28c16
Merge pull request #2788 from alfbr/new-defaults
...
New numerical defaults
2020-09-28 08:57:08 +02:00
Tor Harald Sandve
85e25f7e0e
Invalidate and update the intensive quantities instead of just invalidate them
2020-09-23 11:39:04 +02:00
Atgeirr Flø Rasmussen
68add695fe
Merge pull request #2735 from hakonhagland/python_step2
...
Implements a Python step() method.
2020-09-22 15:47:48 +02:00
Joakim Hove
c059653fa0
Add #include <opm/common/Exceptions.hpp>
2020-09-21 19:25:52 +02:00
Joakim Hove
cc6abb4086
Merge pull request #2796 from joakim-hove/rm-exceptions
...
Remove unused #include of exceptions
2020-09-21 16:33:19 +02:00
Joakim Hove
0565d6f402
Remove unused #include of exceptions
2020-09-21 11:12:15 +02:00
Joakim Hove
9809dcc804
Remove references to unused class SimulationDataContainer
2020-09-21 07:16:11 +02:00
Alf Birger Rustad
2e2bad179d
New default tuning parameters based on pore volume
2020-09-16 15:58:14 +02:00
Alf B. Rustad
d0c110e935
Removed duplicated OPTIONS
2020-09-13 23:15:01 +02:00
Alf B. Rustad
1b05ed1199
Removed OPERATER and OPERNUM since they are supported.
2020-09-13 22:40:20 +02:00
Atgeirr Flø Rasmussen
3dffb5d4da
Use log mechanism for info output, and tell the user the deck has been read.
2020-09-03 15:11:25 +02:00
Atgeirr Flø Rasmussen
92bdcbf597
Reinstate lost logging of header and parameters.
...
Also re-add the ability to do strict parsing.
2020-09-03 14:07:33 +02:00
Arne Morten Kvarving
7305f84351
use std::make_unique where applicable
2020-09-02 15:35:39 +02:00
Arne Morten Kvarving
f4f5fa3a5d
changed: remove one missed TTAG usage
...
also include header for the Scalar property definition
2020-08-28 10:44:53 +02:00
Arne Morten Kvarving
9a000c6d07
changed: remove SET_TAG_PROP macro usage
2020-08-28 10:44:53 +02:00
Arne Morten Kvarving
3b21a8a481
changed: remove SET_TYPE_PROP macro usage
2020-08-28 10:44:53 +02:00
Arne Morten Kvarving
93a3ebf8f7
changed: remove NEW_PROP_TAG macro usage
2020-08-28 10:44:53 +02:00
Arne Morten Kvarving
7d853d2e05
changed: remove SET_SCALAR_PROP macro usage
2020-08-27 13:01:51 +02:00
Arne Morten Kvarving
fca83318aa
changed: remove SET_INT_PROP macro usage
2020-08-27 13:01:51 +02:00
Arne Morten Kvarving
a79c37a041
changed: remove SET_STRING_PROP macro usage
2020-08-27 13:01:51 +02:00
Arne Morten Kvarving
0e71c0e29b
changed: remove SET_BOOL_PROP macro usage
2020-08-27 13:01:51 +02:00
Arne Morten Kvarving
e8248b44ff
changed: remove NEW_TYPE_TAG macro usage
2020-08-27 13:01:51 +02:00
Arne Morten Kvarving
914053ac3c
changed: remove GET_PROP_VALUE macro usage
2020-08-27 13:01:51 +02:00
Markus Blatt
c958034d26
Adapt and use readDeck from EclipseBaseVanguard, too.
...
This reduces code duplication ad should fix the bad_cast exception
when running ebos in parallel.
2020-08-27 09:05:09 +02:00
Markus Blatt
575245d785
Factored out logging setup and deck reading from class Main.
...
These codes are reimplemented in the ebos simulator and should
be reused, instead. This commit factilitates this and starts
reusing the logging setup code in ebos. Hence reduces code duplication.
2020-08-27 09:05:09 +02:00
Markus Blatt
75104fd310
Move to more consistent ownership of ECL data in EclBaseVanguard
...
We resort to consistently use unique_ptrs in EclBaseVanguard for
the data read from ECL files or set externally. This means that
during the simulation EclBaseVanguard owns this data and not Main
or the ebos setup functions. This ownership transfer becomes
transparent due to std::move.
This came up when trying to fix the parallel runs of ebos and during
that removing some code duplication.
2020-08-27 09:05:09 +02:00
Markus Blatt
83bfd4edfc
Merge pull request #2738 from akva2/more_macro_replacement
...
More macro replacement
2020-08-27 08:46:25 +02:00
Arne Morten Kvarving
74fac38d85
changed: remove GET_PROP_TYPE / GET_PROP macro usage
2020-08-27 08:19:39 +02:00
Arne Morten Kvarving
82a35e53b7
changed: remove TTAG macro calls
2020-08-27 08:19:39 +02:00
Markus Blatt
bee46ed309
Finally fix selection for relaxed tolerance.
...
Default values are MaxStrictIter=8 and RelaxedPvFraction=1.0.
To activate relaxed pv fraction set MaxStrictIter to 0 and
fraction below 1.
2020-08-26 15:42:27 +02:00
Tor Harald Sandve
25c8a219a5
Merge pull request #2701 from blattms/relaxed-cnv-based-on-pv-fraction
...
relaxed tolerance for CNV if only small fraction of PV is violated
2020-08-25 15:02:06 +02:00
Markus Blatt
92b1708433
Use reference to ebos residual to prevent copying.
2020-08-25 14:07:27 +02:00
Håkon Hægland
81319a7923
Implements the Python step() method.
...
A resubmission of commit 8e4f748
in PR #2403 and PR #2444 and continues
the work in #2690 implementing Python bindings to the flow simulator.
The Python step() method advances the simulator one report step. Before
calling step() for the first time, step_init() must have been called.
2020-08-25 13:42:48 +02:00
Håkon Hægland
3749dcab7d
Implements the Python step_init() function.
...
A resubmission of commit 11eaa3d7
in PR #2403 and PR #2443 and continues
the work in #2555 implementing Python bindings to the flow simulator.
The step_init() method initializes the simulation. It is required for the
Python script to run step_init() before calling the step() method (which
will be implemented in a later commit).
2020-08-24 10:27:50 +02:00
Håkon Hægland
c6752c1e0e
Clarify by using this->
...
Clarify usage of member variables in FlowMainEbos.hpp by prefixing with
this->.
Also rebased PR on the current master, and updated
flow_ebos_oilwater_brine.cpp according to the PR.
2020-08-24 08:35:04 +02:00
Håkon Hægland
f9d47b7c68
Capture some variables in FlowMainEbos.
...
Make Opm::FlowMainEbos capture the variables argc, argv, outputCout, and
outputFiles. Passing the variables to the constructor and saving them as
class variables in Opm::FlowMainEbos makes the implementation of the
Python interface simpler. For example, the step_init() method does not
need to ask Opm::Main about the values of the variables when it needs to
run execute() in FlowMainEbos.
Another advantage of this refactoring could be that less variables needs
to be passed around from Opm::Main, to flow_ebos_xxx.cpp, and then again
to FlowMainEbos.
2020-08-24 00:19:19 +02:00
Arne Morten Kvarving
70908d9017
changed: remove BEGIN_PROPERTIES/END_PROPERTIES macro usage
2020-08-21 15:50:35 +02:00
Markus Blatt
efe17780e2
Reinforce maxStrictIter for the newton.
...
That was removed before in lieu of the fraction of cells that
violate CNV.
This change should make the results as before unless somebody changes
maxStrictIter or RelaxedMaxPvFraction
2020-08-19 14:42:40 +02:00
Markus Blatt
f65eca3310
Use RelaxedMaxPvFraction 0 for now.
...
This should make the tests work.
2020-08-18 16:57:16 +02:00
Markus Blatt
e040484580
relaxed tolerance for CNV if only small fraction of PV is violated
...
Previously we used relaxed tolerance once a certain number of Newton
steps was exceeded. Now we check for all cells violating CNV locally
and if their pore volume is less than a certaun fraction (default 3%)
we use the relaxed tolerance (default: 1e9)
Original idea originated from Norce.
2020-08-18 16:57:16 +02:00
Tor Harald Sandve
bd9186b41d
implement Saltvd
2020-08-18 10:55:43 +02:00
Kai Bao
08b93424f3
setting UseInnerIterationsWells default to be false
...
and reducing default MaxInnerIterWells to be 50, which should not matter
much. We should try to reduce it further to something like 20, 10 later.
2020-08-11 09:46:23 +02:00
Kai Bao
11807747cb
renaming solveWellEqUntilConverged to be iterateWellEquations
2020-08-11 09:10:19 +02:00
Tor Harald Sandve
fc45b1bd47
Add inner iterations for standard wells also
2020-08-11 09:10:19 +02:00
Tor Harald Sandve
fdf0f1ed27
SALTVD and BDENSITY is not implemented
2020-07-02 13:49:05 +02:00
Tor Harald Sandve
fce0ba6759
Add oil water brine specialization
2020-06-30 10:41:28 +02:00
Håkon Hægland
23505cf5c9
Fixed up minor issues from review of PR #2645
...
Renamed some functions, and checked the return value from runStep().
2020-06-23 12:14:07 +02:00
Håkon Hægland
e8a4065192
Refactor SimulatorFullyImplicitBlackoilEbos.hpp
...
A resubmission of commit bb20804
in PR #2403 and PR #2442 to work with the
current master.
Continues the work in #2619 and #2631 to refactor main simulation loop in
flow to work with the Python bindings.
The run() method in SimulatorFullyImplicitBlackoilEbos.hpp is refactored
in preparation for the implementation of a Python step() function in a
later commit. Currently run() is called from runSimulatorInitOrRun() in
FlowMainEbos.hpp using the runSimulatorRunCallback_(). Later, there
will be other callbacks like runSimulatorStepInitCallback_(), and
runSimulatorStepCallback_(), that will need to call different parts of
the code in run(). The run() function is thus refactored into run(),
runInit(), runStep(), and runLastStep(). Also, some of the local
variables in run() have to be made persistent between calls to
runStep(), this applies to variables report, solverTimer, totalTimer,
and adaptiveTimeStepping, which are made private class variables.
2020-06-23 11:50:57 +02:00
Arne Morten Kvarving
41e7201c73
make parseSuccess dependent on MPI
...
avoids unused warnings when building without
2020-06-19 09:46:21 +02:00
Markus Blatt
9870206c53
flow --help|--print-properties=1|--print-parameters=1} returns 0
...
Previously (in this PR) they returned an error code.
2020-06-03 16:49:29 +02:00
Markus Blatt
2457133ebf
Use MPI_Abort to make flow return nonzero error codes in parallel.
...
The previously used MPI_Finalize might have resulted in returning
zero even if there were problems.
2020-06-03 16:48:50 +02:00
Markus Blatt
f8201e5a94
Catch parser errors in parallel and abort.
...
Previously only the master process was aware of the error and flow did
deadlock in parallel runs if there were parser errors
encountered. With this commit all processes are made aware of the
problem and flow aborts with an error code.
2020-06-03 11:14:57 +02:00
Atgeirr Flø Rasmussen
6f1a159adc
Merge pull request #2611 from totto82/improveConvergenceMSW
...
Improve convergence msw
2020-05-30 17:00:30 +02:00
Atgeirr Flø Rasmussen
2261c1ee74
Merge pull request #2637 from hnil/hide_vtk
...
Hide vtk
2020-05-29 08:21:31 +02:00
Joakim Hove
4ab3b92298
Merge pull request #2631 from hakonhagland/refac_run_simulator
...
Refactor runSimulator().
2020-05-29 07:25:49 +02:00
Atgeirr Flø Rasmussen
20c63f9f49
Merge pull request #2624 from OPM/fix/adapt-to-propertysystem-changes
...
adapt to changes in the property system
2020-05-28 12:05:17 +02:00
hnil
16edd5ecc5
fixed commented code
2020-05-26 22:04:42 +02:00
hnil
95ead78a0d
made all vtk paramters allways be hidden
2020-05-26 21:56:51 +02:00
hnil
81714806c2
hide all vtk related if not vtk enabled
2020-05-26 16:16:42 +02:00
Tor Harald Sandve
82b424c2cf
don't regularize MSW as default
2020-05-22 20:52:14 +02:00
Tor Harald Sandve
8a5c9e82df
add run time parameters for msw convergence tuning. Default values are set to minimize convergence failures for model2 based tests. These parameters are also tested on bigger models with good results
2020-05-22 20:52:14 +02:00
Håkon Hægland
2734445bf5
Refactor runSimulator().
...
A resubmission of commit b25f489
in PR #2403 and PR #2441 to work with
the current master.
Continues the work in PR #2619 to refactor FlowMainEbos.hpp to work with
the Python bindings.
We need to refactor runSimulator() to avoid code duplication when
executeStepInit() is implemented (see later commit). Here, runSimulator()
is refactored into a runSimulatorInitOrRun() that takes a callback
function. When runSimulatorInit() is implemented it will pass a different
callback that only initializes the simulator. Currently, runSimulator()
passes the callback runSimulatorRunCallback_() which runs the whole
simulation. The code outputting the simulation summary in runSimulator()
is also refactored into a runSimulatorAfterSim_() method.
2020-05-19 16:52:46 +02:00
Bernd Flemisch
21df1cbe31
[properties] adapt to changes in the property system
...
`NEW_PROP_TAG` is now a definition and not just a declaration.
Eliminate superfluous declarations, include headers with definitions.
Make one necessary forward declaration explicit.
2020-05-18 15:54:26 +02:00
Håkon Hægland
fcddbbba52
Refactor execute() in FlowMainEbos.hpp
...
Currently, execute() calls runSimulator() to run the simulation. When
the Python step_init() is implemented (see a later commit), it will
instead call an executeStepInit() that will need to do the same
initialization as in execute() except that it should call a
runSimulatorInit() instead of runSimulator(). In order to avoid code
duplication for execute() and executeStepInit(), execute() is here
refactored into an execute_() method.
2020-05-13 16:59:29 +02:00
Håkon Hægland
8bb914b144
Fixed bug in initFlowEbosBlackoil()
...
The return code from the call to initialize_() in initFlowEbosBlackoil()
in Main.hpp was overwritten by a mistake.
2020-05-13 13:45:16 +02:00
Håkon Hægland
946b5f5806
Refactor flow_ebos_blackoil.cpp (2)
...
NOTE: this pull request depends on #2555 which should be merged first.
A rewrite of the outdated PR #2543 .
Refactors flow_ebos_blackoil.cpp such that we can choose not to execute
the whole simulation using the flowEbosBlackoilMain() function but
instead only initialize by calling flowEbosBlackoilMainInit(). This is
necessary to implement a Python step() method that can advance the
simulator one report step at a time.
Also adds a method initFlowEbosBlackoil() to Main.hpp that can be used
directly from the Python interface's BlackOilSimulator object to gain
access to the FlowMainEbos object before it has initialized the
simulation main loop.
2020-05-13 11:54:18 +02:00
Håkon Hægland
f94553c5a7
Python bindings for the blackoil simulator.
...
A simplified version of PR #2518 that uses a deck filename to construct
the simulator.
After private discussion with @joakim-hove it was decided that the
construction of the blackoil simulator from Python using deck,
ecliseState, schedule and summaryConfig as constructor arguments from
\#2518 should be replaced by a constructor taking only the deck filename
as parameter.
A rewrite of the Python bindings for the blackoil simulator using
pybind11 as introduced in PR #2127 . The new version uses the
refactored flow.cpp introduced in PR #2516 and thus avoids duplication
of the code in simulators.cpp.
This PR will be the starting point for implementing the Python bindings
introduced in PR #2403 .
2020-05-11 15:03:17 +02:00
Bård Skaflestad
34b750336e
Remove 'MAXVALUE' From List of Missing Features
...
We've supported that operator for quite some time.
2020-05-10 14:38:17 +02:00
Atgeirr Flø Rasmussen
d108f9afa6
Avoid file-ending starting with S or A to not confuse comparison program.
2020-05-08 11:56:52 +02:00
Atgeirr Flø Rasmussen
561bec4a64
Make CASENAME.STEPINFO the name of the step info report file.
2020-05-07 22:29:01 +02:00
Atgeirr Flø Rasmussen
9458357009
Use = rather than += when appropriate for reports.
2020-05-07 22:09:17 +02:00
Atgeirr Flø Rasmussen
9dd2275af9
Remove seconds and add timestep to ITERINFO report.
2020-05-07 21:19:31 +02:00
Atgeirr Flø Rasmussen
769028b591
Remove 'verbosity' member and reorganize.
2020-05-07 21:00:39 +02:00
Atgeirr Flø Rasmussen
8dd53a38e9
Refactor SimulatorReport system.
...
Now SimulatorReport object contains a vector of SimulatorReportSingle objects,
for both successful and failing steps.
2020-05-07 16:13:39 +02:00
hnil
0f33835e67
added writing of detailed performance report
2020-05-07 11:37:24 +02:00
Atgeirr Flø Rasmussen
9357919201
Do not run setupParameter_() twice for the static-typed sims.
2020-05-05 16:19:10 +02:00
Atgeirr Flø Rasmussen
f0b1ee76b8
Ensure that the typetag used for initialization is correct.
...
Without this, properties set in the static variants of flow such as
flow_blackoil_dunecpr.cpp will be honored in the run. However, the
text for '--help' and the property printout in the .DBG file will not
reflect the true type tag, but the default.
This bug was added during the recent refactoring of all Flow variants
to use the same initialization and setup code.
2020-05-04 08:52:49 +02:00
Markus Blatt
ca744231b1
Removes unused member istlSolver_ and method to get it from BlackoilModelEbos
...
It is not used since quite some time and tends to confuse me.
2020-04-28 16:46:17 +02:00
OPMUSER
163ce3b613
Update Missing Features with PERMFACT
2020-04-28 13:39:40 +02:00
Joakim Hove
750070fbd7
Remove VISCREF from MissingFeatures
2020-04-27 10:30:50 +02:00
OPMUSER
c62318387d
Update Missing Features with HMMULTSG
...
HMMULTSG
2020-04-25 18:19:31 +02:00
OPMUSER
04295871f4
Update MissingFeatures.cpp
...
Missing features fixed typo SCPDIMS to SCDPDIMS, and added RWGSALT.
2020-04-25 18:19:31 +02:00
Joakim Hove
0773d07df5
Missing features ( #2562 )
...
Updates to the list of missing features
2020-04-24 13:08:55 +02:00
OPMUSER
9d32980821
Added the Water Vaporization keywords to Missing-Features
...
Added the following Water Vaporization keywords to Missing-Features: PRESALT, PVTGW, PVTGWO, SALTPVD, SALTSOL, and VAPWAT
2020-04-21 16:39:51 +08:00
OPMUSER
4906a3e69e
Added ADSORP and CPR to Missing-Features
...
Added ADSORP and CPR to Missing-Features
2020-04-21 16:30:54 +08:00
OPMUSER
048d21fdab
Update MissingFeatures.cpp
...
Changed DIFFMTHT- to DIFFMTH-
2020-04-21 14:29:03 +08:00
OPMUSER
a8dba1a726
Update Missing-Features keywords
...
Added GECONT, changed RIVRDIM to RIVRDIMS, added RPTSOL, RSSPEC, changed SCPDIMS to SCDPDIMS,
2020-04-21 14:05:46 +08:00
Cintia Goncalves Machado
2ac17103f8
Remove BDENSITY
2020-04-20 17:44:40 +02:00
Joakim Hove
11d65f41d2
Add keywords to the list of missing features
2020-04-17 08:56:10 +02:00
Atgeirr Flø Rasmussen
a1091bd718
Stop simulating if the schedule has set an exit condition.
...
The program will return the value set in the EXIT keyword.
2020-04-16 15:42:17 +02:00
Atgeirr Flø Rasmussen
07d9ec135b
Make Main a non-template class again, simplify.
2020-04-16 11:35:01 +02:00
Håkon Hægland
1932e42cbb
Fixed minor typo.
2020-04-16 01:22:07 +02:00
Håkon Hægland
954d32c3ab
Refactor main_() into initialize_() and dispatch_().
...
For the Python interface's usage (as opposed to the usage by e.g.
flow.cpp), we do not neccessarily want to run the whole simulation by
calling run(), it is also useful to just run one report step at a time.
According to these different usage scenarios, main_() is refactored into
initialize_() and dispatch_() as a preparatory step for implementing the
Python interface (to be presented in a later PR).
2020-04-16 00:21:10 +02:00
Håkon Hægland
3f97561380
Fixup Deck, EclipseState, Schedule, ....
...
Fixup usage of Deck, EclipseState, Schedule, and SummaryConfig to take
into account the class variables deck_, eclipseState_, schedule_, and
summaryConfig_. These variables might initially be empty (nullptr) when
the object is constructed by calling Main(argc, argv) from flow.cpp,
flow_blackoil_dunecpr.cpp, flow_onephase.cpp, or
flow_onephase_energy.cpp. However, when Opm::Main is constructed from the
Python interface code (to be implemented in a later PR) by using the
constructor Main(argc, argv, deck, eclispeState, schedule, summaryConfig)
the variables will not be intially empty.
2020-04-15 23:49:44 +02:00
Håkon Hægland
09230808e0
Adapting Main.hpp to the Python interface.
...
Adapting Main.hpp to be called from Python interface, Part 1.
Building on PR #2521 and PR #2535 , we gradually adapt Main.hpp for
being called from the Python interface (to be committed in a later PR)
to the flow executable. This PR introduces a new constructor for class
Opm::Main that takes a Deck, EclipseState, Schedule, and SummaryConfig
as arguments. It also introduces some new class variables that will be
useful when the main_() method is split up (in a later commit).
2020-04-15 20:45:20 +02:00
Håkon Hægland
de53c98605
Always print banner.
...
Remove the #ifdef OPM_FLOW_MAIN guard on printBanner() as it makes sense
to print the banner in either case.
2020-04-14 14:53:48 +02:00
Håkon Hægland
efa6c54096
Avoid a preprocessor directives.
...
Some of the functions in Main.hpp do not need to be guarded by a
\#ifndef OPM_FLOW_MAIN
Since they are template functions, they will not be included in the
code unless explicitly instantiated.
2020-04-14 14:53:48 +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
Joakim Hove
fcdca0f9e5
The "default" Schedule constructor has Python argument
2020-04-10 07:53:45 +02:00
Joakim Hove
fc5875d981
Remove keywords SEPARATE, RUNSUM and DATES from MissingKeywords list
2020-04-07 08:31:22 +02:00
Joakim Hove
76111897a6
MOve String utility in opm-common
2020-04-04 16:28:16 +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
Joakim Hove
c8524a139e
Add build time to flow startup banner
2020-03-31 08:42:24 +02:00
Arne Morten Kvarving
30eb7256bc
remove call to checkMissingFeatures
...
once is enough. as a bonus avoids deck usage in simulator
2020-03-23 15:54:48 +01:00
Joakim Hove
65f4635e20
Merge pull request #2464 from joakim-hove/relperm-diag-no-deck
...
Relperm diag no deck
2020-03-16 13:28:44 +01:00
Kai Bao
3af1d852ef
removing WSEGVALV from MissingFeatures.cpp
2020-03-13 22:18:29 +01:00
Arne Morten Kvarving
c40c733a57
fixed: build without MPI
2020-03-13 17:52:37 +01:00
Joakim Hove
8473aa38e5
Remove Deck argument to RelpermDiagnostic
2020-03-13 08:54:30 +01:00
Bård Skaflestad
1af796257c
Merge pull request #2348 from goncalvesmachadoc/patch-1
...
Add missing keywords to list
2020-03-11 15:40:02 -05:00
Arne Morten Kvarving
21ef1103cc
fixed: VAPPARS is supported, remove from unsupported features list
2020-03-05 13:41:09 +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
c73c7bef55
avoid use of boost::lexical_cast
2020-02-19 11:20:16 +01:00
Arne Morten Kvarving
e262cf8d51
changed: use internal function to uppercase string
2020-02-19 11:20:16 +01:00
Arne Morten Kvarving
4ba7d3a7bc
changed: replace boost::any with std::any
2020-02-19 11:20:16 +01:00
Arne Morten Kvarving
abc439d336
remove last usage of boost::filesystem
2020-02-18 08:54:37 +01:00
Cintia Goncalves Machado
88ed7ed82d
Add missing keywords to list
...
Add keywords WEIR (Energy Injection Rate) and WEIR (Energy Injection Rate).
2020-02-17 16:50:05 +01:00
Tor Harald Sandve
76682497e8
Merge pull request #2318 from akva2/fix_brine_module_init
...
fixed: call initFromDeck for Brine module
2020-02-17 14:17:17 +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
526f1f9bb1
[bugfix][AsyncOutput] Restore asynchronicity for output and make sure
...
that all output is written before the simulator is finalized.
2020-02-10 12:11:30 +01:00
Arne Morten Kvarving
cfa0904321
fixed: quell deprecation warnings with dune 2.7
2020-02-07 15:19:44 +01:00
Arne Morten Kvarving
88eae71811
fixed: remove PVTWSALT from missing feature list
2020-02-05 12:23:15 +01:00
Arne Morten Kvarving
df62305673
update for simplified Tuning data structure in opm-common
2020-01-31 13:45:05 +01:00
Arne Morten Kvarving
d4d69c4978
fixed: run RelpermDiagnostics on the global grid in parallel runs
2020-01-29 09:40:24 +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
Joakim Hove
8bba4f0557
Mark UDT as not supported
2019-12-20 16:33:13 +01:00
Steinar Foss
d8ebacd1d2
adding some keywords.
...
...
2019-12-18 13:00:07 +01:00
Steinar Foss
435f90ecc8
added alternating keywords.
2019-12-11 11:39:16 +01:00
Atgeirr Flø Rasmussen
d4433b80b5
Improve/fix well potential calculations for MultiSegmentWell.
...
Includes fixes for bhp-based potentials, and an implementation for thp-based
potentials similar to that for StandardWell.
2019-12-04 11:01:45 +01:00
Tor Harald Sandve
6d07aefef6
Merge pull request #2149 from goncalvesmachadoc/patch-1
...
Delete few thermal keywords from list
2019-12-02 10:17:58 +01:00
Tor Harald Sandve
18ecd3fd2b
Merge pull request #2173 from joakim-hove/actionx-supported
...
Remove keywords from list of missing features
2019-11-28 10:35:03 +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
Bård Skaflestad
26c8d78eac
Merge pull request #2155 from blattms/print-mpi-omp-size
...
Print number of MPI/OMP threads at start and end.
2019-11-21 16:06:37 +01:00
Joakim Hove
2f7e1c2e10
Remove ENDACTIO from list of unsupported keywords
2019-11-20 15:48:53 +01:00
Joakim Hove
5d1dba4686
Remove FIPNUM from list of unsupported keywords
2019-11-20 15:47:26 +01:00
Joakim Hove
e79723b5c1
Remove ACTIONX from list of missing features
2019-11-20 15:35:59 +01:00
Steinar Foss
3d2892fbdb
added 'special' keywords to MissingFeatures.
2019-11-20 15:31:11 +01:00
Markus Blatt
5c34b843f1
Use process instead of processor for MPI.
2019-11-19 15:56:18 +01:00
Markus Blatt
b4ec2f0611
Use correct number of threads when printing banner.
...
At that stage flow did not set the number of thread in the case where
OMP_NUM_THREADS is not defined. That happens in setupParallelism which
is called when the simulator is run. Hence we have to manually compute
the number of threads similar to there.
2019-11-19 15:45:50 +01:00
Markus Blatt
afc76a8b27
Print number of MPI/OMP threads at start and end.
2019-11-19 15:45:50 +01:00
Kai Bao
fabc2a6f22
adding AQUFET back to MissingFeatures.cpp
...
which was removed by mistake in PR #2162
2019-11-16 23:45:26 +01:00
Kai Bao
b36ac45fea
removing several keywords from MissingFeatures.cpp
...
COMPSEGS, AQUFET and PLYROCK
2019-11-16 22:44:24 +01:00
Steinar Foss
099df1d566
MissingFeatures: updated list, corrected spelling errors.
2019-11-13 12:17:39 +01:00
Cintia Goncalves Machado
ac30f97c43
Delete few thermal keywords from list
...
@slawekszklarz and I were checking the keywords mentioned in warnings as unhandled when running thermal models. The keywords RTEMP, RTEMPVD and THCONR seem to be working fine. The WATVISCT table breaks the simulation when extrapolation is needed.
2019-11-07 15:04:57 +01:00
Joakim Hove
7c471688f1
Add missing keywords on P
2019-11-01 14:39:38 +01:00
Steinar Foss
7d84a244d9
added even more keywords beginning w/ P.
2019-10-31 13:16:54 +01:00
Steinar Foss
aff6ce6f77
added keywords beginning w/ N, O and P.
2019-10-30 16:00:16 +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
Steinar Foss
01b57da9e1
added keywords beg with N.
2019-10-26 12:54:59 +02:00
Joakim Hove
b58d14bfb0
Add Q keywords as missing features
2019-10-24 17:08:47 +02:00
Steinar Foss
c285b93c2b
added more keywords beginning with M.
2019-10-24 11:56:09 +02:00
Tor Harald Sandve
5c60a487f9
Add well operability param
2019-10-22 12:57:32 +02:00
Atgeirr Flø Rasmussen
5267f3cf17
Merge pull request #1965 from totto82/killDistr
...
Reimplementation of the well control code
2019-10-22 10:25:32 +02:00
Joakim Hove
481c09170a
Merge pull request #2068 from stefoss23/add_keywords_M
...
added keywords beginnign w/ M.
2019-10-20 12:22:24 +02:00
Joakim Hove
7211cb4486
Use Location class for keyword location
2019-10-19 21:59:10 +02:00
Tor Harald Sandve
53896ffca8
Use well and group controls from opm-common.
...
This PR remove the usage of well_control_ from opm-core
and instead uses the control classes for wells and groups
from opm-common.
This PR also removes the usage of the group classes from
opm-core.
2019-10-18 16:08:07 +02:00
Tor Harald Sandve
b053558b3f
Remove supported keywords from the missing feature list
2019-10-18 12:56:12 +02:00
Joakim Hove
3ef94af74e
Merge pull request #2067 from joakim-hove/missingR
...
Missing features on R
2019-10-17 14:54:38 +02:00
dr-robertk
18c31bda0b
Merge pull request #2047 from totto82/enableRockcompFlow
...
enable rockcomp in flow
2019-10-17 14:12:35 +02:00
Steinar Foss
973c039853
added keywords beginnign w/ M.
2019-10-17 13:05:15 +02:00
Tor Harald Sandve
8c7d7e3d2e
enables rockcomp in flow
2019-10-17 12:44:49 +02:00
Joakim Hove
a6c890e274
Missing features on R
2019-10-17 11:29:33 +02:00
Steinar Foss
6ad1471e9f
added keywords beginning w/ L.
...
...
...
2019-10-16 13:46:22 +02:00
Joakim Hove
337f36bac1
Merge pull request #2057 from stefoss23/add_keywords_IJKL
...
Added keywords beginning w/ I, J, K and L.
2019-10-15 18:26:53 +02:00
dr-robertk
abf793726d
Merge pull request #2046 from totto82/sync_logging
...
Add logging in ebos
2019-10-15 14:19:34 +02:00
Joakim Hove
ab779b4213
Merge pull request #2056 from goncalvesmachadoc/goncalvesmachadoc-missingFeaturesList
...
Add few missing unsupported keywords to the list
2019-10-15 09:47:05 +02:00
Steinar Foss
0510173408
MissingFeatures.cpp: added keywords beginning w/ I, J, K and L.
2019-10-14 15:48:21 +02:00
Atgeirr Flø Rasmussen
40f91b0e32
Merge pull request #2034 from totto82/sync_restart
...
sync restart
2019-10-14 13:26:57 +02:00
Cintia Goncalves Machado
d5f5fd8b8b
Add few missing unsupported keywords to the list
...
Added the unsupported keywords WBP, WBP4, WBP5, WBP9, NLINEARS to the list in MissingFeatures.cpp.
2019-10-14 12:47:17 +02:00
Tor Harald Sandve
86ef30950d
Add logging in ebos
...
With this .PRT and .DBG files are created also for ebos
2019-10-14 10:39:10 +02:00
Atgeirr Flø Rasmussen
4ddb8e8d56
Merge pull request #2051 from atgeirr/enable-onephase-revised-rebased
...
Enable onephase
2019-10-11 21:02:46 +02:00
Atgeirr Flø Rasmussen
b0de207940
Merge pull request #2040 from alfbr/prt-banner
...
Make PRT header self-explanatory
2019-10-11 20:48:43 +02:00
Atgeirr Flø Rasmussen
8ef1958c18
Silence warnings.
2019-10-11 20:18:53 +02:00
Atgeirr Flø Rasmussen
5211217c94
Whitespace fixes (tabs->spaces, reformatted new files).
2019-10-11 15:57:51 +02:00
Atgeirr Flø Rasmussen
0b9b20695c
Change back relative change computation to old order.
...
Changing this caused tiny timestepping differences.
2019-10-11 15:29:49 +02:00
Joakim Hove
5ba9107bea
Missing features on S
2019-10-11 14:49:33 +02:00
Joakim Hove
f75934c5cb
Merge pull request #2038 from joakim-hove/W
...
Add missing features for W keywords
2019-10-11 10:24:05 +02:00
Joakim Hove
15a004114f
Merge pull request #2050 from stefoss23/add_keywords_H
...
added keywords beginnign w/ H and I.
2019-10-11 08:41:01 +02:00
Atgeirr Flø Rasmussen
3ddcdf2349
Only run relperm diagnostics for > 1 phase cases.
2019-10-11 08:19:18 +02:00
Halvor M. Nilsen
d873ae165d
Enable single-phase runs.
2019-10-11 08:19:18 +02:00
Steinar Foss
9f8b5341ce
added keywords beginnign w/ H and I.
2019-10-09 15:50:11 +02:00
Joakim Hove
4f79a281b6
Add missing features on T
2019-10-09 12:03:23 +02:00
Alf Birger Rustad
ab1bf5f710
Make PRT header self-explanatory
2019-10-03 15:31:17 +02:00
Atgeirr Flø Rasmussen
189dc150fb
Merge pull request #2039 from totto82/moveBanner
...
move PRT header to the top
2019-10-03 14:28:06 +02:00
Tor Harald Sandve
aeb29a5412
move PRT header to the top
2019-10-03 12:13:13 +02:00
Joakim Hove
e1c2e70f09
Add missing features for W keywords
2019-10-02 19:28:37 +02:00
Steinar Foss
bab522d433
added keywords beginning w/ G and H.
2019-10-02 15:50:17 +02:00
Tor Harald Sandve
f83e99c6aa
sync restart
2019-10-01 14:30:11 +02:00
Joakim Hove
1544f84fb4
Merge pull request #2031 from joakim-hove/missing-features-W
...
Add keywords WSEGDFIN - WSEGTABL as not supported
2019-10-01 07:48:06 +02:00
Joakim Hove
07c5430ac3
Add keywords WSEGDFIN - WSEGTABL as not supported
2019-09-30 18:47:25 +02:00
Bård Skaflestad
c06881b04e
Merge pull request #2027 from joakim-hove/missing-keywords-V
...
Add missing features on U, V and T
2019-09-30 14:44:16 +02:00
Joakim Hove
97209c2b6e
Add missing features on U, V and T
2019-09-27 20:55:12 +02:00
Steinar Foss
0734802996
MissingFeatures.cpp: added keywords beginning w/ G.
2019-09-25 15:49:44 +02:00
Joakim Hove
dccb9bfa10
Merge pull request #2017 from atgeirr/fix-abort-unknown-param
...
Abort the run before reading the deck if there are unknown params.
2019-09-23 22:10:17 +02:00
Atgeirr Flø Rasmussen
37854bcdcb
Merge pull request #2016 from akva2/ewoms_to_models
...
Move ewoms/* into an opm/models/* structure
2019-09-19 14:23:47 +02:00
Atgeirr Flø Rasmussen
c7200460ab
Abort the run before reading the deck if there are unknown params.
2019-09-19 14:20:05 +02:00
Joakim Hove
7ab5bf8598
Merge pull request #2015 from stefoss23/add_keywords_F1
...
WIP. added keywords beginning w/ F and G.
2019-09-19 12:24:32 +02:00
Arne Morten Kvarving
d3d9831fc3
changed: ewoms/common -> opm/models/utils
2019-09-19 11:14:36 +02:00
Steinar Foss
112225f338
added keywords beginning w/ F and G.
2019-09-18 16:20:37 +02:00
Atgeirr Flø Rasmussen
523e38e095
Remove some supported keywords from the missing features list.
2019-09-18 15:34:38 +02:00
Joakim Hove
d24e935c73
Add missing features W
2019-09-16 19:46:40 +02:00
Joakim Hove
9fd4030269
Add missing features LCUNIT and LINCOM
2019-09-16 15:43:30 +02:00
Joakim Hove
4b8331bc0c
Add missing keywords on W
2019-09-13 17:31:50 +02:00
Steinar Foss
997580668c
added keywords beginning w/F.
2019-09-12 12:17:58 +02:00
Steinar Foss
2ac118c6e0
added keywords beginning with E.
2019-09-12 08:48:56 +02:00
Joakim Hove
63f9fde3ca
Merge pull request #1992 from stefoss23/add_keywords_D1
...
added more kw starting w/ D.
2019-09-11 23:22:18 +02:00
Joakim Hove
c14d8f69e7
Update missing features with W keywords
2019-09-10 07:42:58 +02:00
Atgeirr Flø Rasmussen
b8b3599ac5
Merge pull request #1993 from akva2/namespace_change
...
changed: namespace Ewoms -> namespace Opm
2019-09-09 09:05:19 +02:00
Joakim Hove
96025d224e
Unsupported W keywords
2019-09-06 11:22:25 +02:00
Arne Morten Kvarving
5599bb6d8c
changed: namespace Ewoms -> namespace Opm
2019-09-05 17:14:38 +02:00
Steinar Foss
748f09c3e0
added more kw starting w/ D.
2019-09-05 14:55:06 +02:00
Joakim Hove
c804e85bc7
Setup logging before the simulator is initialized ( #1980 )
...
Setup logging before the simulator is initialized
2019-08-27 22:41:48 +02:00
Joakim Hove
5b857dd43e
Merge pull request #1982 from stefoss23/add_keywords_D
...
added keywords beginning w/ D.
2019-08-24 05:31:52 +02:00
Steinar Foss
caea91002a
added keywords beginning w/ D.
2019-08-23 09:38:32 +02:00
Joakim Hove
9df2a6f0c9
List W keywords as missing features
2019-08-23 08:02:14 +02:00
Joakim Hove
ad82f1aef3
Remove COMPDAT from list of unsupported keywords
2019-08-21 22:52:07 +02:00
Joakim Hove
21f2448034
Merge pull request #1977 from stefoss23/add_keywords_c
...
added keywords beginning w/C.
2019-08-16 17:45:34 +02:00
Joakim Hove
d09b7e88ae
Add some W keywords to list of missing features
2019-08-16 16:34:15 +02:00
Steinar Foss
f6bf7bec6d
added keywords beginning w/C.
2019-08-16 15:14:28 +02:00
Joakim Hove
c989874b26
Some missing features on Z and W
2019-08-15 08:04:41 +02:00
Steinar Foss
8aa4af836a
added keywords beginning with B.
2019-08-13 13:41:50 +02:00
Joakim Hove
1bc571535e
Merge pull request #1963 from stefoss23/add_keywords_A
...
added keywords beginning w/ A.
2019-08-09 10:35:18 +02:00
Steinar Foss
d3399015d7
MissingFeatures: AQUNNC spell error.
2019-08-08 15:17:29 +02:00
Steinar Foss
f377e1dd39
added keywords beginning w/ A.
2019-08-08 12:02:59 +02:00
Atgeirr Flø Rasmussen
b9e7881878
Finalize integration of foam module.
2019-08-07 10:39:16 +02:00
Bård Skaflestad
d08af810ef
Remove FILLEPS from MissingFeatures
...
Pull request OPM/opm-common#849 added support for this keyword.
2019-07-28 17:58:30 +02:00
Steinar Foss
9b01b6b478
MISSING_FEATURES: added keywords ALPOLADS, ALSURFADM ALSURFST.
2019-07-26 18:07:52 +02:00
Steinar Foss
546dd676ad
MISSING_FEATURES: added keywords beginning w/ a.
2019-07-26 17:26:29 +02:00
Steinar Foss
72a005e8b9
MISSING_FEATURES: added ACTIONG.
2019-07-26 12:41:35 +02:00
Joakim Hove
a5eaf914e2
Fix error message for COMPORD partially support keyword
2019-07-02 06:10:50 +02:00
Tor Harald Sandve
e2420a4361
Merge pull request #1916 from andlaus/abort_on_unknown_parameters
...
mebos, flow: adapt to the eWoms changes in handling unknown parameters
2019-06-27 14:59:35 +02:00
Andreas Lauser
2a2b183679
add comments to describe flag arguments
2019-06-27 14:27:18 +02:00
Tor Harald Sandve
fd26b61599
Merge pull request #1907 from andlaus/improve_time_integration
...
Improve time integration
2019-06-27 14:08:07 +02:00
Andreas Lauser
1bbf18d7c8
mebos, flow: adapt to the eWoms changes in handling unknown parameters
...
for `flow`, there's no change compared to the current behavior, `ebos`
and its variants will complain when it encounters unused parameters.
2019-06-27 11:51:28 +02:00
Kai Bao
9a2fcdbfd5
fixing warnings in other folder under opm-simulators
2019-06-26 10:48:41 +02:00
Andreas Lauser
c2aebbb5da
EclProblem: use the generic time integration mechanism
...
i.e., the EclProblem does no longer need to implement the
`timeIntegration()` method itself. since `flow` does not use this code
path, it is unaffected.
2019-06-25 12:39:00 +02:00
Atgeirr Flø Rasmussen
bc07b688c5
Fix typo, indentation and return in unknown-parameter situation.
2019-06-25 10:10:58 +02:00
Markus Blatt
35ad7a60e2
Notify user that we are aborting because of unused keywords.
2019-06-21 13:11:21 +02:00
Atgeirr Flø Rasmussen
5749a7150c
Move files out of opm/core/simulator.
2019-06-20 11:00:52 +02:00
Atgeirr Flø Rasmussen
fa016a6008
Moved all remaining files out of opm/autodiff.
2019-06-20 11:00:51 +02:00
Atgeirr Flø Rasmussen
a33cfbf0bc
Moved Flow-related classes and files to opm/simulators/flow.
2019-06-20 11:00:51 +02:00