Commit Graph

8188 Commits

Author SHA1 Message Date
Arne Morten Kvarving
518634f994 fixed: need to init ewoms thread manager 2018-08-24 15:44:09 +02:00
Tor Harald Sandve
61b4b34ad6
Merge pull request #1542 from andlaus/use_ewoms_blackoil_update
flow: use the update procedure of the eWoms blackoil model
2018-08-21 09:16:35 +02:00
Andreas Lauser
fb44c41ea0
Merge pull request #1553 from andlaus/remove_ThreadManager_typedef
FlowMainEbos: remove unused typedef `ThreadManager`
2018-08-20 15:25:54 +02:00
Andreas Lauser
445a36972b FlowMainEbos: remove unused typedef ThreadManager
this may avoid a compiler warning under some circumstances.
2018-08-20 13:10:15 +02:00
Arne Morten Kvarving
5d753994b5
Merge pull request #1552 from andlaus/better_input_case_handling
print usage message if the input case cannot be found
2018-08-20 09:37:16 +02:00
Andreas Lauser
455b38e729 remove some now unused parameters 2018-08-17 13:16:11 +02:00
Andreas Lauser
66b95c7f8d flow: use the update procedure of the eWoms blackoil model 2018-08-17 13:03:37 +02:00
Andreas Lauser
6ff1d580ea
Merge pull request #1551 from akva2/fix_run_scripts
fixed: run-norne and run-spe for new parameter system
2018-08-17 12:25:22 +02:00
Andreas Lauser
8e9b43fdce print usage message if the input case cannot be found 2018-08-17 11:36:21 +02:00
Arne Morten Kvarving
b036761872 fixed: run-norne and run-spe for new parameter system 2018-08-17 09:43:31 +02:00
Atgeirr Flø Rasmussen
31280d579b
Merge pull request #1512 from andlaus/ewoms_parameters
Switch flow to the eWoms parameter system
2018-08-16 10:36:11 +02:00
Andreas Lauser
f2b0630040 flow: minor parameter related fixes
- Change the brief description slightly
- Do not print anything anymore if there are no unused parameters
- Change the boiler plate text for printing the parameters to the
  PRT/DBG files

in part, this has been requested by [at]atgeirr.
2018-08-15 23:36:56 +02:00
Andreas Lauser
f22f1668f3 fix some rebase fallout 2018-08-15 23:36:56 +02:00
Andreas Lauser
620a89587c fix a few parameter names
bph should be "bhp" and "DWellFractionMax" looks weird as a command
line parameter (-d-well-fraction-max). now, it only looks slightly
weird in the c++ code.
2018-08-15 23:34:32 +02:00
Andreas Lauser
43ac2e36c6 remove the Flow prefixes of parameters only used by flow
this has been requested by [at]atgeirr.

Note: The FlowLinearSolverVerbosity, FlowNewtonMaxIterations and
FlowNewtonMinIterations parameters are still prefixed because they
clashes with parameters registered deeply within eWoms.
2018-08-15 23:34:32 +02:00
Andreas Lauser
9203b614e8 flow: customize the brief description printed in the usage message
The text can certainly be improved uppon.
2018-08-15 23:34:32 +02:00
Andreas Lauser
1ac74c62ee flow: print the parameters at the beginning of the .PRT and .DBG files 2018-08-15 23:34:32 +02:00
Andreas Lauser
0714ab5930 add the parameters which were introduced by the MILU PR
i.e., make it possible to specify them via the eWoms parameter system.
2018-08-15 23:34:32 +02:00
Andreas Lauser
61650a22df fix the fallout of OPM/opm-simulators#1495 2018-08-15 23:34:32 +02:00
Andreas Lauser
076312b28a fix the CPR warning
this was probably a rebase mistake. thanks to [at]blattms for noticing
this.
2018-08-15 23:34:32 +02:00
Andreas Lauser
d94be85a9d flow: do not mention unused parameters in the help message
while they do no longer appear in the help message, in the code they
are still there and can be specified and used as normal.

also, this patch makes --print-parameters=1 and --print-properties=1
work.
2018-08-15 23:34:32 +02:00
Andreas Lauser
66b749c2eb undo most of the variable changes of the previous commits
a few were probably forgotten.
2018-08-15 23:34:32 +02:00
Andreas Lauser
394790475f make it possible to disable the terminal output
the well model and (probably) the ECL output writing code look like
they cannot be gagged.
2018-08-15 23:34:32 +02:00
Andreas Lauser
b5cddef928 flow: switch it to use the eWoms parameter system
this has several advanges:

- a consistent and complete help message is now printed by passing the
  -h or --help command line parameters. most notably this allows to
  generically implement tab completion of parameters for bash
- the full list of runtime parameters can now be printed before the simulator
  has been run.
