OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2024-12-01 21:39:09 -06:00
Code Issues Packages Projects Releases Wiki Activity
11,303 Commits 24 Branches 101 Tags 75 MiB
55b3a65230
Commit Graph

11303 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bård Skaflestad
541c57106d
Merge pull request #2583 from GitPaean/increasing_maxit_satFromPc 
increasing the max iteration number for statFromPc
 2020-04-30 13:54:04 +02:00
Kai Bao
93655244ce increasing the max iteration number for statFromPc 
when doing the equilibration.
 2020-04-30 12:12:58 +02:00
Alf Birger Rustad
1920ec567a Include 2B tests in update_data. 2020-04-30 10:35:29 +02:00
Alf Birger Rustad
69c48687fb Added the 2B test cases in model2. 2020-04-30 10:33:15 +02:00
Joakim Hove
87a7fd1962
Merge pull request #2578 from akva2/fix_focal_packaging 
changed: remove multiarch-support predepends
 2020-04-30 10:28:04 +02:00
Arne Morten Kvarving
e3a0137dd1 quell deprecation warnings with boost 1.71 2020-04-30 09:47:58 +02:00
Arne Morten Kvarving
0125b71451 changed: remove multiarch-support predepends 
no longer required in ubuntu bionic, and breaks ubuntu focal,
and in any case it is support by both platforms.
 2020-04-30 09:16:12 +02:00
Bård Skaflestad
c8754551aa
Merge pull request #2577 from joakim-hove/instantiate-optional-double 
Instantiate std::optional<double> and std::optional<std::string>
 2020-04-29 17:00:07 +02:00
Joakim Hove
926e904e90 Instantiate std::optional<double> and std::optional<std::string> 2020-04-29 16:26:58 +02:00
Markus Blatt
6a0bad0243 Need to set ENV{CUDAHOSTCXX}, too. 
No variables are used by check_language and hence we need
ti make nvc aware of the host compiler by the environment
variable.
 2020-04-29 13:58:48 +02:00
Markus Blatt
2d32fde1c9 Fix CMake CUDA documentation. 2020-04-29 13:29:45 +02:00
Markus Blatt
2c7556d286 Use CMAKE_CUDA_HOST_COMPILER instead of ENV{CUDAHOSTCXX}. 2020-04-29 13:29:45 +02:00
Joakim Hove
ec647bcc16
Merge pull request #2574 from joakim-hove/serialize-optional 
Add support for serializing std::optional
 2020-04-29 10:48:43 +02:00
Markus Blatt
9b8887d39f
Merge pull request #2576 from blattms/remove-unused-code-blackoilmodelebos 
Removes unused member istlSolver_ and method to get it from BlackoilM…
 2020-04-28 22:14:40 +02:00
Markus Blatt
ca744231b1 Removes unused member istlSolver_ and method to get it from BlackoilModelEbos 
It is not used since quite some time and tends to confuse me.
 2020-04-28 16:46:17 +02:00
Joakim Hove
40d7cd4381 Add support for serializing std::optional 2020-04-28 16:25:17 +02:00
Bård Skaflestad
02923a6dee
Merge pull request #2571 from alfbr/group-tests2 
Activate a bunch of group tests.
 2020-04-28 15:44:12 +02:00
OPMUSER
163ce3b613 Update Missing Features with PERMFACT 2020-04-28 13:39:40 +02:00
Alf Birger Rustad
a8566de64d Fix typos. 2020-04-28 10:40:39 +02:00
Atgeirr Flø Rasmussen
8b77d68d9c
Merge pull request #2572 from bska/prune-unused 
Remove Unused 'currentControl' Variable
 2020-04-28 08:09:17 +02:00
Markus Blatt
46ccc77959 Use CMAKE_CUDA_FLAGS_${CMAKE_BUILD_TYPE} if appropriate. 2020-04-27 22:05:47 +02:00
Markus Blatt
4e0cd2a77e Prevent multiple "-ccbin g++" in nvcc command. 
If ENV{CUDAHOSTCXX} is set then this will cause CMake to add
"-ccnin ${ENV{CUDAHOSTCXX}}" to variable CMAKE_CUDA_FLAGS
even if there already is one.
 2020-04-27 22:05:47 +02:00
Bård Skaflestad
9756edce50 Remove Unused 'currentControl' Variable 2020-04-27 21:29:10 +02:00
Alf Birger Rustad
75f5b1c2e1 Update the data. 2020-04-27 21:16:04 +02:00
Alf Birger Rustad
a8d80366d1 Activate a bunch of group tests. 2020-04-27 18:22:19 +02:00
Atgeirr Flø Rasmussen
14bde098ce
Merge pull request #2570 from blattms/fix-prec-factory-dune-master 
Complete future-proofing ILU usage in the preconditioner factory.
 2020-04-27 16:37:27 +02:00
Atgeirr Flø Rasmussen
06e5e6b6ac
Merge pull request #2565 from totto82/avoidOscNupcol 
use nupcol to avoid oscillation between group controls
 2020-04-27 16:02:32 +02:00
