Commit Graph

5587 Commits

Author SHA1 Message Date
Kai Bao
b5323b1b79 begin the class WellStateMSWell
it will be for each individual MS well.
it is kind of the start of the refactoring of the WellState.
2017-10-12 13:36:27 +02:00
Kai Bao
359de15f2b begining MultisegmentWell.hpp 2017-10-12 13:36:27 +02:00
Atgeirr Flø Rasmussen
f30b95e0e7 Merge pull request #1298 from blattms/cleanup-version-ifs
[cleanup] Removes unnecessary if clauses for unsupported DUNE versions.
2017-10-12 13:28:45 +02:00
Atgeirr Flø Rasmussen
91cac266b4 Merge pull request #1299 from andlaus/remove_SimulationParameter
do not set the SimulationParameter property anymore
2017-10-12 10:47:03 +02:00
Atgeirr Flø Rasmussen
9206909f75 Merge pull request #1297 from GitPaean/ratio_economic_well
handling WELL workover over ratio economic limit.
2017-10-12 06:52:33 +02:00
Atgeirr Flø Rasmussen
aba0b14907 Merge pull request #1301 from andlaus/update_banner2
update flow startup message
2017-10-12 06:49:06 +02:00
Andreas Lauser
d1ce08d654 update flow startup message
The old message was not really accurate anymore because flow also
supports the polymer and solvent extensions. (Also, the parentheses
around the version were removed because they are not necessary.)

v2: use the message proposed by [at]atgeirr
v3: re-add accidentially removed website URL
2017-10-11 23:33:47 +02:00
Atgeirr Flø Rasmussen
d770e16abf Merge pull request #1289 from totto82/removeWellStateFullyImplicitBlackoilDense.hpp
Remove WellStateFullyImplicitBlackoilDense
2017-10-11 18:59:53 +02:00
Markus Blatt
56cd0f5d24 Removed unnecessary version if in transmult test 2017-10-11 16:20:36 +02:00
Andreas Lauser
ae3842fa80 remove do not set the SimulationParameter property anymore
this needs to merged before the SimulationParameter hack can be
removed from eWoms. the patch will cause spurious deprecation warnings
until then. (i.e., it is best to merge them together.)
2017-10-11 16:01:55 +02:00
Markus Blatt
6a5dc78249 [cleanup] Removes unnecessary if clauses for unsupported DUNE versions.
We are targetting DUNE 2.4.* and 2.5.* currently. Therefore this commit removes
the if checks for lower versions to cleanup the code.
2017-10-11 15:53:45 +02:00
Atgeirr Flø Rasmussen
67401d7d63 Merge pull request #1287 from andlaus/improve_polymorphic_flow
Improve polymorphic flow
2017-10-11 15:44:54 +02:00
Atgeirr Flø Rasmussen
0264a1f609 Merge pull request #1294 from akva2/there_there_mr_ocd
quell signed/unsigned mismatch warning
2017-10-11 14:07:03 +02:00
Kai Bao
5328de6361 handling WELL workover over ratio economic limit. 2017-10-11 13:35:07 +02:00
Tor Harald Sandve
dc8f811cbe Remove WellStateFullyImplicitBlackoilDense
After the restructuring of of the well model, keeping an extra class for
the "Dense" model is not needed. The only thing still left in
WellStateFullyImplicitBlackoilDense was some solvent related stuff, this
PR moves this to WellStateFullyImplicitBlackoil and removes
WellStateFullyImplicitBlackoilDense.

