OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2024-11-25 10:40:21 -06:00
Code Issues Packages Projects Releases Wiki Activity
4,481 Commits 24 Branches 101 Tags 97 MiB
850d9571e8
Commit Graph

4481 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Atgeirr Flø Rasmussen
54ad92ff40 Merge pull request #931 from atgeirr/fix-deck-error 
Do not assign to dereferenced null pointers.
 2016-11-18 11:59:40 +01:00
Andreas Lauser
dde8333343 Merge pull request #936 from andlaus/frankenstein_merge_master_v13 
Frankenstein merge master v13
 2016-11-18 11:41:48 +01:00
Andreas Lauser
a82ec08cfa adjust the list of files in CMakeLists_files 
some files (e.g., thresholdPressures.hpp) are already missing in the
master version of this file, but most of them were specific to the
`frankenstein` branch.

thanks to [at]atgeirr for noticing this.
 2016-11-18 11:34:16 +01:00
Andreas Lauser
2f208962f0 revert AutoDiffMatrix back to the master version 
that class is not used by flow_ebos anymore...
 2016-11-18 11:24:35 +01:00
Andreas Lauser
b2f7b8c989 Merge remote-tracking branch 'origin/master' into frankenstein 2016-11-18 11:09:41 +01:00
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
Andreas Lauser
f8874a2f19 Merge pull request #935 from andlaus/frankenstein_fix_build 
flow_ebos: fix the build
 2016-11-17 16:53:52 +01:00
Andreas Lauser
a3fecc8edc flow_ebos: fix the build 
this broke after the latest master merge (again, the reason were API
changes. this time they did not lead to merge conflicts.)

I've verified that flow_ebos works with Norne and that the performance
did not regress.
 2016-11-17 16:34:53 +01:00
Andreas Lauser
bd1f93ff32 Merge pull request #934 from andlaus/frankenstein_merge_master_v12 
Frankenstein merge master v12
 2016-11-17 16:12:10 +01:00
Andreas Lauser
0d00579f7d Merge remote-tracking branch 'origin/master' into frankenstein_merge_master_v12 
* origin/master:
  Start with a clean globalCellData_ for each data gathering.
  Added assertion that entry was added to globalCellData_ for pack/unpack
  Use data::Solution to gather cell data including user requested data.
  Warn about broken parallel matlab output.
  a few warning fixing.
  Removed second implementation of matlab output.
  Fix spelling in warning about unhandled parallel ouput.
 2016-11-17 16:08:21 +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
Andreas Lauser
b8a0bb6aea Merge pull request #926 from totto82/frankenstein_revertChanges 
Revert som changes in default values
 2016-11-17 13:46:37 +01:00
Atgeirr Flø Rasmussen
71bd419c03 Do not assign to dereferenced null pointers. 2016-11-17 13:18:02 +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
Tor Harald Sandve
b66bb27a65 Revert som changes in default values 
Make sure flow in Frankenstein and flow in master uses the same default
values
 2016-11-16 15:09:54 +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