Markus Blatt
b6c06738b5
Do not assume ordering in an unordered_map when gathering data.
...
The order of an unordered_map is quite unpredictable. (The same
order will only hold with the same hash function, comparison
operator, and insertion order). Therefore we cannot assume that
the global SimulationDataContainer uses the same order for the
cell data as the local one (This was done before this commit).
But we can assume that the local one uses the same order on every
process.
Before this commit data got mixed up (e.g. gasoilratio with surfacevol)
when gathering local data for writing eclipse files on the master
process. This commit fixes this.
Instead of iterating over the cell data of the global state when
writing the data received, we again iterate over the cell data of
the local state and simply use the key to request the correct data
for writing from the global state.
2016-07-25 17:17:06 +02:00
Bård Skaflestad
01ec7befb4
Merge pull request #758 from qilicun/fix-wellIterations-bugs
...
fix well iterations counting bugs.
2016-07-20 11:20:28 +02:00
Liu Ming
3f4aa65180
add wellIterationsLast_.
2016-07-20 10:44:12 +08:00
Liu Ming
52d51e8565
remove wellIterationsLast_.
2016-07-18 09:02:30 +08:00
Liu Ming
b43cbe0531
drop useages of std::numeric_limits for counting well iterations.
2016-07-14 10:25:32 +08:00
Kai Bao
2f5045bb85
removing some white spaces in MissingFeatures
2016-07-13 09:16:18 +02:00
Liu Ming
6af9aee20f
counting well iterations correctly.
2016-07-13 09:00:15 +08:00
Kai Bao
ab31ab470b
removing two supported keywords from MissingFeatures.
2016-07-12 16:59:45 +02:00
Liu Ming
bb0164f39f
fix well iterations counting bugs.
2016-07-11 11:47:29 +08:00
Liu Ming
daf1eb9e74
use const reference instead of shared_prt.
2016-07-08 14:52:37 +08:00
Liu Ming
3f819e908d
Merge remote-tracking branch 'opm/master' into missing-features-handle
2016-07-08 14:49:38 +08:00
Liu Ming
77fedce11e
remove unused argument.
2016-07-08 08:19:03 +08:00
Liu Ming
c5fd3b2161
remove some keywords only related to parser.
2016-07-07 15:52:28 +08:00
Liu Ming
1b5b112031
call checkDeck() in FlowMain instead of checkKeywords().
2016-07-07 15:38:03 +08:00
Liu Ming
3e01b42d55
use std::unordered_set.
2016-07-07 13:50:32 +08:00
Liu Ming
064f512893
Diagnostics keywords that not supported by flow.
2016-07-07 10:38:29 +08:00
Andreas Lauser
88519d70c4
adapt to the EclMaterialLawManager's rename of the *Pointer methods
2016-07-06 13:00:35 +02:00
Kai Bao
399298be21
using mapentry_t instead of iterator.
2016-07-05 15:28:02 +02:00
Kai Bao
a8c2626e5a
fixing comments.
...
no functional change.
2016-07-05 13:02:28 +02:00
Kai Bao
4dad47f90d
adding warning tags to all the WECON related warnings.
2016-07-05 13:02:28 +02:00
Kai Bao
ddec62288a
fixing the warning messages.
2016-07-05 13:02:28 +02:00
Kai Bao
6a70450422
wrtiting state to report at the end of each time step
...
insead of writing in the begining of each time step.
2016-07-05 13:02:28 +02:00
Kai Bao
8e52e71993
changing shutted to shut.
2016-07-05 13:02:28 +02:00
Kai Bao
b2524a7dc3
making a forwarded updateListEconLimited in SimulatorBase.
...
and some changes to make the code compile for all the simulators.
2016-07-05 13:02:28 +02:00
Kai Bao
98a6495abc
makeing wellModel public for flow_polymer and flow_solvent.
2016-07-05 13:02:27 +02:00
Kai Bao
cc957a77fe
some well will go to stopped list and infomation output.
2016-07-05 13:02:27 +02:00
Kai Bao
e817719d48
When last connection is closed, the well is shut done.
2016-07-05 13:02:27 +02:00
Kai Bao
109b55f61c
using OpmLog to give warning.
2016-07-05 13:02:27 +02:00
Kai Bao
41b9fca434
implementing checkRatioEconLimits
2016-07-05 13:02:27 +02:00
Kai Bao
9220a2bbaf
refactoring updateListEconLimited based on new functions.
2016-07-05 13:02:27 +02:00
Kai Bao
dd59762c0b
adding checkMaxWaterCutLimit to StandardWells.
2016-07-05 13:02:27 +02:00
Kai Bao
c77aa5af09
adding checkRateEconLimited to StandardWells
...
to check rate related to economic limits.
2016-07-05 13:02:27 +02:00
Kai Bao
d48399ac3a
WIP for handling the water cut ecnomic limit
2016-07-05 13:02:27 +02:00
Kai Bao
a019460268
warning if requesting opening a new well after closing a well
...
it is not supported yet.
2016-07-05 13:02:27 +02:00
Kai Bao
e903690107
giving a warning if the WECON request ending running
...
It is not supported yet to stop the whole program after a well is closed
due to economic limits.
2016-07-05 13:02:27 +02:00
Kai Bao
53490270e1
adding updateListEconLimited to StandardWells
2016-07-05 13:02:27 +02:00
Kai Bao
18fa442721
adapted to the interface change of WellsManager
...
At the moment, for the ParallelDebugOutput, we put a dummy
dyanmic_list_econ_limited, not sure how it will the parallel running.
The basic problem is that when initialzing the globalWellState_, what
will happen if they can not find state information for a well in the Wells*.
If some defaulted values are used, then no big problem here.
2016-07-05 13:02:27 +02:00
Markus Blatt
fb76737bea
Moved step_msg inside if-branch
...
as it is not used outside of it.
2016-07-04 15:07:02 +02:00
Markus Blatt
047ae8f444
Use termininal_output_ to only print time step status once for parallel runs.
...
Previously each process printed this to the terminal
2016-07-04 13:46:29 +02:00
Joakim Hove
be71a2f8b2
Removed NNC argument from EclipseWriter ctor.
2016-07-01 12:26:25 +02:00
Joakim Hove
e262d0da68
Renamed writeInit -> writeInitAndEgrid( )
2016-07-01 12:26:25 +02:00
Joakim Hove
5a89598788
Write TRAN? to the INIT file.
2016-07-01 12:26:25 +02:00
Atgeirr Flø Rasmussen
895a1de3fc
Make iteration counts signed integers.
...
Generated warning when compared to the minimum int in well iteration count.
2016-06-30 15:31:07 +02:00
Atgeirr Flø Rasmussen
c7e6070d31
Correctly override NOSIM.
2016-06-30 15:30:49 +02:00
Atgeirr Flø Rasmussen
86b66863b4
Merge pull request #734 from qilicun/format-step-output
...
Format step output
2016-06-30 09:19:54 +02:00
Liu Ming
d3e6a657cd
Initial well iterations as a special number, output it if it is valid.
2016-06-30 09:04:44 +08:00
Liu Ming
136839bd20
fix warnings.
2016-06-29 16:42:43 +08:00
Joakim Hove
09f22f370a
Will look for param: 'nosim' and override deck.
2016-06-29 08:03:38 +02:00
Liu Ming
e6930df28c
make assemble method return IterationReport.
2016-06-28 16:20:33 +08:00
Atgeirr Flø Rasmussen
baeab02bd6
Adapt to changed updateWellControls() signature.
2016-06-28 15:50:50 +08:00