Commit Graph

10408 Commits

Author SHA1 Message Date
Joakim Hove
ec68f4b113
Merge pull request #2219 from stefoss23/alternating_keywords
added alternating keywords.
2019-12-13 09:40:51 +01:00
Joakim Hove
f28cfec56b Use throw std::runtime_error() instead of std::abort() in test 2019-12-12 20:25:53 +01:00
Joakim Hove
f4aa118cc4 Update the internal ACTNUM in the FieldPropsManager 2019-12-12 12:00:51 +01:00
Atgeirr Flø Rasmussen
b81faa9221
Merge pull request #2199 from GitPaean/support_wsegvalv
Support WSEGVALV
2019-12-11 21:07:15 +01:00
Kai Bao
61ed33c458 implementing the support for WSEGVALV 2019-12-11 14:43:09 +01:00
Steinar Foss
435f90ecc8 added alternating keywords. 2019-12-11 11:39:16 +01:00
Robert Kloefkorn
8b09030139 [bugfix] Make compatibility code compile with DUNE 2.7 2019-12-11 11:22:28 +01:00
Robert Kloefkorn
8e800f0c93 [bugfix][BlackoilAmg] Fix compilation error when using DUNE 2.7 2019-12-11 11:22:28 +01:00
Markus Blatt
87b631e15b
Merge pull request #2218 from blattms/use-active-cells-wehen-filtering
Use ActiveGridCells instead of EclipseGrid when filtering connections.
2019-12-11 09:02:37 +01:00
Atgeirr Flø Rasmussen
807375811e
Merge pull request #2217 from atgeirr/silence-override-warnings
Add override to silence warnings.
2019-12-10 12:39:54 +01:00
Markus Blatt
e7f7ad2ddc Use ActiveGridCells instead of EclipseGrid when filtering connections.
The function signature has changed upstream.
2019-12-10 11:50:07 +01:00
Atgeirr Flø Rasmussen
63c766cd30 Add override to silence warnings. 2019-12-10 11:37:52 +01:00
Markus Blatt
201887f283
Merge pull request #2195 from akva2/simplify_parallelrestart_new_types
changed: use a macro to declare prototypes in ParallelRestart.hpp
2019-12-10 08:36:41 +01:00
Tor Harald Sandve
3cccb47847
Merge pull request #2066 from dr-robertk/PR/ebos-oilwaterpolymer
[feature][ebos] Adding oil-water-polymer option of ebos.
2019-12-10 08:36:16 +01:00
Robert Kloefkorn
44e4ea3cdf [feature][ebos] Adding oil-water-polymer option of ebos. 2019-12-09 18:16:23 +01:00
T.D. (Tongdong) Qiu
13e524dba2 Only print warning that cusparseSolver did not converge if it was chosen with --use-gpu=true 2019-12-09 10:02:21 +01:00
Joakim Hove
510fb4a4ae
Merge pull request #2214 from joakim-hove/enable-3dprops-testing
Add cmake switch to enable testing of new 3D property implementation
2019-12-07 13:33:56 +01:00
Joakim Hove
5259fb93ca Add cmake switch to enable testing of new 3D property implementation 2019-12-07 12:34:07 +01:00
T.D. (Tongdong) Qiu
b355537e04 Replaced prints with OpmLog. BdaBridge disables GPU and continues with Dune if unsupported blocksize is used 2019-12-06 17:23:32 +01:00
Markus Blatt
712a902c37
Merge pull request #2205 from andrthu/adjacency-change
Remove non-contributing computations in parallel solver by changing matrix sparsity pattern.
2019-12-06 15:15:50 +01:00
Atgeirr Flø Rasmussen
52b9ecbfd5
Merge pull request #2210 from totto82/gconsalesump
Support for Gconsale and Gconsump
2019-12-06 15:01:49 +01:00
T.D. (Tongdong) Qiu
8b92c5dca6 Removed extra copy of nnzs, now sends pointer to start of Dune::BCRSMatrix data to cusparseSolver. 2019-12-06 14:33:52 +01:00
Atgeirr Flø Rasmussen
4bad782a1f
Merge pull request #2178 from GitPaean/support_wsegsicd_rebased
Support WSEGSICD implementation
2019-12-06 14:20:40 +01:00
Joakim Hove
4ad0074552
Merge pull request #2204 from joakim-hove/shut-wells-timestep
Evaluate ACTIONX at the end of every timestep
2019-12-06 13:29:19 +01:00
Joakim Hove
dc5340046a Call applyActions at the end of every timestep 2019-12-06 13:18:49 +01:00
T.D. (Tongdong) Qiu
48900df882 Fixed 'unused variable' warnings 2019-12-06 11:27:17 +01:00
T.D. (Tongdong) Qiu
a4cb582cfb Moved warning prints from cusparseSolver to BdaBridge. Moved solving logic from BdaBridge to cusparseSolver. Added cusparseSolverStatus enum. 2019-12-06 11:05:41 +01:00
Kai Bao
799997d70a fixing a mistake was introduced when rebasing 2019-12-06 10:34:58 +01:00
Kai Bao
ab9d175e8d addressing the reviewing comments for PR#2178 2019-12-06 10:15:12 +01:00
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