OilfieldToolsNet/opm-common
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
3,018 Commits 18 Branches 75 Tags 73 MiB
79ee673465
Commit Graph

3018 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jørgen Kvalsvik
64b44eda77 Make Box+BoxManager no longer use shared_ptr 2016-10-19 20:38:27 +02:00
Jørgen Kvalsvik
7cff418ae5 Make RestartConfig no longer use shared_ptr 2016-10-19 20:38:27 +02:00
Jørgen Kvalsvik
53f178d7ce Make IOConfig no longer use shared_ptr 2016-10-19 20:38:27 +02:00
Jørgen Kvalsvik
c893a92aa6 Make Dimension+UnitSystem no longer use shared_ptr 2016-10-19 20:38:27 +02:00
Jørgen Kvalsvik
d53c73fb41 Make Fault+FaultFace no longer use shared_ptr 2016-10-19 20:38:27 +02:00
Jørgen Kvalsvik
b3dbd6f930 Return const ref from getSchedule 2016-10-19 20:38:27 +02:00
Jørgen Kvalsvik
4b0e4c5cae Make Tuning no longer use shared_ptr 2016-10-19 20:38:27 +02:00
Jørgen Kvalsvik
4f0e6703f0 Remove DynamicState's reliance on TimeMap. 
DynamicState assumes the time map is fully populated and stores only
its size (which is the only property it cares about).
 2016-10-19 20:38:27 +02:00
Jørgen Kvalsvik
9ad3d78923 Remove DynamicVector's reliance on TimeMap. 
DynamicVectors assumes the time map is fully populated and stores only
its size (which is the only property it cares about).
 2016-10-19 20:38:27 +02:00
Jørgen Kvalsvik
47ca0b333d Remove unnecessary silencing of unused vars 
__attribute__ is a gcc extension (supported by clang), but isn't
portable. However, this warning doesn't show up when the variables are
constexpr.
 2016-10-19 20:37:43 +02:00
Jørgen Kvalsvik
bc58e417f8 Swap ConversionFactors/Units header in cmake 2016-10-19 15:03:51 +02:00
Atgeirr Flø Rasmussen
43e759d261 Merge pull request #936 from andlaus/opm-parser_units 
fully move the units code from opm-core to opm-parser
 2016-10-18 15:25:14 +02:00
Arne Morten Kvarving
6433059067 changed: rename function getType 
typeof is a semi-reserved symbol in gcc (gcc extension to get typeid)
 2016-10-17 10:48:29 +02:00
Liu Ming
fce0bab79f Rename MesasgesLimits to MessageLimits. 2016-10-17 10:41:17 +08:00
Liu Ming
2f265f1407 Drop TimeMapConstPtr and temporary DynamicState object. 2016-10-17 09:22:54 +08:00
Liu Ming
7a73657e00 drop std::shared_ptr 2016-10-14 15:54:02 +08:00
Liu Ming
a25c5c0850 Merge remote-tracking branch 'opm/master' into get-messages 2016-10-14 13:48:49 +08:00
Liu Ming
c7b3e2cf57 Get MESSAGES limits from Schedule and update every time step. 2016-10-14 10:06:35 +08:00
Joakim Hove
a0c08ef4ba Added Well::getCompletions( ). 
The new Well::getCompletions( ) method without argument will return all
the existing completions at the end of the simulation.
 2016-10-12 10:34:09 +02:00
Joakim Hove
e1b2d2f13a Merge pull request #932 from jokva/fix-compiler-warnings-appveyor 
Fix compiler warnings appveyor
 2016-10-11 10:32:58 +02:00
Andreas Lauser
a8b6047b1d fully move the units code from opm-core to opm-parser 
this fixes some annoying inconsistencies (e.g., the recently
introduced 'dyne' unit was unavailable in the opm-core version) and
gets rid of some compiler abiguity errors if 'using namespace
Opm::details' was used by code inside the 'Opm' namespace.

Since opm-parser is a hard dependency of opm-core, the only measure
which must be taken by higher-level code is to include
'opm/parser/eclipse/Units/Units.hpp' instead of
'opm/parser/eclipse/Units/ConversionFactors.hpp' or
'opm/core/utility/Units.hpp'.

Note that a potentially better location for this code would be
opm-common, but this would break the Windows build of opm-parser.
 2016-10-10 17:45:37 +02:00
Andreas Lauser
0680e64b03 add a JSON definition of the JFUNC keyword 2016-10-06 17:18:10 +02:00
Andreas Lauser
eb9dd487c6 add the infrastructure needed to deal with surface tension 
this is required for the JFUNC keyword...
 2016-10-06 17:18:10 +02:00
