Commit Graph

9564 Commits

Author SHA1 Message Date
Tor Harald Sandve
17c249fa46
Merge pull request #1765 from andlaus/minor_cleanups
Minor cleanups
2019-03-26 12:38:50 +01:00
Markus Blatt
831f41c0e3 Cater for empty fipnum vectors in output code.
Due to loadbalancing this vector might be empty under some circumstances.
Hence the old code would dereference the end iterator which is a bug.
2019-03-22 15:14:08 +01:00
Andreas Lauser
cdb2c6312a ebos: add a stub implementation for API tracking
the only thing which this does so far is to introduce the respective
property and `ebos` will abort the run if the deck requests API tracking.

As usual for experimental features, `flow` is unaffected.
2019-03-22 15:04:07 +01:00
Andreas Lauser
076f18c5d5
Merge pull request #1768 from andlaus/ebos_deck_check
ebos: add some checks to make sure that the simulator produces what the deck specifies
2019-03-22 15:02:00 +01:00
Andreas Lauser
0b0eb6df5e ebos: add some checks to make sure that the simulator produces what the deck specifies
this should significantly reduce surprising behavior for users. since
this is an experimental feature, `flow` is unaffected.
2019-03-22 13:38:58 +01:00
Andreas Lauser
72c02f4a5d
Merge pull request #1754 from andlaus/ebos_altidx
add an ebos variant which uses completely different numbering for phases and components
2019-03-22 10:56:23 +01:00
Joakim Hove
9d6e53ac6d
Merge pull request #1766 from joakim-hove/update-testdata
Add PERM values in test deck
2019-03-22 08:29:08 +01:00
Joakim Hove
77bd1c8019 Add PERM values in test deck 2019-03-21 17:00:56 +01:00
Joakim Hove
e16b19adc7
Merge pull request #1764 from joakim-hove/move-events
Move events
2019-03-21 14:51:52 +01:00
Joakim Hove
27c78eb3dc Extract NEW_WELL event from Schedule 2019-03-21 14:49:49 +01:00
Andreas Lauser
f1d3be27a7 ISTLSolverEbos: fix valgrind complaint that isIORank_ is not initialized
like most of the rest of the code, we now simply assume that rank 0
does all printing.
2019-03-21 12:35:26 +01:00
Andreas Lauser
1b8124cc31 EclProblem: remove the initialTemperature_ array
this was not used since the fluid states that correspond to the
initial condition are kept permanently.
2019-03-21 12:35:10 +01:00
Joakim Hove
222241b3b3 Extract production update events from Schedule 2019-03-21 11:45:29 +01:00
Atgeirr Flø Rasmussen
f18477ce71
Merge pull request #1757 from atgeirr/improve_cpr_mod
Improve CPR solver
2019-03-21 11:19:10 +01:00
Atgeirr Flø Rasmussen
19b78b78c0 Updated after review comments. 2019-03-20 10:24:44 +01:00
Atgeirr Flø Rasmussen
dc1135324f
Merge pull request #9 from andlaus/improve_cpr_mod
make the branch self contained
2019-03-20 10:21:34 +01:00
Andreas Lauser
685a193558 make the branch self contained
Concretely this avoids having to patch eWoms by adding a generic
`Opm::transposeDenseMatrix()` template function instead of relying on
the dense matrix class to provide a `transpose()` method.
2019-03-19 15:09:19 +01:00
hnil
41acbcf861 change verbosity level setting for cpr to be more finegrained 2019-03-19 14:38:40 +01:00
hnil
b27e56e386 fixed bug in scaling of rhs for cpr 2019-03-19 14:32:32 +01:00
hnil
31f4c01938 Changes to make CPR able to use general indexing. 2019-03-15 11:27:38 +01:00
Atgeirr Flø Rasmussen
9af17dcc8c
Merge pull request #7 from akva2/improve_cpr_mod
remove unused variables
2019-03-15 09:16:24 +01:00
Arne Morten Kvarving
bedd88bc77 remove unused variables 2019-03-14 15:21:59 +01:00
Kai Bao
a7362abb04
Merge pull request #1758 from akva2/janitoring
convert to unix eol
2019-03-14 14:41:18 +01:00
Arne Morten Kvarving
d8d8050de9 convert to unix eol
unmark sources as executable
2019-03-14 13:37:05 +01:00
Atgeirr Flø Rasmussen
81ba405f26
Merge pull request #6 from akva2/improve_cpr_mod
Improve cpr mod
2019-03-14 11:53:16 +01:00
Arne Morten Kvarving
e1db2d2344 simplify: use dotproduct in DRS for vector 2019-03-14 11:52:21 +01:00
Arne Morten Kvarving
f98be9d43b simplify: use matrix-vector product in DRS for matrix 2019-03-14 11:52:21 +01:00
Arne Morten Kvarving
e12b959def fix test_blackoil_amg 2019-03-14 11:52:21 +01:00
Arne Morten Kvarving
41ff0da2b4 fixed: drs without matrix-add-well-contributions 2019-03-14 11:52:21 +01:00
Arne Morten Kvarving
e05e5e4f0e Fix indenting 2019-03-14 11:52:21 +01:00
Atgeirr Flø Rasmussen
111feead14 Formatting fixes and removing unused code. 2019-03-14 11:22:07 +01:00
Atgeirr Flø Rasmussen
6ee5406a9f Formatting and indentation fixes. 2019-03-14 10:37:46 +01:00
Atgeirr Flø Rasmussen
4eb44b4808 Remove unused code and fix indentation changes. 2019-03-14 10:05:20 +01:00
Atgeirr Flø Rasmussen
13cd05fc19 Add weights argument to test for BlackoilAmg. 2019-03-14 09:56:12 +01:00
Atgeirr Flø Rasmussen
569ee02622
Merge pull request #1730 from fgfuchs/exception_handling_in_wells_for_parallel_runs
correct exception handling in wells for parallel runs
2019-03-13 15:40:36 +01:00
Franz G. Fuchs
25299b7a0a correct exception handling in wells for parallel runs 2019-03-13 15:19:31 +01:00
Andreas Lauser
fe62b4fe5e add an ebos variant which uses completely different numbering for phases and components
for some reason, this yields quite different results for norne than
the default variant, e.g. when comparing PRESSURE, we get

