OilfieldToolsNet/opm-common
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
1,081 Commits 18 Branches 75 Tags 73 MiB
a216d61377
Commit Graph

1081 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Arne Morten Kvarving
81ccf49424 changed: rename initFromDeck to initParamsForElements 
there is no deck dependent code now
 2020-01-29 08:48:39 +01:00
Arne Morten Kvarving
e96c7d9cbc changed: check for SPECROCK in tables instead of checking deck for keyword 2020-01-29 08:42:16 +01:00
Arne Morten Kvarving
31d5347d73 Merge pull request #389 from akva2/hide_fprops_ifaces 
don't use templated get and has interface from fieldpropsmanager
 2020-01-28 15:34:02 +01:00
Arne Morten Kvarving
1cd88d27d7 don't use templated get and has interface from fieldpropsmanager 
it is now private
 2020-01-27 15:32:32 +01:00
Markus Blatt
3be6b7de6e Merge pull request #388 from bska/fix-oob-indexing 
Don't Index Out of Bounds
 2020-01-25 17:21:42 +01:00
Bård Skaflestad
2f827bfae5 Don't Index Out of Bounds 
The phaseIsActive_ array has size numPhases.  We must not form the
expression phaseIsActive_[numPhases].  Switch to using fill_n in
place of fill lest we have to write

    fill(&phaseIsActive_[0], &phaseIsActive_[0] + numPhases, v)
 2020-01-24 20:44:26 +01:00
Joakim Hove
f36d181279 Merge pull request #387 from akva2/noecl_flush_matman 
MPI serialization support for MaterialLawManager
 2020-01-22 15:09:38 +01:00
Arne Morten Kvarving
73b9e32d88 add mpi serialization for EclMaterialLawManager 2020-01-22 11:26:45 +01:00
Arne Morten Kvarving
ee17c70ade add mpi serialization for EclHysteresisConfig 2020-01-22 11:26:45 +01:00
Arne Morten Kvarving
e58d8675ee add serialization support for EclEpsConfig 2020-01-22 11:26:45 +01:00
Arne Morten Kvarving
908b2d1aa6 add equality operator to EclEpsScalingPointsInfo 2020-01-22 11:26:45 +01:00
Joakim Hove
2f53cb9616 Merge pull request #386 from akva2/fix_enums 
fixed: enum member in EclMultiplexerApproach clashes with EclTwoPhaseApproach enum
 2020-01-21 14:49:55 +01:00
Arne Morten Kvarving
93df3fa6d5 fixed: enum member in EclMultiplexerApproach clashes with EclTwoPhaseApproach enum 
fix by converting both to enum class
 2020-01-21 13:22:00 +01:00
Bård Skaflestad
1b5206200c Merge pull request #384 from akva2/reorganize_matlaw 
Reorganize EclMaterialLawManager
 2020-01-21 12:57:26 +01:00
Arne Morten Kvarving
9af6f1fe4d changed: do not call initParamsForElements in initFromDeck 2020-01-21 11:32:57 +01:00
Arne Morten Kvarving
14eff62913 changed: make initParamsForElements public 2020-01-21 11:32:57 +01:00
Arne Morten Kvarving
fcf113509e remove unnecessary parameters 
these are class members. no need to pass them as parameters
 2020-01-21 11:32:57 +01:00
Arne Morten Kvarving
064930de95 EclMaterialLawManager: reorganize to better separate deck and deck-independent code 
in the process some of the config vars are moved to members
 2020-01-21 11:32:56 +01:00
Arne Morten Kvarving
5cfd584e89 changed: put the phase active status in member vars 
and chase the deck usages it eliminates. to prepare for
parallel setup without deck access
 2020-01-21 11:32:14 +01:00
Bård Skaflestad
fe5760beb4 Merge pull request #383 from akva2/add_blackoil_serialization 
Add serialization support for BlackoilFluidSystem
 2020-01-21 10:41:32 +01:00
Arne Morten Kvarving
20b5f5f4bf changed: store stone etas in a member 
thus we avoid deck usage in initThreePhaseParams_
 2020-01-20 14:59:59 +01:00
Joakim Hove
c68202eada Merge pull request #382 from joakim-hove/remove-eclipse3d 
Remove #include GridProperty.hpp
 2020-01-20 11:35:14 +01:00
Arne Morten Kvarving
44d81819f6 add serialization support for BlackoilFluidSystem 2020-01-20 11:16:19 +01:00
Arne Morten Kvarving
e2841d943c use std::array instead of C array 
motivation: simpler serialization
 2020-01-20 11:16:14 +01:00
