Commit Graph

888 Commits

Author SHA1 Message Date
Andreas Lauser
6746afafb2 Merge pull request #458 from atgeirr/fix-testing-bsd
Make runtest.sh also work on BSD/macOS.
2019-01-11 16:38:29 +01:00
Atgeirr Flø Rasmussen
8a1034a3cc Make runtest.sh also work on BSD/macOS.
In particular:
 - "wc -w" will have spaces in the output on BSD,
 - "python" defaults to python 3, so we must explicitly invoke python2.
2019-01-11 15:58:50 +01:00
Tor Harald Sandve
225f67ae24 Merge pull request #456 from andlaus/fix_masochistic_warnings
fix some masochistic compiler warnings for the GCC 9 pre-release
2019-01-10 13:59:34 +01:00
Andreas Lauser
b44b650475 fix some masochistic compiler warnings for the GCC 9 pre-release
the flags which I used are
```
-pedantic \
-Wall \
-Wextra \
-Wformat-nonliteral \
-Wcast-align
-Wpointer-arith \
-Wmissing-declarations \
-Wcast-qual \
-Wshadow
-Wwrite-strings \
-Wchar-subscripts \
-Wredundant-decls \
-fstrict-overflow \
-O3 \
-march=native \
-DNDEBUG=1
```

note that some heavy filtering is not the worst idea because DUNE is
far from not emiting any warnings with these flags.

Also, there were some pesky warnings in test_ecl_output which I don't
know how to fix:

```
tests/test_ecl_output.cc:218:73: warning: missing initializer for member ‘Opm::data::Connection::effective_Kh’ [-Wmissing-field-initializers]
```
2019-01-09 09:34:26 +01:00
Tor Harald Sandve
67cabed090 Merge pull request #406 from andlaus/janitor
Minor cleanups
2018-10-29 13:12:22 +01:00
Andreas Lauser
4e888fdfc8 make all header files includeable on their own right again
some property definitions and includes were missing.
2018-10-29 10:05:46 +01:00
Arne Morten Kvarving
7c4ca41f1f Merge pull request #364 from andlaus/help_line_breaks
Parameter system: Improve usage message
2018-08-20 08:42:34 +02:00
Andreas Lauser
f8a817e8f2 implement line breaks in the usage message
i.e. for `--help`. this is surprisingly complicated...
2018-08-16 15:55:51 +02:00
Atgeirr Flø Rasmussen
938af70bb5 Merge pull request #359 from andlaus/custom_parameter_file_parser
Use a custom parameter file parser
2018-08-12 17:50:23 +02:00
Andreas Lauser
dc08a8b4dd use a custom parameter file parser
this allows the key names to be transformed, i.e.,

```
enable-vtk=true
```

is now also possible in parameter files whereas before only CamelCase
parameter names like

```
EnableVtk=true
```

were valid. besides this, any valid Windows INI file that does not use
parameter groups should be readable, i.e., semicolons are now also
treated as a comment indicator.
2018-08-10 18:13:04 +02:00
Bård Skaflestad
fde580dd20 Merge pull request #354 from andlaus/remove_FluidSystems_namespace
adapt to the fluid system naming convention change in opm-material
2018-07-27 21:05:58 +02:00
Andreas Lauser
04c3e42b87 adapt to the fluid system naming convention change in opm-material 2018-07-27 12:56:19 +02:00
Andreas Lauser
aed7e15d2e fix extra compiler warnings
this is only relevant people who are masochistic enough to go beyond
`-Wall`. (note that at this warning level, there is plenty of noise from
Dune and other upstream dependencies.)
2018-07-02 09:17:56 +02:00
Atgeirr Flø Rasmussen
fbb885f303 Merge pull request #331 from andlaus/function_tasklets
tasklets: allow to dispatch raw functions
2018-06-28 20:47:08 +02:00
Tor Harald Sandve
0bfe876425 rename completion to connection 2018-06-28 15:49:45 +02:00
Andreas Lauser
6dde43dc0b tasklets: allow to dispatch raw functions 2018-06-21 14:56:10 +02:00
Tor Harald Sandve
6d11c69121 Merge pull request #327 from andlaus/property_and_parameter_system_improvements
Some property- and parameter system improvements
2018-06-19 15:59:13 +02:00
Andreas Lauser
acc93ff6e7 do explicit put properties into the the Ewoms::Properties namespace anymore
instead, do it implicitly by using the BEGIN_PROPERTIES and
END_PROPERTIES macros.
2018-06-15 20:22:07 +02:00
Andreas Lauser
1be1f15b47 parameter system: add support for positional parameters
further, this cleans up the code of the parameter system and the
startup routines a bit and finally, it adds positional parameters
support to ebos as well as brief descriptions to ebos and the lens
problem.
2018-06-14 11:13:30 +02:00
Joakim Hove
1f880346e9 Merge pull request #325 from joakim-hove/rename-completions
Rename Completions -> Connections
2018-06-12 13:24:02 +02:00
Joakim Hove
b9395e0291 Rename Completions -> Connections 2018-06-11 14:11:32 +02:00
Andreas Lauser
25e952fb49 tasklets test: guard against garbled output
Use a mutex to ensures that only a single prints at the same
time. this should prevent garbled terminal output and thus makes the
it much easier to read. on the flipside, some race conditions may go
unnoticed.
2018-04-23 13:24:59 +02:00
Andreas Lauser
5c9e20c00e tasklets: introduce the concept of "worker thread index"
if the current thread is not a worker thread, this returns -1.
2018-04-23 13:24:59 +02:00
Atgeirr Flø Rasmussen
de167b188b Merge pull request #312 from andlaus/tasklets_test
Fix undefined mutex unlocking behaviour, add unit test for tasklets
2018-04-23 13:05:17 +02:00
Andreas Lauser
2cb0176754 add an example for tasklets
it is IMO not good as a unit test because it does not excercise the
mechanism at all, but it shows how the mechanism is supposed to be
used.
2018-04-19 14:35:24 +02:00
Atgeirr Flø Rasmussen
1a1e164054 Merge pull request #303 from andlaus/disable_async_for_ecl_output_test
disable asynchronous output for the ECL output test
2018-03-21 14:23:02 +01:00
Andreas Lauser
7de09c08f2 disable asynchronous output for the ECL output test
this leads to crashes deeply inside libecl. My cursory hypotheses are
that this test makes the assumption that the output is written
synchronously (it tries to read back the results from disk
immediately) and/or that libecl is not threadsafe.
2018-03-21 10:31:15 +01:00
Andreas Lauser
e83cc94cea Merge pull request #299 from andlaus/tasklets
ECL output cleanup and tasklets
2018-03-13 12:15:46 +01:00
Andreas Lauser
e2241beef5 clean up the determination of the directory for output
this should be done by the vanguard, not by the problem!
2018-03-12 16:51:30 +01:00
Andreas Lauser
2031f8c438 Merge pull request #298 from andlaus/fix_dune_master
Fix dune master
2018-03-12 15:15:50 +01:00
Andreas Lauser
81bc44ec6d fix the build on the latest dune master
Dune::set_singularity_limit() was removed and the ILU preconditioners
seem to have been refactored. The ILU refactoring included making the
order of the preconditioner a template parameter of the preconditioner
class, i.e., it can no longer be specified at runtime.

