OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2025-01-16 01:41:56 -06:00
Code Issues Packages Projects Releases Wiki Activity
4,358 Commits 24 Branches 102 Tags 90 MiB
34c4053c65
Commit Graph

4358 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Andreas Lauser
34c4053c65 StandardWellsDense: fix assert for the 2p case 
this wasn't noticed earlier because it only bites in the water-oil
case and only if NDEBUG is not defined.
 2016-12-12 14:26:34 +01:00
Andreas Lauser
c7807a99a2 Merge pull request #969 from andlaus/reset_locale 
flow*: reset the locale settings on startup
 2016-12-08 18:02:47 +01:00
Andreas Lauser
3fb55f06e5 flow*: reset the locale settings on startup 2016-12-08 12:17:36 +01:00
Andreas Lauser
d9c01406ea Merge pull request #967 from andlaus/no_opm-parser_pointers 
flow_ebos: do not use (smart) pointers for opm-parser objects anymore
 2016-12-08 10:03:24 +01:00
Robert Kloefkorn
bf18ee7fb9 fix the merge fallout 2016-12-06 20:05:24 +01:00
Andreas Lauser
ef15d76831 Merge commit 'refs/pull/947/head' of https://github.com/OPM/opm-simulators into no_opm-parser_pointers 
* https://github.com/OPM/opm-simulators:
  [bugfix] add defunct_well_names to BlackoilModelEbos.
  [bugfix] fix ownerMask for parallel FIP code.
  flow_ebos: tell the ebos in ourselves to not handle SWATINIT
  [bugfix] Make initialization work in parallel for flow_ebos.
  [bugfix] make flow_ebos work when no wells are present.
  flow_ebos: only instantiate the grid once
 2016-12-06 19:43:47 +01:00
jokva
efc2a79540 Merge pull request #898 from joakim-hove/remove-stale-output 
Removed all calls to writeECLData.
 2016-12-06 16:06:15 +01:00
Joakim Hove
15108f3499 Merge pull request #968 from atgeirr/add-vtk-writing 
Re-add vtk writing functionality
 2016-12-06 11:09:48 +01:00
Atgeirr Flø Rasmussen
508da6689f Change include path for writeVtkData.hpp, or remove include. 2016-12-06 09:48:03 +01:00
Atgeirr Flø Rasmussen
14ab6b6810 Add writeVtkData(), including version for UnstructuredGrid. 2016-12-06 09:26:45 +01:00
Joakim Hove
7ef40b3512 Removed all calls to writeECLData. 2016-12-06 08:34:17 +01:00
Atgeirr Flø Rasmussen
6237e957d7 Merge pull request #966 from OPM/revert-965-polymer_production_concentration 
Revert "changing polymer production concentration to be the grid block concnetration."
 2016-12-06 06:11:25 +01:00
Andreas Lauser
f7910af7d7 flow_ebos: do not use (smart) pointers for opm-parser objects anymore 
this patch also includes code to make FlowMainEbos more autonomous
(i.e. it does not derive from FlowMainBase anymore). this allows more
flexibility how and what stuff gets created.
 2016-12-05 20:11:43 +01:00
Kai Bao
8148105ae3 Revert "changing polymer production concentration to be the grid block concnetration." 2016-12-05 15:05:56 +01:00
Atgeirr Flø Rasmussen
f9deaadcd1 Removed tabs. 2016-12-05 14:58:47 +01:00
Atgeirr Flø Rasmussen
5730e4f56a Merge pull request #965 from GitPaean/polymer_production_concentration 
changing polymer production concentration to be the grid block concnetration.
 2016-12-05 14:11:41 +01:00
Kai Bao
81a73650de polymer production concentration to be the grid block concnetration. 
To be more consistent with the injection well.
 2016-12-05 12:52:21 +01:00
Robert Kloefkorn
42ab4d133f [bugfix] add defunct_well_names to BlackoilModelEbos. 2016-12-02 11:13:06 +01:00
Robert Kloefkorn
2eca5d71e6 [bugfix] fix ownerMask for parallel FIP code. 2016-12-01 22:25:46 +01:00
Andreas Lauser
e6acf888cc flow_ebos: tell the ebos in ourselves to not handle SWATINIT 
because the flow part also wants to do this. (and it is quite a bit
more stubborn!)
 2016-12-01 16:50:31 +01:00
Robert Kloefkorn
c5ca9649d7 [bugfix] Make initialization work in parallel for flow_ebos. 2016-12-01 16:50:31 +01:00
Robert Kloefkorn
1c2a2c417c [bugfix] make flow_ebos work when no wells are present. 2016-12-01 16:50:28 +01:00
Andreas Lauser
5ebed2f500 flow_ebos: only instantiate the grid once 
it now uses the grid object which gets created by ebos for everything
which should make the parallelization efforts easier. I also tried to
cut back the use of the legacy property objects (i.e., for the fluid,
geologic and rock properties), but this effort ran aground because of
the initialization and output code. (also, if those two were fixed,
there would probably be issues with the Newton update.)

