Commit Graph

12589 Commits

Author SHA1 Message Date
Tor Harald Sandve
b42aa07a8d Bump version number 2021-04-27 10:01:32 +02:00
Bård Skaflestad
3faaab3c9f
Merge pull request #3182 from bska/forward-well-potentials
Forward Potential Rates to Next Report Step
2021-04-27 09:26:52 +02:00
Bård Skaflestad
1f14c6ddef Forward Potential Rates to Next Report Step
These are used as part of calculating the BHP/THP when computing new
potential rates in models that feature VFP tables and must therefore
be properly initialised in the next report step's well state object.
2021-04-27 07:58:21 +02:00
Joakim Hove
42a6505cf1
Merge pull request #3179 from joakim-hove/groupstate-dump
Add json dump to GroupState
2021-04-27 07:52:11 +02:00
Bård Skaflestad
6cbe5ae8f4
Merge pull request #3178 from joakim-hove/wellstate-internalize-pu
WellState will internalize PhaseUsage member
2021-04-27 06:33:18 +02:00
Bård Skaflestad
266197fd75
Merge pull request #3186 from akva2/include_headers
fixed: include required headers where needed
2021-04-27 06:31:34 +02:00
Joakim Hove
a68589eb9a WellState will internalize PhaseUsage member 2021-04-27 00:11:04 +02:00
Bård Skaflestad
e258e69802
Merge pull request #3185 from joakim-hove/phaseusage-std-array
Use std::array<> in PhaseUsage
2021-04-26 23:43:01 +02:00
Arne Morten Kvarving
a4c5429341 fixed: include required headers where needed 2021-04-26 22:39:32 +02:00
Joakim Hove
29673a168d Use std::array<> in PhaseUsage 2021-04-26 19:03:22 +02:00
Bård Skaflestad
708645a2c0
Merge pull request #3181 from joakim-hove/call-end-episode
Call endEpisode() for WellModel and Aquifer model
2021-04-26 16:25:11 +02:00
Joakim Hove
979279b31c Call endEpisode() for WellModel and Aquifer model 2021-04-26 14:14:58 +02:00
Tor Harald Sandve
12880be916
Merge pull request #3159 from totto82/updateWellTargetFix
get bhp from thp without solving
2021-04-26 13:15:30 +02:00
Joakim Hove
5a4190bbea Add json dump to GroupState 2021-04-26 11:51:07 +02:00
Joakim Hove
43f42ab7d7
Merge pull request #3162 from totto82/addSwitchEvent
Use the event for swithing between producer and injector
2021-04-23 08:17:47 +02:00
Tor Harald Sandve
93ac6e8283
Merge pull request #3165 from joakim-hove/wellstate-split
Wellstate split
2021-04-22 12:28:33 +02:00
Markus Blatt
824df60e94
Merge pull request #3150 from Tongdongq/always_print_prec_info
Always print CHOW_PATEL info if used
2021-04-21 19:51:22 +02:00
Bård Skaflestad
7842b74808
Merge pull request #3170 from GitPaean/fixing_serial_building
fixing the serial running due to including of eclmpiserializer.hh
2021-04-21 18:26:43 +02:00
Kai Bao
2ee51c2e0d fixing the serial running due to including of eclmpiserializer.hh 2021-04-21 15:59:26 +02:00
Tor Harald Sandve
3445f2e03a
Merge pull request #3168 from joakim-hove/simplify-global-is-grup
Simplify global is grup
2021-04-21 14:49:13 +02:00
Joakim Hove
7fecd9f433 Create new class GroupState to maintain runtime state of groups 2021-04-21 13:07:57 +02:00
Joakim Hove
c8db0d1090 Assign number of phases in WellState constructor 2021-04-21 13:07:57 +02:00
Joakim Hove
763503d13c
Merge pull request #3134 from GitPaean/using_pinched_grid_numerical_aquifers
Using pinched grid for numerical aquifers
2021-04-21 13:03:58 +02:00
Joakim Hove
7131647362 Use Well.insert_index() instead of maintaining extra counter 2021-04-21 10:34:57 +02:00
Joakim Hove
ed2fb11084 Avoid superfluos code to reset globalIsProductionGrup to false 2021-04-21 09:04:55 +02:00
Bård Skaflestad
4c76489cbc
Merge pull request #3166 from totto82/fixSaltVdExt
extrapolate saltvd table

