Commit Graph

2842 Commits

Author SHA1 Message Date
Jørgen Kvalsvik
fdb772e075 DeckItem without internal inheritance.
Replaces the internal inheritance + unique_ptr scheme to a flat sum type
similar scheme that uses a tag to determine which operations are legal,
rather than using the indirection itself as a tag.
2016-11-07 12:24:38 +01:00
Jørgen Kvalsvik
9511d8252b Add Utility/Typetools
An enum and some utilities to build what's essentially sum types.
2016-10-23 15:47:20 +02:00
Jørgen Kvalsvik
7652e0fcb5 TableColumn stores ColumnSchema, not pointer 2016-10-19 20:38:28 +02:00
Jørgen Kvalsvik
4c13f6ad06 Use public parseFile in cparser.cc 2016-10-19 20:38:28 +02:00
Jørgen Kvalsvik
331d61cba5 Parser.parseFile() assumes default parse context 2016-10-19 20:38:28 +02:00
Jørgen Kvalsvik
066be72ce1 Small doc on GridProperty guarantees 2016-10-19 20:38:28 +02:00
Jørgen Kvalsvik
6f35591fad Make IOConfig::getOutputEnabled const 2016-10-19 20:38:28 +02:00
Jørgen Kvalsvik
bf057f157c Deck units no longer unique 2016-10-19 20:38:28 +02:00
Jørgen Kvalsvik
37c04328ca Remove shared_ptr typedefs 2016-10-19 20:38:28 +02:00
Jørgen Kvalsvik
f2e509f59f UnitSystem named constructors with automatic storage 2016-10-19 20:38:28 +02:00
Jørgen Kvalsvik
0e7752c499 Make group no longer use shared_ptr 2016-10-19 20:38:28 +02:00
Jørgen Kvalsvik
f9cb516b99 Remove DeckPtr+ParserPtr aliases
Remove the deprecated DeckPtr and ParserPtr aliases and removes
shared_ptr<Deck> and friends from all interfaces.
2016-10-19 20:38:28 +02:00
Jørgen Kvalsvik
0059446147 Make Completion+CompletionSet no longer use shared_ptr 2016-10-19 20:38:28 +02:00
Jørgen Kvalsvik
239ef7a34c Remove shared_ptr typedef in TimeMap 2016-10-19 20:38:28 +02:00
Jørgen Kvalsvik
8645af71b8 Make PvtxTable no longer use shared_ptr 2016-10-19 20:38:28 +02:00
Jørgen Kvalsvik
8b4350f720 TransMult stores MULTREGTScanner as value
Improves copying semantics and fixes a memory leak in TransMult
initialisation.
2016-10-19 20:38:28 +02:00
Jørgen Kvalsvik
56608e9a10 3DProperties default constructible
This also means UnitSystem must be default constructible, which now
makes the default unit system metric. GridProperties must also be
default constructible (a valid 0x0x0 grid with no properties).
2016-10-19 20:38:28 +02:00
Jørgen Kvalsvik
7a13488fb1 Make SimpleTable no longer use shared_ptr 2016-10-19 20:38:28 +02:00
Jørgen Kvalsvik
930a6216c8 Make SimulationConfig no longer use shared_ptr 2016-10-19 20:38:28 +02:00
Jørgen Kvalsvik
5a48ec4539 Make ThresholdPressure no longer use shared_ptr 2016-10-19 20:38:28 +02:00
Jørgen Kvalsvik
4b51d9b0f5 Make Segment/Compsegs no longer use shared_ptr 2016-10-19 20:38:28 +02:00
Jørgen Kvalsvik
f5a1630dc0 Make InitConfig no longer use shared_ptr 2016-10-19 20:38:28 +02:00
Jørgen Kvalsvik
1906bf4d16 Make EclipseGrid no longer use shared_ptr 2016-10-19 20:38:28 +02:00
Jørgen Kvalsvik
fcc93085ee Make NNC no longer use shared_ptr 2016-10-19 20:38:27 +02:00
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