I ran Norne with this and there did not seem to be any notable
performance regressions or benefits.
 2016-12-01 16:50:06 +01:00
Jørgen Kvalsvik
28c36ef949 Mini deck is reference, not pointer 2016-12-01 16:18:04 +01:00
Atgeirr Flø Rasmussen
2abb2c8144 Merge pull request #914 from GitPaean/test_iterative_wellcontrol 
[WIP] making the updateWellControls an iterative process for StandardWells
 2016-12-01 10:52:03 +01:00
Atgeirr Flø Rasmussen
63b0498843 Merge pull request #951 from andlaus/improve_SimulatorReport 
extend and clean up the SimulatorReport
 2016-11-30 19:34:11 +01:00
Arne Morten Kvarving
f6cf4bfc56 Merge pull request #956 from akva2/multiple_norne_runs 
changed: use a separate output dir for each simulator in norne integration test
 2016-11-30 10:46:45 +01:00
Atgeirr Flø Rasmussen
1ea5440c40 Merge pull request #959 from akva2/update_jenkins_grid 
update jenkins upstream list
 2016-11-29 22:50:06 +01:00
Arne Morten Kvarving
cefc1bb92f update jenkins upstream list 
opm-grid moved in the dependency graph
 2016-11-29 21:47:42 +01:00
Bård Skaflestad
6281d1f090 Merge pull request #958 from andlaus/fix_asserts 
StandardWellsDense: fix two assertations
 2016-11-29 15:05:32 +01:00
Andreas Lauser
69240fe435 StandardWellsDense: fix two assertations 
the compiler suggested braces around the conditions, and by look of
it, it was right: these asserts most likely want express that only the
threephase case or the twophase case without gas are handled...
 2016-11-29 14:29:51 +01:00
Andreas Lauser
eb4e2c9548 Merge pull request #957 from andlaus/flow_ebos-fix-debug-build 
flow_ebos: fix build with debugging flags
 2016-11-29 11:41:18 +01:00
Andreas Lauser
fdb01cb9a3 flow_ebos: fix build with debugging flags 
once more, it seems like we became a victim of the combinatorial
explosion of possibilities.
 2016-11-29 11:36:30 +01:00
Andreas Lauser
5bb23cfe9d Merge pull request #946 from andlaus/implement_two-phase_blackoil 
Implement two phase blackoil
 2016-11-28 15:16:19 +01:00
Atgeirr Flø Rasmussen
3887c584f6 Merge pull request #954 from GitPaean/fixing_wellsactive_checking 
adding localWellsActive() checking for two MSW functions
 2016-11-28 12:16:27 +01:00
Arne Morten Kvarving
41b2dadff5 changed: use a separate output dir for each simulator in norne integration test 2016-11-28 10:15:21 +01:00
Andreas Lauser
8c5f92dbc4 extend and clean up the SimulatorReport 2016-11-25 21:19:57 +01:00
Kai Bao
69d5ec94c9 adding localWellsActive() checking for two MSW functions 
updatePerfPhaseRatesAndPressures() and addWellFluxEq()
 2016-11-25 13:45:38 +01:00
Atgeirr Flø Rasmussen
42eb5e77a5 Merge pull request #952 from akva2/fix_oilkr 
fixed: [WAT|OIL|GAS)KR are ratios and thus dimensionless
 2016-11-25 08:00:13 +01:00
Arne Morten Kvarving
312491f349 Merge pull request #2 from andlaus/flow_ebos-fix-kr-units 
also fix the units of the relperm in SimulatorFullyImplicitBlackoilOutputEbos
 2016-11-24 18:19:33 +01:00
Andreas Lauser
12bed02b1e also fix the units of the relperm in SimulatorFullyImplicitBlackoilOutputEbos 2016-11-24 18:13:49 +01:00
Arne Morten Kvarving
f813d829e4 fixed: [WAT|OIL|GAS)KR are ratios and thus dimensionless 2016-11-24 17:43:06 +01:00
Kai Bao
e57da11fbd making the updateWellControls an iterative process for StandardWells 
Seperating the updateWellStateWithTarget from updateWellControls, will
update the controls when any of the control constraints gets broken.

The reason is that the updated well control can still break some of
other the contstaints. We need to choose one control to make sure all the
constraints are honored.
 2016-11-24 11:27:59 +01:00
Arne Morten Kvarving
0429c756ba Merge pull request #944 from akva2/add_init_tests 
New test class: init
 2016-11-23 13:10:09 +01:00
Arne Morten Kvarving
9cae20d6f3 added: new test class: init 
this compares the init file from a simulation run to a reference
in opm-data
 2016-11-23 12:54:21 +01:00
Arne Morten Kvarving
c8fae07be3 Merge pull request #904 from akva2/parallel_io_tests 
add new regression test class: parallel
 2016-11-23 11:26:28 +01:00
Arne Morten Kvarving
d8a829db46 add new regression test class: parallel 
this compares the output of a serial and a parallel
run for a simulation
 2016-11-23 10:59:48 +01:00
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