In addition to a cleaning code this PR fixes missing solvent well output.
2017-10-11 10:54:59 +02:00
Atgeirr Flø Rasmussen
6b00176966 Merge pull request #1296 from GitPaean/removing_GEFAC_missing_features
removing GEFAC from MissingFeatures.cpp
2017-10-11 10:15:36 +02:00
Kai Bao
2458b45901 removing GEFAC and SSOL from MissingFeatures.cpp 2017-10-10 15:53:12 +02:00
Atgeirr Flø Rasmussen
de1be6b5ef Merge pull request #1273 from GitPaean/different_oscillation
avoiding the oscillation treatment applied to well solution
2017-10-10 14:29:04 +02:00
Andreas Lauser
ab93f58371 some minor cleanups
this fixes a few warnings and removes now-unnecessary function arguments.
2017-10-10 14:07:07 +02:00
Arne Morten Kvarving
a0b81a131a quell signed/unsigned mismatch warning 2017-10-09 14:45:08 +02:00
Atgeirr Flø Rasmussen
63b38cfe20 Merge pull request #1281 from totto82/fixRESV
Use pore volume weighted averaged hydrocarbon state in rateConverted.
2017-10-09 13:42:43 +02:00
dr-robertk
682424a7bf Merge pull request #1286 from blattms/communicate-ebos-solution-in-run
Communicate the ebos solution at the beginning of the run method.
2017-10-09 13:13:58 +02:00
Atgeirr Flø Rasmussen
8a31121522 Merge pull request #1293 from akva2/include_flow_in_data_update
add flow simulators to the data update script
2017-10-09 12:14:16 +02:00
Arne Morten Kvarving
2acb886292 add flow simulators to the data update script 2017-10-09 11:21:55 +02:00
Andreas Lauser
cede806bd5 flow: refactor the specializations
The motivation for this PR is that currently the build fails on my
Ubuntu 17.10 laptop with two processes because that machine "only" has
8 GB of RAM (granted, the optimization options may have been a bit too
excessive). under the new scheme, each specialization of the simulator
is put into a separate compile unit which is part of
libopmsimulators. this has the advantages that the specialized
simulators and the main binary automatically stay consistent, the
compilation is faster (2m25s vs 4m16s on my machine) because all
compile units can be built in parallel and that compilation takes up
less RAM because there is no need to instantiate all specializations
in a single compile unit.

