Commit Graph
8441 Commits
Author SHA1 Message Date
Zeeuw 73445a3055 solves merging conflicts 2019-01-03 13:18:01 +01:00
WesselDeZeeuw 214c963177 correction to update_reference_data.sh file 2019-01-03 13:04:10 +01:00
WesselDeZeeuw b3deeed165 Changed the compare and test files, to extend with a test case for the fetkovich aquifer 2019-01-03 13:04:10 +01:00
WesselZ d6f1f1bd3d Implementation of Fetkovich Aquifers. Makes changes to the files for BlackOilAquiferModel(_impl) and AquiferFetkovich file. 2019-01-03 13:04:10 +01:00
Kai Bao 9a6f390f38 Merge pull request #1691 from atgeirr/fix-missing-grat
Fix missing GRAT in switch.
2019-01-02 21:22:41 +01:00
Atgeirr Flø Rasmussen 9ba0184da4 Merge pull request #1676 from GitPaean/fixing_grid_indices
fixing grid_index for AquiferCarterTracy
2019-01-02 15:32:28 +01:00
Atgeirr Flø Rasmussen 10c77257ad Fix missing GRAT in switch. 2019-01-02 15:29:22 +01:00
Kai Bao b3f29de675 using compressed cell index for cellToConnectionIdx_ in AquiferCarterTracy 2019-01-02 14:59:12 +01:00
Atgeirr Flø Rasmussen 7771725e4c Merge pull request #1683 from GitPaean/using_msw_test_msw_model_1
adding --use-multisegment-well=true to msw-model-1 test
2019-01-02 12:51:03 +01:00
Kai Bao f5648b13a1 adding --use-multisegment-well=true to msw-model-1 test 2018-12-19 16:36:56 +01:00
Atgeirr Flø Rasmussen 483d6c50e1 Merge pull request #1681 from atgeirr/fix-shutting-new-well
Avoid opening well that was shut on same time step.
testing/2018.12/rc4
2018-12-17 11:47:31 +01:00
Atgeirr Flø Rasmussen a48fbac322 Merge pull request #1680 from GitPaean/flow_polymw_remake
adding the simulator for flow injectivity study
2018-12-17 10:26:41 +01:00
Kai Bao 3a55e4aac2 fixing grid_index for AquiferCarterTracy
adding the mapping from cartisian indices to the actual grid indices.
2018-12-14 15:36:49 +01:00
Kai Bao 0c42a179d5 makig StandardWellV can handle producer
now StandardWellV should be able to be used as the general Standard
Well.
2018-12-14 10:24:08 +01:00
Atgeirr Flø Rasmussen b1c16e536b Avoid opening well that was shut on same time step. 2018-12-14 10:04:59 +01:00
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
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
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 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 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
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
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
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
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