Joakim Hove
429d008eb6 Remove #include GridProperty.hpp 2020-01-20 08:42:00 +01:00
Joakim Hove
028e53e7d7 Merge pull request #380 from joakim-hove/only-active-cells 
Use FieldProps implementation for 3D properties
 2020-01-13 15:47:22 +01:00
Joakim Hove
ce989e6a64 Use FieldPropsManager unconditionally 2020-01-11 07:01:07 +01:00
Joakim Hove
a2d728724d Merge pull request #381 from totto82/trinemykk-smartwater 
Trinemykk smartwater
 2020-01-11 06:50:36 +01:00
Tor Harald Sandve
fdfe8cbbb2 allow constructing ConstCompressibilityBrinePvt from data 
also add accessors and equality operator
    and adapt multiplexer to brine
 2020-01-09 11:04:18 +01:00
Trine S. Mykkeltvedt
36eda7f17e renamed saltwater-->brine and fixed other things commented in review 2020-01-07 09:30:08 +01:00
Trine S. Mykkeltvedt
1841b05b16 implemented simple salt/brine option 2020-01-07 09:30:08 +01:00
Bård Skaflestad
8d5d8ad26c Merge pull request #379 from akva2/noecl_flush 
More serialization preparation
 2019-12-19 17:42:13 +01:00
Arne Morten Kvarving
4606f7e752 allow constructing WaterPvtThermal from data 
also add accessors, assignment operator and equality operator
 2019-12-19 14:21:40 +01:00
Arne Morten Kvarving
c1b55c4364 allow constructing WaterPvtMultiplexer from data 
also add accessors, assignment operator and equality operator
 2019-12-19 14:19:40 +01:00
Arne Morten Kvarving
125ab46c71 allow constructing ConstCompressibilityWaterPvt from data 
also add accessors and equality operator
 2019-12-19 14:19:01 +01:00
Arne Morten Kvarving
9966756ef1 allow constructing OilPvtThermal from data 
also add accessors and equality operator
 2019-12-19 14:18:01 +01:00
Arne Morten Kvarving
0d53ec6e3f allow constructing OilPvtMultiplexer from data 
also add accessors, assignment operator and equality operator
 2019-12-19 14:14:58 +01:00
Arne Morten Kvarving
788ec7eb6a allow constructing LiveOilPvt from data 
also add accessors and equality operator
 2019-12-19 14:14:58 +01:00
Arne Morten Kvarving
b3b22c8021 allow constructing DeadOilPvt from data 
also add accessors and equality operator
 2019-12-19 14:14:13 +01:00
Arne Morten Kvarving
d21edaff6a allow constructing ConstCompressOilPvt from data 
also add accessors and equality operator
 2019-12-19 14:12:08 +01:00
Bård Skaflestad
d63c127d52 Merge pull request #378 from akva2/noecl_flush 
Serialization preparation
 2019-12-19 13:57:58 +01:00
Arne Morten Kvarving
e9e495295a allow constructing GasPvtThermal from data 
also add accessors, assignment operator and equality operator
 2019-12-19 12:02:40 +01:00
Arne Morten Kvarving
bd03a9a30e allow constructing GasPvtMultiplexer from data 
also add accessors, assignment operator and equality operator
 2019-12-19 12:02:40 +01:00
Arne Morten Kvarving
a23f6998ea allow constructing WetGasPvt from data 
also add accessors and equality operator
 2019-12-19 10:57:03 +01:00
Joakim Hove
477360ca75 Merge pull request #377 from joakim-hove/use-vector-value 
Use std::vector<T> and check for .empty() instead of pointer
 2019-12-19 10:53:54 +01:00
Arne Morten Kvarving
059c6b58aa add accessors and equality operator to Uniform(X)Tabulated2DFunction 2019-12-19 10:45:05 +01:00
Arne Morten Kvarving
0a73e4531e allow DryGasPvt to be constructed from variables 
also add accesors and equality operator
 2019-12-19 10:33:20 +01:00
Arne Morten Kvarving
52d310760b add accessors and equality operator to IntervalTabulated2DFunction 2019-12-19 10:32:47 +01:00
Arne Morten Kvarving
5757ccd237 allow SolventPvt to be constructed from variables 
also add accesors and equality operator
 2019-12-19 10:29:05 +01:00
Arne Morten Kvarving
5a23d7ffca add accessors and equality operator to Tabulated1DFunction 2019-12-19 10:27:50 +01:00