7971 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Atgeirr Flø Rasmussen	e3e4f3acac	Merge pull request #1408 from atgeirr/add-nowells-test ... Add integration test with no wells.	2018-02-15 13:33:58 +01:00
Atgeirr Flø Rasmussen	5f8124bfbf	Add integration test with no wells.	2018-02-15 10:07:58 +01:00
Arne Morten Kvarving	8ff91c83e7	Merge pull request #1406 from akva2/dyn_boost_test_bs ... changed: let the build system handle the dynamic boost test defines	2018-02-15 08:14:46 +01:00
Arne Morten Kvarving	adee0a1649	changed: let the build system handle the dynamic boost test defines	2018-02-14 16:04:48 +01:00
Atgeirr Flø Rasmussen	8e9b13584d	Merge pull request #1403 from lars-petter-hauge/empty_wells_init ... Allow Wells struct initialization without wells	2018-02-14 10:31:52 +01:00
Atgeirr Flø Rasmussen	17a524e42c	Merge pull request #1404 from atgeirr/fix-no-wells ... Ensure we do not dereference nullptr.	2018-02-14 09:56:43 +01:00
Lars Petter Øren Hauge	011143829d	Allow Wells struct initialization without wells ... Calling wells()->number_of_wells on nullptr causes segmentation fault. This occurs when running a deck without wells. Allowing WellsManager::init to continue for decks without wells enables the well struct to be set. Authored by Sveinung Rundhovde & Lars Petter Hauge	2018-02-13 16:43:10 +01:00
Atgeirr Flø Rasmussen	4f414b78ed	Ensure we do not dereference nullptr.	2018-02-13 16:22:11 +01:00
Atgeirr Flø Rasmussen	dd93a67086	Merge pull request #1402 from atgeirr/fix-binary-path ... Use PROJECT_BINARY_DIR instead of CMAKE_BINARY_DIR.	2018-02-13 15:51:22 +01:00
Atgeirr Flø Rasmussen	cf51303697	Merge pull request #1387 from akva2/buildsystem_conditionals ... changed: only add conditionally built files if they are to be built	2018-02-13 15:51:04 +01:00
Atgeirr Flø Rasmussen	7b1d377e82	Use PROJECT_BINARY_DIR instead of CMAKE_BINARY_DIR.	2018-02-13 13:04:54 +01:00
Arne Morten Kvarving	371ae786ca	changed: only add conditionally built files if they are to be built ... instead of unconditionally adding, and then conditionally removing again.	2018-02-13 12:35:39 +01:00
Arne Morten Kvarving	5ac22e9f42	Merge pull request #1401 from atgeirr/moved-opm-grid-headers ... Adapt to moved opm-grid headers.	2018-02-12 16:32:06 +01:00
Tor Harald Sandve	a89a6af854	Some more cleaning in the output code in opm-output, ewoms and opm- ... simulator 1) Don't depend on legacy code for communicating the data::wells 2) Bugfix. Store globalIdx instead localIdx in data::wells::complitions 3) Move ThreadHandle to ebos	2018-02-12 08:44:43 +01:00
Atgeirr Flø Rasmussen	cf9b7c39b9	Adapt to moved opm-grid headers.	2018-02-10 08:33:33 +01:00
Andreas Lauser	024344600e	Merge pull request #1400 from andlaus/gridManager_to_vanguard ... adapt to the gridManager() -> vanguard() change in ewoms	2018-02-08 17:54:03 +01:00
Andreas Lauser	3d0fca2f08	adapt to the gridManager() -> vanguard() change in ewoms	2018-02-08 16:27:42 +01:00
Andreas Lauser	996dc3382e	Merge pull request #1398 from andlaus/separate_opm-common_concerns ... adapt to the move of infrastructure from opm-common to opm-material	2018-02-08 16:25:29 +01:00
Andreas Lauser	7f3a9f1f43	catch NumericalIssue instead of NumericalProblem ... the underlying problem is that the OPM build system does not define a HAVE_OPM_COMMON macro in config.h.	2018-02-08 12:02:25 +01:00
Markus Blatt	8456a84ec9	Prevent unused variable warning when compiling test_blackoil_amg	2018-02-07 16:58:51 +01:00
Markus Blatt	e5de96e5f4	Make test_blackoil_amg compile. ... There was typo in the last fix.	2018-02-07 16:58:09 +01:00
Markus Blatt	a82598abe7	include ErrorMacros.hpp to safely make use of OPM_THROW (and not abort)	2018-02-07 16:56:12 +01:00
Markus Blatt	f381336dff	Remove unused function parameters and default arguments for AMG construction. ... It turned out that they are not needed and used.	2018-02-07 16:32:00 +01:00
Andreas Lauser	58a1b7df1f	adapt to the move of infrastructure from opm-common to opm-material	2018-02-07 13:32:52 +01:00
Markus Blatt	bf3132e9cf	Fixes unused variable warning	2018-02-06 19:48:26 +01:00
Markus Blatt	cda0c22d0f	Avoid negation in if clause	2018-02-06 15:36:23 +01:00
Markus Blatt	034b1840ae	Fixed comment about smoother arguments needed for construction	2018-02-06 15:34:13 +01:00
Markus Blatt	4c590c17d6	Moved definition of CPRParameter to top of header as needed for constructor call.	2018-02-06 15:32:35 +01:00
Markus Blatt	fc9acf963e	Spelling fixes in BlackoilAmg.hpp	2018-02-06 15:31:50 +01:00
Markus Blatt	14cde5bafc	Made use of range based for for graph traversal.	2018-02-06 15:30:24 +01:00
Markus Blatt	a8dde44afc	Removed dead code und commented code.	2018-02-06 15:28:10 +01:00
Markus Blatt	6bcfce1733	Prevent problems to due oversight in parallel AMG. ... Currently we run into issues with the parallel AMG if redistribution happened on the coarsest level. That is not detected by AMG and it will construct smoothers on all processors present before the redistribution. Some of them will get OwnerOverlapCommunication objects that have an invalid MPI communicator in them (MPI_COMM_NULL) and an MPI_ERROR will be raised as we communicate in the constructor. With this patch we detect this situaton and set the pointer to OwnerOverlapCommunication to null to prevent communication. A sanity check that the matrix has zero rows has been added.	2018-02-06 13:19:59 +01:00
Atgeirr Flø Rasmussen	532403c5fb	Merge pull request #1391 from totto82/RFIP ... Use FIP, EGRID and INIT output code in ebos.	2018-02-06 12:54:01 +01:00
Markus Blatt	28e566ba02	[bugfix] Prevent indexing an array of zero size for matrices with zero rows.	2018-02-06 12:45:13 +01:00
Markus Blatt	ffda4f96d5	Adjust test to changed constructor.	2018-02-06 12:44:21 +01:00
Markus Blatt	cfa311e055	recover compilation support for dune versions <2.6	2018-02-05 22:09:37 +00:00
Markus Blatt	cf1cdbd375	Improved documentation	2018-02-05 22:37:01 +01:00
Markus Blatt	8fc20456c5	Allow user to request aggregating the pressure system before solving it. ... For this we added a new parameter cpr_pressure_aggregation. If it is true we will aggregate the pressure already for the first system.	2018-02-05 22:37:01 +01:00
Markus Blatt	e24d338ddc	Resort to support the usual parameters (as for flow_legacy) ... These are solver_approach=cpr cpr_use_amg=(true|false), etc.	2018-02-05 22:37:01 +01:00
Markus Blatt	c367382a59	Prepare to use ILU for pressure system.	2018-02-05 22:37:01 +01:00
Markus Blatt	abacbe2cfc	Do not use expensive aggregation when forming pressure system unless requested. ... That means that for traditional CPR no aggregation is used and we simply extract the pressure component.	2018-02-05 22:37:01 +01:00
Markus Blatt	5d8da52679	Use decoupling strategy of Scheichl/Masson in the CPR preconditioner. ... Often it is claimed by CPR-AMG evangelists that this will make the pressure system more elliptic. That may be the case. But even more important it also decouples the pressure from the saturations. Without this approach the pressure correction influences the smoothing of the full system too much and e.g. for Norne CPR is worse than simple block ILU0.	2018-02-05 22:37:01 +01:00
Markus Blatt	6d21214fa7	Switch to ParallelOverlappingILU0 for CPRPreconditioner. ... This seems to have been forgotten previously. Now the code int CPRPreconditioner.hpp uses ParallelOverlappingILU0 instead of SeqILU[0n]/BlockPreconditioner which makes the code more slim.	2018-02-05 22:37:01 +01:00
Markus Blatt	e6e18a3aa9	Make Blackoil system amg / CPR (flow_ebos) DUNE 2.6 aware.	2018-02-05 22:37:01 +01:00
Markus Blatt	c089a59cba	Fix compiler lookup of get method.	2018-02-05 22:37:01 +01:00
Markus Blatt	f5d81513da	First version of a AMG for the Blackoil equations. ... The approach is inspired by Geiger's system-amg but we use dune-istl aggregation AMG for it. On the fine level all unknowns attached to a cell form a matrix block and are treated fully coupled. To form the first coarse level system we use only the pressure component to guide the aggregation and neglect all other unknowns on the fine level. All other level are formed in the usual way by scalar aggregation. Currently,it has to be requested for flow_ebos manually by passing "linear_solver_use_amg=true amg_blackoil_system=true" to it.	2018-02-05 22:37:01 +01:00
Arne Morten Kvarving	a2419e285f	Merge pull request #1396 from akva2/remove_err_brace ... fixed: remove erroneous brace	2018-02-05 12:10:39 +01:00
Arne Morten Kvarving	05593c975d	fixed: remove erroneous brace	2018-02-05 11:38:15 +01:00
Arne Morten Kvarving	9617cf012e	Merge pull request #1395 from andlaus/flow_first ... move the flow_ebos_*.cpp files to the beginning of the source list	2018-02-05 10:56:14 +01:00
Andreas Lauser	bb788a976b	add comment to CMakeLists_files.cmake why the flow_ebos*.cpp files are on top	2018-02-05 10:53:40 +01:00