OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2026-09-05 04:40:19 -05:00
Code Issues Packages Projects Releases Wiki Activity
4,149 Commits 31 Branches 117 Tags
134bf914dc7f8ba7be77fd5d4d1d178baf89470c
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Atgeirr Flø Rasmussen 732786f014 Merge pull request #878 from atgeirr/fix-twophase 
Bugfix: properly handle two-phase cases.
 2016-10-27 14:07:19 +02:00
Atgeirr Flø Rasmussen e762844cdf Bugfix: use correct object in sequential model. 
Discovered as a side effect of two-phase fix.
 2016-10-27 13:20:10 +02:00
Atgeirr Flø Rasmussen 1fe610ef5a Bugfix: properly handle two-phase cases. 
Errors were found in FIP handling and output.
 2016-10-27 11:02:04 +02:00
Atgeirr Flø Rasmussen dbf902e704 Merge pull request #876 from atgeirr/fix-extra-RPTRST-data 
Bugfix: pass both normal and extra data to output.
 2016-10-25 18:39:14 +02:00
Atgeirr Flø Rasmussen 7da420869b Bugfix: pass both normal and extra data to output. 
Normal meaning SWAT, PRESSURE, RS etc.
Extra meaning KR, VISC etc. as asked for in RPTRST.
 2016-10-25 15:27:59 +02:00
Atgeirr Flø Rasmussen b2a64c2ddd Merge pull request #875 from atgeirr/completion-data-changes 
Update well data output integration.
 2016-10-25 13:58:33 +02:00
Atgeirr Flø Rasmussen 17a9f28fb8 Update well data output integration. 
Includes the following changes:
 - update to match API change in opm-output (vector not map for data::Wells::completions),
 - restore WellStateFullyImplicitBlackoil::perfPhaseRates() from output,
 - restore WellStateFullyImplicitBlackoil::currentControls() from output.

Remaining non-restored well-related data are:
 - well potentials,
 - the dynamic list of econ-limited completions.
 2016-10-25 10:53:40 +02:00
Atgeirr Flø Rasmussen 77abb6de1c Merge pull request #840 from jokva/output-data-wells-sans-vectors 
WIP: Output data wells sans vectors
 2016-10-21 15:00:39 +02:00
Atgeirr Flø Rasmussen 1edbc9f238 Merge pull request #866 from atgeirr/convergence-failure-not-error 
Convergence failure classification, fix for parallel logging
 2016-10-21 12:49:07 +02:00
Atgeirr Flø Rasmussen 10e7875734 Merge pull request #873 from atgeirr/fix-compile-error 
Compile fix
 2016-10-21 11:23:33 +02:00
Atgeirr Flø Rasmussen 2d15c1ffec Adapt to API change in opm-parser. 2016-10-21 11:21:02 +02:00
Atgeirr Flø Rasmussen 3a6353a455 Merge pull request #820 from qilicun/support-MESSAGES 
support MESSAGES keyword.
 2016-10-21 11:04:39 +02:00
Atgeirr Flø Rasmussen d527b6862a Ensure logging only on first rank. 2016-10-20 22:47:30 +02:00
Atgeirr Flø Rasmussen a2c9e64291 Add isIORank_ member to avoid repeated calls. 2016-10-20 22:40:24 +02:00
Atgeirr Flø Rasmussen e4731fc14d Rename isRankZero() -> isIORank() for consistency. 2016-10-20 22:40:24 +02:00
Atgeirr Flø Rasmussen 8ed3418245 Ensure only first-rank logging. 
Also classify convergence troubles or out-of-bounds residuals as
"problem" not "error".
 2016-10-20 22:40:24 +02:00
Atgeirr Flø Rasmussen 5559fbd233 Add isRankZero() utility. 2016-10-20 22:40:24 +02:00
Atgeirr Flø Rasmussen 9e1ba49554 Bugfix: missing return. 2016-10-20 22:40:24 +02:00
Atgeirr Flø Rasmussen 93ffb318cd Merge pull request #855 from andlaus/opm-parser_units 
adapt to the removal of the unit system of opm-core
 2016-10-18 15:25:42 +02:00
