Commit Graph

6020 Commits

Author SHA1 Message Date
Markus Blatt
d3b7f24abb Introduced mandatory call to project in top level CMakeLists.txt
Somehow this was never called in the OPM modules. But the CMake documentation
actually says:
"The top-level ``CMakeLists.txt`` file for a project must contain a
literal, direct call to the ``project()`` command; loading one
through the ``include()`` command is not sufficient.  If no such
call exists CMake will implicitly add one to the top that enables the
default languages (``C`` and ``CXX``).
"

Without it some variables (like CMAKE_PROJECT_NAME) are not correctly defined.
2017-09-15 15:37:51 +02:00
Atgeirr Flø Rasmussen
c98683e31e Merge pull request #1173 from totto82/fix_fallout_none_productionSpecification
Fix fallout if no group controll (NONE) is specified for a group
2017-08-18 12:21:03 +02:00
Tor Harald Sandve
9a306def92 Fix fallout if no group controll (NONE) is specified for a group 2017-08-18 08:56:26 +02:00
Atgeirr Flø Rasmussen
4a8d74a910 Merge pull request #1172 from totto82/removeState
Add interface for passing cell pressures directly in wellState.init(...)
2017-08-10 14:21:53 +02:00
Tor Harald Sandve
843e8c9a6f Add interface for passing cell pressures directly in wellState.init(...) 2017-08-03 10:31:10 +02:00
Atgeirr Flø Rasmussen
41234f1bee Merge pull request #1169 from totto82/impl_polymer
Add polymer to blackoilstate
2017-06-23 13:31:40 +02:00
Tor Harald Sandve
d935458fca Add polymer to phase usage. 2017-06-16 13:40:29 +02:00
Tor Harald Sandve
fc380041f2 Add polymer to blackoilstate 2017-06-12 15:37:57 +02:00
Atgeirr Flø Rasmussen
a8a46ee5ae Merge pull request #1167 from GitPaean/fixing_petsc_compilation
removing the unused parameter:: for LinearSolverPetsc
2017-06-12 11:12:45 +02:00
Atgeirr Flø Rasmussen
4bab353e90 Merge pull request #1168 from dr-robertk/PR/remove-warnings
[cleanup] remove two uninitialized warnings in SaturationProposFromDeck.
2017-06-07 14:08:57 +02:00
Robert Kloefkorn
d058d8e380 [cleanup] remove two uninitialized warnings in SaturationProposFromDeck. 2017-06-07 13:19:21 +02:00
Kai Bao
67fbac5c95 removing the unused parameter:: for LinearSolverPetsc
to fix the compilation when PETsc exists.
2017-06-06 11:00:51 +02:00
Atgeirr Flø Rasmussen
d504715caa Merge pull request #1165 from blattms/fix-warnings
Fix some warnings
2017-06-02 17:03:14 +02:00
Markus Blatt
327d146caa Fix uninitialized warning intpfa calculation 2017-05-24 12:12:52 +02:00
Markus Blatt
1231870e56 Add missing include of config.h
Closes OPM/opm-core#1164
2017-05-24 12:11:49 +02:00
Atgeirr Flø Rasmussen
3f403a8470 Merge pull request #1162 from totto82/add_solvent_to_pu
Implement solvent model in flow_ebos
2017-05-19 10:02:59 +02:00
Joakim Hove
02b1e58a77 Merge pull request #1161 from joakim-hove/use-libecl
Use libecl in jenkins
2017-05-10 13:36:53 +02:00
Tor Harald Sandve
dbe7930ef7 Add SSOL to blackoilState
Stores the solvent saturation in the simulator container.
2017-05-10 11:14:53 +02:00
Tor Harald Sandve
daecfa7e55 Add solvent to phaseUsage 2017-05-08 10:29:51 +02:00
Joakim Hove
419aedfcbf Use libecl in jenkins 2017-05-07 12:54:08 +02:00
Atgeirr Flø Rasmussen
acc0f81260 Merge pull request #1160 from akva2/remove_parameters
changed: remove embedded 'parameters' namespace in ParamGroup
2017-05-02 07:19:14 +02:00
Arne Morten Kvarving
f5999e3fcb 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
eeadc43cad Merge pull request #1159 from akva2/remove_xml_params
changed: remove XML support for ParameterGroup
2017-04-28 14:07:23 +02:00
Arne Morten Kvarving
a59ce6581f changed: remove XML support for ParameterGroup 2017-04-28 11:26:38 +02:00
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.
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