OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2025-02-25 18:55:30 -06:00
Code Issues Packages Projects Releases Wiki Activity
10,828 Commits 24 Branches 102 Tags 90 MiB
fbe739ec9b
Commit Graph

1104 Commits

Author SHA1 Message Date
Arne Morten Kvarving
5de7605863 add mpi serialization for GuideRateConfig 2020-01-02 15:19:31 +01:00
Arne Morten Kvarving
805f68fdee add mpi serialization for GuideRateModel 2020-01-02 15:15:49 +01:00
Arne Morten Kvarving
34a55ed381 add mpi serialization for std::array 2020-01-02 15:15:48 +01:00
Arne Morten Kvarving
c6e2db1f69
Merge pull request #2259 from akva2/noecl_flush 
More MPI serialization support
 2020-01-02 15:10:06 +01:00
Tor Harald Sandve
d1ff941adc
Merge pull request #2223 from totto82/makeGrupMPI 
communicate group rates
 2020-01-02 14:38:56 +01:00
Tor Harald Sandve
77d52e5b53 communicate group rates and add test 2020-01-02 13:57:12 +01:00
Atgeirr Flø Rasmussen
5f979b4ec2
Merge pull request #2241 from GitPaean/fixing_non_defaulted_influx_coefficient 
fixing the non-defaulted influx coefficient for AquiferFetkovich
 2020-01-02 13:51:35 +01:00
Tor Harald Sandve
1b7af4c1b6
Merge pull request #2239 from totto82/nupcol2 
froze wellState at nupcol iterations
 2020-01-02 12:47:13 +01:00
Arne Morten Kvarving
ec1a18ca70 add mpi serialization for UDQActive 2020-01-02 12:14:13 +01:00
Arne Morten Kvarving
01d05c9585 add mpi serialization for UDQConfig 2020-01-02 12:12:45 +01:00
Arne Morten Kvarving
dc5a3d0e0e add mpi serialization for UDQIndex 2020-01-02 12:11:15 +01:00
Arne Morten Kvarving
fcd6c7582b add mpi serialization for UDQAssign 2020-01-02 12:09:44 +01:00
Arne Morten Kvarving
3d17266476 add mpi serialization for UDQDefine 2020-01-02 12:08:07 +01:00
Arne Morten Kvarving
7d825cea82 add mpi serialization for UDQASTNode 2020-01-02 12:06:16 +01:00
Arne Morten Kvarving
5873b56025 add mpi serialization for UDQFunctionTable 2020-01-02 12:03:54 +01:00
Arne Morten Kvarving
abe09ae93d add mpi serialization for UDQFunction 2020-01-02 12:02:42 +01:00
Arne Morten Kvarving
b2d454eaf2 add mpi serialization for WListManager 2020-01-02 12:00:03 +01:00
Arne Morten Kvarving
c2bff16e75 add mpi serialization for WList 2020-01-02 11:59:27 +01:00
Arne Morten Kvarving
9fec893834
Merge pull request #2257 from akva2/noecl_flush 
More MPI serialization support
 2020-01-02 11:51:49 +01:00
Tor Harald Sandve
c0598fcc7b
Merge pull request #2252 from totto82/setBHPWP 
set bhp control explicilty for well potential calculations
 2020-01-02 11:07:43 +01:00
Kai Bao
d1fd04e635 WIP in fixing the non-defaulted influx coefficient for AquiferFetkovich 2020-01-02 10:55:03 +01:00
Arne Morten Kvarving
f8029133a5 add mpi serialization for Group 2020-01-02 09:05:53 +01:00
Arne Morten Kvarving
dcdba24f53 add mpi serialization for Group::GroupProductionProperties 2020-01-02 09:05:46 +01:00
Arne Morten Kvarving
c030545478 add mpi serialization for Group::GroupInjectionProperties 2020-01-02 09:04:41 +01:00
Arne Morten Kvarving
2df5aaf876 add mpi serialization for IOrderedSet 2020-01-02 09:03:41 +01:00
Arne Morten Kvarving
4e14746405 add mpi serialization for std::unordered_set 2020-01-02 09:03:11 +01:00
Arne Morten Kvarving
d01a389396 add mpi serialization for Well 2020-01-02 09:00:28 +01:00
Arne Morten Kvarving
c31d209295 add mpi serialization for WellSegments 2020-01-02 08:31:06 +01:00
Arne Morten Kvarving
5bc506cd3b add mpi serialization for UnitSystem 2020-01-02 08:27:13 +01:00
Arne Morten Kvarving
e53072faf5 add mpi serialization for Dimension 2020-01-02 08:25:19 +01:00
Arne Morten Kvarving
781625ec63 add mpi serialization for Segment 2020-01-02 08:23:40 +01:00
Arne Morten Kvarving
badc59ca6f add mpi serialization for std::shared_ptr 2020-01-02 08:22:13 +01:00
Arne Morten Kvarving
cf7e81bb07 add mpi serialiation for Valve 2020-01-02 08:19:46 +01:00
Arne Morten Kvarving
9baba1bae9 add mpi serialization for SpiralICD 2020-01-02 08:18:56 +01:00
Atgeirr Flø Rasmussen
63a2460ed4 Bugfix: correct well efficiency factors for MSW 
With this, the conservation equations for the mswell are in terms of
effective flows. This is similar to the treatment for standard wells.
The alternative (formulating the equations in full rates) could be
better and clearer in the long run.
 2019-12-23 12:37:20 +01:00