Atgeirr Flø Rasmussen 79de15e21d Merge pull request #861 from blattms/fix-parallel-step_timings.txt-writing 
Let only one rank write to step_timing.txt
 2016-10-14 13:42:33 +02:00
Atgeirr Flø Rasmussen d007cd8e6e Merge pull request #859 from atgeirr/compile-fixes 
Compile fixes
 2016-10-14 13:31:12 +02:00
Atgeirr Flø Rasmussen 262d2e1172 Merge pull request #860 from blattms/skip-hint-to-issue-tracker 
Do not refer users to issue tracker if multiple procs log.
 2016-10-14 13:30:00 +02:00
Atgeirr Flø Rasmussen 580e76cf05 Remove unused variable. 2016-10-13 17:09:43 +02:00
Atgeirr Flø Rasmussen 654a24b625 Use vector instead of VLA, also add missing includes. 2016-10-13 17:08:52 +02:00
Atgeirr Flø Rasmussen 7e0cb99bad Merge pull request #839 from babrodtk/summary_data 
Summary data output
 2016-10-10 10:00:17 +02:00
Atgeirr Flø Rasmussen f3ac93a8c8 Merge pull request #853 from blattms/fix-PR-842 
Make WellSwitchingLogger work with DUNE 2.3
 2016-10-07 14:50:18 +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
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
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
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
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
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
Atgeirr Flø Rasmussen 9d991292be Merge pull request #832 from totto82/fix_outputRSsat_solvent 
BUGFIX. Store RsSat and RvSat in simulator container also in the Solvent model
 2016-09-19 13:47:03 +02:00
Atgeirr Flø Rasmussen 06e41bdaca Merge pull request #819 from blattms/use-defunct-wells-from-loadbalancer-for-wellsmanager 
Use names of defunct wells from loadbalancer for wellsmanager
 2016-09-19 13:42:42 +02:00
Atgeirr Flø Rasmussen 51237cb960 Merge pull request #829 from blattms/parallelize-computeFluidInPlace 
Correctly parallelize computeFluidInPlace
 2016-09-19 09:31:05 +02:00
Atgeirr Flø Rasmussen 48f151bfca Merge pull request #806 from andlaus/implement_multregp 
use the PORV 3D property from opm-parser to determine the pore volume
 2016-09-16 09:46:22 +02:00
Atgeirr Flø Rasmussen 420a5b7b4f Merge pull request #827 from babrodtk/bugfix_output_writer_polymer 
Added missing code for polymer model for output
 2016-09-16 09:27:59 +02:00
Atgeirr Flø Rasmussen bbd2575e00 Merge pull request #825 from babrodtk/bugfix_output_writer 
Bugfix for output writer
 2016-09-15 09:57:27 +02:00
Atgeirr Flø Rasmussen 6962eb070c Merge pull request #813 from qilicun/fix-segfault-in-fip 
Remove SolutionState dependency in FIP calculation.
 2016-09-08 10:15:08 +02:00
Atgeirr Flø Rasmussen ef3926da9d Merge pull request #805 from babrodtk/output_writer_celldata 
Output writer cell data
 2016-09-08 09:55:09 +02:00
Atgeirr Flø Rasmussen 4d2d004c43 Merge pull request #769 from blattms/fix-step-used-by-parallel-io 
Fix step number used by parallel io and OutputWriter::writeTimeStep
 2016-09-07 14:09:56 +02:00
Atgeirr Flø Rasmussen ff09dbef71 Merge pull request #811 from atgeirr/remove-unneeded-include 
Remove unused include.
 2016-09-07 13:54:23 +02:00
Atgeirr Flø Rasmussen be8f8b479f Merge pull request #773 from blattms/honor-unordered_map-in-simulationdatacontainer-when-gathering-data 
Do not assume ordering in an unordered_map when gathering data.
 2016-09-07 13:52:08 +02:00
Atgeirr Flø Rasmussen 68a0d3796b Remove unused include. 2016-09-07 12:53:19 +02:00
Atgeirr Flø Rasmussen 98ec930a25 Merge pull request #770 from blattms/call-writeInit-before-distributing-grid 
Call writeInit with global grid and properties.
 2016-09-07 11:29:19 +02:00
