8369 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Atgeirr Flø Rasmussen	1f7b8aa9d1	Merge pull request #1581 from blattms/fix-issue-1574-and-more ... Remove dead code.	2018-09-24 13:37:32 +02:00
Markus Blatt	9f2f6705bc	Merge pull request #1564 from dr-robertk/PR/fix-compile-dune-master ... [bugfix][ISTLSolverEbos] make compile with current dune master.	2018-09-24 07:25:30 +02:00
Markus Blatt	5aa07fca69	Remove more dead code from the ISTLSolver.hpp fork for ebos. ... These functions are also not used.	2018-09-21 16:15:32 +02:00
Markus Blatt	abddcb74d3	Merge branch 'fix_build' into fix-issue-1574-and-more ... It removes some dead code that appeared during the fork of ISTLSolver.hpp for ebos.	2018-09-21 15:49:39 +02:00
Markus Blatt	2dd5a3d15c	Fix compilation issue of flow_legacy without UMFPack. ... The problem was only present if UMFPack was not found and therefore FLOW_SUPPORT_AMG was defined to true. In that case we experienced compile errors in a source branch that would never be executed. Therefore we remove the code there and throw an exception.	2018-09-21 15:07:54 +02:00
Andreas Lauser	cfdf9f3e4d	fix build on some Linux distributions ... i.e., mine (openSuse Tumbleweed). the problem seems to be that the specialization of `ISTLSolver::constructAMGPrecond()` is ambiguous and some compilers seem to be more strict about this than others. Simply removing the problematic method seems to work fine. That said, for non-legacy `flow` this codepath is not taken at runtime anyway because the `ISTLSolverEbos` class is used!?	2018-09-21 13:53:38 +02:00
Arne Morten Kvarving	dcadaff466	added: install bash tab completion for flow	2018-09-19 11:45:40 +02:00
Andreas Lauser	85802932dd	Merge pull request #1573 from GitPaean/sliencing_extra_ ... removing the extra ; after BEGIN_PROPERTIES and END_PROPERTIES	2018-09-18 14:31:31 +02:00
Kai Bao	6e2334dcad	removing the extra ; after BEGIN_PROPERTIES and END_PROPERTIES ... which causes compilation warning.	2018-09-18 13:35:27 +02:00
Joakim Hove	e1a34e77ec	Merge pull request #1569 from joakim-hove/opm-compatible-restart ... Make sure the restart files used when testing are OPM style	2018-09-15 11:10:19 +02:00
Joakim Hove	e6be0f5ca6	Make sure the restart files used when testing are OPM style	2018-09-14 14:28:04 +02:00
Arne Morten Kvarving	0d86d670b5	Merge pull request #1570 from joakim-hove/jenkins-ignore-extra-kw ... Enable -x switch to comparison scripts with jenkins	2018-09-13 13:58:50 +02:00
Joakim Hove	8979d1a3b3	Jenkins can ignore extra keywords when doing regression testing	2018-09-13 12:38:51 +02:00
Bård Skaflestad	c3de357f30	Merge pull request #1567 from blattms/tighten-regex-for-parallel-output ... Let ParallelFileMerger only warn about CASENAME.[0-9]*.EXT files.	2018-09-12 12:21:47 +02:00
Joakim Hove	1a0ab98255	Merge pull request #1548 from joakim-hove/connection-updates ... Get connection properties directly from the opm-common	2018-09-11 13:19:07 +02:00
Arne Morten Kvarving	af863c82a0	Merge pull request #1562 from andlaus/threading_fixes ... flow: default to 2 threads if OpenMP is available	2018-09-11 12:37:13 +02:00
Joakim Hove	b9df94a70f	Use Well CF and Kh calculations from opm-common	2018-09-10 12:23:59 +02:00
Arne Morten Kvarving	a8addc17d3	Merge pull request #1568 from akva2/adjust_compareECL ... changed: adjust to compareSummary being part of compareECL	2018-09-10 11:06:39 +02:00
Arne Morten Kvarving	0f482eef5b	changed: adjust to compareSummary being part of compareECL	2018-09-10 08:44:53 +02:00
Markus Blatt	8455c0457b	ParallelFileMerger: Remove old local regex and fileWaringRegex_ instead	2018-09-05 16:42:13 +02:00
Markus Blatt	5aab0dfb7b	Really only warn about CASENAME.[0-9]+.[A-Z]+. ... Previously we did warn about files not starting with CASENAME.	2018-09-05 16:06:36 +02:00
Markus Blatt	07bc4396ab	Let ParallelFileMerger only warn about CASENAME.[0-9]*.EXT files. ... Previously the regex issued warning for all files containing ".[0-9]*." in the name in the output directory. That was too general and created more warnings than we wanted.	2018-09-05 16:06:36 +02:00
Markus Blatt	0863f665aa	[bugfix] Make parallel file merge work again for any --output-dir. ... This fixes fallout from the merge of PR #1512. Since then the ParallelFileMerger was always given the current directory even if another output directory was requested. This resulted in CASENAME.<procid>.<ext> files in that directory never being merged and removed. Now the ParallelFileMerger gets the output directory path again.	2018-09-05 14:03:00 +02:00
Robert Kloefkorn	97f8f76d13	[bugfix][ISTLSolverEbos] make compile with current dune master.	2018-09-04 12:39:40 +02:00
Andreas Lauser	25248066d8	Merge pull request #1561 from blattms/fix-milu-parameters ... Fix milu parameters	2018-08-31 18:04:37 +02:00
Andreas Lauser	05dfe43fd2	flow: default to 2 threads if OpenMP is available ... I still think it is better to specify `--threads-per-process` explicitly, but this patch is better than the current machinery...	2018-08-31 12:32:41 +02:00
Markus Blatt	9a692b2d09	Improvements to MILU help strings	2018-08-30 18:22:17 +02:00
Markus Blatt	324cb70d3e	Renamed MIluVariant to MiluVariant to correct --m-ilu-variant parameter. ... It should be --milu-variant and is it now. Maybe the parameter system could be a bit smart and detect consecutive upper case letters and treat them correctly.	2018-08-30 18:02:24 +02:00
Atgeirr Flø Rasmussen	c4c461b389	Merge pull request #1558 from totto82/changeDefaultTolMB ... Change default ToleranceMB from 1e-5 to 1e-6	2018-08-27 16:09:09 +02:00
Tor Harald Sandve	b0101647a1	Change default ToleranceMB from 1e-5 to 1e-6	2018-08-27 11:54:32 +02:00
Andreas Lauser	15890a2570	Merge pull request #1557 from akva2/fix_flow_openmp ... fixed: need to init ewoms thread manager	2018-08-24 17:02:03 +02:00
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