Joakim Hove
cb800abd05
Merge pull request #3345 from atgeirr/silence-warnings
...
Silence warnings
2021-06-03 17:25:47 +02:00
Atgeirr Flø Rasmussen
be0515dcba
Avoid warning by defining static variable inline.
2021-06-03 13:27:49 +02:00
Atgeirr Flø Rasmussen
8e6e1c3d5e
Remove unused PhaseUsage data member.
2021-06-03 13:02:31 +02:00
Atgeirr Flø Rasmussen
52877883d8
Add virtual destructor for base class.
2021-06-03 13:01:56 +02:00
Joakim Hove
42d1b4c4a8
Merge pull request #3335 from joakim-hove/segment-state2
...
Segment state2
2021-06-03 11:49:49 +02:00
Joakim Hove
59f36eacc0
Remove WellState::top_segment_index
2021-06-03 10:46:26 +02:00
Joakim Hove
5d8a4c5751
Remove WellState member nseg_
2021-06-03 10:46:26 +02:00
Joakim Hove
f7b1f90c12
Add method SegmentState::size()
2021-06-03 10:46:26 +02:00
Joakim Hove
19ba223c2a
Use SegmentState for segment_number()
2021-06-03 10:46:26 +02:00
Joakim Hove
d3e019fbce
Add private member segment_number to SegmentState class
2021-06-03 10:46:26 +02:00
Joakim Hove
ac12c8b3a4
Use SegmentState for rates
2021-06-03 10:46:26 +02:00
Joakim Hove
357cb11667
Use SegmentState::scale_pressure()
2021-06-03 10:46:04 +02:00
Joakim Hove
eac69061c2
Use SegmentState when copying pressure
2021-06-03 10:46:04 +02:00
Joakim Hove
eb937e8ba2
Use SegmentState as backing store for segment pressure
2021-06-03 10:46:04 +02:00
Joakim Hove
fc185afc02
Initialize pressure in top segment for non MSW well to zero
2021-06-03 10:46:04 +02:00
Joakim Hove
df7d96494b
Add small method SegmentState::scale_pressure()
2021-06-03 10:46:04 +02:00
Joakim Hove
7d89c6e09c
Add std::string overload for WellState::segments()
2021-06-03 10:46:04 +02:00
Joakim Hove
3fd6d7781b
Remove WellState::segPressDrop()
2021-06-03 10:46:04 +02:00
Joakim Hove
6a859c0664
Segmentstate for accelarition pressure drop
2021-06-03 10:46:04 +02:00
Joakim Hove
33f18279d7
Use segmentstate for hydrostatic pressure drop
2021-06-03 10:46:04 +02:00
Joakim Hove
9801469488
Use segmentstate for friction pressure
2021-06-03 10:46:04 +02:00
Joakim Hove
bccb4f36e4
Don't test pressure & rates for top segment in non MSW well
2021-06-03 10:46:04 +02:00
Joakim Hove
45e7c8c982
Add WellContainer<SegmentState> member
2021-06-03 10:46:04 +02:00
Joakim Hove
5dc267c6f5
Add class SegmentState
2021-06-03 10:46:04 +02:00
Joakim Hove
702dc3a924
Merge pull request #3338 from joakim-hove/remove-unused
...
Use perfrates.size() instead of storing num_perf explicitly
2021-06-03 07:58:56 +02:00
Bård Skaflestad
a03d7589b2
Merge pull request #3341 from joakim-hove/explicitly-clear-well-potentials
...
Explicitly zero well potentials at the start of report step
2021-06-02 18:14:41 +02:00
Bård Skaflestad
1bb14c7dd0
Merge pull request #3342 from akva2/janitoring
...
remove unused prototype
2021-06-02 16:27:47 +02:00
Arne Morten Kvarving
29137eae7c
remove unused prototype
2021-06-02 15:27:03 +02:00
Bård Skaflestad
d8cec87f8b
Merge pull request #3340 from akva2/more_tests
...
More tests
2021-06-02 14:56:09 +02:00
Joakim Hove
f733e33d70
Explicitly zero vectors at the start of report step
2021-06-02 14:21:36 +02:00
Arne Morten Kvarving
5754747009
add regression test for flow_onephase_energy
2021-06-02 13:57:05 +02:00
Bård Skaflestad
d974f6bd03
Merge pull request #3333 from totto82/fixTEMPrestart
...
Pass the temperature to the restart machinary if enableTemperature is true
2021-06-02 13:09:41 +02:00
Arne Morten Kvarving
e443759940
add parallel test for flow_onephase
2021-06-02 12:43:55 +02:00
Tor Harald Sandve
3422e18583
Optional passing of the temperature vector to the restart machinary
...
If enableTemperature and --enable-opm-restart-file=true the temperature is passed to or read from the restart file
2021-06-02 11:53:57 +02:00
Joakim Hove
c5a7b49c3d
Use perfrates.size() instead of storing num_perf explicitly
2021-06-02 10:21:02 +02:00
Bård Skaflestad
fc47eb8b4f
Merge pull request #3332 from akva2/fix_trans_writer_par
...
eclwriter: fix regression in parallel
2021-06-01 10:32:20 +02:00
Arne Morten Kvarving
c2211b532f
eclwriter: fix regression in parallel
...
order of constructing and obtaining global transmissibilities
was off. replace constructor argument with a setter so it can be
set at the appropriate time.
2021-06-01 09:08:38 +02:00
Joakim Hove
d57a8514a2
Merge pull request #3323 from joakim-hove/remove-segment-pressure-drop
...
Remove segment pressure drop as separate variable
2021-05-31 14:08:38 +02:00
Bård Skaflestad
279b1f125e
Merge pull request #3319 from akva2/vfphelpers_prune
...
changed: remove unused functions from VFPHelpers
2021-05-31 13:25:49 +02:00
Arne Morten Kvarving
92dd2a1075
pass doubles by value, not reference
2021-05-31 11:44:08 +02:00
Arne Morten Kvarving
c76803b913
changed: make bhp template hidden and use explicit instantations
...
this to avoid includes in headers.
2021-05-31 11:42:29 +02:00
Arne Morten Kvarving
ef635d42af
VFPHelpers: put in separate compile unit
2021-05-31 11:42:29 +02:00
Arne Morten Kvarving
4c4a612cc5
changed: remove unused functions from VFPHelpers
2021-05-31 11:42:29 +02:00
Joakim Hove
2d67d085ef
Remove segment pressure drop as separate variable
2021-05-31 09:10:33 +02:00
Markus Blatt
1ea70da7e6
Merge pull request #3321 from blattms/fix-cuda-only-compilation
...
Fixes compilation with CUDA but without OpenCL.
2021-05-31 08:53:54 +02:00
Bård Skaflestad
5793f91ae0
Merge pull request #3313 from totto82/fix_ginj_reduction
...
fix reduction rate for injection groups
2021-05-29 17:17:27 +02:00
Joakim Hove
db49c8aeef
Merge pull request #3309 from joakim-hove/wellrates-at
...
Make sure all wells are added to the well_rates map
2021-05-29 07:53:45 +02:00
Joakim Hove
95583df955
Merge pull request #3252 from bska/pack-unpack-aqudata
...
Prepare to Save/Restore Richer Set of Aquifer Values
2021-05-29 07:47:42 +02:00
Markus Blatt
7c17db3d06
Fixes unused variable warnings for CUDA only.
2021-05-28 16:26:46 +02:00
Markus Blatt
6ffde47096
Fixes compilation with CUDA but without OpenCL.
...
Using statements should not be in namespaces anyway...
2021-05-28 16:26:46 +02:00