Atgeirr Flø Rasmussen f78155fe23 Merge pull request #808 from qilicun/fix-pav 
Correct the formulation for PAV calculations.
 2016-09-07 08:52:18 +02:00
Atgeirr Flø Rasmussen 983c7d9957 Merge pull request #787 from totto82/fix_minpv_actnum 
BUGFIX. Correctly handle ACTNUM in minPvFillProps_()
 2016-09-02 15:17:28 +02:00
Atgeirr Flø Rasmussen 5f1bcb2a59 Merge pull request #802 from atgeirr/qilicun-fip-support 
Output total fluid in place
 2016-08-31 08:49:35 +02:00
Atgeirr Flø Rasmussen b5e986df5f Remove well state argument from computeFluidInPlace(). 2016-08-30 13:34:18 +02:00
Atgeirr Flø Rasmussen a2001ca2e1 Avoid variable shadowing. 2016-08-30 13:33:50 +02:00
Atgeirr Flø Rasmussen 69812fddd2 Remove unnecessary override of computeFluidInPlace(). 
It also called itself, causing infinite recursion.
 2016-08-30 13:18:54 +02:00
Atgeirr Flø Rasmussen 61af1fa53d Remove unused nnc arg from BlackoilOutputWriter constructor. 2016-08-30 13:18:06 +02:00
Atgeirr Flø Rasmussen 379bd967e1 Merge pull request #801 from qilicun/update-missing-keyword-list 
NOSIM is supported, should remove from the list.
 2016-08-29 08:30:09 +02:00
Atgeirr Flø Rasmussen 183d2f4477 Merge pull request #762 from qilicun/messages-for-keywords-options 
Handle partially supported options manually.
 2016-08-23 08:07:29 +02:00
Atgeirr Flø Rasmussen c14b19c48b Merge pull request #792 from qilicun/fix-polymer-inflow 
look for water injector only, if not find, just continue to next step.
 2016-08-15 17:35:15 +02:00
Atgeirr Flø Rasmussen d6230f74d5 Merge pull request #784 from totto82/fix_ntg_minpv 
BUGFIX. Use the modified NTG values in multiplyHalfIntersections_(..)
 2016-08-09 08:29:39 +02:00
Atgeirr Flø Rasmussen ac11db635c Merge pull request #778 from qilicun/polymer-well-iters 
well iterations should start from 0.
 2016-08-05 09:07:35 +02:00
Atgeirr Flø Rasmussen 68771e6ef5 Merge pull request #777 from qilicun/fix_polymer_rates_bug 
Fix polymer rates bug
 2016-08-05 08:50:31 +02:00
Atgeirr Flø Rasmussen 5581771917 Merge pull request #776 from qilicun/debug-polymer 
fix polymer in flow bug.
 2016-08-03 08:52:17 +02:00
Atgeirr Flø Rasmussen abddac2309 Merge pull request #761 from andlaus/print_linearizations 
distinguish between the number of non linear iterations and the number of linearizations
 2016-08-02 15:01:25 +02:00
Atgeirr Flø Rasmussen 73a4d42918 Merge pull request #764 from joakim-hove/restart-test 
Restart test
 2016-08-02 12:10:38 +02:00
Atgeirr Flø Rasmussen 3c5fe77853 Merge pull request #759 from joakim-hove/check-INIT 
Regression testing on SPE1 DX, DY, DZ and DEPTH
 2016-08-02 11:28:52 +02:00
Atgeirr Flø Rasmussen a084d36da6 Merge pull request #752 from andlaus/pass_timer_instead_of_dt 
pass the simulation timer object instead of the time step size
 2016-08-02 11:05:27 +02:00
Atgeirr Flø Rasmussen f54e3ebe38 Merge pull request #756 from qilicun/missing-features-handle 
Diagnostics keywords that not supported by flow.
 2016-07-08 10:30:02 +02:00
