Joakim Hove
9955589b48
White space
2020-01-28 20:33:52 +01:00
Joakim Hove
27246b91f4
Merge pull request #2302 from joakim-hove/use-bc
...
Use bc
2020-01-28 11:03:33 +01:00
Bård Skaflestad
53f05a7df6
Chase Runspec Member Update
...
The Runspec class gained a new data member of type SatFuncControls.
Update the serialization code accordingly.
2020-01-25 13:09:49 +01:00
Joakim Hove
c9ef6ac843
Add class BCCconfig to parallelrestart
2020-01-25 09:31:28 +01:00
Arne Morten Kvarving
b9ea08519a
fix serialization after removed member in IOCOnfig
2020-01-24 13:12:40 +01:00
Joakim Hove
54509c7b56
Use (std::vector<std::time_t>&) constructor when serialing TimeMap
2020-01-22 18:49:55 +01:00
Joakim Hove
2cfe1dce7f
Merge pull request #2295 from akva2/noecl_flush_matman
...
Avoid deck usage on non-root processes setting up MaterialLawManager
2020-01-22 15:09:57 +01:00
Arne Morten Kvarving
8b4c5c81cb
update InitConfig serialization
...
new member for gravity was added
2020-01-22 12:56:43 +01:00
Arne Morten Kvarving
1354656f8b
add mpi serialization for EclEpsScalingPointsInfo
2020-01-22 11:35:28 +01:00
Arne Morten Kvarving
468c220bca
add mpi serialization for FaultCollection
2020-01-21 15:00:34 +01:00
Arne Morten Kvarving
d00ee94561
add mpi serialization for Fault
2020-01-21 14:57:40 +01:00
Arne Morten Kvarving
1c311743eb
add mpi serialization for FaultFace
2020-01-21 14:53:59 +01:00
Arne Morten Kvarving
a9bc24618f
add mpi serialization for TransMult
2020-01-21 14:49:40 +01:00
Arne Morten Kvarving
b93efe29f8
add mpi serialization for EclipseConfig
2020-01-21 14:47:08 +01:00
Arne Morten Kvarving
ff8fac563f
add mpi serialization for MULTREGTScanner
2020-01-21 14:41:54 +01:00
Arne Morten Kvarving
252f323fb6
add mpi serialization for MULTREGTRecord
2020-01-21 14:35:11 +01:00
Joakim Hove
d1085466e0
Remove #include GridProperty
2020-01-20 09:00:48 +01:00
Arne Morten Kvarving
72b33edf81
fixed: cannot simply deserialize the udq function table
...
rather we simply create it based on the params as elsewhere.
2020-01-17 10:10:07 +01:00
Arne Morten Kvarving
b2b398e217
fixed: missing Kind in Connection serialization
2020-01-17 10:10:07 +01:00
Bård Skaflestad
b455faf067
Parallel Restart: Chase RFTConfig API Update
...
The RFTConfig object gained a new data member and constructor
argument, in addition to altering the type of the data member
well_open_rft_name from an unordered_set to an unordered_map.
Update serialization code accordingly.
2020-01-14 16:49:33 +01:00
Joakim Hove
0e9535319b
Simulate with only active cells ( #2213 )
...
Use FieldProps implementation for 3D properties
2020-01-13 15:46:50 +01:00
Tor Harald Sandve
cf6cb3016b
use SPE1CASE1_BRINE as test case not SPE1CASE2_BRINE
2020-01-10 10:47:39 +01:00
Arne Morten Kvarving
19a40c6047
update serialization for TableManager and Well due to brine additions
2020-01-09 14:14:38 +01:00
Arne Morten Kvarving
f118ae5036
add mpi serialization for WellBrineProperties
2020-01-09 14:14:38 +01:00
Arne Morten Kvarving
1f8ed78683
add mpi serialization for PvtwsaltTable
2020-01-09 14:14:38 +01:00
Arne Morten Kvarving
b9f8429691
add mpi serialization for BrineDensityTable
2020-01-09 14:14:38 +01:00
Tor Harald Sandve
555de445d3
add test case for brine
2020-01-09 14:14:38 +01:00
Arne Morten Kvarving
b18d5a39c4
fixed: use std::make_tuple instead of initializer list
...
the constructor is explicit with gcc5
2020-01-09 10:29:13 +01:00
Bård Skaflestad
736f647936
Merge pull request #2268 from akva2/noecl_flush_summarycfg
...
Avoid using global ecl state setting up SummaryConfig on non-root processes
2020-01-08 16:48:32 +01:00
Arne Morten Kvarving
fa5f026fe4
add mpi serialization for SummaryConfig
2020-01-08 10:08:30 +01:00
Arne Morten Kvarving
725af1442e
add mpi serialization for SummaryNode
2020-01-08 10:08:30 +01:00
Markus Blatt
7e700c11e0
Move PreconditionerFactory into namespace Opm.
...
This fixes name clashes with DUNE's own factory that is introduced
in DUNE 2.7. Hence it closes issue #2266 .
BTW: Dune's factory has more template parameters than ours.
2020-01-07 17:59:23 +01:00
Kai Bao
6be8d1b4bb
adapting to the interface change from OPM/opm-common#1386
2020-01-07 11:40:06 +01:00
Arne Morten Kvarving
66949e0a59
add mpi serialization for Schedule
2020-01-03 10:55:45 +01:00
Arne Morten Kvarving
16ce8af5e9
add mpi serialization for Actions
2020-01-03 08:47:29 +01:00
Arne Morten Kvarving
9fb68ef289
add mpi serialization for Action::ActionX
2020-01-03 08:41:43 +01:00
Arne Morten Kvarving
92811754a8
add mpi serialization for Action::Condition
2020-01-03 08:39:16 +01:00
Arne Morten Kvarving
a0c2d5b0f6
add mpi serialization for Action::Quantity
2020-01-03 08:37:41 +01:00
Arne Morten Kvarving
2a16051d84
add mpi serialization for Action::AST
2020-01-03 08:36:09 +01:00
Arne Morten Kvarving
2d682a0838
add mpi serialization for ASTNode
2020-01-03 08:34:15 +01:00
Arne Morten Kvarving
5be1955e47
add mpi serialization for Tuning
2020-01-03 08:32:41 +01:00
Arne Morten Kvarving
f461db3316
add mpi serialization for Deck
2020-01-03 08:30:26 +01:00
Arne Morten Kvarving
1860141771
add mpi serialization for DeckKeyword
2020-01-03 08:27:51 +01:00
Arne Morten Kvarving
8ba18cf038
add mpi serialization for Location
2020-01-03 08:24:58 +01:00
Arne Morten Kvarving
4899056717
add mpi serialization for DeckRecord
2020-01-02 15:33:27 +01:00
Arne Morten Kvarving
13de64985a
add mpi serialization for DeckItem
2020-01-02 15:30:48 +01:00
Arne Morten Kvarving
55630acded
add mpi serialization for RFTConfig
2020-01-02 15:27:50 +01:00
Arne Morten Kvarving
b925d75def
add mpi serialization for GConSump
2020-01-02 15:25:03 +01:00
Arne Morten Kvarving
e7f0a00b00
add mpi serialization for GConSale
2020-01-02 15:22:21 +01:00
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
c6e2db1f69
Merge pull request #2259 from akva2/noecl_flush
...
More MPI serialization support
2020-01-02 15:10:06 +01:00
Tor Harald Sandve
77d52e5b53
communicate group rates and add test
2020-01-02 13:57:12 +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
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
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
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
Bård Skaflestad
8a378249f7
Merge pull request #2250 from akva2/noecl_flush
...
More MPI serialization support
2019-12-20 17:08:01 +01:00
Arne Morten Kvarving
d840f4b93b
add mpi serialization for Well::WellProductionProperties
2019-12-20 15:46:54 +01:00
Arne Morten Kvarving
df9977894e
fixed: if not tests failed, do not proceed with update data procedure
2019-12-20 12:32:26 +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
Markus Blatt
3968d23a5a
Merge pull request #2249 from joakim-hove/test-throw
...
Throw std::runtime_error() instead of std::abort() in test failure
2019-12-20 11:28:01 +01:00
Joakim Hove
a86ac2120c
Throw std::runtime_error() instead of std::abort() in test failure
2019-12-20 08:33:08 +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
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
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
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
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
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
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
c7163d66f0
Merge pull request #2231 from akva2/noecl_flush
...
Add MPI serialization support for various class types
2019-12-16 16:01:19 +01:00
Arne Morten Kvarving
6bc3a24762
add mpi serialization for TableSchema
2019-12-16 14:45:54 +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
Arne Morten Kvarving
d9268980f3
add mpi serialization for Opm::ThresholdPressure
2019-12-16 14:28:29 +01:00
Joakim Hove
f28cfec56b
Use throw std::runtime_error() instead of std::abort() in test
2019-12-12 20:25:53 +01:00
Kai Bao
9266b8bd1f
adding a running test for wsegsicd
2019-12-06 10:15:12 +01:00
Arne Morten Kvarving
8d1da2ca06
changed: use std::make_tuple
...
avoid explicit init list constructor with gcc5
2019-12-02 18:35:35 +01:00
Arne Morten Kvarving
272e63410d
fixed: wrap symbols unused without MPI in HAVE_MPI
2019-12-02 18:34:16 +01:00
Joakim Hove
2a45199d37
Add PORO to testdata
2019-11-30 13:52:21 +01:00
Joakim Hove
d4b9e95dfe
Add PORO to testdata
2019-11-29 11:38:00 +01:00
Arne Morten Kvarving
42a268a3cf
Merge pull request #2193 from akva2/add_restart_serialization_test
...
added: test for serializations in ParallelRestart
2019-11-28 15:19:32 +01:00
Arne Morten Kvarving
414f64f46d
changed: only update reference data for tests marked as failures
2019-11-28 11:34:42 +01:00
Arne Morten Kvarving
6a630f9648
add test case for rockcomp
2019-11-28 09:55:47 +01:00
Arne Morten Kvarving
1ca7bdfe47
added: test for serializations in ParallelRestart
2019-11-28 08:58:56 +01:00
Arne Morten Kvarving
0d7b7f6e00
Merge pull request #2189 from akva2/add_diff_as_comment
...
Add ascii diff of changes to data update PR
2019-11-28 08:38:46 +01:00
Joakim Hove
099fbc05d0
Use EclipseState based Schedule constructor
2019-11-27 11:39:16 +01:00
Arne Morten Kvarving
a7332e16cf
added: generate ascii diff in update_reference_data.sh
2019-11-27 09:17:37 +01:00
Joakim Hove
b35e5c10b6
Use EclipseState based Schedule constructor
2019-11-27 00:18:28 +01:00
Atgeirr Flø Rasmussen
e718bf3ccf
Remove unused code.
2019-11-25 11:00:21 +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
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
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
0b6899a135
Comment out failing tests
...
The tests fails due to fix in VFPHelpers.hpp that disallow extrapolation higher then 3.0.
2019-10-18 16:08:07 +02:00
Tor Harald Sandve
88d8e2a68e
don't set the control from the schedule, unfix the restart issue
2019-10-18 16:08:07 +02:00
Tor Harald Sandve
53896ffca8
Use well and group controls from opm-common.
...
This PR remove the usage of well_control_ from opm-core
and instead uses the control classes for wells and groups
from opm-common.
This PR also removes the usage of the group classes from
opm-core.
2019-10-18 16:08:07 +02:00
Arne Morten Kvarving
8261a51e6e
remove libecl dependency
2019-10-15 14:36:05 +02:00
Bård Skaflestad
e33be89e6d
Reimplement 'test_ecl_output' Unit Test Using ESmry
...
This commit switches the 'test_ecl_output' unit test to using the
EclIO::ESmry class from OPM-Common. We add simple alternative
implementations of ecl_get_field_var() and ecl_get_general_var() in
terms of ESmry to avoid rewriting the test code itself.
As class ESmry does currently not support reading non-unified
(separate) summary files (.S000n), we temporarily switch the deck to
using unified output.
2019-10-14 19:43:11 -05:00
Joakim Hove
5b4b52fa5b
Merge pull request #2042 from joakim-hove/remove-gridmanager
...
GridManager - is it in use?
2019-10-11 16:34:36 +02:00
Bård Skaflestad
1b610f06a4
Prepare for Making Summary Writing Independent of LibECL
...
This commit adds requisite libecl includes that are needed as an
intermediate steps for enabling new summary writing independent of
libecl.
2019-10-04 20:32:09 +02:00
Joakim Hove
0961cf6e22
Remove unused #include of grid quantities
2019-10-04 13:48:47 +02:00
Joakim Hove
06107450d6
Uuse new EquilRecord from opm-common
2019-09-23 21:42:41 +02:00
Joakim Hove
bbb9cd3483
Pass sim start argument to SummaryState constructor
2019-09-20 07:40:04 +02:00
Arne Morten Kvarving
d3d9831fc3
changed: ewoms/common -> opm/models/utils
2019-09-19 11:14:36 +02:00
Arne Morten Kvarving
b2ce159509
quell unused variable warning
2019-09-18 13:03:21 +02:00
Atgeirr Flø Rasmussen
b8b3599ac5
Merge pull request #1993 from akva2/namespace_change
...
changed: namespace Ewoms -> namespace Opm
2019-09-09 09:05:19 +02:00
Arne Morten Kvarving
9b8d2c0760
fixed: don't flag error if rfts are missing (most cases lack them)
2019-09-06 15:39:45 +02:00
Arne Morten Kvarving
5599bb6d8c
changed: namespace Ewoms -> namespace Opm
2019-09-05 17:14:38 +02:00
Atgeirr Flø Rasmussen
aff158566e
Merge pull request #1990 from akva2/use_opm_grid_region_mapping
...
changed: remove duplicated regionmapping class
2019-09-05 12:39:33 +02:00
Arne Morten Kvarving
e1696e6d5b
changed: remove duplicated regionmapping class
...
use version from opm-grid
2019-09-04 15:47:52 +02:00
Joakim Hove
3d36565db7
Adapt to enum changes
2019-09-03 22:18:34 +02:00
Arne Morten Kvarving
ba698abfd1
changed: rename ewoms to opm-models
2019-08-23 11:27:16 +02:00
Joakim Hove
890d90e6e0
Change testname for UDQ test
2019-08-13 19:32:17 +02:00
Atgeirr Flø Rasmussen
b7a36a6a72
Merge pull request #1938 from atgeirr/use-foam-module
...
Use foam module
2019-08-09 09:54:33 +02:00
Joakim Hove
95f2d82f22
Enable UDA evaluation for groups
2019-08-08 07:54:17 +02:00
Joakim Hove
63e55bfa8f
Remove use of GroupTree from opm-common
2019-08-07 21:00:53 +02:00
Atgeirr Flø Rasmussen
dfae9d1b32
Add foam integration test.
2019-08-07 10:39:16 +02:00
Joakim Hove
2a1d42edcb
Use class Group2 from opm-common
2019-08-07 07:30:01 +02:00
Kai Bao
a772d1ef03
not extrapolating towards negative in VFP tables
2019-07-31 09:16:44 +02:00
Joakim Hove
54c4fc2f9c
Remove calls to Schedule::getGroups()
2019-07-08 07:18:41 +02:00
Joakim Hove
fd276843f2
Header file Group.hpp moved to Group/Group.hpp
2019-07-05 07:29:26 +02:00
Joakim Hove
9e2d6d1da7
Add UDQ_WCONPROD model to integration testing
2019-06-29 08:25:06 +02:00
Joakim Hove
4bc3c4d808
Revert "Add UDQ_WCONPROD model to integration testing"
2019-06-29 08:21:33 +02:00
Joakim Hove
2a7c576509
Add UDQ_WCONPROD model to integration testing
2019-06-28 12:48:31 +02:00
Kai Bao
24fe1c8fba
more fixing for the tests
2019-06-26 13:19:11 +02:00
Kai Bao
9a2fcdbfd5
fixing warnings in other folder under opm-simulators
2019-06-26 10:48:41 +02:00
Kai Bao
53b15527c2
fixing warnings under simulator/wells
2019-06-26 09:52:38 +02:00
Torbjørn Skille
ff212215a0
Including 10 new regression tests to test suite.
...
All of these regression tests are based on model2.
2019-06-25 14:04:12 +02:00
Andreas Lauser
9a4dd6210a
NNC sorter test: include config.h
...
This caused some issues on my machine and it is supposed to be done by
any compile unit anyway.
2019-06-21 19:06:46 +02:00
Atgeirr Flø Rasmussen
a598734e71
Merge pull request #1890 from akva2/janitoring
...
remove unused variables
2019-06-21 08:33:03 +02:00
Atgeirr Flø Rasmussen
5749a7150c
Move files out of opm/core/simulator.
2019-06-20 11:00:52 +02:00
Atgeirr Flø Rasmussen
fa016a6008
Moved all remaining files out of opm/autodiff.
2019-06-20 11:00:51 +02:00
Atgeirr Flø Rasmussen
a33cfbf0bc
Moved Flow-related classes and files to opm/simulators/flow.
2019-06-20 11:00:51 +02:00
Arne Morten Kvarving
34bcccef9c
remove unused variables
...
quells warnings
2019-06-19 11:59:43 +02:00
Joakim Hove
2950faece0
Extract the Summary::eval() call from the output call
2019-06-19 09:51:46 +02:00
Joakim Hove
7f1970af3c
Use the shared SummaryState instance when initializing well rates
2019-06-17 07:49:55 +02:00
Kai Bao
3dcec6a436
removing StandardWellV
2019-06-13 14:49:04 +02:00
Atgeirr Flø Rasmussen
2c5ef367dd
Merge pull request #1852 from atgeirr/flexible-linear-solver
...
Flexible linear solver
2019-06-06 14:21:51 +02:00
Atgeirr Flø Rasmussen
72ae444566
Fixes for Dune < 2.6.
...
The PreconditionerFactory requires 2.6, so this is addressed by
simply not using that code at all for Dune < 2.6. No FlexibleSolver
etc.
2019-06-06 09:10:43 +02:00
Atgeirr Flø Rasmussen
c21fd6f26d
Add and use PreconditionerFactory class.
...
This replaces the makePreconditoner() function. The main advantage
is that it is extensible, making it easy to for example add new
preconditioners to the factory at runtime. It supports both parallel
and serial preconditioners.
2019-06-05 15:12:52 +02:00
Joakim Hove
47f4e750d2
Merge pull request #1865 from joakim-hove/use-shared-summarystate
...
Use shared summarystate
2019-06-04 09:49:56 +02:00
Bård Skaflestad
6c0e5fb5a1
Merge pull request #1833 from tskille/run-regressionTest
...
run compareECL once, checking all files in one go
2019-06-03 11:50:50 +02:00
Atgeirr Flø Rasmussen
866db1c66d
Revise json file for test after changing expected structure.
2019-06-03 11:42:30 +02:00
Atgeirr Flø Rasmussen
a76b19d95a
Make FlexibleSolver feature-complete.
...
In particular:
- Add parallel solvers and preconditioners.
- Add the update() interface to preconditioners, and use it with CPR.
2019-06-03 11:42:30 +02:00
Halvor Møll Nilsen
ec498086a6
Add flexible solver and preconditioner infrastructure.
...
Also use it in flow_blackoil_dunecpr.cpp. Adds new command-line parameter,
--linear-solver-configuration-json-file, to read linear solver config from
JSON-format file at runtime.
2019-06-03 11:42:30 +02:00
Torbjørn Skille
0d916193b2
updated run-regressionTest.sh, added support for ignore_extra
2019-06-03 11:17:32 +02:00
Joakim Hove
a0aa7fcc2b
Use shared SummaryState when instantiating WellsManager
2019-05-29 07:44:23 +02:00
Joakim Hove
511645d12c
Use InjectionControls and ProductionControls data classes
2019-05-23 16:27:17 +02:00
Joakim Hove
b6840db604
Use new well implementation Well2 from opm-common
2019-05-22 21:47:45 +02:00
Bård Skaflestad
c4134fba76
Update Data: Make Protocol Aware of RFT Files
...
If a simulation run intentionally changes an RFT file, then that
change should be reflected in the new reference data.
2019-05-16 13:38:57 +02:00
Torbjørn Skille
a7fd029cbe
run compareECL once, checking all files in one go
2019-05-10 15:25:14 +02:00
Arne Morten Kvarving
cdd1048b68
changed: compareECL now needs -t UNRST
...
previously this was the default, now the default is to compare
files of all types.
2019-05-09 07:55:05 +02:00
Arne Morten Kvarving
c4bcd9e467
Merge pull request #1814 from tskille/master
...
updated test scripts to use eclipse compatible restart
2019-05-08 14:25:14 +02:00
Markus Blatt
d2efdcfaa5
Implement correct ignore thresholds for NNC with/without EDITNNC.
...
It seems like eclipse ignores NNCs with small transmissibility.
Small means less than 1e-6 for Eclipse (Even if it says that it
is ignoring values below 1e-5 and/or zero values)!.
This commit now implements the same threshold during IO.
Also fixes a bug when applying EDITNNC, it needs to have cell1<=cell2 to work.
2019-05-08 13:50:51 +02:00
Atgeirr Flø Rasmussen
c17adf788f
Moved files to opm/simulators/ subdirs.
2019-05-08 12:58:19 +02:00
Andreas Lauser
d329547463
EclProblem: clean up the time management code
...
- when an episode/report step is over, the next is started by endEpisode()
- the problem does not deal with updating the simulation time anymore
- rename `episodeIdx` in to `reportStepIdx` the 'EclWriter' because
this variable is -- and always has been -- the report step number
used by some parts of `opm-output`'s ECL writing code (the report
step number is equivalent to the episode index plus 1). IMO, the
output and parser code should be made more consistent in regard of
whether it expects 0-based or 1-based indices, but this is a story
for another day.
2019-05-03 14:07:15 +02:00
Andreas Lauser
d9be3393d7
equil test decks: make them feature one time step
...
the output writing code has issues if no time steps are specified...
2019-05-03 14:06:41 +02:00
Torbjørn Skille
a9c7d11235
updated test scripts to use eclipse compatible restart
2019-05-02 11:35:26 +02:00
Markus Blatt
c9a06f8bb6
Initialize all members of Opm::Data::Connection
2019-04-25 10:00:59 +02:00
Joakim Hove
63f6f34906
Merge pull request #1781 from andlaus/adapt_to_checkDeck_changes
...
also pass the parseContext and errorGuard to Opm::checkDeck()
2019-04-05 12:07:40 +02:00
Andreas Lauser
6f1018f11a
also pass the parseContext and errorGuard to Opm::checkDeck()
2019-04-04 18:13:36 +02:00
Kai Bao
ca69e2334a
recovering well restart data for multisegment well
...
When multisegment wells are involved for RESTART, based on the recovered
segment-related quantities as Opm::data::Segment objects, the segment
phase rates and segment pressure are recovered as part of the
WellStateFullyImplicitBlackoil.
2019-04-04 16:22:19 +02:00
Bård Skaflestad
dce27c6829
WellState FIBO: Return Segment Vectors from report()
...
This commit extends class WellStateFullyImplictBlackoil to report
segment-related quantities as Opm::data::Segment objects (included
in Opm::data::WellRates objects). All wells have at least a top
segment in the context of WellState FIBO, so there is a meaningful
value to report for each well.
We put the extraction of segment-related quantities into a new
helper function
WellStateFullyImplicitBlackoil::reportSegmentResults()
to avoid cluttering up the body of report() more than absolutely
needed.
The primary use-case for this is assigning appropriate values to
items 8 through 11 of restart vector RSEG. In turn, this will
enable restoring these quantities from a restart file.
2019-04-04 16:22:19 +02:00
Bård Skaflestad
55e452c605
Well State FIBO: Report() Segment Results by Seg-Numbers
...
This commit adds a new data member, seg_number_, that maps a linear
segment index (0 .. #segments - 1) to the appropriate segment number
(segment ID). This ensures that member function report() is able to
produce segment results in terms of user-assigned segment numbers
rather than linear indices internal to the simulator and its state
variables. This, in turn, decouples the well state object from the
output (summary/restart) code and makes the restart facility more
self contained.
Rewrite the unit test for WellStateFullyImplicitBlackoil to account
for the new indexing scheme when assigning the synthetic segment
results.
While here, also abide by the file's naming convention for data
members and locals.
2019-04-04 16:22:19 +02:00
Bård Skaflestad
45689f3ade
WellState FIBO (test): Add Some Vertical Spacing for Separation
...
Suggested by: [at]GitPaean
2019-04-04 16:22:19 +02:00