Note that the AMG code in the dune master currently produces quite a
few warnings because of the latter point, but as far as I can see,
there is nothing which can be done about this from outside of
dune-istl.
2018-03-12 14:31:36 +01:00
Andreas Lauser
ea0c6eeec1 Merge pull request #296 from akva2/fix_conditions
fixed: fix some condition that was missed in eclipse io update
2018-03-08 11:05:19 +01:00
Kai Bao
ec6cf5c94b changing the PVTO in test_ecl_output
to make the table passing the sanity check.
2018-03-08 09:54:08 +01:00
Andreas Lauser
4f3c7fccb3 Merge pull request #292 from andlaus/fix_icc
fix a few "unused variable" warnings that occur on more uncommon compilers
2018-03-03 13:28:46 +01:00
Andreas Lauser
d8792f36a0 fix a few "unused variable" warnings that occur on more uncommon compilers
i.e. on ICC. the compiler is right in producing warnings here, though.
2018-03-03 13:27:48 +01:00
Joakim Hove
cc53ff6fd7 Merge pull request #290 from joakim-hove/test-deck-rename
Rename test-deck to get consistent case
2018-02-20 15:10:08 +01:00
Joakim Hove
e27a69a496 Rename test-deck to get consistent case 2018-02-20 14:34:31 +01:00
Atgeirr Flø Rasmussen
05d4986d7f Merge pull request #284 from totto82/MoveWell
Some more cleaning in the output code in opm-output, ewoms and opm-simulator
2018-02-19 15:05:28 +01:00
Tor Harald Sandve
c47dd68b1d Rename test_ecl_output.cpp -> test_ecl_output.cc 2018-02-19 13:18:56 +01:00
Tor Harald Sandve
7884229085 Minor clean up 2018-02-19 13:18:56 +01:00
Tor Harald Sandve
042d288478 move Test 2018-02-19 13:18:56 +01:00
Arne Morten Kvarving
7d7c6bf46c Merge pull request #286 from atgeirr/adapt-to-opm-grid-moved-headers
Adapt to moved opm-grid headers.
2018-02-12 16:31:54 +01:00
Atgeirr Flø Rasmussen
672cfc3ca4 Adapt to moved opm-grid headers. 2018-02-12 10:20:09 +01:00
Andreas Lauser
eb6be94f7a Merge pull request #285 from andlaus/gridManager_to_vanguard
rename the "grid manager" to "vanguard"
2018-02-08 17:53:43 +01:00
Andreas Lauser
7afb963fdd change gridManager -> vanguard in new file test_ecl_output.cpp 2018-02-08 17:07:32 +01:00
Andreas Lauser
2f4b835a16 rename the "grid manager" to "vanguard"
IMO the term "vanguard" expresses better what these classes are
supposed to do: level the ground for the cavalry. Normally this simply
means to create and distribute a grid object, but it can become quite
a bit more complicated, as exemplified by the vanguard classes of
ebos..
2018-02-08 16:26:58 +01:00
Andreas Lauser
e5344a2add adapt to the move of code from opm-common to opm-material 2018-02-08 12:11:20 +01:00
Atgeirr Flø Rasmussen
23910186f8 Merge pull request #278 from totto82/RFIP
FluidInPlace, INIT and EGRID output to Ebos
2018-02-06 12:54:07 +01:00
Tor Harald Sandve
bad406b0a8 Add test for summary output
Test summary output of FIP, FPR and RPR.
2018-02-05 14:24:11 +01:00
Andreas Lauser
922036da89 Merge pull request #276 from andlaus/boundary_condition_refactoring
refactor the boundary condition handling slightly
2018-01-22 13:02:54 +01:00