Atgeirr Flø Rasmussen ee71a24cd4 Merge pull request #755 from andlaus/MaterialLawManager_follow_up 
adapt to the EclMaterialLawManager's rename of the *Pointer methods
 2016-07-06 14:51:59 +02:00
Atgeirr Flø Rasmussen 8be4cc9295 Merge pull request #749 from GitPaean/support_WECON 
Support of Keyword WECON.
 2016-07-05 21:56:54 +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
Atgeirr Flø Rasmussen baeab02bd6 Adapt to changed updateWellControls() signature. 2016-06-28 15:50:50 +08:00
Atgeirr Flø Rasmussen 6572aeed5e Add sequential models for black oil. 
This commit adds sequential solvers, including a simulator variant
using them (flow_sequential.cpp) with an integration test (running
SPE1, same as for fully implicit).

The sequential code is capable of running several (but not all) test
cases without tuning or special parameters, but reducing ds_max a bit
(from default 0.2 to say 0.1) helps with transport solver
convergence. The Norne model runs fine (esp. with a little tuning). A
parameter iterate_to_fully_implicit (defaults to false) is available,
when set the simulator will iterate with alternating pressure and
transport solves towards the fully implicit solution. Although that
takes a lot extra time it serves as a correctness check.

Performance is not competitive with fully implicit at this point:
essentially both the pressure and transport models inherit the fully
implicit model and do a lot of double (or triple) work. The point has
been to establish a proof of concept and baseline for further
experiments, without disturbing the base model too much (or at all, if
possible).

Changes to existing code has been minimized by merging most such
changes as smaller PRs already, the only remaining such change is to
NewtonIterationBlackoilInterleaved. Admittedly, that code (to solve
the pressure system with AMG) is not ideal because it duplicates
similar code in CPRPreconditioner.hpp and is not parallel. I propose
to address this later by refactoring the "solve elliptic system" code
from CPRPreconditioner into a separate class that can be used also
from here
 2016-06-28 15:50:50 +08:00
Atgeirr Flø Rasmussen 2c50e208dd Clone the Wells pointer for output use later. 2016-06-28 15:50:50 +08:00
Atgeirr Flø Rasmussen d2300e79e4 Merge pull request #714 from blattms/fix-euclidian-norm 
Fixes the parallel Euclidian product for multiple phases.
 2016-06-28 00:25:46 +02:00
Atgeirr Flø Rasmussen 004f14158a Merge pull request #745 from atgeirr/fix-changed-signature 
Adapt to changed updateWellControls() signature.
 2016-06-27 16:56:21 +02:00
Atgeirr Flø Rasmussen 85fdb20c4e Adapt to changed updateWellControls() signature. 2016-06-27 16:52:45 +02:00
Atgeirr Flø Rasmussen 5e18aab106 Merge pull request #744 from blattms/fix-wells-for-null-pointers 
Fix wells for null pointers
 2016-06-27 16:24:01 +02:00
Atgeirr Flø Rasmussen bcf210c03e Merge pull request #711 from blattms/print-all-well-switching-in-parallel 
Print all well switching in parallel.
 2016-06-27 16:22:02 +02:00
Atgeirr Flø Rasmussen 4d834ee371 Merge pull request #742 from blattms/fix-wellstate-for-no-wells 
Fix handling of no wells in WellStateFullyImplicitBlackoil.hpp
 2016-06-27 14:54:48 +02:00
Atgeirr Flø Rasmussen ce9ddedc76 Merge pull request #739 from GitPaean/fixing_bugs_without_plyshlog 
only calculating representative radius when having PLYSHLOG.
 2016-06-27 13:52:14 +02:00
Atgeirr Flø Rasmussen 80b8b5f12f Merge pull request #737 from atgeirr/sequential 
Experimental sequential solvers
 2016-06-27 11:38:13 +02:00
Atgeirr Flø Rasmussen 7489f15ee9 Add sequential models for black oil. 
This commit adds sequential solvers, including a simulator variant
using them (flow_sequential.cpp) with an integration test (running
SPE1, same as for fully implicit).