- all runtime parameters understood by ebos can be specified
- no hacks to marry the two parameter systems anymore
- command parameters now follow the standard unix convention, i.e.,
  `--param-name=value` instead of `param_name=value`

on the negative side, some parameters have been renamed and the syntax
has changed so calls to `flow` that specify parameters must adapted.
2018-08-15 23:34:32 +02:00
Andreas Lauser
976ab03f68 fork ISTLSolver into a legacy and non-legacy version
this is necessary because only the latter can use the property system.
2018-08-15 23:33:50 +02:00
Atgeirr Flø Rasmussen
279d1950dd
Merge pull request #1550 from andlaus/generic_output_dir
adapt to the rename of the EclOutputDir parameter to OutputDir in eWoms
2018-08-15 21:34:18 +02:00
Arne Morten Kvarving
6642df7a8c
Merge pull request #1549 from akva2/use_builtin_analysis
changed: use the built-in analysis in the comparison programs
2018-08-15 08:09:55 +02:00
Arne Morten Kvarving
1e574b8c2f changed: use the built-in analysis in the comparison programs 2018-08-14 11:07:29 +02:00
Andreas Lauser
ca2428cf13 adapt to the rename of the EclOutputDir parameter to OutputDir in eWoms 2018-08-14 10:37:24 +02:00
Arne Morten Kvarving
975cf0bae8
Merge pull request #1547 from akva2/no_remove
changed: do not remove the result path in regression tests
2018-08-14 09:14:50 +02:00
Arne Morten Kvarving
b1b5759d7f changed: do not remove the result path in regression tests
in particular this leads to issues with tests sharing
result dir
2018-08-09 08:24:41 +02:00
Atgeirr Flø Rasmussen
11b987b97d
Merge pull request #1544 from joakim-hove/use-opm-pack
Relocate restart data file in tests
2018-08-08 13:27:01 +02:00
Arne Morten Kvarving
ffd3c6d270
Merge pull request #1546 from andreatlonn/master
Updated the files with the new test.
2018-08-08 09:56:25 +02:00
Andrea T. Lonn
0084d1d369 Updated the files with the new test. 2018-08-07 16:21:37 +02:00
Arne Morten Kvarving
eb126f3c53
Merge pull request #1543 from andreatlonn/master
Updated the files with the new tests.
2018-08-07 14:01:33 +02:00
Andrea T. Lonn
41ead55163 Changed the names of the tests to match the new names in opm-test. 2018-08-07 09:22:04 +02:00
Andrea T. Lonn
919b43cd1f Updated the files with the new tests. 2018-08-07 09:22:04 +02:00
Joakim Hove
8e71e3878f Relocate restart data file in tests 2018-08-06 08:01:55 +02:00
Atgeirr Flø Rasmussen
63e6e88f50
Merge pull request #1541 from akva2/avoid_deck_assignment
changed: avoid use of the assignment operator for the Deck class
2018-08-03 12:22:54 +02:00
Bård Skaflestad
b087cf54af
Merge pull request #1495 from blattms/red-black-ilu
Added support for red black ilu
2018-08-01 18:52:07 +02:00
Markus Blatt
8482b435eb Added clarifying comment on definedness of const_cast 2018-08-01 18:06:45 +02:00
Markus Blatt
f850f04c93 Prevent unnecessary copies of vectors using references. 2018-08-01 15:22:07 +02:00
Markus Blatt
458cd8768f Rely less on implicit includes of header files 2018-08-01 15:20:45 +02:00
Arne Morten Kvarving
3082281bc8 changed: avoid use of the assignment operator for the Deck class 2018-08-01 13:02:40 +02:00
Atgeirr Flø Rasmussen
b4bdea1d3f
Merge pull request #1535 from akva2/remove_unnecessary_includes
Remove unnecessary includes
2018-07-30 16:40:57 +02:00
Bård Skaflestad
6a3199dbe8
Merge pull request #1540 from andlaus/remove_FluidSystems_namespace
adapt to the fluid system naming convention change in opm-material
2018-07-27 21:06:23 +02:00
Andreas Lauser
ac2bc410f3 adapt to the fluid system naming convention change in opm-material
note that almost the only thing which is affected is legacy code.
2018-07-27 12:54:02 +02:00
Markus Blatt
019835b123 Added support for red-black ordering to ILUn. 2018-07-20 14:43:40 +02:00
Markus Blatt
865a690243 Allow usage of red-black ILU0.
We introduced two runtime parameters for this: ilu_redblack and
ilu_reorder_spheres. If the last one is false, we try to preserve
the ordering within in the colors. Otherwise we try to achieve a D2
(alternative diagonal) ordering.
2018-07-20 14:43:40 +02:00
Markus Blatt
41e5779ae3 Extended test for the reordering 2018-07-20 14:43:40 +02:00