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
3,930 Commits 31 Branches 117 Tags
0b24dffe0524c8d7b8343556dd67b348961fa4d8
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Atgeirr Flø Rasmussen 3776ccab9e Add use_update_stabilization parameter. 
This makes it easier to run without, for example for debugging.
The default is 'true', preserving existing behaviour.
 2016-06-17 10:44:53 +02:00
Atgeirr Flø Rasmussen 6fed5a50c3 Merge pull request #726 from atgeirr/const-preparestep 
Use const reference parameters for prepareStep()
 2016-06-17 09:21:27 +02:00
Atgeirr Flø Rasmussen b21f4e16da Merge pull request #725 from atgeirr/add-to-helperops 
Add connection_cells member of HelperOps.
 2016-06-17 09:03:26 +02:00
Atgeirr Flø Rasmussen 194288865b Fix forgotten prepareStep() signatures. 2016-06-17 08:41:12 +02:00
Atgeirr Flø Rasmussen bf5fecfe9a Make prepareStep() parameters const. 2016-06-17 08:41:02 +02:00
Atgeirr Flø Rasmussen 5f51fea874 Add connection_cells member of HelperOps. 2016-06-16 16:21:37 +02:00
Atgeirr Flø Rasmussen 691969eb86 Merge pull request #721 from qilicun/minor-format-change 
Add blank line before and after "Reading Parameters"
 2016-06-16 08:57:55 +02:00
Atgeirr Flø Rasmussen 77562c8cbb Merge pull request #718 from akva2/move_opm_output_upstream 
update jenkins build scripts
 2016-06-15 15:12:16 +02:00
Atgeirr Flø Rasmussen a8760654f7 Merge pull request #717 from qilicun/use-prefix 
use default prefix.
 2016-06-10 11:19:54 +02:00
Atgeirr Flø Rasmussen ccde26143c Merge pull request #709 from qilicun/add-new-type 
Support new message type: Prtinfo
 2016-06-08 11:35:31 +02:00
Atgeirr Flø Rasmussen e861c495b8 Merge pull request #710 from blattms/use-real-parallel-l-infinity-norm 
Fix the parallel L-infinity norm calculation.
 2016-06-07 20:30:43 +02:00
Atgeirr Flø Rasmussen 5d38c77881 Merge pull request #707 from blattms/support-ignoreconvergencefailure-for-cpr 
Make CPR preconditioner honor linear_solver_ignoreconvergencefailure
 2016-06-07 14:13:52 +02:00
Atgeirr Flø Rasmussen f9ecbaeefe Merge pull request #706 from andlaus/lad_to_dad 
rename some variables from "Lad" to "Eval" (was: to "Dad")
 2016-06-07 11:46:44 +02:00
Atgeirr Flø Rasmussen bceaf56c7e Merge pull request #703 from atgeirr/log-output 
Log well control switching message.
 2016-06-07 11:39:01 +02:00
Atgeirr Flø Rasmussen 50e8c5dbd8 Merge pull request #708 from totto82/fix_hydrocarbonstate 
Adds has_disgas and has_vapoil flags to hydrocarbonstate initialization
 2016-06-07 11:38:27 +02:00
Atgeirr Flø Rasmussen edae7da526 Merge pull request #705 from qilicun/use-debug-backend 
Write debug information into a separate file.
 2016-06-06 16:11:48 +02:00
Atgeirr Flø Rasmussen cf5dbf292a Log well control switching message. 
Instead of writing to std::cout.
 2016-05-30 10:26:20 +02:00
Atgeirr Flø Rasmussen 8a76adb658 Merge pull request #700 from dr-robertk/PR/flag-to-ignore-solverconv 
Ignore linear solver convergence failure.
 2016-05-27 13:21:01 +02:00
Atgeirr Flø Rasmussen 0659ae9356 Merge pull request #699 from blattms/add-missing-fstream-include 
Fix incomplete type error for std::ofstream in examples
 2016-05-27 11:15:47 +02:00
Atgeirr Flø Rasmussen decdd3185f Merge pull request #698 from blattms/prevent-dereferencing-null-point-during-paralle-IO 
Prevent dereferencing a null pointer during parallel output.
 2016-05-26 07:53:28 +02:00
Atgeirr Flø Rasmussen ab0df10354 Merge pull request #696 from blattms/distribute-hydrocarbonstate 
Correctly distribute the hydro carbon state for parallel runs.
 2016-05-26 07:49:10 +02:00
Atgeirr Flø Rasmussen 69469bf537 Merge pull request #694 from atgeirr/fix-nnc-vs-noncartesian 
Separate non-neighbour and non-cartesian connections.
 2016-05-25 13:38:15 +02:00