Atgeirr Flø Rasmussen
6684cd7cb3
Merge pull request #2564 from totto82/fixGCONSALE 
Fix GCONSALE
 2020-04-27 15:59:29 +02:00
Markus Blatt
f03b56c261 Complete future-proofing ILU usage in the preconditioner factory. 
SeqILU0/SeqILU0 are removed in master and one should use SeqILU
 2020-04-27 15:52:43 +02:00
Markus Blatt
ddb0940336 Prevent Cmake error for CUDA with incompatible c++. 
At least on Debian 10 the standard c++ compiler is g++-8,
but CUDA only supports g++-7 and our test for CUDA in cmake
did send an error in that case/combination which is quite
annoying.

The reason was that check_language(CUDA) did not honor
the CMAKE_CUDA_FLAGS variable and always used the default g++7,
but enable_language(CUDA) did honor it. As we do set the underlying
host compiler the fromer reported that CUDA is available while the
latter marked the CUDA compiler as broken.

With this commit we work around this by setting the environment
variable ENV{CUDAHOSTCXX} which nvcc will use. Hence now we only try
to enable CUDA if it is compatible with the C++ compiler
 2020-04-27 15:22:56 +02:00
Bård Skaflestad
a7a3aec72d
Merge pull request #2567 from alfbr/update-wsegsicd 
Intended to update WSEGSICD test
 2020-04-27 14:11:03 +02:00
Alf Birger Rustad
2d6fe6a3bf Just a couple of trivial clean-ups. 2020-04-27 13:50:40 +02:00
Bård Skaflestad
87d58a08b1
Merge pull request #2553 from alfbr/add-group-tests 
Added the remaining group tests that are correct.
 2020-04-27 13:43:19 +02:00
Joakim Hove
303ac7fef4
Merge pull request #2566 from joakim-hove/support-viscref 
Remove VISCREF from MissingFeatures
 2020-04-27 12:47:06 +02:00
Joakim Hove
750070fbd7 Remove VISCREF from MissingFeatures 2020-04-27 10:30:50 +02:00
Tor Harald Sandve
33afb332fa use nupcol to avoid oscilation between group controls 2020-04-27 10:29:00 +02:00
OPMUSER
c62318387d Update Missing Features with HMMULTSG 
HMMULTSG
 2020-04-25 18:19:31 +02:00
OPMUSER
04295871f4 Update MissingFeatures.cpp 
Missing features fixed typo SCPDIMS to SCDPDIMS, and added RWGSALT.
 2020-04-25 18:19:31 +02:00
Bård Skaflestad
19461e6b83
Merge pull request #2563 from atgeirr/add-json-param-printout 
Add logging of linear solver parameter tree.
 2020-04-25 14:13:11 +02:00
Tor Harald Sandve
a046977946 Fix GCONSALE 
1) Only check GCONSALE limits at the end of a timestep. NB. The simulator still throws if some of the limits are violated
2) BUGFIX: don't remove gas consumption twice
 2020-04-24 16:10:07 +02:00
Atgeirr Flø Rasmussen
a720bf9942 Add logging of linear solver parameter tree. 2020-04-24 14:52:04 +02:00
Joakim Hove
0773d07df5
Missing features (#2562) 
Updates to the list of missing features
 2020-04-24 13:08:55 +02:00
Atgeirr Flø Rasmussen
c4e020c179
Merge pull request #2556 from totto82/test_atg 
Fix how the group reduction works
 2020-04-24 11:13:22 +02:00
Tor Harald Sandve
e9476e116e make sure the current_rate is added at the right level 2020-04-23 20:54:59 +02:00
Atgeirr Flø Rasmussen
196d6c95ec
Merge pull request #2530 from bska/equil-subdiv-fipcalc 
Equilibration: Add Experimental Support for Horizontal Subdivision
 2020-04-23 16:50:41 +02:00
Tor Harald Sandve
3b479af9c4 Fix the fix on how the group reduction works 2020-04-23 09:45:16 +02:00
Atgeirr Flø Rasmussen
0df3a96fa6 Fix how group rate reductions work. 2020-04-23 09:39:03 +02:00
Bård Skaflestad
b288602dfc Equilibration: Add Experimental Support for Horizontal Subdivision 
This commit adds a very early, alpha-quality implementation of the
"horizontal subdivision" strategy (N < 0) of the EQUIL directive.
This in turn enables more accurate derivations of the initial fluids
in place.

Interactions with SWATINIT are completely untested, and the initial
Rs/Rv derivations in this context are possibly incomplete.  More
work is likely needed in this area, but this does at least enable
more widespread testing.
 2020-04-22 20:10:19 +02:00
Bård Skaflestad
4b04a36a2f Initial State Calculator: Prune Unneeded Steps and Variables 
In particular, remove unneeded function parameters and don't form a
per-cell PVT zero-based index when we're not going to use the
values.
 2020-04-22 20:10:19 +02:00
Bård Skaflestad
f0ed53a6f1 Vertical Extent: Prune Unneeded 'cellcount' Parameter 
The purpose of this function is to determine the vertical extent of
a set of cells.  Counting the number of cells in the region is not
its responsibility.
 2020-04-22 20:10:19 +02:00