Commit Graph

4133 Commits

Author SHA1 Message Date
Atgeirr Flø Rasmussen
1bd58cf471 Merge pull request #862 from GitPaean/group_control
group control_updating well production targets within a group
2016-11-17 23:27:00 +01:00
Kai Bao
0ab04b04cd checking whethter group control is active
When applying group control related functions.
2016-11-17 16:01:59 +01:00
Atgeirr Flø Rasmussen
cf84626da0 Merge pull request #929 from blattms/flexible-parallel-ouput
Allow output for user requested data in parallel runs.
2016-11-17 11:40:09 +01:00
Markus Blatt
80bbabc0b6 Start with a clean globalCellData_ for each data gathering.
Otherwise there might entries from the last call that should
either not be there this time or might have a different size.
2016-11-16 21:21:51 +01:00
Markus Blatt
098bd8f9fc Added assertion that entry was added to globalCellData_ for pack/unpack 2016-11-16 21:20:14 +01:00
Bård Skaflestad
8cc64402be Merge pull request #927 from GitPaean/warning_fixing
a few warning fixing.
2016-11-16 18:48:51 +01:00
Markus Blatt
00440ab344 Use data::Solution to gather cell data including user requested data.
Previously only the cell data registered with SimulationDataContainer
war gathered during parallel output. User requested data was neglected
and a warning was issued. With this commit we intialize the local view
of data::Solution on all processes with the data registered in
SimulationDataContainer and add cell data requested by the user. This is
then gathered on the IO process, and used for the output layer. To
rudimentarily support matlab we also create a global view of
SimulationDataContainer for it.
2016-11-16 17:11:24 +01:00
Markus Blatt
5ad813b4bd Warn about broken parallel matlab output.
If this is a parallel run and matlab output is requested then
we issue a warning that it is broken because of wrong velocities.
2016-11-16 17:09:53 +01:00
Kai Bao
d38a6eb459 adapting the change of the function findWellNode(). 2016-11-16 14:28:35 +01:00
Kai Bao
d06acaa4b5 adapting to the change in opm-core 2016-11-16 14:06:20 +01:00
Kai Bao
f85da3768e cleaning up and updating MultisegmentWells 2016-11-16 13:27:30 +01:00
Kai Bao
6bbc726bc2 checking and outputing the residuals for the well equations.
Before, the tolerance for the norm of the residual of the well control
equations was 1bar, which makes no sense for rate control.
For some rate controls, we are not able to update the well state with
the target rates, we have to enforce the convergence throught the
residual checking.
2016-11-16 13:26:54 +01:00
Kai Bao
002439c5b1 WIP in testing new group update strtegy.
results with min_iter=2 works okay, while not min_iter=1.

It means the iteration stop at the wrong situation.
2016-11-16 13:26:28 +01:00
Kai Bao
753da2dd36 putting the VREP control update after updateWellControls
which makes it almost should be put inside updateWellControls function.

it does not change the result.
2016-11-16 13:25:35 +01:00
Kai Bao
a5aaf9b802 easier way to update whether the well under group control
potentially can be more consistent way.
It does not change the result.
2016-11-16 13:25:35 +01:00
Kai Bao
8a1e1e010a using findWellNode() to avoid dynamic_casting
form WellGroupInterface* to WellNode*.
2016-11-16 13:25:35 +01:00
Kai Bao
337693cc65 removing the wrongly wrapped std::vector
adding more comments for future reference.
2016-11-16 13:25:35 +01:00
Kai Bao
9150c217f2 making the VREP enforcement into a small method.
in BlackoilModelBase.
2016-11-16 13:25:35 +01:00
Kai Bao
9a95697fde updating some comments. 2016-11-16 13:25:35 +01:00
Kai Bao
75e0ff0018 Trying always to give a valid control when initing WellState.
Without the fix, when we specify GRUP control for WCONINJE, the control
mode will be initialized to be -1.
2016-11-16 13:25:35 +01:00
Kai Bao
8474ff2895 fixing all the simulators that call solveWellEq.
Not all the group control functionalities working for allt the
simulators. Some need to be fixed later.
2016-11-16 13:25:35 +01:00
Kai Bao
0f3e34bb25 cleaning up some comments. 2016-11-16 13:25:35 +01:00
Kai Bao
cb897b07d0 Adding VREP injection support.
As part of it, adding a function to calculate reservoir voidage rate.
2016-11-16 13:25:35 +01:00
Kai Bao
a15513e546 adding a rate converter to the BlackoilModelBase 2016-11-16 13:25:35 +01:00
Kai Bao
e65d24aa16 removing outdated log ouptut code about control switching
Which results from the rebasing process.
2016-11-16 13:25:35 +01:00
Kai Bao
e13cf827b5 applying the efficiency factors to the multi-segment wells. 2016-11-16 13:25:35 +01:00
Kai Bao
623ef3850e applying the efficiency factor to flow 2016-11-16 13:25:35 +01:00
Kai Bao
aca587b76b calculate efficiency factor in StandardWells
which will be used to scale the perforation flow rate when entering the
matrial balance equations.
2016-11-16 13:25:35 +01:00
Kai Bao
ac67a10316 removing one updateWellControls from solveWellEq
not recalling why adding it in the first place.

