Commit Graph

1306 Commits

Author SHA1 Message Date
Arne Morten Kvarving
d791636919 remove old serialization support for WellGuideRate 2020-03-19 09:31:07 +01:00
Arne Morten Kvarving
c4e3d9c806 add necessary explicit template instantations 2020-03-19 09:31:07 +01:00
Arne Morten Kvarving
eb53bb0db9 remove old serialization support for DynamicVector 2020-03-19 09:31:07 +01:00
Arne Morten Kvarving
faffa0678b remove old serialization support for Deck 2020-03-19 09:31:07 +01:00
Arne Morten Kvarving
81663e2942 remove old serialization support for Action::Actions 2020-03-19 09:31:07 +01:00
Arne Morten Kvarving
781b11fb07 remove old serialization support for Action::Condition 2020-03-19 09:31:07 +01:00
Arne Morten Kvarving
18a1e735fb remove old serialization support for Action::Quantity 2020-03-19 09:31:07 +01:00
Arne Morten Kvarving
5c89c48554 remove old serialization support for Action::AST 2020-03-19 09:31:07 +01:00
Arne Morten Kvarving
2c1d45ea54 remove old serialization support for ActionX 2020-03-19 09:31:07 +01:00
Arne Morten Kvarving
c5f36bd7cc remove old serialization support for DeckKeyword 2020-03-19 09:31:07 +01:00
Arne Morten Kvarving
a289008c96 remove old serialization support for Location 2020-03-19 09:31:07 +01:00
Arne Morten Kvarving
96cadcc43a remove old serialization support for DeckRecord 2020-03-19 09:31:07 +01:00
Arne Morten Kvarving
d9ab0e7522 remove old serialization support for ASTNode 2020-03-19 09:31:07 +01:00
Arne Morten Kvarving
195bb87712 remove old serialization support for DeckItem 2020-03-19 09:31:07 +01:00
Arne Morten Kvarving
32176b90ef remove old serialization support for GConSump 2020-03-19 09:31:07 +01:00
Arne Morten Kvarving
486c9ce8dd remove old serialization support for GConSale 2020-03-19 09:31:07 +01:00
Arne Morten Kvarving
52bd4cb81c remove old serialization support for GuideRateConfig 2020-03-19 09:31:07 +01:00
Arne Morten Kvarving
1d254914e1 remove old serialization support for GuideRateModel 2020-03-19 09:31:07 +01:00
Arne Morten Kvarving
7389959b88 remove old serialization support for WListManager 2020-03-19 09:31:07 +01:00
Arne Morten Kvarving
778f1cfb8e remove old serialization support for WellTestConfig 2020-03-19 09:31:07 +01:00
Arne Morten Kvarving
a936523165 remove old serialization support for MessageLimits 2020-03-19 09:31:07 +01:00
Arne Morten Kvarving
07d91add01 remove old serialization support for Tuning 2020-03-19 09:31:07 +01:00
Arne Morten Kvarving
9071072565 remove old serialization support for Events 2020-03-19 09:31:07 +01:00
Arne Morten Kvarving
e5e8c0c516 remove old serialization support for OilVaporiationProperties 2020-03-19 09:31:07 +01:00
Arne Morten Kvarving
c00d2f2cb3 remove old serialization support for TimeMap 2020-03-19 09:31:07 +01:00
Arne Morten Kvarving
bbf3b80b3a remove old serialization support for RFTConfig 2020-03-19 09:31:07 +01:00
Arne Morten Kvarving
6d74eb8e88 remove old serialization support for RestartConfig 2020-03-19 09:31:07 +01:00
Arne Morten Kvarving
e87ec7b5a4 remove old serialization support for TimeStampUTC 2020-03-19 09:31:07 +01:00
Arne Morten Kvarving
563e1d9fbc
Merge pull request #2482 from joakim-hove/remove-removed
Remove numRemoved member from WellConnections
2020-03-19 09:29:02 +01:00
Bård Skaflestad
3b67bee169
Merge pull request #2476 from blattms/rely-on-persistent-local-id
Rely on local ids being persistent across grid modifications
2020-03-18 22:51:06 +01:00
T.D. (Tongdong) Qiu
fdcf46792a BdaBridge and WellContributions are only included and compiled when CUDA is found 2020-03-18 19:03:14 +01:00
Joakim Hove
006b87050d Remove numRemoved member from WellConnections 2020-03-18 15:41:21 +01:00
T.D. (Tongdong) Qiu
d29b6a6e5e Removed unnecessary line continuation chars. Merged unsupported cases in switch 2020-03-18 15:14:38 +01:00
T.D. (Tongdong) Qiu
009b5076a4 Removed CPU implementation of WellContributions 2020-03-18 15:08:48 +01:00
Joakim Hove
805236ee22 Move Connection ordering attribute from Well to WellConnections 2020-03-18 14:28:29 +01:00
T.D. (Tongdong) Qiu
ce73337769 Disable GPU when using MPI 2020-03-18 13:53:40 +01:00
Arne Morten Kvarving
f12c83bd8e remove old serialization support for TableManager 2020-03-17 12:29:35 +01:00
Arne Morten Kvarving
258fed1bd5 remove old serialization support for Tabdims 2020-03-17 12:29:16 +01:00
Arne Morten Kvarving
8a3cb58981 remove old serialization support for Aqudims 2020-03-17 12:27:59 +01:00
Arne Morten Kvarving
6c8ff61c1c remove old serialization support for PlyvmhTable 2020-03-17 12:27:59 +01:00
Arne Morten Kvarving
05d02dcd66 remove old serialization support for TableSchema 2020-03-17 12:27:59 +01:00
Arne Morten Kvarving
7f2f1309bd remove old serialization support for TableContainer 2020-03-17 12:27:59 +01:00
Arne Morten Kvarving
198ea25dcb remove old serialization support for TableColumn 2020-03-17 12:27:59 +01:00
Arne Morten Kvarving
1459b8bfd1 remove old serialization support for StandardCond 2020-03-17 12:27:59 +01:00
Arne Morten Kvarving
9002949707 remove old serialization support for SolventDensityTable 2020-03-17 12:27:59 +01:00
Arne Morten Kvarving
c409f7a084 remove old serialization support for SkprpolyTable 2020-03-17 12:27:59 +01:00
Arne Morten Kvarving
d9e28a7129 remove old serialization support for SimpleTable 2020-03-17 12:27:59 +01:00
Arne Morten Kvarving
4ad1353e53 remove old serialization support for RocktabTable 2020-03-17 12:27:59 +01:00
Arne Morten Kvarving
44cab76c57 remove old serialization support for Rock2dtrTable 2020-03-17 12:27:59 +01:00
Arne Morten Kvarving
cda171ff47 remove old serialization support for Rock2dTable 2020-03-17 12:27:59 +01:00
Arne Morten Kvarving
6f070e6bcf remove old serialization support for Regdims 2020-03-17 12:27:59 +01:00
Arne Morten Kvarving
2784dc5800 remove old serialization support for PvtgTable, PvtoTable, PvtxTable 2020-03-17 12:27:59 +01:00
Arne Morten Kvarving
5c5afb1b4a remove old serialization support for PvtwsaltTable 2020-03-17 12:27:59 +01:00
Arne Morten Kvarving
cfe091ce1e remove old serialization support for PolyInjTable, SkprwatTable, PlymwinjTable 2020-03-17 12:27:59 +01:00
Arne Morten Kvarving
937a27471b remove old serialization support for PlyshlogTable 2020-03-17 12:27:59 +01:00
Arne Morten Kvarving
3a440a5388 remove old serialization support for JFunc 2020-03-17 12:27:59 +01:00
Arne Morten Kvarving
e46cd524e4 remove old serialization support for WatdentTable 2020-03-17 12:27:59 +01:00
Arne Morten Kvarving
d76769d738 remove old serialization support for ViscrefTable 2020-03-17 12:27:59 +01:00
Arne Morten Kvarving
b1b3223f83 remove old serialization support for TlmixparTable 2020-03-17 12:27:59 +01:00
Arne Morten Kvarving
1f952e214c remove old serialization support for Stone1exTable 2020-03-17 12:27:59 +01:00
Arne Morten Kvarving
7820a887d4 remove old serialization support for ShrateTable 2020-03-17 12:27:59 +01:00
Arne Morten Kvarving
da136522ba remove old serialization support for PlmixparTable 2020-03-17 12:27:59 +01:00
Arne Morten Kvarving
5feeedaacd remove old serialization support for PvcdoTable 2020-03-17 12:27:59 +01:00
Arne Morten Kvarving
775e5a4802 remove old serialization support for RockTable 2020-03-17 12:27:59 +01:00
Arne Morten Kvarving
46c2144275 remove old serialization support for PvtwTable 2020-03-17 12:27:59 +01:00
Arne Morten Kvarving
720b305ef2 remove old serialization support for DensityTable 2020-03-17 12:27:59 +01:00
Arne Morten Kvarving
92dd3314d7 remove old serialization support for Eqldims 2020-03-17 12:27:59 +01:00
Arne Morten Kvarving
1d279ac245 remove old serialization support for DenT 2020-03-17 12:27:59 +01:00
Arne Morten Kvarving
a3398d58d2 remove old serialization support for ColumnSchema 2020-03-17 12:27:59 +01:00
Markus Blatt
5fc248f786 Rely on local ids being persistent across grid modifications
as the issue in CpGrid was fixed, recently.
2020-03-17 12:26:30 +01:00
Arne Morten Kvarving
dc21682b3e remove old serialization support for BrineDensityTable 2020-03-17 11:41:07 +01:00
Arne Morten Kvarving
c9f810e18e remove old serialization support for AquiferConfig 2020-03-17 11:41:07 +01:00
Arne Morten Kvarving
4a34e7336c remove old serialization support for Aquifetp 2020-03-17 11:41:07 +01:00
Arne Morten Kvarving
52508559bb remove old serialization support for AquiferCT 2020-03-17 11:41:07 +01:00
Arne Morten Kvarving
dca5b06045 remove old serialization support for Aquancon 2020-03-17 11:41:07 +01:00
Arne Morten Kvarving
6ce41ba87b remove unused template 2020-03-16 20:52:17 +01:00
Arne Morten Kvarving
327ae5ce11 remove old serialization support for UDQParams 2020-03-16 20:52:17 +01:00
Arne Morten Kvarving
d7cfb92edc remove old serialization support for UDQCOnfig 2020-03-16 20:52:17 +01:00
Arne Morten Kvarving
e165bd56a5 remove old serialization support for UDQIndex 2020-03-16 20:52:17 +01:00
Arne Morten Kvarving
18365bf709 remove old serialization support for UDQDefine 2020-03-16 20:52:17 +01:00
Arne Morten Kvarving
878885e61f remove old serialization support for UDQAssign 2020-03-16 20:52:17 +01:00
Arne Morten Kvarving
89fcc588e8 remove old serialization support for UDQActive 2020-03-16 20:52:17 +01:00
Arne Morten Kvarving
c07fa535bd remove old serialization support for UDQASTNode 2020-03-16 20:52:17 +01:00
Arne Morten Kvarving
30535b472a remove old mpi serialization support for Runspec 2020-03-16 20:52:17 +01:00
Arne Morten Kvarving
e504f68b72 remove old mpi serialization support for SatFuncControls 2020-03-16 20:52:17 +01:00
Arne Morten Kvarving
00da8bcaaf remove old mpi serialization support for Actdims 2020-03-16 20:52:17 +01:00
Arne Morten Kvarving
a701c9267e remove old mpi serialization support for EclHysterConfig 2020-03-16 20:52:17 +01:00
Arne Morten Kvarving
808b7cc7f4 remove old mpi serialization support for WellSegmentDims 2020-03-16 20:52:17 +01:00
Arne Morten Kvarving
13c8aa6ddb remove old mpi serialization support for Welldims 2020-03-16 20:52:17 +01:00
Arne Morten Kvarving
138673f69c remove old mpi serialization support for EndpointScaling 2020-03-16 20:52:17 +01:00
Arne Morten Kvarving
6fde65439d remove old serialization support for Phases 2020-03-16 14:23:40 +01:00
Arne Morten Kvarving
d3115c7afd
Merge pull request #2468 from akva2/serialize_internal_eclstate_part3
Internal serialization in EclipseState - part 3
2020-03-16 14:21:50 +01:00
Joakim Hove
65f4635e20
Merge pull request #2464 from joakim-hove/relperm-diag-no-deck
Relperm diag no deck
2020-03-16 13:28:44 +01:00
Arne Morten Kvarving
d1b04944d7 remove old serialization support for EclipseConfig 2020-03-16 13:00:02 +01:00
Arne Morten Kvarving
4d5d25bcb6 remove old serialization support for IOConfig 2020-03-16 13:00:02 +01:00
Arne Morten Kvarving
fbe739ec9b remove old serialization support for InitConfig 2020-03-16 13:00:02 +01:00
Arne Morten Kvarving
0dfdb29851 remove old serialization support for FoamConfig, FoamData 2020-03-16 13:00:02 +01:00
Arne Morten Kvarving
542a10e426 remove old serialization support for Equil, EquilRecord 2020-03-16 13:00:02 +01:00
T.D. (Tongdong) Qiu
d067c08be7 Added header to CMake_files, updated copyright year 2020-03-16 12:57:35 +01:00
Arne Morten Kvarving
edca0f7da0 add necessary explicit template instantations 2020-03-16 11:53:51 +01:00
Arne Morten Kvarving
d342ef5c5c remove old serialization support for Fault, FaultCollection, FaultFace 2020-03-16 11:44:13 +01:00
Arne Morten Kvarving
0212c5e9be remove old serialization support for TransMult 2020-03-16 11:44:13 +01:00
Arne Morten Kvarving
aad289841a remove old serialization support for MULTREGTScanner 2020-03-16 11:44:13 +01:00
Arne Morten Kvarving
e6a117abec changed: clear string, do not assert on it being empty
causes issues when deserializing default init classes
with values for string members.
2020-03-16 10:49:42 +01:00
Arne Morten Kvarving
fa3cccdd64 remove old serialization support for SimulationConfig 2020-03-16 10:49:42 +01:00
Arne Morten Kvarving
be74b0903a remove old serialization support for RockConfig 2020-03-16 10:49:42 +01:00
Arne Morten Kvarving
855baf2cb6 remove old serialization support for BCConfig 2020-03-16 10:49:42 +01:00
Arne Morten Kvarving
33cf3826aa remove old serialization support for ThresholdPressure 2020-03-16 10:49:42 +01:00
Arne Morten Kvarving
cdb19da0bd remove old serialization support for GridDims 2020-03-16 10:49:41 +01:00
Arne Morten Kvarving
a576c786dd remove old serialization support for NNC and EDITNNC 2020-03-16 10:49:41 +01:00
Jostein Alvestad
6a659339f1 various corrections to code and coding style 2020-03-16 10:39:56 +01:00
Jostein Alvestad
3f81d68c0a corrections due to rebase to current master 2020-03-16 10:39:54 +01:00
Jostein Alvestad
4006319ff7 further changes to report currentStatusGroupControls to Summary 2020-03-16 10:39:52 +01:00
Jostein Alvestad
0dcacb41d4 intial changes to add current group controls to summary 2020-03-16 10:39:51 +01:00
Arne Morten Kvarving
9cf815ab95 remove unused templates 2020-03-16 08:20:44 +01:00
Arne Morten Kvarving
1e7816a194 remove unnecessary includes 2020-03-16 08:20:44 +01:00
Arne Morten Kvarving
38023fac21 changed: use EclMpiSerializer for Schedule 2020-03-16 08:20:44 +01:00
Kai Bao
3af1d852ef removing WSEGVALV from MissingFeatures.cpp 2020-03-13 22:18:29 +01:00
Markus Blatt
a45c278c4a
Merge pull request #2458 from blattms/use-indices-for-modifying-matrices
Do not use local id set to index matrices.
2020-03-13 20:10:17 +01:00
Markus Blatt
1c2d3fbcc7 Do not use local id set to index matrices.
That the local ids were consecutive and starting from 0 was just
a coincidence and they should never be used to access linear systems
or vectors. This commit fixes this by using the correct mappers instead.

