Commit Graph

9296 Commits

Author SHA1 Message Date
Kai Bao
e1ede3c9d5 adding polymer molecular weight to BlackoilPhases and phaseUsageFromDeck 2018-12-11 21:31:47 +01:00
Kai Bao
93fb5a2c52 add a few fields related to injectivity to WellStateFullyImplicitBlackoil
to account for the water throughput, skin pressure and water velocity
for each perforation.
2018-12-11 21:31:47 +01:00
Atgeirr Flø Rasmussen
56cc37f255 Move throw-if-nan to after storing convergence report. 2018-12-11 13:10:22 +01:00
Atgeirr Flø Rasmussen
c26aed1d42 Merge pull request #436 from totto82/remove_small_trans
remove transmissibilities less then 1e-6 in the given unit system
2018-12-11 11:26:35 +01:00
Atgeirr Flø Rasmussen
39571de366 Merge pull request #443 from totto82/disableTracer
Add parameter for (dis)enable the tracer model
2018-12-10 11:40:48 +01:00
Tor Harald Sandve
704fbb7b60 Add parameter for (dis)enable the tracer model
The tracer model slows down the simulation time and is disabled by
default, until the performance is improved.
2018-12-10 11:13:35 +01:00
Atgeirr Flø Rasmussen
eeb17b460f
Merge pull request #1677 from joakim-hove/version
Add special case handling of commandline argument "--version"
2018-12-10 10:07:05 +01:00
Joakim Hove
7c6831f8b9 Add cmake test for the --version switch 2018-12-09 21:41:28 +01:00
Joakim Hove
54417a8033 Intercept and the handle commandline argument --version 2018-12-09 20:47:00 +01:00
Atgeirr Flø Rasmussen
4c7dcb1aba Merge pull request #441 from blattms/do-silent-getWriteRestartFile-call-on-nonzero-procs
Do not log messages during getWriteRestartFile query on all procs.
2018-12-07 18:53:45 +01:00
Atgeirr Flø Rasmussen
e8628c35d6 Merge pull request #425 from blattms/process-editnnc
Apply multiplicators from EDITNNC from the Deck.
2018-12-07 18:45:22 +01:00
Markus Blatt
84acf3965f Do not log messages during getWriteRestartFile query on all procs.
Previously all processes reported
Warning: Fast restart using SAVE is not supported. Standard restart file is written instead.
Now this is done only on the master process where logging is activated.
2018-12-07 15:56:45 +01:00
Tor Harald Sandve
bec18a5d91
Merge pull request #1647 from andlaus/thermal_determination
flow: use eclipseState.simulatorConfig().isThermal() to determine whether energy ought to be conserved
2018-12-07 12:51:19 +01:00
Tor Harald Sandve
3d866812a6
Merge pull request #1671 from atgeirr/fix-infinite-loop
Fix potential infinite loop
2018-12-07 12:41:37 +01:00
Markus Blatt
d7d9a3ecd8 bugfix: Fallback to SeqILUn in tracer code for DUNE < 2.6
In that versions SeqILU was not there.
2018-12-07 12:08:03 +01:00
Markus Blatt
a2be89d586 bugfix: Use a typedef that is actually defined.
Fixes `error: ‘LinearSolverScalar’ was not declared in this scope`.
2018-12-07 12:06:29 +01:00
Atgeirr Flø Rasmussen
69cd2f9b84
Merge pull request #1668 from totto82/remove_logging
Remove repetitive logging info
2018-12-07 10:53:31 +01:00
Atgeirr Flø Rasmussen
cb06770b54
Merge pull request #1638 from trinemykk/addtracer
add method for getting the surfacevolume well connection rate
2018-12-07 10:38:21 +01:00
Atgeirr Flø Rasmussen
cf687c19fb
Merge pull request #1571 from kel85uk/fix_#14_aquifer_making_connections
Fixes for carter tracy aquifer model
2018-12-07 09:56:36 +01:00
Tor Harald Sandve
77869606f3 Remove repetitive logging info 2018-12-07 09:28:27 +01:00
Markus Blatt
7c2f6d9275 Refactored loop which applies the EDITNCC. 2018-12-05 10:15:42 +01:00
Markus Blatt
7a4b817010 Add spaces where requested by coding standard 2018-12-03 16:46:03 +01:00
Atgeirr Flø Rasmussen
e3c0a21d6d
Merge pull request #1664 from GitPaean/removing_some_repeated_code_phase_usage
removing some repeated code in phaseUsageFromDeck
2018-12-03 14:32:00 +01:00
Atgeirr Flø Rasmussen
23edd39c63 Revise logic of shutting wells vs. chopping step.
An infinite loop was possible if no wells were actually shut,
yet the step was restarted with no chopping.
2018-12-03 13:25:19 +01:00
Atgeirr Flø Rasmussen
6b896d178e Add bool return value to forceShutWellByNameIfPredictionMode().
Returns true if the well requested was actually shut.
2018-12-03 13:24:34 +01:00
Tor Harald Sandve
f9af2c5084 remove transmissibilities less then 1e-6 in the given unit system 2018-11-30 10:28:17 +01:00
kel85uk
4ccbfefe0b Factor out face area calculation to a separate function. 2018-11-29 09:43:55 +01:00
kel85uk
875fec79fc Makes the necessary interface changes to check for nullptr instead of values for the influx_coeff and aquifer initial pressure. 2018-11-29 07:56:53 +01:00
Kai Bao
575907941d removing some repeated code in phaseUsageFromDeck 2018-11-27 14:55:26 +01:00
Atgeirr Flø Rasmussen
7b550ba06c
Merge pull request #1662 from akva2/remove_files
remove files moved to opm-simulators-legacy
2018-11-27 11:35:05 +01:00
Arne Morten Kvarving
51da91c1ad remove files moved to opm-simulators-legacy 2018-11-27 11:00:21 +01:00
Atgeirr Flø Rasmussen
b6f8128260
Merge pull request #1661 from akva2/removeBlackoilStateCorr
Remove usage of BlackoilState class
2018-11-27 10:14:06 +01:00
Tor Harald Sandve
b661791a63 Remove usage of BlackoilState class
This allows (re)moving of the following files
opm/autodiff/RateConverter.hpp
opm/autodiff/Compat.cpp
opm/autodiff/Compat.hpp
opm/core/props/BlackoilPropertiesInterface.hpp
opm/core/simulator/BlackoilState.cpp
opm/core/simulator/BlackoilState.hpp
opm/core/simulator/BlackoilStateToFluidState.hpp
opm/core/utility/initHydroCarbonState.hpp
opm/polymer/PolymerBlackoilState.cpp
opm/polymer/PolymerBlackoilState.hpp
tests/test_blackoilstate.cpp
2018-11-27 09:38:38 +01:00
Atgeirr Flø Rasmussen
a95e7f60d1
Merge pull request #1659 from atgeirr/fix-wtest-parallel
Fix WTEST in parallel
2018-11-26 11:03:54 +01:00
Atgeirr Flø Rasmussen
7e91381cd8 Fix another parallel bug.
A WellSwitchingLogger was created in a local context (meaning not
all processes might be there), but since its destructor does
communication it must be called in a global context (guaranteeing
that all processes create it).
2018-11-26 10:21:25 +01:00
Atgeirr Flø Rasmussen
09405ce6f5 Fix bug in parallel case.
Since computeAverageFormationFactor() involves communication to reduce
values across the whole reservoir, it must be called by all processes,
also those with no wells to reopen.
2018-11-26 09:39:54 +01:00
Atgeirr Flø Rasmussen
cc1d22b35c
Merge pull request #1657 from GitPaean/welltesting_physical_reason
first version of the well testing for physical reason
2018-11-26 09:32:46 +01:00
Kai Bao
76271e3960 not shut a well because of cannot-produce-inject reason
which is a numerical reason. Removing it for now for better result.

