Joakim Hove
19318e5019
Schedule no longer part of EclipseState.
2017-10-24 20:38:15 +02:00
Atgeirr Flø Rasmussen
bbfd5b6413
Merge pull request #1180 from blattms/cleanup-version-ifs
...
[cleanup] Removes unnecessary if clauses for unsupported DUNE versions.
2017-10-12 13:28:50 +02:00
Atgeirr Flø Rasmussen
df59dbbabf
Merge pull request #1177 from alfbr/master
...
Removing redundant checks from Nexus
2017-10-11 21:57:36 +02:00
Markus Blatt
2bdafdb602
[cleanup] Removes unnecessary if clauses for unsupported DUNE versions.
...
We are targetting DUNE 2.4.* and 2.5.* currently. Therefore this commit removes
the if checks for lower versions to cleanup the code.
2017-10-11 21:25:18 +02:00
Alf B. Rustad
fa886bc3aa
Cosmetic change
2017-10-11 10:45:18 +02:00
Alf B. Rustad
7d32729a00
Cosmetic change
2017-10-11 10:45:18 +02:00
Alf B. Rustad
db7c47042c
Remove remaining Nexus checks
2017-10-11 10:45:17 +02:00
Alf B. Rustad
520574513f
Avoid false positives by introducing a tolerance
2017-10-11 10:45:17 +02:00
Alf B. Rustad
cc3ab456e9
Removing redundant checks from Nexus
2017-10-11 10:44:59 +02:00
Tor Harald Sandve
4b123f839a
Update the swatinit test base on fix in opm-material#248
2017-10-11 09:39:12 +02:00
Andreas Lauser
d95b622c75
mark initHydroCarbonState() as inline
...
this allows it to be used in multiple compile units without the linker
running amok.
2017-10-04 19:24:20 +02:00
Joakim Hove
b6b2f12142
Updated NNC() constructor.
2017-09-26 14:30:50 +02:00
Tor Harald Sandve
d643476ea5
Fix fallout if no group controll (NONE) is specified for a group
2017-08-18 08:56:26 +02:00
Tor Harald Sandve
6b55b8316b
Add interface for passing cell pressures directly in wellState.init(...)
2017-08-03 10:31:10 +02:00
Tor Harald Sandve
d247b05b6b
Add polymer to phase usage.
2017-06-16 13:40:29 +02:00
Tor Harald Sandve
655b81c8d7
Add polymer to blackoilstate
2017-06-12 15:37:57 +02:00
Atgeirr Flø Rasmussen
8a2cf4fd2d
Merge pull request #1167 from GitPaean/fixing_petsc_compilation
...
removing the unused parameter:: for LinearSolverPetsc
2017-06-12 11:12:45 +02:00
Robert Kloefkorn
02b0b9d0f9
[cleanup] remove two uninitialized warnings in SaturationProposFromDeck.
2017-06-07 13:19:21 +02:00
Kai Bao
bbb0c5a993
removing the unused parameter:: for LinearSolverPetsc
...
to fix the compilation when PETsc exists.
2017-06-06 11:00:51 +02:00
Markus Blatt
1b52fc0724
Add missing include of config.h
...
Closes OPM/opm-core#1164
2017-05-24 12:11:49 +02:00
Tor Harald Sandve
d7fa66197f
Add SSOL to blackoilState
...
Stores the solvent saturation in the simulator container.
2017-05-10 11:14:53 +02:00
Tor Harald Sandve
9e504da6a1
Add solvent to phaseUsage
2017-05-08 10:29:51 +02:00
Arne Morten Kvarving
ca2288ac37
changed: remove embedded 'parameters' namespace in ParamGroup
...
inconsistent and unnecessary.
this is purely a cosmetic change, the only exception was a function with
the generic name 'split', which was renamed to splitParam to avoid confusion.
2017-04-28 15:34:11 +02:00
Atgeirr Flø Rasmussen
ce6801df7a
Merge pull request #1157 from andlaus/fix-non-MPI-build
...
fix non-MPI builds
2017-04-20 21:47:08 +02:00
Andreas Lauser
6f257f0877
fix non-MPI builds
...
some headers must be included unconditionally.
2017-04-20 15:12:34 +02:00
Tor Harald Sandve
9a1a26b267
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
Kai Bao
926f93fa4e
adding flag to tell when using well potential for guide rate
...
for WellNode.
2017-04-11 16:53:19 +02:00
Kai Bao
e0d48a366b
removing well potentails from WellsManager
2017-04-11 16:53:19 +02:00
Kai Bao
ff08c6b4f3
small corrections in WellsGroup
...
should not change reults.
2017-04-11 16:53:19 +02:00
Kai Bao
e8aa431ec7
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
a498d48a73
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
b027b27452
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
4bd1b1cf76
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
bec92dee9e
Wells specified with GRUP will be put under group control
...
immediately.
2017-04-11 16:53:19 +02:00
Kai Bao
2f10b8fc23
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
530afe55dd
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
d41c4a371f
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
745a2a5561
adding a flag to indicate whether group controls applied
...
for WellCollection.
2017-04-11 16:53:19 +02:00
Kai Bao
dff247d975
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
Andreas Lauser
5125929a66
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
208e394e3d
Merge pull request #1153 from babrodtk/hysteresis_output
...
Added functions in SaturationProps for hysteresis IO
2017-04-07 15:54:26 +02:00
babrodtk
46bd3499dc
Added functions in SaturationProps for hysteresis IO
2017-04-07 14:31:22 +02:00
Tor Harald Sandve
214e9764b2
Add sat table id to well struct
2017-04-06 13:52:27 +02:00
Tor Harald Sandve
df74d7e696
Enable swatinit equil test
2017-03-22 10:26:03 +01:00
Tor Harald Sandve
02122a60ce
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
d237c91b8d
Temporarily disabled EQUIL + SWATINIT test.
2017-03-21 16:49:14 +01:00
Tor Harald Sandve
289a15f0e5
Do not extrapolate initial rs and rv values in the depth tables
2017-03-16 12:57:56 +01:00
Kai Bao
d1469bd39e
putting wells under immidatel group control when specified
...
with GRUP.
2017-03-07 12:48:30 +01:00
Atgeirr Flø Rasmussen
863b00bf30
Merge pull request #1143 from GitPaean/fixing_thp_initialization
...
Fixing thp initialization
2017-03-02 15:51:38 +01:00
Tor Harald Sandve
d3a4976529
Do not set rs=rsSat and rv=rvSat for the saturated case
2017-02-22 15:57:53 +01:00