Andreas Lauser
777fd61342
flow: account for external setup costs
2019-02-05 16:52:58 +01:00
Franz G. Fuchs
42f6f4d784
Correct Logging for Black Oil Well Model for parallel runs using DeferredLogger
2019-02-05 15:24:10 +01:00
Andreas Lauser
4ecda15b11
coding style fixes for the black-oil model and more style fixes for ebos
2019-02-01 17:33:30 +01:00
Andreas Lauser
7f27c4fb4b
fix coding style of the ECL tracer model
2019-02-01 17:33:30 +01:00
Andreas Lauser
9afa62b78b
fix some minor coding style issues in Ewoms::EclOutputBlackOilModule
2019-02-01 17:33:30 +01:00
Andreas Lauser
8b89e6ed97
unify coding style of Ewoms::AluCartesianIndexMapper
2019-02-01 17:33:30 +01:00
Andreas Lauser
c600d807b6
use the eWoms coding style conventions for Ewoms::TracerVdTable
2019-02-01 17:33:30 +01:00
Andreas Lauser
a9359602fc
fix some minor coding style inconsistencies in EclWriter
2019-02-01 17:33:30 +01:00
Andreas Lauser
80e04aa8b4
fix style issues in EclTransmissibility and make the editNnc handling a bit simpler
...
the new editNNC code might be slightly slower, but I doubt that the
difference is even measureable for real decks.
2019-02-01 17:33:30 +01:00
Andreas Lauser
0aa9a2c6b8
make the coding style of femcpgridcompat.hh consistent with the rest of eWoms/ebos
2019-02-01 17:33:30 +01:00
Atgeirr Flø Rasmussen
b471b89890
Merge pull request #1718 from andlaus/mea_culpa
...
Properly adapt to the new linear solver API used by eWoms
2019-02-01 15:45:45 +01:00
Tor Harald Sandve
fb34eb304c
Fix generic boundary conditions for blackoil model
...
Currently it doesn't allow for polymer or solvent influx
on the boundary with the free flow option
2019-01-31 15:41:47 +01:00
Andreas Lauser
c379823dec
Really adapt to the new linear solver API used by eWoms
...
I tested #1712 without deriving the `EclFlowProblem` type tag from
`FlowIstlSolver`, and it worked because the linear solver was still
`Opm::ISTLSolverEbos` because the linear solver is set via the
`LinearSolverSplice` a few lines down.
This time, I verified that the
`Ewoms::Linear::ParallelBiCGStabSolverBackend` was used if the
offending line was commented out. also, Norne worked fine with the
default solver as long as the Schur complement for the wells was done
explicitly.
Finally, the naming of the eWoms API is a bit inconsistent
(`setMatrix()` vs. `setResidual()`). any opinions here? I'm fine with
whatever.
2019-01-30 15:26:39 +01:00
Joakim Hove
13aeee109c
The missing features check takes a ParseContext argument
2019-01-25 18:03:32 +01:00
Andreas Lauser
70a7207578
Merge pull request #465 from GitPaean/fixing_single_precision_restart
...
each phase needs to be above certain value to be treated to be present
2019-01-22 16:11:53 +01:00
Kai Bao
56e829329f
each phase needs to be above certain value to be treated to be present
...
it helps to recover some RESTART running based on single precision
format.
2019-01-22 13:53:08 +01:00
Atgeirr Flø Rasmussen
e39f68787f
Merge pull request #1715 from atgeirr/fix-missing-virtual-destructor
...
Add virtual destructor to base class.
2019-01-21 21:58:15 +01:00
Atgeirr Flø Rasmussen
7c30ee46ce
Merge pull request #1713 from fgfuchs/replace_well_switching_logger
...
Replace well switching logger
2019-01-21 21:56:56 +01:00
Andreas Lauser
dc6de0c31a
Merge pull request #463 from totto82/convertFIPtoLAB
...
convert FIP values to LAB scale
2019-01-21 16:19:04 +01:00
Atgeirr Flø Rasmussen
6b6daa228a
Add virtual destructor to base class.
2019-01-21 15:05:05 +01:00
Atgeirr Flø Rasmussen
037367bb03
Merge pull request #1714 from akva2/janitoring
...
Some janitoring
2019-01-21 15:00:58 +01:00
Tor Harald Sandve
ee7b47e0f9
convert FIP values to LAB scale
2019-01-21 14:55:40 +01:00
Atgeirr Flø Rasmussen
a00972dc0b
Merge pull request #1712 from andlaus/fix_ebos_convergence
...
adapt to the new preparation procedure of ewoms linear solvers
2019-01-21 14:54:09 +01:00
Arne Morten Kvarving
3f79495593
convert to unix line endings
2019-01-21 12:41:52 +01:00
Arne Morten Kvarving
fbc3491fe9
fixed: initializer list order
2019-01-21 12:41:36 +01:00
Franz G. Fuchs
7f1df40b74
fixed naming conventions, messages and comments
2019-01-21 08:26:28 +01:00
Franz G. Fuchs
26bc063a0c
report rank only if size>1
2019-01-18 15:48:05 +01:00
Franz G. Fuchs
80747fc123
log rank
2019-01-18 15:16:59 +01:00
Tor Harald Sandve
22097d4c10
Add trivial connection output to silence the output code
...
In this PR only trivial data is added.
2019-01-18 14:57:25 +01:00
Franz G. Fuchs
129e7d181e
replace well switching logger with deferred logger
2019-01-18 14:04:30 +01:00
Andreas Lauser
2563a58db8
adapt to the new preparation procedure of ewoms linear solvers
2019-01-18 09:05:24 +01:00
Bård Skaflestad
a689973760
Merge pull request #1708 from blattms/warn-parallel-logging-fallout
...
Warn about parallel logging fallout only on request / Use uppercase logfiles
Fixes OPM/opm-common#606
2019-01-17 16:13:25 +01:00
Kai Bao
1a5d38ec9c
Merge pull request #1711 from akva2/fix_update_fetkovich
...
fixed: spurious white space
2019-01-17 12:34:42 +01:00
Arne Morten Kvarving
fd7db0b94a
fixed: spurious white space
2019-01-17 11:29:54 +01:00
Markus Blatt
3b8ef5f004
one line per variable as requested.
2019-01-16 13:16:45 +01:00
Markus Blatt
d87c5764b9
Use doxygen style suggested by reviewer.
2019-01-16 13:16:45 +01:00
Markus Blatt
ace49a2c22
Adhere to CamelCase for types, functions, and variables.
...
This seems to be covered for types and functions by our coding style
with room for interpretation. For variables the coding styles asks for
underlines though, but nevermind.
2019-01-16 13:16:45 +01:00
Markus Blatt
fb0f04d814
[bugfix] Cater for multiple EDITNNC entry for same cell pair.
2019-01-16 13:16:45 +01:00
Markus Blatt
64326dad53
[bugfix] Prevent accessing elements beyond end of NNC entries.
2019-01-16 13:16:45 +01:00
Markus Blatt
362476a494
[bugfix] Prevent double scaling of NNC with EDITNNC resembled trans
...
The former order resulted of first apply NCC to the grid
transmissibilities and then applying EDITNNC resulted in NNCs being
scaled twices. The reason is that applyNNCToGridTrans_ scales the NNC
with EDITNNC. With the patch the order of the function calls is
reversed to prevent double scaling.
2019-01-16 13:16:45 +01:00
Markus Blatt
5e83a26908
Process values from NNC keyword for those connection resembled by grid.
...
This is includes neighboring connection and NNCs due to faults. In both
cases the transmissibilities of specified via NNC are added to the set or
computed ones.
This is the first step for supporting NNC in flow.
2019-01-16 13:16:45 +01:00
Markus Blatt
2dd0b62eff
[bugfix] Added missing ) to make code compile
2019-01-16 12:03:01 +01:00
Markus Blatt
4f4f5cbca3
[bugfix] Only strip ".DATA" or "." extensions.
...
As there might models named MODEL.01.DATA for which a call
"flow MODEL.01" would have stripped the extension.
2019-01-16 12:03:01 +01:00
Markus Blatt
20d12f5b53
[bugfix] Use file not filename to remove files not in current directory.
...
Passing just the filename to remove only will remove files in the
current directory. When --output-dir the files would not have been
removed.
2019-01-16 12:01:46 +01:00
Markus Blatt
0c2edcfe47
Remove debugging output
2019-01-16 11:56:47 +01:00
Joakim Hove
c4c0d4ab9f
Set default value of parameter EnableOpmRstFile to false
2019-01-15 13:05:45 +01:00
Atgeirr Flø Rasmussen
f9f02724b9
Merge pull request #1710 from blattms/fix-parallel-well-hasTHPConstraints
...
Make BlackoilWellModel::hasTHPConstraints() work correctly in parallel.
2019-01-15 09:50:55 +01:00
Atgeirr Flø Rasmussen
1b79501060
Merge pull request #1709 from bska/deferredlogger-openmpi-18
...
Deferred Logger: Support Older MPI Implementations
2019-01-15 09:34:06 +01:00
Markus Blatt
89ec35e0d2
Make BlackoilWellModel::hasTHPConstraints() work correctly in parallel.
...
Previously, this method did not take parallelism into account but just
checked the local wells for the constraints. Depending on the load balancing
of the wells this sometimes led to different return values of the function on different
processors. As the output is used to limit the time step size, different processors
were sometimes using different time steps in their local computations. This screwed
up convergence checks int the nonlinear operator such that only some processor thought
convergence was already achieved while others wanted to do more iterations.
With this commit the method now returns whether there is any well on any processor
with the constraint being true.
2019-01-14 22:14:01 +01:00
Bård Skaflestad
767df6c6fe
Deferred Logger: Support Older MPI Implementations
...
The MPI_Pack() function does not support pointers-to-const until
MPI-3.
2019-01-14 18:10:53 +01:00