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

1202 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bård Skaflestad
14286eca07 Merge pull request #402 from akva2/use_array 
changed: use std::array instead of C arrays
 2020-02-24 08:16:24 -06:00
Arne Morten Kvarving
723c619b5e changed: void more deck usage setting up pvt classes 2020-02-24 13:41:48 +01:00
Arne Morten Kvarving
2f838a4268 Merge pull request #391 from akva2/noecl_avoid_global 
changed: avoid allocating long vectors of zeros
 2020-02-24 13:13:27 +01:00
Arne Morten Kvarving
aa0725e519 changed: use std::array instead of C arrays 2020-02-24 09:56:03 +01:00
Tor Harald Sandve
517ce64f58 Merge pull request #392 from akva2/cleanup_brine 
some cleanups in ConstantCompressibilityBrinePvt
 2020-02-17 14:13:55 +01:00
Atgeirr Flø Rasmussen
89dd68d1e7 Merge pull request #398 from atgeirr/fix-warning 
Silence unused variable warning.
 2020-02-13 12:59:10 +01:00
Atgeirr Flø Rasmussen
6dfe5c7ac9 Silence unused variable warning. 2020-02-13 09:18:01 +01:00
Atgeirr Flø Rasmussen
ee5011a61d Merge pull request #397 from akva2/use_numeric_limits 
fixed: use std::numeric_limits<Scalar> in one more spot
 2020-02-11 08:06:13 +01:00
Arne Morten Kvarving
0668699179 fixed: use std::numeric_limits<Scalar> in one more spot 2020-02-10 15:57:25 +01:00
Arne Morten Kvarving
5f36812707 get rid of deck usage setting up GasPvtMultiplexer 2020-02-07 10:11:44 +01:00
Arne Morten Kvarving
6524ed889a use PvtwTable from TableManager setting up ConstantCompressibilityWaterPvt 2020-02-07 10:11:44 +01:00
Arne Morten Kvarving
6d8f5f50bf changed: use PVCDO from TableManager setting up ConstantCompressibilityOilPvt 2020-02-07 10:11:44 +01:00
Arne Morten Kvarving
c681d0a402 Merge pull request #393 from akva2/no_density_kw 
changed: avoid using DENSITY from deck in Pvt classes
 2020-02-06 18:14:39 +01:00
Arne Morten Kvarving
ed99a1df1a changed: avoid using DENSITY from deck in Pvt classes 2020-02-06 12:12:09 +01:00
Arne Morten Kvarving
9a7eac1874 some cleanups in ConstantCompressibilityBrinePvt 2020-02-06 10:33:00 +01:00
Arne Morten Kvarving
1c71722179 changed: avoid allocating long vectors of zeros 2020-01-29 16:45:12 +01:00
Bård Skaflestad
ff5c8eea84 Merge pull request #390 from akva2/thermal_fixes 
Thermal fixes
 2020-01-29 13:26:36 +01:00
Arne Morten Kvarving
75c9726d96 remove unused parameters from private member functions 
they can be re-added if they are needed. keep it simple
 2020-01-29 08:48:39 +01:00
Arne Morten Kvarving
8909d471e8 disable assert 
this triggers while running a thermal deck (SPE1CASE2_THERMAL),
but there is no apparent reason why it is an error.
 2020-01-29 08:48:39 +01:00
Arne Morten Kvarving
370923a186 fix operators after brine addition 2020-01-29 08:48:39 +01:00
Arne Morten Kvarving
328bb9c427 add missing initializers 
does not really do harm, but quells warnings from valgrind
when serializing the class
 2020-01-29 08:48:39 +01:00
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