Atgeirr Flø Rasmussen
a767e166ae
Make DataMap.hpp properly include its dependencies.
2017-12-04 16:24:14 +01:00
Joakim Hove
3725ac8f7d
Added DataMap.hpp
2017-12-04 16:24:14 +01:00
Atgeirr Flø Rasmussen
65034250d1
Merge pull request #1356 from dr-robertk/PR/fix-minor-issue-gridview
...
[bugfix] make code compile when GridView is not Grid::LeafGridView.
2017-12-04 09:25:43 +01:00
Atgeirr Flø Rasmussen
95c8a0e673
Merge pull request #1358 from GitPaean/cleaningup_well_models
...
Cleaningup well models
2017-12-01 10:51:30 +01:00
Kai Bao
9317c1f023
removing the current argument in updateWellStateWithTarget
...
and some other cleaning up.
2017-11-30 17:14:29 +01:00
Kai Bao
ea3cbd1fe8
removing numComponents() from WellInterface
...
which is dumplicated from BlackoilWellModel.
2017-11-30 16:31:48 +01:00
Atgeirr Flø Rasmussen
7c3893016e
Merge pull request #1357 from totto82/changeMaxIterTest
...
Increase max_iter for ctests SPE5 and 2D_THREEPHASE_POLY_HETER
2017-11-30 13:01:16 +01:00
Tor Harald Sandve
8ae24f7f02
Increase max_iter for ctests SPE5 and 2D_THREEPHASE_POLY_HETER
2017-11-30 08:45:03 +01:00
Robert Kloefkorn
3a35a495a8
[bugfix] make code compile when GridView is not Grid::LeafGridView.
2017-11-29 23:26:38 +01:00
Atgeirr Flø Rasmussen
277a7809ac
Merge pull request #1354 from akva2/remove_polymer_int
...
remove polymer integration test
2017-11-29 20:50:10 +01:00
Atgeirr Flø Rasmussen
eef7b8ea94
Merge pull request #1348 from totto82/refactorBlackoilModelEbos
...
Put the ebosSimulator start and end methods where it belongs
2017-11-29 20:49:18 +01:00
Arne Morten Kvarving
70584b4a55
remove polymer integration test
2017-11-29 14:00:38 +01:00
Atgeirr Flø Rasmussen
29370f7962
Merge pull request #1353 from akva2/missing_msw_3d
...
fixed: missing msw_3d in commit message for the opm-data PR
2017-11-29 10:59:32 +01:00
Atgeirr Flø Rasmussen
2bf880fadd
Merge pull request #1351 from totto82/changeDefaultTimeStep
...
Use 1 day as default initial time step
2017-11-29 10:01:15 +01:00
Arne Morten Kvarving
937e8afb77
fixed: missing msw_3d in commit message for the opm-data PR
2017-11-29 09:45:09 +01:00
Atgeirr Flø Rasmussen
9cffa946f6
Merge pull request #1350 from totto82/onlyReadTuningParamOnce
...
Only read use_TUNING param once.
2017-11-28 20:43:35 +01:00
Atgeirr Flø Rasmussen
3d698cabcf
Merge pull request #1347 from totto82/fixLargeTime
...
Fix date for long simulation times
2017-11-28 16:54:48 +01:00
Tor Harald Sandve
a1dbeec4d4
Use 1 day as default initial time step
2017-11-28 15:12:48 +01:00
Tor Harald Sandve
2d2f9285c5
Only read use_TUNING param once.
...
Just to clean up the .DEBUG file.
2017-11-28 14:25:25 +01:00
Tor Harald Sandve
e350c04871
Fix date for long simulation times
2017-11-28 13:37:00 +01:00
Atgeirr Flø Rasmussen
14cedcf434
Merge pull request #1349 from akva2/polymer_fix
...
fixed: run polymer integration test with flow, not recently removed flow_polymer
2017-11-28 12:42:40 +01:00
Arne Morten Kvarving
425c7c2d66
fixed: run polymer integration test with flow, not recently removed flow_polymer
2017-11-28 09:51:37 +01:00
Atgeirr Flø Rasmussen
9db16ad9dc
Merge pull request #1342 from GitPaean/fixing_polymer
...
fixing a polymer running with both shear and non-fully mixed polymer.
2017-11-27 13:33:38 +01:00
Kai Bao
7b61f3e692
moving polymer related to updateWaterMobilityWithPolymer
...
in StandardWell.
And not calculating the shear effect for the injecting wells when the
injection wells do not inject polymer.
2017-11-27 09:24:02 +01:00
Atgeirr Flø Rasmussen
46e958af43
Merge pull request #1337 from totto82/removeBlackOilPropsFromInit
...
Adapt to the refactoring of the Equil initialization code
2017-11-27 07:26:22 +01:00
Atgeirr Flø Rasmussen
f62275cb06
Merge pull request #1339 from blattms/write-ranks-without-nonactive
...
Disregard non-active cells when writing MPI_RANK in writeInitial.
2017-11-27 07:22:34 +01:00
Atgeirr Flø Rasmussen
401aa28c08
Merge pull request #1340 from totto82/solventAndResv
...
Make it possible to combine solvent and RESV
2017-11-27 07:20:24 +01:00
Atgeirr Flø Rasmussen
369e9f5a06
Merge pull request #1344 from atgeirr/remove-legacy-polymer
...
Remove legacy fully implicit polymer simulator.
2017-11-27 07:19:01 +01:00
Atgeirr Flø Rasmussen
3fd27d9bd6
Merge pull request #1346 from GitPaean/removing_more_multisegment_legacy
...
removing more legacy Multisegment Wells related.
2017-11-24 15:30:39 +01:00
Tor Harald Sandve
9edb351d34
Put the ebosSimulator start and end methods were it belongs
...
Move the beginEpisode/endEpisode call to ebos to beginReportStep/
endReportStep and beginTimeStep/endTimeStep call to ebos to prepareStep/
afterStep
2017-11-24 15:16:03 +01:00
Atgeirr Flø Rasmussen
aab41f3df2
Merge pull request #1341 from totto82/fixTUNING
...
Only update TUNING after event
2017-11-24 13:15:40 +01:00
Atgeirr Flø Rasmussen
47df8417f1
Merge pull request #1345 from andlaus/remove_configure
...
remove the configure wrapper script
2017-11-24 13:12:21 +01:00
Atgeirr Flø Rasmussen
eabd06389c
Stop updating reference data for legacy flow_polymer regression test.
2017-11-24 12:38:55 +01:00
Kai Bao
f87e6d35db
removing more legacy Multisegment Wells related.
2017-11-24 12:27:43 +01:00
Atgeirr Flø Rasmussen
32c7d822ec
Remove legacy fully implicit polymer simulator.
...
It has been replaced with the faster local-ad-based code, that is now
part of the integrated flow.cpp application.
We do not remove the old sequential implicit polymer simulators.
2017-11-24 11:41:34 +01:00
Andreas Lauser
804d38dcb6
remove the configure wrapper script
...
this used to provide autotools compatibility, but it has not been working for a while. Thus it is IMO better to remove it in order not to mislead people.
2017-11-24 10:36:46 +01:00
Tor Harald Sandve
ba358c0522
Only update TUNING when TUNING_CHANGE event
2017-11-23 14:24:40 +01:00
Tor Harald Sandve
dd97fc8908
Some clean up.
2017-11-23 11:15:50 +01:00
Tor Harald Sandve
c076ed6485
Move Rateconverter and pvtIdx to the wellInterface
2017-11-23 08:37:30 +01:00
Tor Harald Sandve
054361d537
Make it possible to combine solvent and RESV
...
Compute the conversion factor for solvent using the RateConverter.hpp
2017-11-22 15:21:21 +01:00
Markus Blatt
f32743cf31
Disregard non-active cells when writing MPI_RANK in writeInitial.
...
This saves space and it is allowed and recommended (spacewise) to
use integer arrays with only values for active cells in writeInitial.
2017-11-22 14:18:32 +01:00
Atgeirr Flø Rasmussen
796f6cd13c
Merge pull request #1338 from totto82/scheduleTUNING
...
Support TUNING in schedule section.
2017-11-22 14:03:58 +01:00
Andreas Lauser
ef76d0a8cc
Merge pull request #1335 from atgeirr/refactor-sim
...
Removing unused code parts and minor refactoring
2017-11-22 13:57:58 +01:00
Joakim Hove
e7e7aa9274
Merge pull request #1336 from blattms/print-mpi-ranks
...
Adapt writeInitial call to use integer vectors for printing ranks
2017-11-22 12:21:42 +01:00
Markus Blatt
9402f4bde1
Make CellOwnerHandle available without MPI
...
and thus make compilation succeed in this case as using
it is perfectly find even if MPI is not there.
2017-11-21 15:06:36 +01:00
Tor Harald Sandve
2a7d7b8ae5
Pass ref instead of shared pointer to initEquil
2017-11-21 14:29:08 +01:00
Tor Harald Sandve
31bfb22273
Adapt to the refactoring of the Equil initialization code
...
Most noteably the blackoilState is not returned by the initialization
code anymore, instead the initialization class is returned.
2017-11-21 13:52:07 +01:00
Markus Blatt
e7688a2ca0
Use MPI_RANK as ECL keyword (max length is 8)
...
MPI_RANKS was one character to long and rose an exception with message
"Error: Program threw an exception: Keyword is too long."
2017-11-21 11:17:40 +01:00
Tor Harald Sandve
c03dbc1693
Support TUNING in schdule section.
2017-11-21 11:12:16 +01:00
Markus Blatt
073f63ac4c
Adapt writeInitial call to use integer vectors for printing ranks
...
This adapts to the new function signature as of PR 216 in opm-output. It uses the
newly introduced map of integer vectors to print the MPI ranks in a parallel run.
2017-11-20 15:30:50 +01:00