Commit Graph

12549 Commits

Author SHA1 Message Date
Bård Skaflestad
eb8e270b50
Merge pull request #3190 from akva2/fix_missing_include
fixed: include <cstring> for strlen
2021-04-28 11:03:55 +02:00
Tor Harald Sandve
398b284c03
Merge pull request #3094 from bska/wellpi-shut-wells
Compute Well-Level PI For Shut Wells
2021-04-28 09:03:57 +02:00
Arne Morten Kvarving
f004b59217 fixed: include <cstring> for strlen 2021-04-28 09:01:09 +02:00
Bård Skaflestad
a6c374a27c Compute Well-Level PI For Shut Wells
This commit includes the shut wells in 'wells_ecl_' and expands the
PI/II value calculation to apply to those shut wells too.  With this
in place we are able to run cases that have a 'WELPI' keyword before
the well opens, even at the very first report step.
2021-04-27 14:51:18 +02:00
Bård Skaflestad
6e9d2bd89e Initialise More Data Members at Construction Time
In particular, apply explicit default constructors to most data
members and push initialisation to initialiser list if convenient.

While here, also split long lines and apply const in more places.
Finally, reset well- and connection-level PI values to zero in
WellState::shutWell().  This is in preparation of including shut
wells in BlackoilWellModel's internal state.
2021-04-27 14:50:37 +02:00
Joakim Hove
1de5c9539c
Merge pull request #3174 from joakim-hove/use-groupstate2
Use groupstate2
2021-04-27 14:15:49 +02:00
Joakim Hove
a446e9619c
Merge pull request #3188 from joakim-hove/actionx-record-correct-time
Record the correct simulation time in ActionState
2021-04-27 14:07:53 +02:00
Joakim Hove
590c9443ec Record the correct simulation time in ActionState 2021-04-27 11:44:03 +02:00
Joakim Hove
e1d117c59f Extract group state and create WGState to manage well & group state 2021-04-27 10:55:38 +02:00
Arne Morten Kvarving
2574634c5f
Merge pull request #3187 from totto82/bump_master
Bump version number
2021-04-27 10:13:05 +02:00
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