The sequential code is capable of running several (but not all) test
cases without tuning or special parameters, but reducing ds_max a bit
(from default 0.2 to say 0.1) helps with transport solver
convergence. The Norne model runs fine (esp. with a little tuning). A
parameter iterate_to_fully_implicit (defaults to false) is available,
when set the simulator will iterate with alternating pressure and
transport solves towards the fully implicit solution. Although that
takes a lot extra time it serves as a correctness check.

Performance is not competitive with fully implicit at this point:
essentially both the pressure and transport models inherit the fully
implicit model and do a lot of double (or triple) work. The point has
been to establish a proof of concept and baseline for further
experiments, without disturbing the base model too much (or at all, if
possible).

Changes to existing code has been minimized by merging most such
changes as smaller PRs already, the only remaining such change is to
NewtonIterationBlackoilInterleaved. Admittedly, that code (to solve
the pressure system with AMG) is not ideal because it duplicates
similar code in CPRPreconditioner.hpp and is not parallel. I propose
to address this later by refactoring the "solve elliptic system" code
from CPRPreconditioner into a separate class that can be used also
from here
 2016-06-27 10:28:09 +02:00
Atgeirr Flø Rasmussen c1e5a64329 Merge pull request #712 from totto82/fix_2p_equil_init 
Allow for 2 phase initialization using EQUIL
 2016-06-24 14:42:54 +02:00
Atgeirr Flø Rasmussen ffd96c08e5 Merge pull request #733 from GitPaean/adding_MSW_test 
adding a test for flow_multisegment
 2016-06-21 16:59:03 +02:00
Atgeirr Flø Rasmussen 79d000812e Merge pull request #735 from atgeirr/fix-mseg-wells 
Clone the Wells pointer for output use later.
 2016-06-21 13:44:55 +02:00
Atgeirr Flø Rasmussen e7c70ddb71 Clone the Wells pointer for output use later. 2016-06-21 12:00:10 +02:00
Atgeirr Flø Rasmussen 82d0c81c13 Merge pull request #730 from atgeirr/add-store-fluxes 
Changes to well model for supporting sequential approach.
 2016-06-20 22:46:35 +02:00
Atgeirr Flø Rasmussen ba9e599ec7 Use 'Vector' in place of 'V'. 2016-06-20 14:08:00 +02:00
Atgeirr Flø Rasmussen 9c0ffee8e9 Changes to well model for supporting sequential approach. 
The changes are:
 - Make the WellOps struct public (needed by transport solver).
 - Make it possible to store and retrieve total reservoir volume
   perforation fluxes with getStoredWellPerforationFluxes(), controlled
   by a flag set by setStoreWellPerforationFluxesFlag(), defaulting to
   false (needed by pressure solver).
 2016-06-20 11:02:49 +02:00
Atgeirr Flø Rasmussen 6dfd5ec63d Merge pull request #729 from atgeirr/refine-nonlinear-solver-interface 
Refine nonlinear solver interface
 2016-06-17 12:37:15 +02:00
Atgeirr Flø Rasmussen b811ec7715 Merge pull request #728 from atgeirr/improve-solverselection 
Refine setting of (linear) solver_approach.
 2016-06-17 12:23:19 +02:00
Atgeirr Flø Rasmussen f1af4f945c Make variable const. 2016-06-17 11:48:04 +02:00
Atgeirr Flø Rasmussen 82e935d92b Merge pull request #727 from atgeirr/use-update-stabilization 
Add use_update_stabilization parameter.
 2016-06-17 11:40:09 +02:00
Atgeirr Flø Rasmussen d29355d17d Remove unneeded (implicit) template argument. 2016-06-17 11:39:00 +02:00
Atgeirr Flø Rasmussen 19f4cef6c1 Add new step() overload taking initial states separately. 2016-06-17 11:14:32 +02:00
Atgeirr Flø Rasmussen fab64f5afb Add non-const overload of model(). 2016-06-17 11:14:21 +02:00
Atgeirr Flø Rasmussen d8390590f8 Refine setting of (linear) solver_approach. 
Ensure that the parameter is printed also if defaulted.
 2016-06-17 11:00:56 +02:00