Joakim Hove
8ba5caadd4
Merge pull request #2255 from joakim-hove/missing-UDT 
Mark UDT as not supported
 2019-12-20 17:16:04 +01:00
Bård Skaflestad
8a378249f7
Merge pull request #2250 from akva2/noecl_flush 
More MPI serialization support
 2019-12-20 17:08:01 +01:00
Joakim Hove
8bba4f0557 Mark UDT as not supported 2019-12-20 16:33:13 +01:00
Arne Morten Kvarving
d840f4b93b add mpi serialization for Well::WellProductionProperties 2019-12-20 15:46:54 +01:00
Kai Bao
7fc81ae228 using range for a few occasions in BlackoilAquiferModel_impl.hpp 2019-12-20 15:32:39 +01:00
Kai Bao
3fb96deb36 re-formatting aquifer files with clang-format 2019-12-20 14:30:13 +01:00
Tor Harald Sandve
7a0ff52bbc set bhp control explicilty for well potential calculations 2019-12-20 13:18:10 +01:00
Tor Harald Sandve
e340f25c42
Merge pull request #2229 from totto82/fixOrderOfCheck 
check groups from top
 2019-12-20 12:26:20 +01:00
Arne Morten Kvarving
5dc9ac507d add mpi serialization for WellConnections 2019-12-20 11:52:56 +01:00
Arne Morten Kvarving
8bd9f2f68f add mpi serialization for Well::WellGuideRate 2019-12-20 11:51:36 +01:00
Arne Morten Kvarving
c909075f16 add mpi serialization for WellEconProductionLimits 2019-12-20 11:48:38 +01:00
Arne Morten Kvarving
9915b046eb add mpi serialization for Well::WellInjectionProperties 2019-12-20 11:48:00 +01:00
Arne Morten Kvarving
89efc489e4 add mpi serialization for Connection 2019-12-20 11:40:30 +01:00
Arne Morten Kvarving
cadd8dc414 add mpi serialization for UDAValue 2019-12-20 11:40:06 +01:00
Arne Morten Kvarving
cebb19ad01 add mpi serialization for WellTracerProperties 2019-12-20 11:38:54 +01:00
Arne Morten Kvarving
072a2d748f add mpi serialization for WellFoamProperties 2019-12-20 11:38:54 +01:00
Arne Morten Kvarving
f4e991e491 add mpi serialization for WellPolymerProperties 2019-12-20 11:38:54 +01:00
Arne Morten Kvarving
95cc555561 Explicitly instantiate further pack functions for needed symbols 2019-12-20 11:38:44 +01:00
Markus Blatt
b9062396be
Merge pull request #2209 from Tongdongq/master 
Added cusparseSolver, needs GPU to be used
 2019-12-20 11:37:27 +01:00
Bård Skaflestad
80714243c6
Merge pull request #2248 from akva2/noecl_flush 
More MPI serialization support
 2019-12-20 10:44:24 +01:00
Arne Morten Kvarving
c14a991b25
Merge pull request #2235 from totto82/wellEffFix 
Fix bug in the well efficiency factor
 2019-12-20 08:31:16 +01:00
Arne Morten Kvarving
76733a8eae add mpi serialization for WellTestConfig 2019-12-20 08:15:03 +01:00
Arne Morten Kvarving
5445e0e2d7 add mpi serialization for WellTestConfig::WTESTWell 2019-12-20 08:14:56 +01:00
Arne Morten Kvarving
b4b8f17cf3 add mpi serialization for VFPProdTable 2019-12-20 08:14:12 +01:00
Arne Morten Kvarving
a8b76b5ffc add mpi serialization for VFPInjTable 2019-12-20 08:13:14 +01:00
Arne Morten Kvarving
a932b81d79 add mpi serialization for MessageLimits 2019-12-20 08:11:47 +01:00
Arne Morten Kvarving
987257554f add mpi serialization for MLimits 2019-12-20 08:11:34 +01:00
Arne Morten Kvarving
4be5a5207d add mpi serialization for Events 2019-12-20 08:10:36 +01:00
Arne Morten Kvarving
74aca3fefb add mpi serialization for DynamicVector 2019-12-20 08:09:42 +01:00
Arne Morten Kvarving
1e145194c4 add mpi serialization for OilVaporizationProperties 2019-12-20 08:08:40 +01:00
Arne Morten Kvarving
1ab9a66bf4 add mpi serialization for WaterPvtMultiplexer and WaterPvtThermal 
these are intermixed so kept in one commit
 2019-12-19 14:20:19 +01:00
Arne Morten Kvarving
e56bbba99c add mpi serialization for ConstantCompressibilityWaterPvt 2019-12-19 14:20:05 +01:00
Arne Morten Kvarving
fe4ed0466a add mpi serialization for OilPvtMultiplexer and OilPvtThermal 
these are intermixed so kept in one commit
 2019-12-19 14:16:47 +01:00
