OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2026-08-09 03:38:10 -05:00
Code Issues Packages Projects Releases Wiki Activity
9,457 Commits 31 Branches 117 Tags
58aab220ac568faae17305f42936d222e0264af7
Commit Graph
9457 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Joakim Hove 58aab220ac Merge pull request #1799 from joakim-hove/add-missing-comma 
Add missing "," in set literal
 2019-04-17 07:21:43 +02:00
Joakim Hove 58f541cd93 Add missing "," in set literal 2019-04-17 06:43:08 +02:00
Kai Bao 8e5bfa0c67 Merge pull request #1751 from GitPaean/fixing_multisegment_wells_cleaning_up 
various improvements/corrections to the multisegment well model
 2019-04-12 14:28:12 +02:00
Atgeirr Flø Rasmussen e3f951ee7d Merge pull request #1790 from hnil/cpr_less_verbose 
changed verbosity of the cpr solver
 2019-04-12 12:48:47 +02:00
Kai Bao 5a34922d11 silencing some compilation warnings. 2019-04-12 12:27:02 +02:00
Kai Bao 88fb158067 upwinding segment for top segment is itself 2019-04-12 11:25:19 +02:00
hnil 526187325b changed verbosity of the cpr solver 2019-04-12 11:02:50 +02:00
Kai Bao 1d7089fca8 some minor cleaning up 2019-04-12 10:43:30 +02:00
Kai Bao af9a500b98 setting UseMultisegmentWell to be false by default 2019-04-12 10:30:50 +02:00
Kai Bao 683c097ecd adding residual of control equation to getWellResiduals() for MSW 
then it is consistent that when it is converged, we do not need to enter
this function anymore.
 2019-04-12 10:30:03 +02:00
Atgeirr Flø Rasmussen d03465b00d Merge pull request #1783 from GitPaean/not_throw_for_potential_failure 
not throw for failure when failing in calculating well potentials
 2019-04-12 09:45:34 +02:00
Bård Skaflestad 08be4ed0f9 Merge pull request #1789 from blattms/sequential-cpr-dune-2.4 
Support CPR when using DUNE 2.4 and no MPI
 2019-04-11 22:10:37 +02:00
Markus Blatt a270994ad0 Support compiling Cpr without any MPI support. 
There is a problem compiling upstream
Hierarchy::recalculateGalerkin() without MPI. Therefore we
reimplement that method in our AMG version. Fixes will travel
upstream.

Apart from that we made sure that all types have a meaning even
if there is no MPI found and that we at least have redistribute method
to call even if using SequentialInformation. In that case the method
does nothing but prevents compilation errors complaining about missing
parallel functionality.
 2019-04-11 18:43:07 +02:00
Markus Blatt 26e1a9a94d Support DUNE 2.4 with CPR. 
This version does not support the DirectsolverSelector struct and we
therefore implemented a fallback.
 2019-04-11 14:15:04 +02:00
Atgeirr Flø Rasmussen 628be79cfe Merge pull request #1788 from blattms/amg_cpr_dune_2.5_rebased 
Amg cpr reusing hierarchy and supporting dune 2.5
 2019-04-10 19:14:15 +02:00
Markus Blatt 9f49e3fc26 Also pass the parseContext and errorGuard to Opm::checkDeck() 
This is now mandated since the checkDeck interface was changed recently.
Otherwise compilation errors out.
 2019-04-10 15:01:52 +02:00
Markus Blatt 81b7af1d8a Support DUNE 2.5 with CPR reusing hierarchy 2019-04-10 15:01:35 +02:00
Markus Blatt 29e893dc8e Make sure the the OwnerOverlopCommunication object stays alive. 
As the AMG hierarchy is kept and uses the initial OwnerOverlopCommunication object
we need to make sure that this object lives as long as the hierarchy. We assure
this by storing a shared_ptr to it in ISTLSolverEbosCpr and reuse it to construct
the WellModelMatrixAdapter.
 2019-04-10 14:40:46 +02:00
Markus Blatt 8057c2ba83 Use a shared pointer to the OwnerOverlapCommunication in WellModelMatrixAdapter. 
Previously the OwnerOverlapCommunication object was owned by the adapter as a
unique_ptr was used. The change to shared_ptr makes it possible to to extract
it and reuse even if OwnerOverlapCommunication is thrown away.
 2019-04-10 14:40:46 +02:00
Markus Blatt 6538b59d9e Added parallel CPR that reuses the matrix hierarchy. 
Currently this just compiles but still segfaults in parallel.
 2019-04-10 14:40:46 +02:00
