OilfieldToolsNet/opm-simulators
4
0 Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2026-10-12 17:02:02 -05:00
Code Issues Packages Projects Releases Wiki Activity
4,220 Commits 31 Branches 117 Tags
f8bf7c392cfe07fdec4cd49a15aecd66cacf18c0
Commit Graph
4220 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Jørgen Kvalsvik 13a4364d55 Schedule::getGroup returns reference, not pointer 2016-10-05 15:32:24 +02:00
Atgeirr Flø Rasmussen f598906e09 Merge pull request #842 from blattms/fix-parallel-output 
Fix parallel output
 2016-10-05 15:16:28 +02:00
Markus Blatt 14eeb7c39a Removed warning in WellSwitchLogger::calculateMessageSize 2016-10-05 13:51:08 +02:00
Markus Blatt 3dbc6f5500 Correctly initialize MPI for multisegment wells test 2016-10-05 12:29:56 +02:00
Markus Blatt 99bf74c705 Changed some names in WellSwitchingLogger 2016-10-05 11:45:59 +02:00
Markus Blatt 80fb5b66d7 Use speaking name for bool in getCellData 2016-10-05 11:45:59 +02:00
Markus Blatt ab05cb66d9 Whitespace and other formatting changes 2016-10-05 11:45:51 +02:00
Markus Blatt d86f552a76 Added missing const reference to constructor argument 2016-10-05 11:39:28 +02:00
Markus Blatt bfb7ccfa8b Moved ParallelFileMerger to its own file. 2016-10-05 11:39:06 +02:00
Markus Blatt c0ca9afe5a Prevent loss of log messages in parallel by merging multiple files. 
This completes f94459d5ed
Each process with rank >0 will use .<deckname>.<rank>.DEBUG, and
<deckname>-<rank>.PRT for logging (instead of <file>.<rank>as before.
After the simulator has finished running we will append the content
of those files to the usual log files. If these files have a non-zero
size we will omit a warning as this should not happen if logging is
done right.
 2016-10-05 10:33:15 +02:00
Markus Blatt 07318edfa1 Added a parallel aware logger for switching wells. 
It will collect all the switches. Afterwards they are collect on
the root process and logged there.

This commit includes a small test program.
 2016-10-05 10:33:15 +02:00
Markus Blatt 02e8211067 Use <FILE>.<rank for nonzero ranks to capture fallout. 
These files will be empty unless we fail to to log messages
only on the root process. Currently that is the case for
the messages about switching the well controls.
 2016-10-05 10:33:15 +02:00
Markus Blatt fd52d0e223 Print "Reading parameters" only once in parallel. 2016-10-05 10:33:15 +02:00
Markus Blatt 12b3456f3b Fixup 46e22f515 2016-10-05 10:33:15 +02:00
Markus Blatt c5fd95affe Stop creating file outside output_dir for parallel runs. 
Only the root process did set the output_dir correctly. Others
used the default. Therefore all messages logged by non-root
processes did end up in the current directory even if an
output_dir was passed to flow_mpi.
 2016-10-05 10:33:15 +02:00
Markus Blatt 61a28cf12f Disable relperm diagnosis for non-root processes 2016-10-05 10:33:15 +02:00
Markus Blatt 81a617e892 Switch off output in EclipsePRTLog for non-root processes. 2016-10-05 10:33:15 +02:00
Markus Blatt 70d4dedfd2 Omit deck check warnings on non-root processes 2016-10-05 10:33:14 +02:00
Markus Blatt 6d0d063413 Omit "Unhandled keyword" messages on non-root processes 2016-10-05 10:33:14 +02:00
Markus Blatt d4b818c948 Omit fluid in place messages on non-root process 2016-10-05 10:33:14 +02:00
Markus Blatt fd24070931 Omit "well converge" on non-root process 2016-10-05 10:33:14 +02:00
Markus Blatt 2a6494cfcd Only extract parser message on process 0 2016-10-05 10:33:14 +02:00
Andreas Lauser ddd4225684 Merge pull request #849 from totto82/frankensteinfixcrossflow 
Allow crossflow if all perforations is crossflowing
 2016-10-03 14:27:11 +02:00
Tor Harald Sandve 22f1df612b Allow crossflow if all perforations is crossflowing 2016-10-03 09:54:28 +02:00
Atgeirr Flø Rasmussen 4c0b21d2f8 Merge pull request #843 from totto82/start_using_TUNING 
Add an option for using values from TUNING in the timestepping.
 2016-09-30 13:03:07 +02:00
Atgeirr Flø Rasmussen 4d948b19d7 Merge pull request #845 from andlaus/threshold_pressure_fixes 
Default threshold pressure fixes
 2016-09-30 13:00:19 +02:00
Andreas Lauser f9bf09e832 Merge pull request #847 from totto82/frankenstein_fixModel2 
Frankenstein fixes for model2
 2016-09-30 11:16:03 +02:00
Atgeirr Flø Rasmussen 03416022cc Merge pull request #848 from totto82/output_solvent_summary2 
Feed solvent wellrates to data::wells for summary output
 2016-09-30 11:03:16 +02:00
Tor Harald Sandve bef33ed00c Add an option for using values from TUNING in the timestepping. 
if the paramter use_TUNING is set to true, the adaptive timestepper will
initalize with relevant values from the TUNING keywords.
 2016-09-30 10:28:34 +02:00
Tor Harald Sandve 09a86747b5 Feed solvent wellrates to data::wells for summary output 2016-09-30 09:49:16 +02:00
Tor Harald Sandve 8e2657ce4d Some tuning in the Appleyard 2016-09-30 08:57:52 +02:00
Tor Harald Sandve 69811e9585 Use correct pvtregions in rsSat and rvSat calculations 2016-09-30 08:57:52 +02:00
Tor Harald Sandve 84c33e0e96 Add trivial well equation when there is no flow 
Fixes case when all perforations in a well are crossflowing while
crossflow is not allowed
 2016-09-30 08:57:52 +02:00
Tor Harald Sandve 07339be80e BUGFIX. Make frankenstein compile and run 
- remove outout of initial timestep
- pass phaseUsage to report(...) in WellStateFullyImplicitBlackoil.hpp
 2016-09-30 08:57:52 +02:00
Andreas Lauser 7d7e619333 Merge pull request #846 from andlaus/frankenstein_merge_master_v2 
Frankenstein merge master v2
 2016-09-29 18:44:55 +02:00
Andreas Lauser 6722c67534 Merge remote-tracking branch 'origin/master' into frankenstein_merge_master_v2 2016-09-29 18:38:39 +02:00
Andreas Lauser fa626a543b make it work with the latest master branches 
it broke because the Compat.hpp header was removed today.
 2016-09-29 18:24:54 +02:00
Atgeirr Flø Rasmussen 4a82ac386b Merge pull request #844 from blattms/report-step-iterations-in-step_timing.txt 
Correct number of (nonlineat) iterations/linearizations in step_timing.txt
 2016-09-29 17:44:37 +02:00
Atgeirr Flø Rasmussen 4a6fcde45e Merge pull request #837 from totto82/output_solvent2 
Output solvent saturation
 2016-09-29 17:32:51 +02:00
Andreas Lauser 6aabc99814 Merge pull request #818 from andlaus/frankenstein_merge_master 
Frankenstein merge master
 2016-09-29 09:55:32 +02:00
Andreas Lauser 36b00ba570 Merge remote-tracking branch 'origin/master' into frankenstein_merge_master 2016-09-28 21:20:47 +02:00
Andreas Lauser 83a9f6ffce threshold pressure defaults: calculate the pressure difference like when computing the fluxes 
this should not change the value of the result at all (because the
total delta which is added to the phase pressures stays identical),
but it should be less confusing when comparing this with the code that
calculates the gravity correction term in the flux calculation.
 2016-09-28 16:57:34 +02:00
Andreas Lauser 000fde19dc threshold pressures: simplify code for the density calculation a bit 2016-09-28 16:57:34 +02:00
Andreas Lauser 4f4d7531af threshold pressure: be more cautious when acessing the defaults 
maybe it worked as-is, or maybe decks which lead to illegal accesses
to the map are incorrect (i.e., they specify threshold pressures for
EQUIL-regions that do not touch), but let's play save here...
 2016-09-28 16:56:54 +02:00
Andreas Lauser 662d6e28cd threshold pressures: properly consider the dissolved components for the density 
even if a phase is saturated, the dissolved component must be
considered when calculating the fluid density.
 2016-09-28 16:55:15 +02:00
Andreas Lauser ae3248da8b threshold pressure: use phase pressure instead of reference pressure... 
... to calculate phase densities for the threshold pressure
defaults. I don't know if the reference simulator does this, but this
makes it consistent with what's done in the flux calculation of flow.
 2016-09-28 16:54:00 +02:00
Markus Blatt 0bdab6e579 Correct number of (nonlineat) iterations/linearizations in step_timing.txt 
Previously, for all step zero was reported. With this commit
we set these numbers in the SimulatorReport and now they end
up correctly in step_timings.txt
 2016-09-28 12:05:52 +02:00
Tor Harald Sandve 45eae4bbc8 Output solvent saturation 
-- Compat.hpp is moved to opm-simulators
-- add SSOL if solvent is present
 2016-09-27 08:40:04 +02:00
Atgeirr Flø Rasmussen 3e04ef89f4 Merge pull request #838 from atgeirr/avoid-pessimizing-move 
Do not move when it would disable copy elision.
 2016-09-26 10:25:01 +02:00
Atgeirr Flø Rasmussen 08c5e31265 Do not move when it would disable copy elision. 2016-09-26 09:33:13 +02:00