Arne Morten Kvarving
30dde6f410 add mpi serialization for LiveOilPvt 2019-12-19 14:16:06 +01:00
Arne Morten Kvarving
1a3f00f300 add mpi serialization for DeadOilPvt 2019-12-19 14:14:33 +01:00
Arne Morten Kvarving
e6a608ccc9 add mpi serialization for ConstantCompressibilityOilPvt 2019-12-19 14:13:37 +01:00
Arne Morten Kvarving
981ba74211 add mpi serialization for GasPvtMultiplexer and GasPvtThermal 
these are interlinked so kept in one commit
 2019-12-19 11:00:26 +01:00
Arne Morten Kvarving
987ae06ace add mpi serialization for WetGasPvt 2019-12-19 10:56:44 +01:00
Arne Morten Kvarving
8e80b043f3 add mpi serialization for UniformXTabulated2DFunction 2019-12-19 10:56:11 +01:00
Arne Morten Kvarving
d2dd2c51be add mpi serialization for tuples 2019-12-19 10:55:42 +01:00
Arne Morten Kvarving
a2ac61f592 add mpi serialization for DryGasPvt 2019-12-19 10:43:39 +01:00
Arne Morten Kvarving
f2640197be add mpi serialization for IntervalTabulated2DFunction 2019-12-19 10:42:52 +01:00
Arne Morten Kvarving
6fde7dcb47 add mpi serialization for SolventPvt 2019-12-19 10:32:06 +01:00
Arne Morten Kvarving
37d8f702c8 add mpi serialization for Tabulated1DFunction 2019-12-19 10:28:12 +01:00
Arne Morten Kvarving
5b5dddd64c add mpi serialization for TableManager 2019-12-19 09:29:48 +01:00
Arne Morten Kvarving
f9fc843ce2 add mpi serialization for RockTable 2019-12-19 09:29:48 +01:00
Arne Morten Kvarving
fb4c1deb10 add mpi serialization for ROCKRecord 2019-12-19 09:29:48 +01:00
Arne Morten Kvarving
c19a816bfa add mpi serialization for Aqudims 2019-12-19 09:28:48 +01:00
Arne Morten Kvarving
1da522d815 add mpi serialization for Eqldims 2019-12-19 09:28:48 +01:00
Arne Morten Kvarving
6a130697af add mpi serialization for Regdims 2019-12-19 09:28:48 +01:00
Arne Morten Kvarving
fab1b9eaf1 add mpi serialization for SkprwatTable 2019-12-19 09:27:11 +01:00
Arne Morten Kvarving
81602af103 add mpi serialization for SkprpolyTable 2019-12-19 09:27:11 +01:00
Arne Morten Kvarving
cda78cee94 add mpi serialization for PlymwinjTable 2019-12-19 09:27:11 +01:00
Arne Morten Kvarving
0cadc377ac add mpi serialization for PolyInjTable 2019-12-19 09:26:35 +01:00
Markus Blatt
2511121a84
Merge pull request #2222 from dr-robertk/PR/ebos-polyhedralgrid2 
Make ebos compile with PolyhedralGrid again.
 2019-12-18 23:57:38 +01:00
T.D. (Tongdong) Qiu
103cc9b83a Added return explanation in comments 2019-12-18 17:09:33 +01:00
T.D. (Tongdong) Qiu
57344fd5e0 Added doxygen-style comments 2019-12-18 17:05:33 +01:00
T.D. (Tongdong) Qiu
6506ab5f55 Added some const qualifiers and comments 2019-12-18 16:37:29 +01:00
T.D. (Tongdong) Qiu
a491e64883 Added some whitespace around brackets in accordance with OPM suggested coding standard 2019-12-18 15:54:14 +01:00
T.D. (Tongdong) Qiu
950d1c92c1 Replaced tabs with 4 spaces 2019-12-18 15:50:09 +01:00
T.D. (Tongdong) Qiu
b543947e66 Addressed some comments of PR#2209 2019-12-18 15:47:35 +01:00
Tor Harald Sandve
df6774c45c froze wellState at nupcol iterations 2019-12-18 14:37:16 +01:00
Arne Morten Kvarving
fc8a4fdae1 add mpi serialization for WatdentTable 2019-12-18 14:27:25 +01:00
Arne Morten Kvarving
a8a30cbd4c add mpi serialization for WATDENTRecord 2019-12-18 14:27:25 +01:00
Arne Morten Kvarving
c7d661bfc8 add mpi serialization for ViscrefTable 2019-12-18 14:27:25 +01:00
Arne Morten Kvarving
b0d6e34799 add mpi serialization for VISCREFRecord 2019-12-18 14:27:25 +01:00
Arne Morten Kvarving
0adbdc1d05 add mpi serialization for DensityTable 2019-12-18 14:27:25 +01:00
Arne Morten Kvarving
e5b1b48bcb add mpi serialization for DENSITYRecord 2019-12-18 14:27:25 +01:00
Arne Morten Kvarving
ba647bac5b add mpi serialization of PvcdoTable 2019-12-18 14:26:33 +01:00
Arne Morten Kvarving
8f541db989 add mpi serialization for PVCDORecord 2019-12-18 14:26:27 +01:00
Arne Morten Kvarving
0e93df61ad add mpi serialization of PvtwTable 2019-12-18 14:26:20 +01:00
Arne Morten Kvarving
e6321cfe87 add mpi serialization for PVTWRecord 2019-12-18 14:24:37 +01:00
Arne Morten Kvarving
35498f0241 add mpi serialization for JFunc 2019-12-18 14:23:39 +01:00
Arne Morten Kvarving
c956b8fcc0
Merge pull request #2234 from akva2/noecl_flush 
More MPI serialization support
 2019-12-18 14:16:53 +01:00
