Commit Graph
5996 Commits
Author SHA1 Message Date
Atgeirr Flø Rasmussen d837401d33 Merge pull request #1158 from akva2/no_native_in_packaging
disable native tuning in packaging
2017-04-28 08:36:55 +02:00
Arne Morten Kvarving 9dc2fc4a82 disable native tuning in packaging 2017-04-26 14:55:47 +02:00
Atgeirr Flø Rasmussen fdd7b39587 Merge pull request #1157 from andlaus/fix-non-MPI-build
fix non-MPI builds
2017-04-20 21:47:08 +02:00
Atgeirr Flø Rasmussen 0cb21a8c04 Merge pull request #1156 from totto82/memfix_wellControl
FIX memory leakage in well_controls
2017-04-20 20:59:09 +02:00
Andreas Lauser d690549842 fix non-MPI builds
some headers must be included unconditionally.
2017-04-20 15:12:34 +02:00
Tor Harald Sandve a96c1f9ea0 FIX memory leakage in well_controls
The Alq and vfp is set free in well_controls_destroy to avoid memory
leakage.
2017-04-20 12:58:16 +02:00
Atgeirr Flø Rasmussen e52b7ef2ad Merge pull request #1155 from akva2/add_deps
Packinging update backport
2017-04-18 23:17:14 +02:00
Arne Morten Kvarving b6c5247ef9 remove binary package
no binaries left here
2017-04-18 12:17:42 +02:00
Arne Morten Kvarving aed63397c5 add new dependencies 2017-04-18 12:09:18 +02:00
Andreas Lauser 8ef90deb2a Change the version to 2017.10-pre 2017-04-13 12:58:55 +02:00
Andreas Lauser 2e9b04fc37 Merge pull request #1152 from GitPaean/fixing_updating_well_petentials_2
[WIP] changes needed to compute well potentials each time step.
release/2017.04/branchpoint
2017-04-12 10:34:24 +02:00
Kai Bao e77f726906 adding flag to tell when using well potential for guide rate
for WellNode.
2017-04-11 16:53:19 +02:00
Kai Bao 29372e287c removing well potentails from WellsManager 2017-04-11 16:53:19 +02:00
Kai Bao 44924b9ee9 small corrections in WellsGroup
should not change reults.
2017-04-11 16:53:19 +02:00
Kai Bao bd9ff2ad94 not negative rate_for_group_control
in WellsGroup::updateWellProductionTargets. The current implementation
of group control is allowed tiny over-producing of the group target
while it cause negative rate_for_group_control . When all the wells are
not under group controls, it can cause oscillation of the control mode
later.

Probably a better way is to do something when we see overproducing
happens.
2017-04-11 16:53:19 +02:00
Kai Bao b7ea707928 Tracking situation when group overproducing its target
Bascially it means that something wrong with our algorithms. Not sure
how to handle it properly yet.
2017-04-11 16:53:19 +02:00
Kai Bao a6f4772ca1 not applying the group control in WellsManager
since the guide rates are not completed yet.
2017-04-11 16:53:19 +02:00
Kai Bao 17fb6f9ffe not setting up guide_rates in WellsManager based on well potentials
That part is moved to well_collection, will be handled in the beginning
of time step.
2017-04-11 16:53:19 +02:00
Kai Bao d50d21d8e0 Wells specified with GRUP will be put under group control
immediately.
2017-04-11 16:53:19 +02:00
Kai Bao 2fcb449196 Always updating the well targets under group control
for each iteration. Even all the wells are under individual controls,
their group targets/constraints should also be updated for correct group
behavoirs.
2017-04-11 16:53:19 +02:00
Kai Bao 7701b68814 handle the situatioin when giving a NaN prod target to injectors
When all production wells are under individual controls, the group can
have zero production guide rates, which can result NaN value targets for
injectors.
2017-04-11 16:53:19 +02:00
Kai Bao 81fb20160c Considering the injection phase when applying VREP group controls
GCONINJE only support single phase injection. When we inject one phase,
the values of distr for other phases should be set to be zero.

It will provide one strategy to figure out which phase we are
injecting. It is important when we inject one phase while the well is
claimed to be another phase in WELSPECS.
2017-04-11 16:53:19 +02:00
Kai Bao aaaacce49e adding a flag to indicate whether group controls applied
for WellCollection.
2017-04-11 16:53:19 +02:00
Kai Bao be00224a4b adding a function setGuideRatesWithPotentials() to WellCollection
it only handles the calculation based on wellPotentials though.