It minght come back with more complete strategy and understanding.
2018-11-25 20:31:56 +01:00
Kai Bao
3dac7266b0 typo correction and message output adjustment for WTEST
recovering the const for updateWellStateWithTarget

there is no functional change.
2018-11-25 20:31:56 +01:00
Kai Bao
680c45b8f8 not updateWellControl for non-operable wells 2018-11-25 20:31:56 +01:00
Kai Bao
eaa3ad19f5 first version of the well testing for physical reason
the key difficulty is that we do not have reliable explicit information
to do the testing.

In this version, we try to obtain the explicit information by finishing
one converged solving.
2018-11-25 20:31:56 +01:00
Atgeirr Flø Rasmussen
4343ae6be0
Merge pull request #1654 from atgeirr/optimize-parilu0
Avoid in-loop allocation in convertToCRS().
2018-11-23 22:24:54 +01:00
Atgeirr Flø Rasmussen
48db4062b5 Count lower/upper entries simpler and faster. 2018-11-23 21:38:22 +01:00
Atgeirr Flø Rasmussen
8a038401ce Avoid in-loop allocation in convertToCRS().
This is done by counting entries first.
2018-11-23 21:38:22 +01:00
Atgeirr Flø Rasmussen
e66af25d0d
Merge pull request #1658 from atgeirr/shutdown-chopping-wells
Shut time-chopping wells
2018-11-23 13:56:47 +01:00
Atgeirr Flø Rasmussen
8bd3cbc1c1 Only shut down wells if under prediction-type control. 2018-11-23 12:51:13 +01:00
Atgeirr Flø Rasmussen
d8882fe263
Merge pull request #1655 from akva2/remove_legacy_update
remove legacy tests from update data script
2018-11-22 19:13:48 +01:00
Atgeirr Flø Rasmussen
1979fc8f5d Avoid deep chopping by shutting down misbehaving wells. 2018-11-22 16:24:52 +01:00
Atgeirr Flø Rasmussen
422d477945 Add method BlackoilWellModel::forceShutWellByName(). 2018-11-22 16:24:17 +01:00
Atgeirr Flø Rasmussen
3bbc13a9ce Add step numbers to convergence reports, add query method. 2018-11-22 11:14:39 +01:00