And correcting some comments for clarification.
2016-11-16 13:25:35 +01:00
Kai Bao
e049508eec adding the group control related part to MultisegmentWells
while looks like the well potentials part may not work with multisegment
wells.

Will check later.
2016-11-16 13:25:35 +01:00
Kai Bao
0df52603d7 fixing the interface of wellModel constructors
to make all the simulators compile.
2016-11-16 13:25:35 +01:00
Kai Bao
26b16c1050 cleaning up the output and adding more comments. 2016-11-16 13:25:11 +01:00
Kai Bao
d992161b82 output cleaning up and add more comment. 2016-11-16 13:24:39 +01:00
Kai Bao
e323f15d2f putting more things in the prototyping test. 2016-11-16 13:23:55 +01:00
Kai Bao
e0dd9bfabd keeping putting group control in. 2016-11-16 13:22:52 +01:00
Kai Bao
f62d40fc05 adding a pointer to the well_collection of WellsManger
might change to reference later. Using pointer now is trying to keep the
WellModel constant.
2016-11-16 13:22:52 +01:00
Kai Bao
1c34af4dea a few warning fixing. 2016-11-16 13:17:35 +01:00
Atgeirr Flø Rasmussen
6df917e9e0 Merge pull request #925 from blattms/use-one-outputStateMatlab
Removed second implementation of matlab output.
2016-11-16 13:02:57 +01:00
Markus Blatt
b91f747a3e Removed second implementation of matlab output.
There is already a generic one with the Grid implementation
being the template parameter in the header file. The other
implementation using UnstructuredGrid does exactly the same.
Therefore we remove it with this commit.
2016-11-16 12:16:40 +01:00
Atgeirr Flø Rasmussen
fd4d57e68c Merge pull request #923 from blattms/fix-spelling-for-unhandled-ouput
Fix spelling in warning about unhandled parallel ouput.
2016-11-15 20:50:40 +01:00
Markus Blatt
55362ecdc2 Fix spelling in warning about unhandled parallel ouput. 2016-11-15 12:08:58 +01:00
Atgeirr Flø Rasmussen
ae9cd62a5c Merge pull request #906 from GitPaean/test_residual_checking
checking the residual for the well control equations.
2016-11-14 10:44:44 +01:00
Atgeirr Flø Rasmussen
129db89dc0 Merge pull request #900 from blattms/fix-parallel-eclipse-writing
Fix using local active cells for writing eclipse files in parallel.
2016-11-11 15:28:46 +01:00
Atgeirr Flø Rasmussen
38abf56d5e Merge pull request #905 from blattms/do-not-throw-for-unrecognized-parallel-file
Do not throw for unrecognized file when merging log files.
2016-11-11 15:23:42 +01:00
Kai Bao
ce8498c4d7 checking the residual for the well control equations. 2016-11-11 13:26:22 +01:00
Markus Blatt
1882d3315a Do not throw for unrecognized file when merging log files.
The regex we are using might also consider a file named bla.2.blub.
In that case it is not nice to throw an exception. Instead we print
a message to std::cerr.
2016-11-11 12:00:49 +01:00
Markus Blatt
8632c71cef Do not populate cellData but issue a warning in parallel.
This will lead to some data missing in the parallel runs
but will allow successful runs.
2016-11-10 17:46:49 +01:00
Markus Blatt
747c93e898 Removed ternary operator in inline initialization.
This made the code rather hard to read. Now we do the initialization
in the constructor body if needed.
2016-11-10 13:28:21 +01:00
Markus Blatt
3eba3353d0 Correctly mark transfer of ownership for ouptut writer 2016-11-10 13:04:30 +01:00
Atgeirr Flø Rasmussen
736585e85b Merge pull request #902 from blattms/support-dune-2.5
Cater for variable name change in BCRSMatrix of DUNE 2.5
2016-11-09 12:19:41 +01:00