Atgeirr Flø Rasmussen 07e495c9da More minor cleanup. 2019-04-10 14:40:46 +02:00
Atgeirr Flø Rasmussen 7664d27849 Clean up formatting and get most types from superclass. 2019-04-10 14:40:46 +02:00
Atgeirr Flø Rasmussen be86b90bac Make typed protected rather than private, enabling inheritance. 2019-04-10 14:40:46 +02:00
Atgeirr Flø Rasmussen 2cf990e404 Do not store copy of weights inside BlackoilAmgCpr class. 2019-04-10 14:40:46 +02:00
Atgeirr Flø Rasmussen 416cc93f96 Remove code that is no longer needed. 2019-04-10 14:40:46 +02:00
Atgeirr Flø Rasmussen 0e5a5c5266 Minor cleanup. 2019-04-10 14:40:46 +02:00
Atgeirr Flø Rasmussen 3d9c776384 Disable most of the file, as the base version is sufficient. 
All features have been added to BlackoilAmg.hpp.
 2019-04-10 14:40:46 +02:00
Atgeirr Flø Rasmussen 6d18c2849d Allow updating the AMG preconditioner. 
This adds the significant modifications from the BlackoilAmgCpr
experimental class to BlackoilAmg.
 2019-04-10 14:40:46 +02:00
Atgeirr Flø Rasmussen 032701ffc9 Silence unused argument warnings. 2019-04-10 14:40:46 +02:00
Atgeirr Flø Rasmussen 0e1db0c6bd Reindent, remove unused function (after refactoring). 2019-04-10 14:40:46 +02:00
Atgeirr Flø Rasmussen 5d68a308b5 Fix memory bug by refactoring. 
Moving out of a matrix in the same function argument list as the matrix is passed
to another function is wrong. Simplified by avoiding the unwieldy tuple.
 2019-04-10 14:40:46 +02:00
Atgeirr Flø Rasmussen c92d84432c Replace tabs with spaces. 2019-04-10 14:40:46 +02:00
Atgeirr Flø Rasmussen 5f4f8b71a8 Silence override and member order warnings. 2019-04-10 14:40:46 +02:00
Atgeirr Flø Rasmussen 29837be2e3 Changes to minimize differences to original istl versions. 
Also added note pointing to original istl files.
 2019-04-10 14:40:46 +02:00
Atgeirr Flø Rasmussen 13c6463f89 Refactor to be closer to the original amg.hh. 
Should minimize the diff when comparing.
 2019-04-10 14:40:46 +02:00
Atgeirr Flø Rasmussen b39815edb5 Minor formatting and removing unused code. 2019-04-10 14:40:46 +02:00
Atgeirr Flø Rasmussen 28dfef1ecf Compile fix: do not use undefined member. 2019-04-10 14:40:46 +02:00
hnil 4f1603407d Added timing of prepare call for linear solvers 2019-04-10 14:40:46 +02:00
hnil ed24b3fcad changed code to use direct solver on coarses scale for amg. This should runtime stettings for this.. 2019-04-10 14:40:46 +02:00
hnil f05a9fdb25 Version of cpr amg which can reuse setup and also change smoothers of fine and coarse system by changing tags 2019-04-10 14:40:46 +02:00
Kai Bao 1faf4de904 not throw for failure when failing in calculating well potentials 
it is just a temporary approach to recover the prediction case. In the
case, there is no group control, while there is some requirements of
well potential output
 2019-04-09 14:28:44 +02:00
Kai Bao e73fc4ebe4 first version of using upwinding to handle mass balance for MSW 
some details to come to make it complete.

We are not handling it for injectors and also we are not considering the
upwinding when handle the frictional pressure loss and acceleration
pressure loss.
 2019-04-08 14:23:21 +02:00
Kai Bao 2c69556fad correcting of the sign when calculating perforation pressure 
the sign of the perforation and cell pressure difference was wrong.
 2019-04-08 14:23:05 +02:00
Kai Bao dadb31f093 fixing some mistakes from rebasing 2019-04-07 14:55:08 +02:00
Kai Bao e5090a26fb setting the simulation parameters 2019-04-07 14:55:08 +02:00
Kai Bao 49a8c7bfd1 changing the sign of the mass balance equations for ms wells 
following the conventions with StandardWell
 2019-04-07 14:55:08 +02:00
Kai Bao 23d2097d44 various improvements to the inner iteration of ms wells 2019-04-07 14:54:05 +02:00
Kai Bao 031c19fc78 fixing mistakes due to rebasing. 2019-04-07 14:54:05 +02:00
Kai Bao e9c0bdba06 using B_avg for the inner iteration for multisegment wells 2019-04-07 14:54:05 +02:00
Kai Bao 1df65913d7 updating the primary variables before calculating accumulation term 2019-04-07 14:54:05 +02:00