Atgeirr Flø Rasmussen
f03c4004b3
Merge pull request #2228 from totto82/fixGP3 
Fix the accumulation of the group potentials.
 2019-12-18 14:00:21 +01:00
Atgeirr Flø Rasmussen
f0bb49199a
Merge pull request #2236 from totto82/setMinimumChoppedTimeStep 
at option to set the time step size for shutting problematic wells
 2019-12-18 13:57:24 +01:00
Arne Morten Kvarving
d4df817b50 add mpi serialization of PvtxTable 2019-12-18 13:08:13 +01:00
Arne Morten Kvarving
6ca259c890 add mpi serialization for Runspec 2019-12-18 13:08:13 +01:00
Arne Morten Kvarving
1eb45ad5c2 add mpi serialization for Actdims 2019-12-18 13:08:13 +01:00
Arne Morten Kvarving
39ffbd6629 add mpi serialization for EclHysterConfig 2019-12-18 13:08:13 +01:00
Arne Morten Kvarving
efdabae2a2 add mpi serialization for UDQParams 2019-12-18 13:08:13 +01:00
Arne Morten Kvarving
0bf43fc516 add mpi serialization for WellSegmentDims 2019-12-18 13:08:13 +01:00
Arne Morten Kvarving
7989fb89d4 add mpi serialization for Welldims 2019-12-18 13:08:13 +01:00
Arne Morten Kvarving
64c7ead11c add mpi serialization for EndpointScaling 2019-12-18 13:08:13 +01:00
Steinar Foss
d8ebacd1d2 adding some keywords. 
...
 2019-12-18 13:00:07 +01:00
Tor Harald Sandve
29c2a3da3f only count group under group control when accumulating the group potentials 2019-12-18 11:40:06 +01:00
Tor Harald Sandve
9924ba48a1 at option to set the time step size for shutting problematic wells 2019-12-18 11:18:18 +01:00
Robert Kloefkorn
2fa90d24f6 [bugfix][ebos] Make compile with PolyhedralGrid again. 2019-12-18 11:03:42 +01:00
Tor Harald Sandve
6aafdba80d fix well efficency factor 2019-12-18 10:29:04 +01:00
Markus Blatt
d255e1cad6
Merge pull request #2215 from dr-robertk/PR/fix-compile-dune27 
Fix compilation with DUNE 2.7
 2019-12-18 08:56:51 +01:00
Markus Blatt
75a551c668
Merge pull request #2230 from totto82/addOutput 
add group name to output
 2019-12-18 08:14:17 +01:00
Arne Morten Kvarving
7c1b5bc25f add mpi serialization for Tabdims 2019-12-17 16:37:03 +01:00
Arne Morten Kvarving
cdfac8c02b add mpi serialization for Phases 2019-12-17 16:37:03 +01:00
Arne Morten Kvarving
2a2effd54b add mpi serialization for IOConfig 2019-12-17 16:35:36 +01:00
Arne Morten Kvarving
3470760307 add mpi serialization for RestartConfig 2019-12-17 16:35:36 +01:00
Arne Morten Kvarving
a869641ee4 add mpi serialization of DynamicState 2019-12-17 16:35:35 +01:00
Arne Morten Kvarving
3e93b3e043 add mpi serialization for TimeMap 2019-12-17 16:34:05 +01:00
Arne Morten Kvarving
7aa73eadd2 add mpi serialization for RestartSchedule 2019-12-17 16:33:59 +01:00
Arne Morten Kvarving
498bee5310 add mpi serialization for SimulationConfig 2019-12-17 11:17:28 +01:00
Arne Morten Kvarving
c011306ba7 add mpi serialization for InitConfig 2019-12-17 11:17:28 +01:00
Arne Morten Kvarving
c113aa1a11 add mpi serialization for FoamConfig 2019-12-17 11:17:28 +01:00
Arne Morten Kvarving
1f313d6b04 add mpi serialization for FoamData 2019-12-17 11:17:28 +01:00
Arne Morten Kvarving
f989b004e0 add mpi serialization for Equil 2019-12-17 11:11:36 +01:00
Arne Morten Kvarving
21eab1aa6d add mpi serialization for EquilRecord 2019-12-17 11:11:36 +01:00
Arne Morten Kvarving
f837a5f7eb add mpi serialization for TableContainer 2019-12-17 11:11:36 +01:00
Arne Morten Kvarving
ec95a19f4c add mpi serialization for SimpleTable 2019-12-17 11:11:36 +01:00
Arne Morten Kvarving
443cb4402f add mpi serialization for TableColumn 2019-12-17 11:11:36 +01:00
Arne Morten Kvarving
b33611077b add mpi serialization specialization for std::vector<bool> 2019-12-17 11:11:36 +01:00
Arne Morten Kvarving
95ee6566d4 added: a macro to handle types as pod 2019-12-17 11:11:36 +01:00
Arne Morten Kvarving
6bc3a24762 add mpi serialization for TableSchema 2019-12-16 14:45:54 +01:00
Arne Morten Kvarving
09554a4c25 add mpi serialization for OrderedMap 2019-12-16 14:45:53 +01:00
Arne Morten Kvarving
46c5afa490 add mpi serialization for ColumnSchema 2019-12-16 14:39:17 +01:00
Arne Morten Kvarving
e08a5c3046 add mpi serialization for Rock2dtrTable 2019-12-16 14:35:17 +01:00
Arne Morten Kvarving
5a1f1a6b36 add mpi serialization for Rock2dTable 2019-12-16 14:32:14 +01:00
Arne Morten Kvarving
fb7d4b7cb9 add mpi serialization for NNC and EDITNNC 2019-12-16 14:29:16 +01:00
Tor Harald Sandve
2a732d3c99 add group name to output 2019-12-16 14:28:55 +01:00
Arne Morten Kvarving
d9268980f3 add mpi serialization for Opm::ThresholdPressure 2019-12-16 14:28:29 +01:00
Tor Harald Sandve
bec8b33f70 check groups from top 2019-12-16 14:15:02 +01:00
T.D. (Tongdong) Qiu
293bd5816f Replaced exit() with OPM_THROW. Replaced primitive pointer with unique_ptr. 2019-12-16 10:05:12 +01:00
Atgeirr Flø Rasmussen
f769b97198
Merge pull request #2225 from atgeirr/fix-zero-wconprod 
Shut wells under zero WCONPROD when disallowing crossflow
 2019-12-13 14:41:52 +01:00