Closes #2889.
2021-04-20 11:30:07 +02:00
Kai Bao
06fa81f4e3 following interface change for processEcipseFormat 2021-04-20 11:27:15 +02:00
Atgeirr Flø Rasmussen
fc8d17c04e
Merge pull request #3164 from totto82/fixNOgrp
honour group available for higher controll
2021-04-20 11:13:27 +02:00
Tor Harald Sandve
c55864b1be extrapolate saltvd table 2021-04-20 09:24:26 +02:00
Tor Harald Sandve
352e40d109 honour group available for higher controll 2021-04-19 14:34:38 +02:00
Bård Skaflestad
32a035f8a5
Merge pull request #3163 from akva2/janitoring
fixed: mark possibly unused variables as such to quell warnings
2021-04-19 11:34:43 +02:00
Arne Morten Kvarving
b9c19958fb fixed: mark possibly unused variables as such to quell warnings
also take chance to break an extremely long line
2021-04-19 09:49:20 +02:00
Markus Blatt
8fe9314104
Merge pull request #3148 from totto82/gliftmpi2
make gaslift parallel
2021-04-19 08:30:14 +02:00
Tor Harald Sandve
090b75425f Use switch event 2021-04-16 13:38:56 +02:00
Joakim Hove
48b10e2029
Merge pull request #3157 from joakim-hove/rst-test-norne
Add test which loads a restart case for norne and runs one timestep
2021-04-15 14:37:31 +02:00
Tor Harald Sandve
e69b097ac5 fix for distributed wells 2021-04-15 14:00:28 +02:00
Markus Blatt
13f62a718b
Merge pull request #2998 from g-marchiori/fpgasolver-integration
Added fpgaSolver, requires Xilinx Alveo U280 FPGA board
2021-04-15 11:21:39 +02:00
Tor Harald Sandve
ebcaea3faa get bhp from thp without solving 2021-04-14 15:58:58 +02:00
Tor Harald Sandve
9d56588906 Make gaslift parallel 2021-04-14 14:14:39 +02:00
Kai Bao
9f360c5c6d fixing the mistakes due to rebasing 2021-04-14 13:16:30 +02:00
Kai Bao
06ec3d2420 fixing test_relpermdiagnostics test 2021-04-14 09:48:55 +02:00
Kai Bao
364187aa1a updating NNC after grid processing for parallel case
numerical aquifers might modify NNCs during grid processing, while it
only updates in the root process. Other processes need to be updated
too.
2021-04-14 09:47:57 +02:00
Bård Skaflestad
481c72a0fc
Merge pull request #3156 from joakim-hove/well-init-restart-bug
Well init restart bug
2021-04-14 09:10:30 +02:00
Joakim Hove
289e0ea938 Handle closed connections when loading connection data from restart 2021-04-14 07:59:55 +02:00
Bård Skaflestad
b165e8d3c5
Merge pull request #3155 from alfbr/supported
Removed four supported keywords
2021-04-14 00:25:22 +02:00
Joakim Hove
914c18d4f1 Add test which loads a restart case for norne and runs one timestep 2021-04-13 22:10:40 +02:00
Joakim Hove
7d825ba9d0 Rename function wellToState -> loadRestartData 2021-04-13 21:02:36 +02:00
Joakim Hove
c939ca90e6 Throw exception in not implemented function 2021-04-13 11:44:51 +02:00
Alf Birger Rustad
a7f7c1af72 Removed four supported keywords 2021-04-13 09:53:15 +02:00
Joakim Hove
061b5c2395
Merge pull request #3062 from joakim-hove/enable-actionx-test
Enable new test udq_actionx/ACTIONX_M1
2021-04-13 09:28:32 +02:00