on the minus side, all specializations must now always be compiled,
the approach means slightly more work for the maintainers and the
flow_* startup code gets even more complicated.
2017-10-06 15:35:00 +02:00
Andreas Lauser
0c92c24dcb flow_ebos*: make it build and (the sequential part) work if dune-fem is available
in particular, this implied some changes to the MPI initialization
code. since dune-fem's GridPart class currently has issues with
CpGrid's implementation of loadBalance(), parallel computations still
do not work if dune-fem is around, but at least sequential ones now
do even if MPI is enabled.
2017-10-06 15:35:00 +02:00
Andreas Lauser
64d7366de2 mark the non-template methods of the adaptive time stepper as inline
this is needed to avoid linker errors if this class ought to be used
in multiple compile units. IMO the main problem here is the use of an
_impl.hpp file.
2017-10-06 15:34:59 +02:00
Atgeirr Flø Rasmussen
1dd86cfc61 Merge pull request #1285 from akva2/quell_warnings
Quell warnings
2017-10-06 15:28:06 +02:00
Atgeirr Flø Rasmussen
26aa03e7ae Merge pull request #1291 from akva2/workaround_eigen_operator_issue
workaround eigen 3.3.2 issue
2017-10-06 14:27:34 +02:00
Atgeirr Flø Rasmussen
396b9886cc Merge pull request #1290 from atgeirr/test-tolerance
Further slacken coarse test tolerance for the benefit of test 27.
2017-10-06 13:03:51 +02:00
Arne Morten Kvarving
02b4644612 workaround eigen 3.3.2 issue
eigen returns a matrix with all coefficients stored from the operator/
this makes the comparison fail as x has no nonzeros
2017-10-06 12:48:43 +02:00
Atgeirr Flø Rasmussen
597021084f Further slacken coarse test tolerance for the benefit of test 27. 2017-10-06 11:49:54 +02:00
Atgeirr Flø Rasmussen
66cbc30bf6 Merge pull request #1288 from atgeirr/improve_test_macros_modified
Improve test macros modified
2017-10-06 10:38:41 +02:00
Atgeirr Flø Rasmussen
6c1ae7a658 Make tests pass across Dune 2.4 and 2.5. 2017-10-06 09:26:37 +02:00
Markus Blatt
9adc4d5d3c Communicate the ebos solution at the beginning of the run method.
Currently, the ReservoirState passed to the method and converted
to the initial solution of the Ebos simulator might have wrong
values in the ghost layer (this is the case for SPE9, Norne, Model 2).
This commit uses the syncOverlap method to update these values once they
are converted to the Ebos solution. The  ReservoirState remains untouched.
This is enough to have consistent values throughout the simulation and only
introduces one additional communication step.
2017-10-05 14:33:48 +02:00
Arne Morten Kvarving
35fbe03ca7 remove unused variables
quells warnings
2017-10-05 12:02:10 +02:00
Arne Morten Kvarving
167147acc4 use std::remove_const instead of Dune::remove_const 2017-10-05 12:02:10 +02:00
Arne Morten Kvarving
0cf7080284 added: allow 15 iterations in spe3 test
this is necessary due to slight differences between dune 2.4 and dune 2.5
2017-10-05 11:05:14 +02:00
Arne Morten Kvarving
55ca4c9dbe changed: rewrite the test invocation macros using cmake_parse_arguments
motivation is to make it easier to pass additional parameters to the test
2017-10-05 10:51:20 +02:00
Tor Harald Sandve
ebc2f46967 Use pore volume weighted averaged hydrocarbon state in rateConverted.
- pressure, rs and rv is averaged using hydrocarbon pore volume weights.
- pvtRegions is used as input in the conversion factor calculations.
- the pvt cell of the first well cell is used as the pvt index.
(Completing a well in two different PVT regions sounds like a very bad
idea anyway)
- FIP region support is added to the rate converter also for the ebos
interface.
2017-10-03 10:25:56 +02:00
Kai Bao
28a7167d61 avoiding the oscillation treatment applied to well solution
it is a design to avoid some performance degeneration for parallel
running.
2017-09-29 17:15:39 +02:00
Arne Morten Kvarving
cdb8220c9b Merge pull request #1276 from blattms/cmakify-sibling-search
Cmakify sibling search
2017-09-27 09:34:33 +02:00
Markus Blatt
03a94c1cde Got rid of false warning for empty opm_common_DIR. 2017-09-26 16:39:50 +02:00
Atgeirr Flø Rasmussen
5aa78bd0f8 Merge pull request #1278 from akva2/fix_flow_ebos_spe1_2p
fixed: spe1_2p is not run with flow_ebos, it is run with flow_ebos_2p
2017-09-26 08:43:10 +02:00
Arne Morten Kvarving
0b2fa89e69 fixed: spe1_2p is not run with flow_ebos, it is run with flow_ebos_2p 2017-09-26 08:05:42 +02:00
Markus Blatt
54acb69d7a Drop support for OPM_COMMON_ROOT.
Users should either rely in sibling search, use opm-common_DIR, or
set CMAKE_PREFIX_PATH correctly to find opm-common.
2017-09-25 14:03:01 +02:00
Markus Blatt
a26cec6a6c Allow arbitrary clone directories and <prefix><module-name><postfix> build directories 2017-09-25 13:54:04 +02:00
Markus Blatt
0b83f68cdc Warn if OPM_COMMON_ROOT and opm-common_DIR are set and use the latter. 2017-09-25 13:53:34 +02:00
Markus Blatt
f6db28eb5d Changed find_package call to require opm-common.
Previously, QUIET was passed to opm-common which would
not even print a message if there is a problem. Now cmake
will fail if OPM_COMMON_ROOT is not set, and neither guessing
opm_common_DIR did  work nor searching in the default locations.
2017-09-25 13:53:34 +02:00
Markus Blatt
e59084c540 Added deprecation warning if OPM_COMMON_ROOT is used 2017-09-25 13:53:34 +02:00