OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2025-02-20 11:48:25 -06:00
Code Issues Packages Projects Releases Wiki Activity
4,770 Commits 24 Branches 102 Tags 90 MiB
5194cc5122
Commit Graph

4770 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Arne Morten Kvarving
31d5d2824c Merge pull request #948 from akva2/move_seq_test 
Redo existing tests
 2016-11-23 10:53:54 +01:00
Arne Morten Kvarving
26ebe27cad convert flow_sequential SPE1CASE1 test to actual regression test 2016-11-22 16:51:39 +01:00
Arne Morten Kvarving
a27e58c0bf changed: remove duplicated test 
no reason to run spe1case2 without checking output as we have
tests checking the output in place
 2016-11-22 16:51:39 +01:00
Arne Morten Kvarving
93f2bfc526 changed: allow specifying simulator to use for tests 
in preparation for adding tests for others
 2016-11-22 16:51:39 +01:00
Atgeirr Flø Rasmussen
bda6a42299 Merge pull request #939 from blattms/fix-ebos-warnings 
Fixes unsused parameter warnings for ebos stuff
 2016-11-22 15:33:34 +01:00
Tor Harald Sandve
d23270c98f Fix the 2p simulator 
Only tested for oil+water case
The blockmatrix and vectors are hardcoded to be 3
and a trivial equation is used for the Gas phase.
 2016-11-22 15:01:48 +01:00
Andreas Lauser
5e0804b39f some twophase fixes for flow_ebos 
this changes the conversion of the results to hopefully make it work
with twophase simulations. Note that flow_ebos still does not work
because there is a crash in the well model that I don't understand
(and also, I've disabled an assertation in the well model plus I'm not
completely sure if the conversion code need to do something about the
primary variables in the twophase case).
 2016-11-22 15:01:48 +01:00
Joakim Hove
21b1b2318d Merge pull request #943 from jokva/write-init-and-egrid-rename 
Rename to EclipseWriter.writeInitial
 2016-11-22 12:59:51 +01:00
Arne Morten Kvarving
ecd0e2c5bd Merge pull request #940 from joakim-hove/remove-python-tests 
Remove python tests.
 2016-11-22 12:07:17 +01:00
Atgeirr Flø Rasmussen
621a72bb25 Merge pull request #941 from blattms/read-write-perforation-rates-and-pressure 
Read write perforation rates, pressure, phase reates, and control of wells.
 2016-11-22 11:16:19 +01:00
Jørgen Kvalsvik
ffc3de0f6e Rename to EclipseWriter.writeInitial 2016-11-22 09:52:41 +01:00
Atgeirr Flø Rasmussen
d075940ccc Merge pull request #924 from dr-robertk/PR/introduce-singleprecision-parameter 
Introduce parameter for time step in days when single precision should be used.
 2016-11-22 07:57:50 +01:00
Markus Blatt
0179a17704 Gather well controll, too. 2016-11-21 21:20:47 +01:00
Markus Blatt
f601ac4013 Gather perforation phase rates, too. 
To do this we needed to switch from WellState to WellStateFullyImplicitBlackoil
as only the latter stores this information.
 2016-11-21 21:19:51 +01:00
Markus Blatt
88e118d76a Consistently use WellStateFullyImplicitBlackoil in output 
Otherwise we cannot write out all the data in a parallel run.
 2016-11-21 21:19:51 +01:00
Markus Blatt
a6c323c48b Read and write rate and pressure per well perforation when gathering. 2016-11-21 21:19:39 +01:00
Joakim Hove
e999ad7a98 Remove python tests. 2016-11-21 18:02:21 +01:00
Robert Kloefkorn
feea8c1753 Introduce parameter for time step in days when single precision should be used 
in the linear solvers. Also, a parameter was introduced to toggle the use of AMG.
 2016-11-21 17:18:24 +01:00
Markus Blatt
a16bce8785 Fixes unsused parameter warnings for ebos stuff 2016-11-21 15:23:12 +01:00
Atgeirr Flø Rasmussen
720d341c76 Merge pull request #938 from dr-robertk/PR/cleanup-paralleldebugoutput 
ParallelDebugOutput: remove unused variable and tabbing.
 2016-11-21 12:20:32 +01:00
Robert Kloefkorn
a2b2e6dd27 [cleanup][ParallelDebugOutput] remove unused variable and tabbing. 2016-11-21 11:26:08 +01:00
Atgeirr Flø Rasmussen
95cc415fba Merge pull request #937 from akva2/quell_warnings 
Quell some compiler warnings
 2016-11-21 11:11:46 +01:00
Arne Morten Kvarving
caac9d7843 fixed: put variable under ifdef to avoid unused warnings without mpi 2016-11-21 10:21:11 +01:00
Arne Morten Kvarving
b0aae037f6 quell unused variable warning 2016-11-21 10:20:24 +01:00
Atgeirr Flø Rasmussen
e223c03647 Merge pull request #800 from OPM/frankenstein 
Frankenstein V2
 2016-11-18 15:49:31 +01:00
Andreas Lauser
b2159b5ed0 Merge pull request #932 from dr-robertk/PR/bug-hunt2 
Bug fix for reusing cached intensive quantities.
 2016-11-18 13:54:35 +01:00
Robert Kloefkorn
5fce54fd44 [bugfix][ISTLSolver] make code compile with AMG when different matrix operator 
is used.
 2016-11-18 12:47:54 +01:00
Robert Kloefkorn
59f40ba14e [cleanup][WellModelMatrixAdapter] use only one implementation of the matrix 
adapter to avoid confusion.
 2016-11-18 12:47:54 +01:00
Robert Kloefkorn
a0da20378c [bugfix][WellModelMatrixAdapter] fix applyscaleadd method. 2016-11-18 12:47:54 +01:00
Robert Kloefkorn
439a084508 [bugfix][BlockoilModelEbos] fix invalidation of intensive quantities after 
linear solver failure.
 2016-11-18 12:47:54 +01:00
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