Note the we removed some computations from the constructor of
ISTLSolverEbosCpr as it inherits from ISTLSolverEbos and the operations
already happnen in constructor of the base class.
2020-03-13 17:56:49 +01:00
Arne Morten Kvarving
3180974e63
Merge pull request #2471 from akva2/fix_no_mpi
fixed: do not build ParallelRestart test without MPI
2020-03-13 17:53:59 +01:00
Arne Morten Kvarving
c40c733a57 fixed: build without MPI 2020-03-13 17:52:37 +01:00
Markus Blatt
e65f6c02bb
Merge pull request #2220 from andrthu/owners-first
[For testing] Enable "owners first" ordering. Altered SpMV, SP and ILU.
2020-03-13 17:48:22 +01:00
andrthu
3d0d0f9624 Remove GhostLast ILU 2020-03-13 15:03:31 +01:00
T.D. (Tongdong) Qiu
581cbc6a3e cusparseSolver can now apply wellcontributions separately, so --matrix-add-wellcontributions=true is not required anymore 2020-03-13 14:21:59 +01:00
Arne Morten Kvarving
d8028dfa1b remove old serialization support for SummaryNode 2020-03-13 14:09:17 +01:00
Joakim Hove
8473aa38e5 Remove Deck argument to RelpermDiagnostic 2020-03-13 08:54:30 +01:00
Arne Morten Kvarving
a8b3d05c52 changed: move the serialization template definitions for generic scalars to the header
this to avoid having to explicitly instance the templates for
various enums when serialization functions are moved into classes
2020-03-12 10:42:49 +01:00
Bård Skaflestad
1af796257c
Merge pull request #2348 from goncalvesmachadoc/patch-1
Add missing keywords to list
2020-03-11 15:40:02 -05:00
Bård Skaflestad
21dc2620fd
Merge pull request #2453 from akva2/eclstate_serialize
drop serialization from ParallelEclipseState
2020-03-11 12:15:46 -05:00
andrthu
c91eb330d3 remove 2.6 and move ownerFirst in lb 2020-03-11 12:42:55 +01:00
andrthu
866a661255 New owners-first based linear algebra operations (SoMV, SP and ILU.apply). 2020-03-11 12:41:38 +01:00
Arne Morten Kvarving
5b457cbbd6
Merge pull request #2446 from blattms/use-compressed-in-initstateequil.hh
Autocreate parallel fieldprops and use compressed ones in initstateequil.hh
2020-03-11 08:14:21 +01:00
Bård Skaflestad
c53d8c58f7
Merge pull request #2450 from akva2/serializer_summaryconfig
use eclmpiserializer for SummaryConfig broadcast
2020-03-10 20:32:06 -05:00
Bård Skaflestad
8700ea1310
Merge pull request #2451 from akva2/followup_stonetype
update serialization for relocated KrModel
2020-03-10 07:58:43 -05:00
Arne Morten Kvarving
10af852d1e drop serialization from ParallelEclipseState
now done in base class
2020-03-10 13:24:30 +01:00
Arne Morten Kvarving
a7e3a69d8f
Merge pull request #2449 from akva2/dynstate_general
put the specialized DynamicState serialization functions in normal hierarchy
2020-03-10 12:31:22 +01:00
Markus Blatt
04311f6337 Allow auto creation of field properties arrays in ParallelEclipseState.
There are field properties that can usually be queried even if they
are not explicitly specified in the input
file (e.g. PVTNUM). Unfortunately, the ParallelEclipseState cannot
forsee which of these will be queried at startup and after the
loadbalancing only the master process is able to auto creates
these (easily). Hence this commit uses a fall-back if an unstored
keyword is queried. In this case we use get_global-* to auto create
the keyword and use functions of the cartesian mapper to extract the
relevant values on the process.