Atgeirr Flø Rasmussen
f09dcda21c Shut production well if zero rate and disallowing crossflow. 2019-12-13 11:08:36 +01:00
Atgeirr Flø Rasmussen
a89e8f6457 Complain less about missing operability checking. 
Do not give a warning for production wells or history wells,
respect the EnableWellOperabilityCheck flag. This is identical
to the behaviour of StandardWell. There will now only be a
warning for producers in prediction mode.
 2019-12-13 11:00:01 +01:00
Atgeirr Flø Rasmussen
c8e1f61050 Ensure open_for_output_ flag is set to true in init(). 2019-12-13 10:59:24 +01:00
Joakim Hove
ec68f4b113
Merge pull request #2219 from stefoss23/alternating_keywords 
added alternating keywords.
 2019-12-13 09:40:51 +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
8e800f0c93 [bugfix][BlackoilAmg] Fix compilation error when using DUNE 2.7 2019-12-11 11:22:28 +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
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
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
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
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
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
4c4a893781 Aquifer Model: Add Initialization from Restart Data 
This commit adds a new member function,

    initFromRestart()

to the EclBaseAquiferModel and the BlackoilAquiferModel.  The former
does nothing, the latter calls AquiferInterface::initFromRestart()
on the contained analytic aquifer objects.
 2019-12-05 09:41:21 +01:00
Bård Skaflestad
df86d01486 Add Means of Initializing Analytic Aquifers From Restart Data 
This commit adds a new member function,

    AquiferInterface::initFromRestart()

that consumes a vector<data::AquiferData> constructed from
information in the restart file's SAAQ and XAAQ vectors.  At the
moment, we use the initial aquifer pressure, the total produced
liquid volume and the current aquifer pressure at restart.

We implement the interface's member function in terms of the virtual
function

    AquiferInterface::assignRestartData()

that must be overridden in derived classes.

Implement a trivial such function for Carter-Tracy aquifers, and a
function that only stores the current aquifer pressure for the
Fetkovich aquifer model.

Additionally, record whether or not the aquifer object was
initialised from a previous solution.  If so, don't reset total
produce liquid volumes or aquifer pressures to their base values
from the model input file.
 2019-12-05 09:41:21 +01:00
Bård Skaflestad
92cbdf3c63
Merge pull request #2207 from joakim-hove/wellstate-open-for-output 
Refactor WellState SHUT
 2019-12-04 18:16:19 +01:00
T.D. (Tongdong) Qiu
69033ca7f2 Changed structure of cusparseSolver to fit into master branch 2019-12-04 16:59:58 +01:00
andrthu
eb83cef717 Remove tab 2019-12-04 15:44:37 +01:00
andrthu
5f68b71d0f Remove makeOverlapInvalid 2019-12-04 15:43:31 +01:00
andrthu
0829d1fa3e fix mistake in flexible 2019-12-04 15:39:42 +01:00
Tor Harald Sandve
c930ac9858 fix spelling 2019-12-04 11:39:26 +01:00
Tor Harald Sandve
9e64896054 fix issue when GRUP is used in WCONPROD and WCONINJE and NONE group control 
Use a bhp control when a well is controlled by a unvalied group control
 2019-12-04 11:37:00 +01:00
Atgeirr Flø Rasmussen
d4433b80b5 Improve/fix well potential calculations for MultiSegmentWell. 
Includes fixes for bhp-based potentials, and an implementation for thp-based
potentials similar to that for StandardWell.
 2019-12-04 11:01:45 +01:00
Joakim Hove
ce9108a9d2 Refactor WellState SHUT 
- Move some WellState shut code to separate method.
- Add bool flag open_for_output_ to WellState to ensure that shut wells do not
  create output.
 2019-12-03 19:37:44 +01:00