Or it should also give each well a value for wells does not specify a
guide rates? which will be some value same for all the wells?
2017-04-11 16:53:19 +02:00
Atgeirr Flø Rasmussen 524233c60a Merge pull request #1154 from andlaus/report-failure
SimulatorReport: make it possible to report failed time steps
2017-04-11 12:29:37 +02:00
Andreas Lauser b368cb0177 SimulatorReport: make it possible to report failed time steps
the method can still be called as it used to be. in this case no
failures are reported, though.
2017-04-10 23:31:24 +02:00
Atgeirr Flø Rasmussen 3b5e15771b Merge pull request #1153 from babrodtk/hysteresis_output
Added functions in SaturationProps for hysteresis IO
2017-04-07 15:54:26 +02:00
Atgeirr Flø Rasmussen 901dbc248e Merge pull request #1145 from totto82/add_sat_table_id
Add sat table id to well struct
2017-04-07 14:43:33 +02:00
babrodtk c3dc875005 Added functions in SaturationProps for hysteresis IO 2017-04-07 14:31:22 +02:00
Tor Harald Sandve a8261b62da Add sat table id to well struct 2017-04-06 13:52:27 +02:00
Atgeirr Flø Rasmussen e2f8375a1a Merge pull request #1151 from totto82/fix_test_equil
Fix test equil
2017-04-05 09:01:12 +02:00
Tor Harald Sandve e289c8f35b Enable swatinit equil test 2017-03-22 10:26:03 +01:00
Tor Harald Sandve 77b9311f2c FIX swatinit test in test_equil
The capillarySwatinit.DATA is updated to make it possible to run in Ecl.
Referance solutions is updated accordingly.
2017-03-22 10:20:59 +01:00
Joakim Hove 0b1d5745a6 Merge pull request #1149 from joakim-hove/disable-equil-swatinit
Temporarily disabled EQUIL + SWATINIT test.
2017-03-21 19:50:55 +01:00
Joakim Hove b55ce6b53e Temporarily disabled EQUIL + SWATINIT test. 2017-03-21 16:49:14 +01:00
Joakim Hove 53eb7e2f1c Merge pull request #1150 from joakim-hove/travis-install-bc
Travis: apt-get install bc
2017-03-21 16:48:28 +01:00
Joakim Hove 1caaa5bd35 Travis: apt-get install bc 2017-03-21 16:21:47 +01:00
Atgeirr Flø Rasmussen d3d7c64107 Merge pull request #1147 from totto82/fix_initial_rs
Do not extrapolate initial rs and rv values in the depth tables
2017-03-16 13:55:17 +01:00
Tor Harald Sandve 7579f2bdb9 Do not extrapolate initial rs and rv values in the depth tables 2017-03-16 12:57:56 +01:00
Atgeirr Flø Rasmussen 7bf6da1953 Merge pull request #1146 from GitPaean/putting_wells_under_group_control
putting wells under immidatel group control when specified with GRUP
2017-03-10 10:18:39 +01:00
Kai Bao 70b19780b4 putting wells under immidatel group control when specified
with GRUP.
2017-03-07 12:48:30 +01:00
Atgeirr Flø Rasmussen 03e005bb76 Merge pull request #1143 from GitPaean/fixing_thp_initialization
Fixing thp initialization
2017-03-02 15:51:38 +01:00
Atgeirr Flø Rasmussen aecfa0e448 Merge pull request #1144 from totto82/output_initial_rs
Do not set rs=rsSat and rv=rvSat for the saturated case
2017-02-23 09:13:40 +01:00
Tor Harald Sandve 70b6a6e5ef Do not set rs=rsSat and rv=rvSat for the saturated case 2017-02-22 15:57:53 +01:00
Kai Bao b97c585519 do not assign non-zero THP value when no THP involved. 2017-02-17 13:45:55 +01:00
Kai Bao 6ca48313ca correcting the confusing indent in WellState init 2017-02-17 13:28:29 +01:00
Atgeirr Flø Rasmussen 6d01c29686 Merge pull request #1142 from GitPaean/output_thp
adding thp to the report for summary output.
2017-02-16 13:16:14 +01:00
Kai Bao 8198c256a9 adding thp to the report for summary output. 2017-02-13 10:15:58 +01:00
Atgeirr Flø Rasmussen d5a9f27e5e Merge pull request #1141 from akva2/remove_adaptive_time_stepping
remove AdaptiveTimeStepping class
2017-02-10 15:16:56 +01:00
Arne Morten Kvarving e6cad074c2 Remove adaptive time stepping and simulator timer classes and tests/examples
They have been moved to opm-simulators
2017-02-10 14:53:22 +01:00