Tom Hogervorst
c8eb14aaac
Graph coloring now uses CSC-format version of input pattern as well.
2020-07-06 13:29:30 +02:00
Tom Hogervorst
38c58bffae
Renamed functions to all used Camel case, and renamed parameters to better represent what is stored in them.
...
Fixed mistake of using wrong sparsity pattern data to call canBeStarted function, and removed nnzValues of CSCmat, which were never used.
2020-07-06 13:18:46 +02:00
T.D. (Tongdong) Qiu
7f8faa018b
Replaced timing function with Dune::Timer
2020-07-06 11:22:11 +02:00
T.D. (Tongdong) Qiu
845563c37b
Replaced hardcoded constant with template
2020-07-06 11:20:43 +02:00
T.D. (Tongdong) Qiu
8913e1d057
Make sure OpenCL can be used without CUDA
2020-06-25 18:44:49 +02:00
T.D. (Tongdong) Qiu
b7f47c9787
Clarified preprocessor macros
2020-06-25 15:01:23 +02:00
T.D. (Tongdong) Qiu
c76630687d
Removed config.h in header files
2020-06-25 14:49:41 +02:00
T.D. (Tongdong) Qiu
0471da3815
Rewritten Graph Coloring
2020-06-25 14:42:35 +02:00
T.D. (Tongdong) Qiu
ca83a8f53c
Removed unused headers
2020-06-25 13:12:12 +02:00
T.D. (Tongdong) Qiu
4ad234bf55
Changed some ints to unsigned
2020-06-25 12:29:20 +02:00
T.D. (Tongdong) Qiu
b692b66d3a
Added block_size templates to BlockedMatrix and Reorder functions
2020-06-25 11:51:41 +02:00
T.D. (Tongdong) Qiu
8f9fa15ecd
Fixed warnings, mostly shadowed parameters
2020-06-25 09:40:20 +02:00
T.D. (Tongdong) Qiu
98ddf47b44
Added block_size template to BdaSolvers and BILU0
2020-06-25 09:39:55 +02:00
T.D. (Tongdong) Qiu
2a48f5f63f
Simplified usage of BdaSolver::second() for timing
2020-06-24 19:48:50 +02:00
T.D. (Tongdong) Qiu
3dc368b0b4
Added block_size templates to the BdaBridge. Removed unused gpu_mode variable
2020-06-24 16:46:04 +02:00
T.D. (Tongdong) Qiu
26133c4fd7
Fixed type of gpu_mode when HAVE_CUDA is false
2020-06-24 15:55:03 +02:00
T.D. (Tongdong) Qiu
e4417fdc01
Set default value for use_gpu, using Dune would segfault because of the unitialized value
2020-06-23 18:20:10 +02:00
T.D. (Tongdong) Qiu
b9e4bd3a95
Updated HAVE_XX guards. Replaced string == compare with .compare()
2020-06-23 18:19:33 +02:00
T.D. (Tongdong) Qiu
39df7c9381
Updated comments, fixed shadowed declaration warnings
2020-06-23 11:30:15 +02:00
T.D. (Tongdong) Qiu
f974a5f6db
Added openclSolver
...
Usage: --gpu-mode=[cusparse|opencl|none] on command line
2020-06-22 18:26:49 +02:00
Atgeirr Flø Rasmussen
e4ea932a9d
Merge pull request #2661 from totto82/fixUpwindMSW_clean
...
Fix upwinding for friction, acceleration, valve and SIGD for MSW
2020-06-18 11:40:31 +02:00
Tor Harald Sandve
1fe5a2812f
relax rel_tol for msw restart case
2020-06-17 15:08:47 +02:00
Tor Harald Sandve
43d434d42e
trivial clean up
2020-06-17 08:39:19 +02:00
Tor Harald Sandve
e9d040a284
Fix upwining for friction, acceleration, valve and SIGD for MSW
...
Note 1:
The rate vectors used for the pressure equation now contains derivatives wrt to the upwind segment for fractions.
To make sure derivatives wrt. to different segmens gets mixed we disregard the derivatives for the properties (density, viscosity) evaluated at the upwind segment.
Note 2:
A factor 2 is added to the velocity head term similar as in the friction term
Note 3:
A sign change is added to the acceleration term for massrates > 0. Is this correct. It seems like the reference simulator does this.
2020-06-17 08:39:19 +02:00
Atgeirr Flø Rasmussen
9c552ec812
Merge pull request #2675 from totto82/changeRstTest
...
change MSW restart test to read the schedule
2020-06-16 19:48:13 +02:00
Tor Harald Sandve
da3801ea14
change MSW restart test to read the schedule
2020-06-16 15:06:45 +02:00
Bård Skaflestad
0310fa4edf
Merge pull request #2673 from blattms/fix-tranyxyz-sub-3D
...
[bugfix] Fix TRANXYZ for problems with less than 3 dimensions.
Also subsumes and closes #2150 .
2020-06-15 17:15:48 +02:00
Atgeirr Flø Rasmussen
16a599684d
Merge pull request #2672 from akva2/fix_harmless_ubsan
...
changed: delay deck dereference
2020-06-15 10:42:44 +02:00
Markus Blatt
2e9cfffea6
Fix TRANXYZ for problems with less than 3 dimensions.
...
Up to now We always assumed that cardDims[i]>1 holds. which it does for most
of the cases. But when e.g. simulating a vertical stack of 5 cells
flow would report the transmissibilities in the Z direction in TRANX
and output TRANZ as zero. Similar problems should be there for 2D grids.
With this commit we actually check whether there can be neighbours in
the X and Z direction to prevent this behavior.
2020-06-15 10:40:26 +02:00
Arne Morten Kvarving
44bec2d7db
changed: delay deck dereference
...
this was harmless unless enableExperiments was given, since
the deck ref is not used otherwise, but it caused an UBSAN issue
when run in parallel.
2020-06-15 09:50:06 +02:00
Bård Skaflestad
0dfcb8f411
Merge pull request #2671 from bska/shorten-update-title
...
update_data: Move List of Changed Tests to Commit Message Body
2020-06-15 09:31:02 +02:00
Bård Skaflestad
cab9be486c
update_data: Move List of Changed Tests to Commit Message Body
...
This way we are less at risk of overrunning GitHub's 256 character
limit for issue/PR title lengths when a PR happens to affect many
regression tests.
2020-06-13 12:14:36 +02:00
Joakim Hove
f03dd20b96
Merge pull request #2636 from joakim-hove/serialize-gpmaint
...
Instantiate packer for std::optional<GPMaint>
2020-06-12 12:19:28 +02:00
Joakim Hove
bba5ca48ba
Merge pull request #2668 from joakim-hove/aicd
...
Aicd
2020-06-12 09:12:33 +02:00
Arne Morten Kvarving
e9c56f869e
Merge pull request #2670 from bska/remove-duplicate-decl
...
Remove Redundant 'packSize' Declaration
2020-06-12 08:27:20 +02:00
Joakim Hove
754f74df01
Adapt variant serialization to four types
2020-06-12 07:21:46 +02:00
Bård Skaflestad
201ef4adef
Remove Redundant 'packSize' Declaration
...
The 'std::string' case is covered by a call to ADD_PACK_PROTOTYPES.
2020-06-12 00:14:41 +02:00
Joakim Hove
baba9b6773
Merge pull request #2642 from joakim-hove/icd-variant
...
Use std::variant access to Segment::icd
2020-06-11 11:32:08 +02:00
Joakim Hove
be5f3ff2e1
Use std::variant access to Segment::icd
2020-06-10 20:41:14 +02:00
Joakim Hove
a1306a62fc
Add serialization of std::variant<T1,T2,T3>
2020-06-10 20:41:14 +02:00
Kai Bao
23a9f4732b
Merge pull request #2666 from atgeirr/msw-log-output-cleanup
...
Prettifying and reducing log output from MSW.
2020-06-10 19:44:01 +02:00
Atgeirr Flø Rasmussen
dd8e42958a
Prettifying and reducing log output from MSW.
2020-06-10 16:36:17 +02:00
Markus Blatt
b1adbd45cb
Merge pull request #2663 from akva2/fix_timestamp_gen
...
fixed: fix parallel builds
2020-06-09 17:31:25 +02:00
Arne Morten Kvarving
6ab90bb0e3
fixed: fix parallel builds
...
we need the update-version target to run to generate the
necessary headers.
2020-06-09 15:08:30 +02:00
Joakim Hove
c977a28cfa
Merge pull request #2660 from joakim-hove/restart-testing-enable-adaptive-timestepping
...
Changes in running of restart regression tests
2020-06-08 13:52:06 +02:00
Joakim Hove
df11bb5b55
Changes in running of restart regression tests
...
- The parallel test gets a designated driver
- The serial test is run with default adpative timestepping
2020-06-08 12:53:29 +02:00
Atgeirr Flø Rasmussen
1afbe4b0a8
Merge pull request #2659 from akva2/move_timestamp
...
changed: move moduleVersion to a separate object library
2020-06-08 12:51:56 +02:00
Arne Morten Kvarving
5d423e2300
changed: move moduleVersion to a separate object library
...
this to minimize re-linking due to compile timestamp support
2020-06-08 10:07:22 +02:00
Joakim Hove
04f6c24022
Merge pull request #2648 from joakim-hove/use-connections-segment-perf-length
...
Use WellConnections.segment_perf_length()
2020-06-05 11:05:57 +02:00
Joakim Hove
5b940836ec
Remove MultisegmentWell::calculateSICDFlowScalingFactors()
2020-06-04 14:13:14 +02:00