T.D. (Tongdong) Qiu
4db2e7ca4e Added cusparseSolver. Automatically compiled when CUDA is detected. Must be enabled at runtime by adding '--use-gpu=true' 2019-12-03 14:29:06 +01:00
andrthu
b980637f74 Romove extra copyOwnerToAll calls. Set ghost diagonal to one. Remove ghost adjecency 2019-12-03 12:04:17 +01:00
Atgeirr Flø Rasmussen
0edecb9a78
Merge pull request #2196 from totto82/smallTime 
Add option for throwing for small time steps
 2019-12-02 12:28:12 +01:00
Tor Harald Sandve
6d07aefef6
Merge pull request #2149 from goncalvesmachadoc/patch-1 
Delete few thermal keywords from list
 2019-12-02 10:17:58 +01:00
Tor Harald Sandve
b577f294b5 Add option for throwing for small time steps 2019-12-02 09:56:19 +01:00
Arne Morten Kvarving
77879f50fe changed: use a macro to declare prototypes in ParallelRestart.hpp 
more readable, less tedious to add new types
 2019-11-28 13:58:10 +01:00
Tor Harald Sandve
18ecd3fd2b
Merge pull request #2173 from joakim-hove/actionx-supported 
Remove keywords from list of missing features
 2019-11-28 10:35:03 +01:00
Tor Harald Sandve
853a726bb2 fix after rebase 2019-11-27 14:56:10 +01:00
Tor Harald Sandve
cab2f4b41f use common WellGroupEvent map 2019-11-27 13:12:53 +01:00
Tor Harald Sandve
49b5883ff7 Clean-up output message for group 2019-11-27 13:08:25 +01:00
Tor Harald Sandve
2c84970314 honor group event 2019-11-27 13:08:25 +01:00
Atgeirr Flø Rasmussen
937369166d
Merge pull request #2182 from blattms/parallel-restart-fixes 
ParallelRestart: use references and allow non-default template parame…
 2019-11-26 11:14:14 +01:00
Markus Blatt
a0650012c3 ParallelRestart: use references and allow non-default template parameters. 
packSize now uses a reference to map/unordered_map to prevent copying.
In addition we always specify all template parameters for the containers to
allow for sending data if non-default ones are used.
 2019-11-25 13:04:40 +01:00
Atgeirr Flø Rasmussen
bddeaba880 Delete obsolete include directives and functions. 
Also make other minor adjustments, in particular moving the function
getCubeDim() from WellsManagerDetail to WellHelpers.hpp.
 2019-11-25 10:58:44 +01:00
Atgeirr Flø Rasmussen
87188f5862 Avoid using the Wells struct. 2019-11-25 08:36:18 +01:00
Atgeirr Flø Rasmussen
cab0724a26
Merge pull request #2119 from blattms/fix-multiple-usage-printing-parallel 
Only print usage information on one processes.
 2019-11-22 15:23:27 +01:00
Bård Skaflestad
26c8d78eac
Merge pull request #2155 from blattms/print-mpi-omp-size 
Print number of MPI/OMP threads at start and end.
 2019-11-21 16:06:37 +01:00
Joakim Hove
2f7e1c2e10 Remove ENDACTIO from list of unsupported keywords 2019-11-20 15:48:53 +01:00
Joakim Hove
5d1dba4686 Remove FIPNUM from list of unsupported keywords 2019-11-20 15:47:26 +01:00
Joakim Hove
e79723b5c1 Remove ACTIONX from list of missing features 2019-11-20 15:35:59 +01:00
Steinar Foss
3d2892fbdb added 'special' keywords to MissingFeatures. 2019-11-20 15:31:11 +01:00
Markus Blatt
5c34b843f1 Use process instead of processor for MPI. 2019-11-19 15:56:18 +01:00
Markus Blatt
b4ec2f0611 Use correct number of threads when printing banner. 
At that stage flow did not set the number of thread in the case where
OMP_NUM_THREADS is not defined. That happens in setupParallelism which
is called when the simulator is run. Hence we have to manually compute
the number of threads similar to there.
 2019-11-19 15:45:50 +01:00
Markus Blatt
afc76a8b27 Print number of MPI/OMP threads at start and end. 2019-11-19 15:45:50 +01:00
Atgeirr Flø Rasmussen
4aa79bf39c
Merge pull request #2152 from GitPaean/wip_fixing_aquifer_2 
fixing and improvement of the Aquifer models
 2019-11-18 11:19:15 +01:00
Kai Bao
0c6adbbba0 some small cleaning up for Aquifer models 
there should be no functional change.
 2019-11-17 10:37:10 +01:00
Kai Bao
eea833ced2 correcting the way of calculate initial aquifer pressure 
for AquiferFetkovich.
 2019-11-17 10:37:10 +01:00
Kai Bao
383748b161 some cleaning up for the AquiferFetkovich 2019-11-17 10:37:10 +01:00
Kai Bao
21d69a7af0 making dp is Eval for AquiferFetkovich 2019-11-17 10:37:10 +01:00
Kai Bao
fabc2a6f22 adding AQUFET back to MissingFeatures.cpp 
which was removed by mistake in PR #2162
 2019-11-16 23:45:26 +01:00
