Kai Bao
76edcc0d91
addressing the second part of comments form PR#1680
2018-12-13 21:31:36 +01:00
Kai Bao
c4254240e2
addressing the first part of comments form PR#1680
...
there should be no functional change.
2018-12-13 13:29:59 +01:00
Tor Harald Sandve
af45c893cf
Merge pull request #445 from totto82/remove_nnc
...
Remove only nnc trans
2018-12-13 12:27:10 +01:00
Atgeirr Flø Rasmussen
51d85d25d1
Merge pull request #1678 from atgeirr/fix-throw-before-storing-report
...
Move throw-if-nan to after storing convergence report.
2018-12-13 11:15:03 +01:00
Tor Harald Sandve
a5499ce576
remove only small nnc trans
2018-12-13 11:00:27 +01:00
Kai Bao
1ddcfcb679
adding test for polymer_injectivity
2018-12-12 16:24:24 +01:00
Kai Bao
5535406b67
cleaning StandardWell and StandardWellV
...
to make them more comparable, so that we can do refactoring easier
later.
2018-12-12 15:58:15 +01:00
Kai Bao
c9d9023039
addressing reviewing comments from PR #444
2018-12-12 14:50:22 +01:00
Kai Bao
932e4d1bf1
cleaning up of the code
...
there should be no functionality change
2018-12-11 21:55:20 +01:00
Kai Bao
31c18bd70e
adding the functionality to track the polymer molecular weight
...
it is used to evaluate the water-polymer mixture viscosities
2018-12-11 21:55:20 +01:00
Kai Bao
167306169b
including the injectivity program to flow
2018-12-11 21:41:44 +01:00
Kai Bao
525caad508
finishing the function addWellContributions for StandardWellV
2018-12-11 21:40:47 +01:00
Kai Bao
612ac74b89
finish the injecivity functionality
...
the result looks okay
2018-12-11 21:40:47 +01:00
Kai Bao
391d31e1d6
adding the polymer molecular related to the well model
2018-12-11 21:40:47 +01:00
Kai Bao
7923628f83
adding the few injectivity related functions to StandardWellV
2018-12-11 21:40:47 +01:00
Kai Bao
a08216efd5
creating StandardWellV as the new well model
...
to employ dynamic-size Evalution, vectors and matrices.
2018-12-11 21:40:47 +01:00
Kai Bao
b079c0a1e5
adding flow_injecitivity executable target
2018-12-11 21:40:47 +01:00
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