Commit Graph

12404 Commits

Author SHA1 Message Date
Bård Skaflestad
120afea99a
Merge pull request #3079 from totto82/testDiff
FOR TESTING. Enable Diffusion by default
2021-03-19 23:49:19 +01:00
Bård Skaflestad
f82386c2d5
Merge pull request #3122 from joakim-hove/throw-std-logic-error
Deferred logger will throw "correct" exception
2021-03-19 17:26:42 +01:00
Joakim Hove
634f0d61d8 Deferred logger will throw "correct" exception 2021-03-19 14:05:55 +01:00
Bård Skaflestad
984ea28d6f
Merge pull request #3121 from bska/prune-unused-object
Push 'corners' Object into Assert
2021-03-19 12:23:05 +01:00
Bård Skaflestad
c220d7f127 Push 'corners' Object into Assert
That way we don't get "unused variable" warnings when someone
defines NDEBUG.  While here, also switch to using Geometry
references where appropriate to avoid needlessly copying Geometry
objects.
2021-03-19 09:42:27 +01:00
Bård Skaflestad
2b34dc843c
Merge pull request #3119 from totto82/mintimestep
Change minimum timestep size to 1e-12
2021-03-19 09:39:35 +01:00
Tor Harald Sandve
16f7bb4be1
Merge pull request #3093 from bska/record-dynamic-wellstatus
Record dynamic wellstatus
2021-03-19 09:07:44 +01:00
Bård Skaflestad
b982ad0fd2 Record Dynamic Well Status in 'wellData()' Output
This commit sets the 'data::Well::dynamicStatus' based on the
dynamically updated 'Schedule' object (i.e., from ACTIONX and
similar) and the results of well/operability testing (WECON and/or
WTEST).  If a well is closed due to economic limits (WECON) we still
provide summary-style data at the timestep that closed the well, but
omit this data at later steps until the well reopens.

We add a new parameter to WellState::report() to distinguish these
situations.

This is in preparation of making the 'BlackoilWellModel' manage both
open and shut wells alike.
2021-03-18 17:28:28 +01:00
Bård Skaflestad
65edfb702c Preparations for Recording Dynamic Well State
Coalesce blocks with same conditions, split long lines, and apply
'const' where appropriate.  While here, also tighten the "rate = 0"
criterion to include denormalised numbers.
2021-03-18 17:28:28 +01:00
Joakim Hove
cd7c4d9927
Merge pull request #3112 from totto82/refact_ginj
Add support for explicit guiderate for injection groups
2021-03-18 17:03:53 +01:00
Tor Harald Sandve
61de5689bd cleanup: add and remove comments 2021-03-18 14:56:45 +01:00
Tor Harald Sandve
58fa3eaf31 replace asserts with OPM_DEFLOG_THROW 2021-03-18 11:58:05 +01:00
Tor Harald Sandve
1582d92d06 Change minimum timestep size to 1e-12
the unit is days for field and metric and hours for lab
the purpose is to shut down "dead" simulations
2021-03-18 10:45:26 +01:00
Tor Harald Sandve
3df75f5ab6
Merge pull request #3076 from totto82/drsdt_dyn
Implement convective dissolution rate
2021-03-18 08:45:46 +01:00
Bård Skaflestad
0667497108
Merge pull request #3039 from GitPaean/new_numerical_aquifer
New numerical aquifer
2021-03-16 16:30:53 +01:00
Tor Harald Sandve
6bac5da27c adapt to changes in the guiderate interface 2021-03-16 15:56:31 +01:00
Tor Harald Sandve
f4ac7f555b Add support for explicit guiderate for injection groups
With this commit the guiderate logic used for the production groups is also used for injectors
This allows for setting guiderates explicit at different group levels
Only RATE, NETV and VOID guiderate type is suppored.
2021-03-16 15:56:31 +01:00
Kai Bao
24d5d73009 cleaning up comments
There is no functional change.
2021-03-15 21:15:56 +01:00
Tor Harald Sandve
c29b61ff99
Merge pull request #3074 from plgbrts/thermaloutput
Temperature output for producers
2021-03-15 13:54:18 +01:00
Markus Blatt
906c3036c4
Merge pull request #3110 from blattms/external-fmtlib-2
Enable usage of fmtlib on the system.
2021-03-15 13:26:34 +01:00
Kai Bao
1bd7d8775a Merge remote-tracking branch 'upstream/master' into new_numerical_aquifer 2021-03-15 12:16:09 +01:00
Kai Bao
116b77bd8a addressing the reviewing comments for PR OPM/opm-simulators#3039
putting the numerical aquifer related modification in a function and the
function is called after the equilibration calculation, so it will work
for different equilibration methods.
2021-03-15 10:21:40 +01:00
Joakim Hove
8adea8c68a
Merge pull request #3102 from totto82/validControls2
make sure wells has valid controls
2021-03-15 09:43:22 +01:00
Kai Bao
afac0fb485 changing the parameters for the numerical aquifer regression tests
cpr linear solver is used for better convergence.
2021-03-12 23:39:01 +01:00
Markus Blatt
6766f2f81e Enable usage of fmtlib on the system.
If fmtlib is present on the system we used that one
in the normal mode (not header only). Otherwise we
fallback to the embedded one header only.
Searching for the library is done on opm-common.
2021-03-11 20:03:00 +01:00
Atgeirr Flø Rasmussen
a05bb1a0b9
Merge pull request #3109 from fgfuchs/fix_infostep
fix ordering of first line in *INFOSTEP files
2021-03-11 15:31:07 +01:00
Kai Bao
9ecdca75d9 Merge remote-tracking branch 'upstream/master' into new_numerical_aquifer 2021-03-11 14:08:42 +01:00
Kai Bao
82521be152 adjusting the parameters for the numerical aquifer regression test 2021-03-11 11:43:34 +01:00
Franz Georg Fuchs
d13cf3ee6a fix ordering of first line in *INFOSTEP files 2021-03-11 11:22:58 +01:00
Joakim Hove
7a8fa25772
Merge pull request #3108 from joakim-hove/simplify-rst-keywords
Remove superfluos function call
2021-03-10 14:48:44 +01:00
Tor Harald Sandve
9c330b724c
Merge pull request #3070 from GitPaean/limiting_time_step
[test] Not reducing time step to be below 3 days due to iterations counting
2021-03-10 14:41:00 +01:00
Kai Bao
347ca3978a adding parameter to control the min time step
can be reduced to based on the newton iteration counts.