Kai Bao
b36ac45fea removing several keywords from MissingFeatures.cpp 
COMPSEGS, AQUFET and PLYROCK
 2019-11-16 22:44:24 +01:00
Joakim Hove
d91f66869a
Merge pull request #2159 from stefoss23/add_missing_kws 
MissingFeatures: updated list, corrected spelling errors.
 2019-11-16 08:44:34 +01:00
Atgeirr Flø Rasmussen
2a5c93356c
Merge pull request #2160 from joakim-hove/rename-well2 
Rename Well2 -> Well and Group2 -> Group
 2019-11-14 10:33:54 +01:00
Joakim Hove
fce5d2f369 Rename Well2 -> Well and Group2 -> Group 2019-11-13 23:18:01 +01:00
Steinar Foss
099df1d566 MissingFeatures: updated list, corrected spelling errors. 2019-11-13 12:17:39 +01:00
Joakim Hove
b03078452f Make sure the perforation pressures is initialized also for STOP wells 2019-11-12 15:41:22 +01:00
Tor Harald Sandve
95f013bd96 fixup review comments. including bug in updateGroupTargetReduction 2019-11-08 14:07:12 +01:00
Tor Harald Sandve
8218f81183 set reservoir rate to zero for shut wells 2019-11-08 11:30:37 +01:00
Tor Harald Sandve
a95459e6ff copy wellReservoirRates 2019-11-08 10:26:34 +01:00
Cintia Goncalves Machado
ac30f97c43
Delete few thermal keywords from list 
@slawekszklarz and I were checking the keywords mentioned in warnings as unhandled when running thermal models. The keywords RTEMP, RTEMPVD and THCONR seem to be working fine.  The WATVISCT table breaks the simulation when extrapolation is needed.
 2019-11-07 15:04:57 +01:00
Tor Harald Sandve
8cece8641e fix mpi 2019-11-07 14:57:59 +01:00
Tor Harald Sandve
159f36ff85 add openCrossFlowAvoidSingularity functionality for MSW 2019-11-07 14:01:21 +01:00
Tor Harald Sandve
1ab99d07c7 Support VREP with combined gas and water injectors 2019-11-07 11:31:47 +01:00
Tor Harald Sandve
c3423c770c fix vrep and rein 2019-11-06 13:27:47 +01:00
Tor Harald Sandve
04701580d8 keep current injection and production control 2019-11-06 13:27:47 +01:00
Tor Harald Sandve
008eb17693 Support nupcol 
Only update groupTargetReduction, group REIN rates and group VREP rates when iteration < nupcol
 2019-11-06 10:23:30 +01:00
Atgeirr Flø Rasmussen
b9b8905db5
Merge pull request #2142 from atgeirr/prediction-fixes 
Prediction improvements
 2019-11-05 19:15:01 +01:00
Atgeirr Flø Rasmussen
20f767555e
Merge pull request #2141 from totto82/fixGroupFraction 
fix group fraction bug
 2019-11-05 16:18:01 +01:00
Atgeirr Flø Rasmussen
672835710b
Merge pull request #2140 from totto82/fixGroupProd 
Fix for hierarchy of production groups.
 2019-11-05 16:15:29 +01:00
Atgeirr Flø Rasmussen
4b7e37df1b Increase hardcoded producer bhp search range to 600 bar. 2019-11-05 16:07:22 +01:00
Atgeirr Flø Rasmussen
5ce4e84acd Do not add 0 to flo_samples vector. 2019-11-05 16:06:09 +01:00
Atgeirr Flø Rasmussen
5e8b577cd0 Use the RegulaFalsiBisection method instead of RegulaFalsi. 2019-11-05 16:05:42 +01:00
Atgeirr Flø Rasmussen
b034ea2b04
Merge pull request #2139 from totto82/thpInj 
add computeBhpAtThpLimitInj
 2019-11-05 15:15:12 +01:00
Tor Harald Sandve
3c89e4ba75 fix group fraction bug 2019-11-05 15:13:47 +01:00
Tor Harald Sandve
485bbfe010 fix group prod 2019-11-05 15:04:26 +01:00
Tor Harald Sandve
9dc536bc82 add computeBhpAtThpLimitInj 2019-11-05 14:18:30 +01:00
Tor Harald Sandve
fb815e78e6 compute resv rates for MSW 2019-11-05 13:11:03 +01:00
Atgeirr Flø Rasmussen
bc71341462
Merge pull request #2125 from totto82/mswThp 
add support for thp control in MSW
 2019-11-04 11:25:20 +01:00
Atgeirr Flø Rasmussen
7922c51adb
Merge pull request #2132 from totto82/gconinje 
Support custom vrep and rein group
 2019-11-04 10:23:33 +01:00
Atgeirr Flø Rasmussen
95aeca322f
Merge pull request #2130 from totto82/reorderThp 
Check THP in the end
 2019-11-04 09:14:24 +01:00
Joakim Hove
24fd019037
Merge pull request #2128 from joakim-hove/P 
Add missing keywords on P
 2019-11-01 17:36:42 +01:00
Markus Blatt
a5506956fb renamed numWells to numLocalWells in BlackoilWellmodel 
as this better reflects that it is not the number of wells in
the whole domain but just the one in the part of the domain
stored in the local process.
 2019-11-01 15:11:21 +01:00
