Commit Graph

11227 Commits

Author SHA1 Message Date
Atgeirr Flø Rasmussen
cfdb2b9be6 Modifications of formatting, compile fix. 2020-05-07 15:04:20 +02:00
hnil
0f33835e67 added writing of detailed performance report 2020-05-07 11:37:24 +02:00
Atgeirr Flø Rasmussen
9476dfc35a
Merge pull request #2594 from atgeirr/writematrix-revised
Add a writeSystem() helper and use it to write system matrices.
2020-05-07 09:07:07 +02:00
hnil
d275242b01 Add a writeSystem() helper and use it to write system matrices.
Triggered only when using the flexible solver and a solver verbosity > 10.
2020-05-06 16:56:30 +02:00
Bård Skaflestad
a64f660bff
Merge pull request #2589 from alfbr/group-tests5
Group tests5
2020-05-05 19:58:13 +02:00
Alf Birger Rustad
090d1467e7 Fix typo 2020-05-05 18:15:19 +02:00
Markus Blatt
d26c993d86
Merge pull request #2579 from akva2/quell_dep_warning_boost_1.71
quell deprecation warnings with boost 1.71
2020-05-05 17:29:33 +02:00
Markus Blatt
3f65235935
Merge pull request #2591 from atgeirr/fix-parameter-setup
Do not run setupParameter_() twice for the static-typed sims.
2020-05-05 17:27:44 +02:00
Atgeirr Flø Rasmussen
9357919201 Do not run setupParameter_() twice for the static-typed sims. 2020-05-05 16:19:10 +02:00
Atgeirr Flø Rasmussen
7dbbc0f2e5
Merge pull request #2588 from totto82/addMinMaxSupportGCONSALE
Implement min/max for GCONSALE
2020-05-05 15:46:36 +02:00
Tor Harald Sandve
85e95fb87d Implement min/max for GCONSALE
Only default action RATE is implemented for violation of maximum sales target
2020-05-05 14:24:17 +02:00
Markus Blatt
c6fe4c7bab
Merge pull request #2569 from blattms/prevent-cmake-error-for-cuda-g++-master
Prevent Cmake error for CUDA with incompatible c++ compiler.
2020-05-05 13:32:10 +02:00
Atgeirr Flø Rasmussen
859db45e45
Merge pull request #2590 from totto82/fixSolventRein
Fix solvent reinjection when different reinjection group is given
2020-05-05 11:36:50 +02:00
Tor Harald Sandve
f33737afc4 Fix solvent reinjection when different reinjection group is given 2020-05-05 10:46:49 +02:00
Alf Birger Rustad
0b7e9489a6 Update data for 9_3E/D cases. 2020-05-05 09:58:09 +02:00
Alf Birger Rustad
3b9f8bffd6 Added 9_3D/E cases to testing. 2020-05-05 09:54:44 +02:00
Arne Morten Kvarving
fa5c4a8573
Merge pull request #2586 from atgeirr/fix-tag-for-init
Ensure that the typetag used for initialization is correct.
2020-05-04 11:12:44 +02:00
Atgeirr Flø Rasmussen
f0b1ee76b8 Ensure that the typetag used for initialization is correct.
Without this, properties set in the static variants of flow such as
flow_blackoil_dunecpr.cpp will be honored in the run. However, the
text for '--help' and the property printout in the .DBG file will not
reflect the true type tag, but the default.

This bug was added during the recent refactoring of all Flow variants
to use the same initialization and setup code.
2020-05-04 08:52:49 +02:00
Joakim Hove
1885426f3c
Merge pull request #2573 from joakim-hove/segdist-refactor
Update connection <-> segment implementation
2020-05-01 08:52:58 +02:00
Bård Skaflestad
e2c85db9c3
Merge pull request #2585 from alfbr/group-tests4
Group tests4
2020-04-30 19:02:14 +02:00
Alf Birger Rustad
3194d06a69 Update data for model4 group test. 2020-04-30 15:39:06 +02:00
Alf Birger Rustad
f7ec85dad9 Add model4 group test. 2020-04-30 15:37:15 +02:00
Joakim Hove
da5042c538 Update connection <-> segment implementation 2020-04-30 14:53:35 +02:00
Bård Skaflestad
b34a10f611
Merge pull request #2580 from alfbr/group-tests3
Group tests3
2020-04-30 14:28:54 +02:00
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