By default it is zero, so it should not change any running results.
2021-03-10 11:49:59 +01:00
Joakim Hove
16e6bc0d59 Remove superfluos function call 2021-03-10 10:44:39 +01:00
Joakim Hove
7e59532944
Merge pull request #3104 from joakim-hove/summary-config-rm-tables
Remove TableManager argument when constructing SummaryConfig
2021-03-10 07:33:06 +01:00
Arne Morten Kvarving
fd273f4802
Merge pull request #3107 from totto82/fixBoundaryIssueAgain
adapt to changes in opm-models
2021-03-09 14:42:57 +01:00
Tor Harald Sandve
8ad00e60f9
Merge pull request #3096 from totto82/weconPOTN
add support for POTN in WECON
2021-03-09 13:51:14 +01:00
Tor Harald Sandve
858856adec update solution for WAG injectors 2021-03-09 13:37:03 +01:00
Kai Bao
0ad848658e
Merge pull request #3099 from atgeirr/revive-using_porevolume_average
Fix hydrocarbon volume issue with no oil or gas
2021-03-09 12:15:06 +01:00
Arne Morten Kvarving
132bad5f6a
Merge pull request #3106 from akva2/janitoring
quell uninitialized usage warning without mpi
2021-03-09 10:48:53 +01:00
Tor Harald Sandve
0c66a38adf adapt to changes in opm-models 2021-03-09 09:44:53 +01:00
Arne Morten Kvarving
e179bb5850 quell uninitialized usage warning without mpi 2021-03-09 08:39:17 +01:00
Joakim Hove
46ae5fa577
Merge pull request #3105 from joakim-hove/output-interval
Pass ouput interval overeride to Schedule constructor
2021-03-09 07:25:50 +01:00
Joakim Hove
ec344d555d Pass ouput interval overeride to Schedule constructor 2021-03-08 19:30:58 +01:00
Markus Blatt
3ec181e231
Merge pull request #3089 from Tongdongq/exact-ilu-decomp-gpu
Exact ilu decomp gpu
2021-03-08 17:25:04 +01:00
Joakim Hove
253205d63e Remove TableManager argument when constructing SummaryConfig 2021-03-08 15:40:17 +01:00
Paul Egberts
646dafe78f introduced computeWellTemperature() to be called at each timestep 2021-03-08 15:11:50 +01:00
Joakim Hove
9597a4be37
Merge pull request #3101 from joakim-hove/summary-config-fp
Add FieldProps argument to SummaryConfig constructor
2021-03-08 12:25:25 +01:00
Joakim Hove
6d7777ee50
Merge pull request #3100 from joakim-hove/private-rst-config
Utilize private restartconfig
2021-03-08 12:24:18 +01:00
Tor Harald Sandve
a098d76c19 fix issue when switching from injection to/from production 2021-03-08 11:13:34 +01:00
Tor Harald Sandve
f861188d60 make sure wells has valid controls 2021-03-08 08:44:55 +01:00