Markus Blatt
905403e2ed Fix BlackoilWellModel::numComponents for parallel runs. 
In the case with active solvent (BlackoilWellModel::has_solvent_ is
true, e.g. case 2D_OILWATER_POLYMER.DATA) and one process have no
wells while another has some this lead to numComponents returning
different values. Later this lead to truncated message in MPI_Allgather.

The underlying problem was the usage of numWells() which returns just
the number of local wells. We resort to using wellsActive which
returns whether there any well active regardless which process knows it.
 2019-11-01 15:07:00 +01:00
Tor Harald Sandve
f23b375c87 Check THP in the end 2019-11-01 14:58:40 +01:00
Tor Harald Sandve
375d936ecd Support custom vrep and rein group 2019-11-01 14:57:50 +01:00
Joakim Hove
7c471688f1 Add missing keywords on P 2019-11-01 14:39:38 +01:00
Tor Harald Sandve
abbff074b4 add support for thp control in MSW 2019-11-01 10:04:44 +01:00
Joakim Hove
29a514754a
Merge pull request #2121 from stefoss23/add_keywords_NOP 
added keywords beginning w/ N, O and P.
 2019-10-31 16:50:08 +01:00
Alf Birger Rustad
8922113869
Merge pull request #2100 from totto82/fixMSW 
BUGFIX. Scale MSW injector
 2019-10-31 15:39:49 +01:00
Steinar Foss
7d84a244d9 added even more keywords beginning w/ P. 2019-10-31 13:16:54 +01:00
Steinar Foss
aff6ce6f77 added keywords beginning w/ N, O and P. 2019-10-30 16:00:16 +01:00
Markus Blatt
10db57f66b Only print usage information on one processes. 
No matter whether requested via --help or printed due to a wrong
command line parameter.

Closes #2012.
 2019-10-29 17:00:24 +01:00
Steinar Foss
01b57da9e1 added keywords beg with N. 2019-10-26 12:54:59 +02:00
Joakim Hove
b58d14bfb0 Add Q keywords as missing features 2019-10-24 17:08:47 +02:00
Steinar Foss
c285b93c2b added more keywords beginning with M. 2019-10-24 11:56:09 +02:00
Tor Harald Sandve
9a3ce14885 scale the gas equation, not the control 2019-10-24 10:54:50 +02:00
Tor Harald Sandve
e1f09d89cd Scale MSW injector 2019-10-24 10:18:16 +02:00
Atgeirr Flø Rasmussen
5d1e125ab9
Merge pull request #2096 from totto82/avoid_nan_density 
avoid nan in the density calculation
 2019-10-22 14:27:45 +02:00
Tor Harald Sandve
775573e3b2 avoid nan in the density calculation 2019-10-22 13:04:29 +02:00
Tor Harald Sandve
5c60a487f9 Add well operability param 2019-10-22 12:57:32 +02:00
Atgeirr Flø Rasmussen
5267f3cf17
Merge pull request #1965 from totto82/killDistr 
Reimplementation of the well control code
 2019-10-22 10:25:32 +02:00
Markus Blatt
9751984021
Merge pull request #2033 from blattms/avoid_equil_grid-rebased 
Avoid using global grid (equilGrid) on non-IO processes.
 2019-10-21 11:47:17 +02:00
Joakim Hove
481c09170a
Merge pull request #2068 from stefoss23/add_keywords_M 
added keywords beginnign w/ M.
 2019-10-20 12:22:24 +02:00
Joakim Hove
5524852a31
Merge pull request #2075 from joakim-hove/use-location 
Use Location class for keyword location
 2019-10-19 23:30:51 +02:00
Joakim Hove
7211cb4486 Use Location class for keyword location 2019-10-19 21:59:10 +02:00
Kai Bao
c4a9bd346c converting the aquifer files to be unix format 
to avoid ^M in git diff and when editing.
 2019-10-19 20:53:35 +02:00
Markus Blatt
3dad4f21e8 Fixed unused parameter warning wehn compiling without MPI. 2019-10-18 16:23:22 +02:00
Markus Blatt
42247105bf Addressed reviewer's comments. 2019-10-18 16:23:22 +02:00
Tor Harald Sandve
cd0bf8045d change control eq tol for standard wells 2019-10-18 16:08:07 +02:00
Tor Harald Sandve
9bd44dc79a quell some more warnings 2019-10-18 16:08:07 +02:00
Arne Morten Kvarving
af2e150118 fixed: missing break 2019-10-18 16:08:07 +02:00
Arne Morten Kvarving
17a6861f09 quell unused parameter warning 2019-10-18 16:08:07 +02:00
Arne Morten Kvarving
33dee9f7f8 quell shadowing warnings 2019-10-18 16:08:07 +02:00
Tor Harald Sandve
47dc94f21e the usual rebase fixup commit 2019-10-18 16:08:07 +02:00
Tor Harald Sandve
5e1ec249cd don't count wells not under group controll when computing guiderates 2019-10-18 16:08:07 +02:00
Tor Harald Sandve
614025b28b clean up the logging message 2019-10-18 16:08:07 +02:00
Tor Harald Sandve
5dcfd1c8f1 check bhp and thp constrains first 2019-10-18 16:08:07 +02:00