```
> compareECL -k PRESSURE -t UNRST ebos/NORNE_ATW2013 ebos_altidx/NORNE_ATW2013 1 1e-4
Comparing 'ebos/NORNE_ATW2013' to 'ebos_altidx/NORNE_ATW2013'.
Comparing PRESSURE...
Occurrence in first file    = 9
Occurrence in second file   = 9
Value index                 = 0
(first value, second value) = (254.195, 253.191)

Program threw an exception: [/home/and/src/opm-common/build-cmake/fake-src/examples/test_util/EclRegressionTest.cpp:161] Deviations exceed tolerances.
The absolute deviation is 1.00311, and the tolerance limit is 1.
The relative deviation is 0.00394624, and the tolerance limit is 0.0001.
```

IMO this is a bug, but the reasons for it are currently unknown.
2019-03-13 11:14:22 +01:00
Atgeirr Flø Rasmussen
a80527f808
Merge pull request #1753 from atgeirr/fix-hardcoded-phase-indices
Replace hardcoded phase indexing.
2019-03-13 11:07:23 +01:00
hnil
3bcc80cc5b changes to make test compile, however the tests tests matrixes functionality not used in flow 2019-03-12 15:13:38 +01:00
hnil
40537f1999 Changes to make cpr work 2019-03-12 13:55:11 +01:00
Andreas Lauser
6452fbc3cd
Merge pull request #1752 from totto82/fixTUNING
Fix bugs in the TUNING implementation in ebos
2019-03-11 12:00:56 +01:00
Atgeirr Flø Rasmussen
ea9783277d Replace hardcoded phase indexing. 2019-03-11 11:36:41 +01:00
Tor Harald Sandve
a6e82886bb Fix bugs in the TUNING implementation in ebos 2019-03-11 10:18:27 +01:00
Joakim Hove
39525dbf9c
Merge pull request #1749 from joakim-hove/move-wells
Move well includes to subdirectory Well/
2019-03-08 12:42:30 +01:00
Tor Harald Sandve
90168da8af
Merge pull request #1747 from andlaus/ebos_variants
add some ebos variants
2019-03-08 11:31:17 +01:00
Joakim Hove
485db348f0 Move well includes to subdirectory Well/ 2019-03-07 15:30:33 +01:00
Andreas Lauser
fb70fe2ba3 add but do not build disabled targets
this simply excludes the disabled simulators from `make all` while
`make flow` will continue to work even if the cmake variable
`BUILD_FLOW` was set to `OFF`. This requires a small patch for
opm-common.
2019-03-07 12:45:15 +01:00
Arne Morten Kvarving
e1de1d88b9
Merge pull request #1748 from akva2/package_bash_completions
fixed: package all bash completions on redhat
2019-03-07 09:05:13 +01:00
Arne Morten Kvarving
1d3df07f90 fixed: package all bash completions on redhat 2019-03-06 14:59:48 +01:00
Atgeirr Flø Rasmussen
f0f06225c5
Merge pull request #1743 from GitPaean/testing_storage_term_stdwell
correcting the sign of the accumulation term of StandardWell
2019-03-06 13:31:10 +01:00