Of course this temporarily wastes space and we might want to resort to
a more memory savy approach later.
2020-03-10 11:36:02 +01:00
Markus Blatt
f4876becfb Improve exception handling in ParallelEclipseState::get_global-*
In particular we make sure that all processes throw on unknown
keywords.
2020-03-10 11:36:02 +01:00
Arne Morten Kvarving
a1e9e2a190 update serialization for relocated KrModel 2020-03-10 10:38:12 +01:00
Arne Morten Kvarving
e1bf6ed4a6 use eclmpiserializer for SummaryConfig broadcast 2020-03-10 10:01:26 +01:00
Arne Morten Kvarving
ab5ca03027 put the specialized DynamicState serialization functions in normal hierarchy
i am confident it is okay to do this in general now.
2020-03-10 09:57:47 +01:00
Arne Morten Kvarving
dd0f6dd517 changed: simplify eclmpiserializer
now users only have to implement a single method for
packsize/pack/unpack
2020-03-10 08:56:40 +01:00
Markus Blatt
1e65a1421b
Merge pull request #2448 from akva2/serialize_aquifer_config
fixed: serialize AquiferConfig
2020-03-10 08:37:22 +01:00
Joakim Hove
bb29ad1060
Merge pull request #2392 from joakim-hove/welltype
Add serialization for WellType
2020-03-09 16:40:35 +01:00
Atgeirr Flø Rasmussen
724adc31cb
Merge pull request #2436 from akva2/no_serialization_matman
No need to serialize MaterialLawManager any longer
2020-03-09 16:05:46 +01:00
Arne Morten Kvarving
0088073d05 fixed: serialize AquiferConfig 2020-03-09 15:58:55 +01:00
Joakim Hove
3ab0e570c7 Use WellType when serializing and constructing Well 2020-03-09 14:45:44 +01:00
Joakim Hove
69871fdefd Add serialization for WellType 2020-03-09 14:45:44 +01:00
Joakim Hove
bbbf3c42fd
Merge pull request #2414 from joakim-hove/serialize-dimension
Update serialization of Dimension class
2020-03-09 13:28:15 +01:00