9630 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Andreas Lauser	f5db6e8e1c	Merge pull request #1811 from atgeirr/bump-version ... Update version to 2019.10-pre.	2019-05-02 09:55:56 +02:00
Bård Skaflestad	4d76ea5000	Merge pull request #1809 from atgeirr/log-messages-only-once ... Clear DeferredLogger's message container after logging.	2019-04-30 15:47:40 +02:00
Atgeirr Flø Rasmussen	b5f343a414	Update version to 2019.10-pre.	2019-04-30 15:37:47 +02:00
Atgeirr Flø Rasmussen	32572ac2ab	Clear DeferredLogger's message container after logging. ... This keeps from logging the same messages again. Also add clearMessages() method, which is useful to clear the local container after gathering into a global container (which leaves the local containers untouched).	2019-04-30 12:24:31 +02:00
Atgeirr Flø Rasmussen	ad1eb4ae04	Merge pull request #1808 from GitPaean/correcting_mistake_pr1803 ... Correcting a small assertion mistake introduce in PR#1803	2019-04-30 12:22:08 +02:00
Kai Bao	65db00c1f9	removing --use-multisegment-well in compareECLFiles ... since MSW is activated by default now.	2019-04-30 10:25:36 +02:00
Kai Bao	6c2a806e61	correcting an assertion mistake introduced in PR#1803	2019-04-30 10:25:17 +02:00
Atgeirr Flø Rasmussen	9bbb0ef679	Merge pull request #1807 from atgeirr/enable-msw-by-default ... Enable multi-segment wells by default.	2019-04-28 23:13:16 +02:00
Atgeirr Flø Rasmussen	9b583ef936	Merge pull request #1806 from blattms/fix-editnnc-application ... [bugfix] Use NNC data with applied EDITNCC for transmissibility.	2019-04-28 16:21:17 +02:00
Atgeirr Flø Rasmussen	d2f8f07337	Enable multi-segment wells by default.	2019-04-27 07:16:36 +02:00
Markus Blatt	184be292ea	[bugfix] Use NNC data with applied EDITNCC for transmissibility. ... Unfortunately, we first created NNC with applied EDITNNC and then still used the original NNC data to set the transmissibility. Thus we were actually ignoring EDITNNC. This commit fixes this by using the data structure that has EDITNNC applied.	2019-04-26 21:25:59 +02:00
Bård Skaflestad	75e8508e3b	Merge pull request #1803 from blattms/remove-warnings ... Remove warnings experienced with g++-8	2019-04-26 17:41:55 +02:00
Atgeirr Flø Rasmussen	8c95d3e163	Merge pull request #1804 from totto82/removeDuplictaedThrow ... BUGFIX. Make sure that the convergece report is stored before throw	2019-04-26 09:27:59 +02:00
Tor Harald Sandve	8a4117441c	Make sure that the convergece report is stored before throw	2019-04-25 10:33:39 +02:00
Markus Blatt	c9a06f8bb6	Initialize all members of Opm::Data::Connection	2019-04-25 10:00:59 +02:00
Markus Blatt	b847f36ec8	Removes warning about unused variable.	2019-04-25 10:00:59 +02:00
Markus Blatt	66ef71e67a	Removes warning about ignored return type qualifier on function.	2019-04-25 10:00:59 +02:00
Markus Blatt	3aa60433ad	Removes unsigned-signed integer comparison warnings.	2019-04-25 10:00:59 +02:00
Markus Blatt	48c3802bf3	Removes unused function parameter warnings.	2019-04-25 10:00:59 +02:00
Joakim Hove	cda7d1906e	Merge pull request #1801 from joakim-hove/FLUXTYPE-keyword ... Add 'FLUXTYPE' to list of not supported keywords	2019-04-19 12:08:21 +02:00
Joakim Hove	ed91356a90	Add 'FLUXTYPE' to list of not supported keywords	2019-04-19 11:02:18 +02:00
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