OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2025-02-25 18:55:30 -06:00
Code Issues Packages Projects Releases Wiki Activity
4,008 Commits 24 Branches 102 Tags 90 MiB
2a1388d124
Commit Graph

4008 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Markus Blatt
2a1388d124 Make WellSwitchingLogger work with DUNE 2.3 
That version does not provide a default constructor for
CollectiveCommunication, Therefore we now use
MPIHelper::getCollectiveCommunication() for the default
constructor argument.
 2016-10-05 16:13:11 +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
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
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
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
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
Tor Harald Sandve
7f91eade7e Move Compdat.hpp from opm-core to opm-simulators 2016-09-23 13:03:12 +02:00
Jørgen Kvalsvik
95143868a3 2 -> To 2016-09-23 12:59:18 +02:00
Jørgen Kvalsvik
7448ecae09 Newlines 2016-09-23 12:59:18 +02:00
Jørgen Kvalsvik
c468d9c84b Braces. 2016-09-23 12:59:18 +02:00
Jørgen Kvalsvik
5f5d69da6f WellState::report() to make opm-output Well data 2016-09-23 12:59:18 +02:00
Jørgen Kvalsvik
9894f98910 utility/Compat 
Introduces some helper functions to quickly enable support for the new
opm-output implementation. Conversion from simulator oriented cell- and
well representation to opm-output defined representation.
 2016-09-23 12:59:18 +02:00
Atgeirr Flø Rasmussen
ec955690cd Merge pull request #834 from akva2/fix_regression_pr_833 
fix output of gas phase
 2016-09-21 10:54:29 +02:00
Arne Morten Kvarving
78049a174e fix output of gas phase 
fixes a regression caused by 65b512e903
 2016-09-21 10:46:50 +02:00
Arne Morten Kvarving
bf88ccc95a Merge pull request #821 from akva2/kristfho_moretests 
Added more cases/models to ctest
 2016-09-20 12:40:32 +02:00
Atgeirr Flø Rasmussen
c84abe63a5 Merge pull request #833 from ANerd/output_present_phases 
Output well rates for present phases
 2016-09-20 11:03:31 +02:00
Anders Matheson
65b512e903 Use PhaseUsage to determine output phases 2016-09-20 09:44:17 +02:00
Anders Matheson
0ac0c97612 Output rates for present phases 2016-09-19 16:43:41 +02:00