Jørgen Kvalsvik
9a3e5e4c4f Explicit boolean expression in isAutoGenerated_ 2016-10-06 13:17:23 +02:00
Jørgen Kvalsvik
db66f0302c Explicit bool conversion in isRecognizedKeyword 2016-10-06 13:17:23 +02:00
Jørgen Kvalsvik
a51127f0c8 Make character lookup table boolean 2016-10-06 13:17:06 +02:00
jokva
1fc4fa633b Merge pull request #931 from joakim-hove/unit-system-vector-overlaod 
Added vector overload of unit onversion methods.
 2016-10-06 13:10:39 +02:00
Pål Grønås Drange
f73d7f66ae Merge pull request #930 from jokva/remove-shared-ptrs-from-schedule 
Remove shared ptrs from schedule
 2016-10-06 13:01:08 +02:00
Joakim Hove
0d4bfdea2d Added vector overload of unit onversion methods. 2016-10-06 11:47:49 +02:00
Jørgen Kvalsvik
b932b0d2c2 fixup! Make Schedule.oilvaporization auto, not shared_ptr 2016-10-05 14:46:56 +02:00
Jørgen Kvalsvik
d5251d97e6 Make Schedule.groups auto, not a shared_ptr 2016-10-05 14:39:01 +02:00
Jørgen Kvalsvik
1638341a90 Default construction for OilVaporizationProperties 
OilVaporizationProperties can now be default constructed, and its
storage has been changed from shared_ptr to value (which mandates the
support for default construction and equality/unequality).

The default constructed Property is considered unspecified and
operations on it will not make sense.
 2016-10-05 14:11:57 +02:00
Jørgen Kvalsvik
a97890bce2 Make Schedule.grouptree auto, not a shared_ptr 
Also makes the *contents* of the vector values, not shared_ptrs.
This introduces the copy constructor (as an alternative to deepcopy())
and comparison operators, mandated by DynamicState.
 2016-10-05 10:36:35 +02:00
Jørgen Kvalsvik
fd26e24049 Make Schedule.oilvaporization auto, not shared_ptr 2016-10-05 10:36:21 +02:00
Jørgen Kvalsvik
5202c4ee6b Make Schedule.modifierDeck auto, not a shared_ptr 2016-10-05 10:12:46 +02:00
Jørgen Kvalsvik
81cbe53109 Make Schedule.events auto, not a shared_ptr 2016-10-05 10:09:45 +02:00
Jørgen Kvalsvik
f72b784a7e Make Schedule.tuning auto, not a shared_ptr 2016-10-05 10:04:36 +02:00
Jørgen Kvalsvik
6a0afc8a80 DynamicState::get returns const reference 
dynamicstate.get returns a const reference rather than a by-value copy,
in order to be consistent with other container classes.

This introduces a problem for std::vector<bool> with its specialisation,
so all DynamicState<bool> instances has been replaced by
DynamicState<int> and explicit bool conversions.
 2016-10-05 09:57:42 +02:00
Pål Grønås Drange
e7c2ebd915 Removed ERT_PYTHON_PATH, we only need cwrap path 2016-10-04 15:27:39 +02:00
Pål Grønås Drange
aa09373f18 added find cwrap from opm-common 2016-10-04 12:49:05 +02:00
Pål Grønås Drange
7ef665994b Use cwrap library from ert 2016-10-04 11:50:57 +02:00
Pål Grønås Drange
5a0e4c191d Merge pull request #929 from joakim-hove/python-test 
Python test: locate testdata + add declarations.
 2016-09-29 12:16:36 +02:00
Tor Harald Sandve
5d7d5be679 Add support for control mode in WHISTCTL 
-- Control mode given by WHISTCTL overwrites control mode given in
WCONHIST
-- option for termination of run if changed to BHP control in not
implemented. But ParseContext is used to inform the user and make
throwing optional.
 2016-09-29 08:29:57 +02:00
Joakim Hove
44f7d023b7 Added forward declaration. 2016-09-28 19:14:20 +02:00
Joakim Hove
36b5f8d0f5 Changed code to find testdata for Python tests. 2016-09-28 18:52:05 +02:00
Pål Grønås Drange
9fe350e094 Made production group and injection group pure values 2016-09-28 07:39:24 +02:00
Kai Bao
7f49f5e53d fixing the group test. 2016-09-23 13:17:26 +02:00
Kai Bao
a70b1799c7 A well group can be both injection and production group. 2016-09-23 12:55:44 +02:00
Pål Grønås Drange
36ab19bc73 Merge pull request #923 from joakim-hove/summary-config-query 
Added simple test for hasKeyword.
 2016-09-21 14:37:08 +02:00
Kai Bao
a4c2c5bec3 adding FLD to the ControlEnum of GroupProduction 2016-09-20 13:37:07 +02:00