10429 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Kai Bao	9266b8bd1f	adding a running test for wsegsicd	2019-12-06 10:15:12 +01:00
Kai Bao	196e997e79	various fixes and improvements	2019-12-06 10:15:11 +01:00
Kai Bao	3d7f0efe07	various fixes. ... the most important one is that the formulation is changed in the recent version	2019-12-06 10:14:20 +01:00
Kai Bao	cc77c0e826	importing the old WSEGSICD implementation ... with small adjustments to make it compile	2019-12-06 10:14:20 +01:00
Bård Skaflestad	c256bfdfa4	Merge pull request #2170 from atgeirr/msw-thp-potential ... Compute well potential of multi-segment wells with a THP constraint	2019-12-06 10:02:50 +01:00
Tor Harald Sandve	4d8d9a7a05	Fix vrep	2019-12-06 09:04:50 +01:00
T.D. (Tongdong) Qiu	b6e13bffd2	Added headers to PUBLIC_HEADER_FILES. Added warning print when cusparseSolver did not converge. Added more synchronization points in cusparseSolver. Pinning b and x vector as well.	2019-12-05 18:02:27 +01:00
Kai Bao	975a7a6c50	Merge pull request #2197 from bska/load-aquifer-data ... Load aquifer data	2019-12-05 15:08:15 +01:00
T.D. (Tongdong) Qiu	f19a3b09b1	Updated copyright notice	2019-12-05 14:24:37 +01:00
Bård Skaflestad	ce1e0691a8	Aquifer Restart: Address Review Comments ... Mostly 'throw'ing in the case of unsupported operations. While here, also remove an unused header.	2019-12-05 13:41:05 +01:00
Tor Harald Sandve	2c9797ec50	Always update group target reduction	2019-12-05 13:08:17 +01:00
Tor Harald Sandve	ad21da87ca	fix after rebase	2019-12-05 13:08:17 +01:00
Tor Harald Sandve	26a01794bf	A group can both be injection and a production group	2019-12-05 13:08:17 +01:00
Tor Harald Sandve	876f5587e5	Add GCONSALE and fix conversion from UDA	2019-12-05 13:08:17 +01:00
Tor Harald Sandve	5dbf0927d3	Add support for GCONSUMP	2019-12-05 13:08:17 +01:00
Tor Harald Sandve	615e4422b9	BUGFIX REIN	2019-12-05 13:08:17 +01:00
Atgeirr Flø Rasmussen	d96e0a2478	Refactor solving functions to take control objects directly. ... This allows us to avoid some very hacky manipulation of the Well object.	2019-12-05 12:40:35 +01:00
T.D. (Tongdong) Qiu	cf48650a5e	BdaBridge lets cusparseSolver copy the resulting x vector from the GPU directly into the BlockVector from ISTLSolverEbos, this only works if the underlying data from BlockVector is contiguous	2019-12-05 10:59:33 +01:00
T.D. (Tongdong) Qiu	5cb6ec510c	Allow verbosity of cusparseSolver to be set via command line	2019-12-05 10:07:40 +01:00
Bård Skaflestad	143b45ed52	EclWriter: Initialize Aquifers From Restart Data ... This commit calls the aquifer model's 'initFromRestart' function if the loadParallelRestart() function happens to return any aquifer data from the restart file. Such data is currently limited to two items of information for analytic aquifers (from XAAQ vector), but future extensions are likely.	2019-12-05 09:41:21 +01:00
Bård Skaflestad	8a764568e1	EclProblem: Provide Mutable Access to Aquifer Model Object ... This commit adds a new public member function, EclProblem::mutableAquiferModel() that returns a read/write reference to the contained EclAquiferModel object. The immediate use-case is initializing analytic aquifers from restart data.	2019-12-05 09:41:21 +01:00
Bård Skaflestad	4c4a893781	Aquifer Model: Add Initialization from Restart Data ... This commit adds a new member function, initFromRestart() to the EclBaseAquiferModel and the BlackoilAquiferModel. The former does nothing, the latter calls AquiferInterface::initFromRestart() on the contained analytic aquifer objects.	2019-12-05 09:41:21 +01:00
Bård Skaflestad	df86d01486	Add Means of Initializing Analytic Aquifers From Restart Data ... This commit adds a new member function, AquiferInterface::initFromRestart() that consumes a vector<data::AquiferData> constructed from information in the restart file's SAAQ and XAAQ vectors. At the moment, we use the initial aquifer pressure, the total produced liquid volume and the current aquifer pressure at restart. We implement the interface's member function in terms of the virtual function AquiferInterface::assignRestartData() that must be overridden in derived classes. Implement a trivial such function for Carter-Tracy aquifers, and a function that only stores the current aquifer pressure for the Fetkovich aquifer model. Additionally, record whether or not the aquifer object was initialised from a previous solution. If so, don't reset total produce liquid volumes or aquifer pressures to their base values from the model input file.	2019-12-05 09:41:21 +01:00
Bård Skaflestad	92cbdf3c63	Merge pull request #2207 from joakim-hove/wellstate-open-for-output ... Refactor WellState SHUT	2019-12-04 18:16:19 +01:00
T.D. (Tongdong) Qiu	69033ca7f2	Changed structure of cusparseSolver to fit into master branch	2019-12-04 16:59:58 +01:00
andrthu	eb83cef717	Remove tab	2019-12-04 15:44:37 +01:00
andrthu	5f68b71d0f	Remove makeOverlapInvalid	2019-12-04 15:43:31 +01:00
andrthu	0829d1fa3e	fix mistake in flexible	2019-12-04 15:39:42 +01:00
Atgeirr Flø Rasmussen	cfcbc7159c	Merge pull request #2208 from akva2/parallel_tests ... Add some more parallel tests	2019-12-04 14:49:59 +01:00
Arne Morten Kvarving	581218f890	add parallel test with foam	2019-12-04 12:54:33 +01:00
Arne Morten Kvarving	f7b76e2b43	add parallel test with polymer	2019-12-04 12:54:33 +01:00
Arne Morten Kvarving	e7463c9c85	add parallel test with solvent	2019-12-04 12:54:33 +01:00
Arne Morten Kvarving	d5eea3252b	added: allow DIR parameter in add_test_compare_parallel_simulation	2019-12-04 12:54:33 +01:00
Atgeirr Flø Rasmussen	8690a71aac	Merge pull request #2175 from totto82/fixGRUPInit ... fix issue when GRUP is used in WCONPROD and WCONINJE and NONE	2019-12-04 12:31:37 +01:00
Tor Harald Sandve	c930ac9858	fix spelling	2019-12-04 11:39:26 +01:00
Tor Harald Sandve	9e64896054	fix issue when GRUP is used in WCONPROD and WCONINJE and NONE group control ... Use a bhp control when a well is controlled by a unvalied group control	2019-12-04 11:37:00 +01:00
Atgeirr Flø Rasmussen	d4433b80b5	Improve/fix well potential calculations for MultiSegmentWell. ... Includes fixes for bhp-based potentials, and an implementation for thp-based potentials similar to that for StandardWell.	2019-12-04 11:01:45 +01:00
Atgeirr Flø Rasmussen	c922bf3b30	Merge pull request #2206 from joakim-hove/move-summarystate-eval ... SummaryState is updated at the end of simulator timestep	2019-12-04 09:33:33 +01:00
Joakim Hove	ce9108a9d2	Refactor WellState SHUT ... - Move some WellState shut code to separate method. - Add bool flag open_for_output_ to WellState to ensure that shut wells do not create output.	2019-12-03 19:37:44 +01:00
Joakim Hove	ad00a3a891	SummaryState is updated at the end of simulator timestep	2019-12-03 15:52:47 +01:00
T.D. (Tongdong) Qiu	4db2e7ca4e	Added cusparseSolver. Automatically compiled when CUDA is detected. Must be enabled at runtime by adding '--use-gpu=true'	2019-12-03 14:29:06 +01:00
andrthu	b980637f74	Romove extra copyOwnerToAll calls. Set ghost diagonal to one. Remove ghost adjecency	2019-12-03 12:04:17 +01:00
Atgeirr Flø Rasmussen	becb29cec6	Merge pull request #2203 from joakim-hove/apply-action-output-update ... Update output from applyActions() to show date	2019-12-03 09:02:02 +01:00
Joakim Hove	deb397cf0e	Update output from applyActions() to show date	2019-12-03 00:44:08 +01:00
Bård Skaflestad	0a6b5f0ea9	Merge pull request #2202 from akva2/janitoring ... Janitoring	2019-12-02 19:56:16 +01:00
Arne Morten Kvarving	8d1da2ca06	changed: use std::make_tuple ... avoid explicit init list constructor with gcc5	2019-12-02 18:35:35 +01:00
Arne Morten Kvarving	272e63410d	fixed: wrap symbols unused without MPI in HAVE_MPI	2019-12-02 18:34:16 +01:00
Atgeirr Flø Rasmussen	0edecb9a78	Merge pull request #2196 from totto82/smallTime ... Add option for throwing for small time steps	2019-12-02 12:28:12 +01:00
Tor Harald Sandve	6d07aefef6	Merge pull request #2149 from goncalvesmachadoc/patch-1 ... Delete few thermal keywords from list	2019-12-02 10:17:58 +01:00
Tor Harald Sandve	b577f294b5	Add option for throwing for small time steps	2019-12-02 09:56:19 +01:00