Atgeirr Flø Rasmussen 0f290e3f6e Separate non-neighbour and non-cartesian connections. 
The non-cartesian connections are required by the output facilities,
while the truly non-neighbour connections (meaning those not in the grid)
should be used by all other code.
 2016-05-24 11:54:17 +02:00
Atgeirr Flø Rasmussen ad604bca89 Merge pull request #685 from GitPaean/well_refactoring_interface_refactoring 
Well interface refactoring
 2016-05-24 10:58:57 +02:00
Atgeirr Flø Rasmussen d1da78b5b2 Merge pull request #692 from GitPaean/fixing_volumeratio_calculation 
fixing application of rs and rv to the volumeRatio calculation.
 2016-05-23 10:02:37 +02:00
Atgeirr Flø Rasmussen 7dbd197650 Merge pull request #684 from totto82/liveoilsolvent2 
Changes needed to run Model 2 with co2
 2016-05-20 15:08:48 +02:00
Atgeirr Flø Rasmussen bd774ed06c Merge pull request #679 from qilicun/log_simulation_messages 
write simulation details to log file.
 2016-05-19 15:09:39 +02:00
Atgeirr Flø Rasmussen 1f4b9e56f8 Merge pull request #690 from pgdr/try-to-disable-async-output 
WIP trying disabling async output default setting
 2016-05-18 22:42:33 +02:00
Atgeirr Flø Rasmussen 9c771ab6b1 Merge pull request #687 from totto82/hydrocarbonstate 
Use stored hydrocarbonstate to get primal variables
 2016-05-18 14:16:58 +02:00
Atgeirr Flø Rasmussen ca40a31e7b Merge pull request #681 from dr-robertk/PR/use_have_pthread 
Use HAVE_PTHREAD to enable async output.
 2016-05-12 12:20:09 +02:00
Atgeirr Flø Rasmussen 3074a043b4 Merge pull request #686 from totto82/sparsity_pattern 
Add the option of computing the full sparity pattern based on all phases
 2016-05-11 17:38:54 +02:00
Atgeirr Flø Rasmussen d3192028b6 Merge pull request #683 from atgeirr/check-dir-exists 
Check if dir already exists before creating.
 2016-05-10 10:10:57 +02:00
Atgeirr Flø Rasmussen 5fabce7c2c Check if dir already exists before creating. 
May be necessary on some platforms for the current dir (".").
 2016-05-10 09:22:31 +02:00
Atgeirr Flø Rasmussen 1671d493ea Merge pull request #670 from GitPaean/well_refactoring_multi_segment 
Well refactoring multi segment
 2016-05-09 14:49:38 +02:00
Atgeirr Flø Rasmussen 49d7cadaa5 Merge pull request #678 from GitPaean/remove-warnings 
silencing a few shadowing warnings.
 2016-05-07 09:51:45 +02:00
Atgeirr Flø Rasmussen 60b00a0ddf Merge pull request #673 from akva2/simplify_jenkins_build_scripts 
simplify jenkins build scripts a little
 2016-05-04 10:17:26 +02:00
Atgeirr Flø Rasmussen 8e550bf98c Merge pull request #668 from qilicun/get-messages-from-parser 
extract messages from parser.
 2016-05-04 10:16:57 +02:00
Atgeirr Flø Rasmussen e4f3622ee1 Merge pull request #675 from atgeirr/bump-version 
dune.module: change version to 2016.10-pre
 2016-05-03 14:36:54 +02:00
Atgeirr Flø Rasmussen ac6a8f7229 dune.module: change version to 2016.10-pre 2016-05-03 14:31:32 +02:00
Atgeirr Flø Rasmussen 7b85cb306a Merge pull request #674 from akva2/add_flow_mpi_installation 
Add flow mpi installation
 2016-05-02 10:59:47 +02:00
Atgeirr Flø Rasmussen c11d322ef8 Merge pull request #662 from GitPaean/well_refactoring_keep_moving 
More functions moved to StandardWells
 2016-04-29 15:29:22 +02:00
Atgeirr Flø Rasmussen 34bc69c257 Move helpers to the detail namespace, layout changes. 
The helpers were moved to the bottom of the file for clarity.
Misc. layout and whitespace changes, also fix two minor
errors in comments.
 2016-04-29 14:59:18 +02:00
Atgeirr Flø Rasmussen 8ea71e2f15 Use a small lambda to avoid repeating code. 2016-04-29 14:58:44 +02:00
Atgeirr Flø Rasmussen 5fac939afb Merge branch 'get-messages-from-parser' of https://github.com/qilicun/opm-simulators into qilicun-get-messages-from-parser 2016-04-29 14:42:37 +02:00