OilfieldToolsNet/opm-common
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
7,431 Commits 18 Branches 75 Tags
d36b6fa287b112868f04323f00118307e020c934
Commit Graph

7431 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Joakim Hove
d36b6fa287 TimeMap iterate only over SCHEDULE section 2020-01-28 20:38:45 +01:00
Joakim Hove
084b4721f9 Merge pull request #1437 from joakim-hove/schedule-testdata 
Schedule testdata
 2020-01-28 14:35:31 +01:00
Joakim Hove
79a75eba2a Add public accessor TimeMap::restart_offset() 2020-01-28 12:49:27 +01:00
Joakim Hove
8480e37975 Add header member to RstState 2020-01-28 12:49:27 +01:00
Joakim Hove
dcc52eb225 Add testdata 2020-01-28 12:46:18 +01:00
Joakim Hove
d1608ea2cf Merge pull request #1430 from joakim-hove/ecl-bc 
Add class to internalize BC keyword - and add to SimulationConfig
 2020-01-28 11:03:43 +01:00
Joakim Hove
c9f6326dc5 Add class to internalize BC keyword - and add to SimulationConfig 2020-01-27 11:55:15 +01:00
Joakim Hove
eed3c290b3 Merge pull request #1431 from bska/expose-tolcrit 
Internalise TOLCRIT Keyword
 2020-01-27 09:45:05 +01:00
Bård Skaflestad
7c1b77ec5d Internalise TOLCRIT Keyword 
This commit internalises the TOLCRIT keyword into the EclipseState
for subsequent use in determining critical saturations when
processing saturation function keywords such as SGOF and SOF3.
Specifically, we add a new type

    Opm::SatFuncControls

that, at present, stores only the TOLCRIT data item (defaulted to
the keyword's default value).  Client code can then retrieve the
value by calling the

    SatFuncControls::minimumRelpermMobilityThreshold()

member function.

Add a new data member of this type to the Opm::Runspec class so that
we complete the chain from EclipseState, and a few simple unit tests
to exercise the expected functionality.
 2020-01-24 20:58:38 +01:00
Bård Skaflestad
4094e4957a Merge pull request #1427 from joakim-hove/time-map-restart 
Time map restart
 2020-01-24 20:25:44 +01:00
Joakim Hove
db8ded1f09 Pass restart info to TimeMap constructor 2020-01-24 19:27:53 +01:00
Joakim Hove
0ba3a65d16 Merge pull request #1429 from akva2/remove_ioconfig_member 
Fix TimeMap constructor and remove IOConfig member
 2020-01-24 15:15:02 +01:00
Joakim Hove
c7023ab3c6 Merge pull request #1428 from atgeirr/avoid-repeated-warnings 
Remove duplicate warnings for unhandled summary keywords.
 2020-01-24 14:09:45 +01:00
Arne Morten Kvarving
1c2a284ee8 remove unused member m_first_restart_step from IOConfig 2020-01-24 13:13:22 +01:00
Arne Morten Kvarving
d885c09ffd fixed: add additional members also in std::vector<std::time_t> constructor 
this is done in the deck based constructor, so we have to do the same
 2020-01-24 13:13:21 +01:00
Atgeirr Flø Rasmussen
3ee092792c Remove duplicate warnings for unhandled summary keywords. 2020-01-24 12:27:32 +01:00
Joakim Hove
67fbdd3102 Merge pull request #1426 from joakim-hove/time-map-rm-cons 
Time map rm cons
 2020-01-23 09:15:20 +01:00
Joakim Hove
fd698139f5 Remove special code for serialization 2020-01-22 18:50:59 +01:00
Bård Skaflestad
2539a0d0e9 Merge pull request #1425 from joakim-hove/time-map-immutable 
Time map immutable
 2020-01-22 18:45:34 +01:00
Joakim Hove
fc9958bb0c Remove TimeMap( start_time ) constructor 2020-01-22 16:56:42 +01:00
Joakim Hove
63e99fb807 Make mutable accessors in TimeMap private 2020-01-22 16:23:37 +01:00
Joakim Hove
2d8151808f Add TimeMap(std::vector<std::time_t>& ) constructor 2020-01-22 16:23:37 +01:00
Joakim Hove
dd4a68b0a2 Merge pull request #1424 from akva2/add_gravity_flag 
added: gravity flag to InitConfig
 2020-01-22 14:15:59 +01:00
Joakim Hove
1cc2293c05 Merge pull request #1419 from joakim-hove/rst-state 
POD classes for restart info
 2020-01-22 13:33:26 +01:00
Arne Morten Kvarving
448ea5f3ab added: gravity flag to InitConfig 2020-01-22 12:47:39 +01:00
Joakim Hove
69822e880f Add POD struct for state with wells and groups from restart file 2020-01-22 12:23:26 +01:00
Joakim Hove
51daf43cef Merge pull request #1422 from akva2/noecl_flush_prestate 
More serialization preparation
 2020-01-22 06:30:57 +01:00
Arne Morten Kvarving
6a1acc15b8 make FaultCollection constructible from variables 
also add accessor and equality operator
 2020-01-21 15:22:10 +01:00
Arne Morten Kvarving
d5d5a01503 make Fault constructible from variables 
also add default constructor and accessor
 2020-01-21 15:22:10 +01:00
Arne Morten Kvarving
86b3566229 make FaultFace constructible from variables 
also add default constructor and equality operator
 2020-01-21 15:22:10 +01:00
Arne Morten Kvarving
be799586c8 make TransMult constructible from variables 
also add default constructor and equality operator
 2020-01-21 15:22:10 +01:00
Arne Morten Kvarving
43fae042b1 make EclipseConfig constructible from variables 
also add default constructor and equality operator
 2020-01-21 15:22:10 +01:00
Arne Morten Kvarving
4c49aea83e allow construction MULTREGTScanner from variables 
also add accessors, equality operator, copy constructor,
assignment operator and make it default constructible
 2020-01-21 15:22:10 +01:00
Arne Morten Kvarving
48bca722f5 changed: store reference to FieldPropsManager as a pointer 
default initialization required for serialization
is not possible with a const ref member
 2020-01-21 15:22:10 +01:00
Arne Morten Kvarving
83b3b5bab6 add equality operator to MULTREGTRecord 2020-01-21 14:36:00 +01:00
Joakim Hove
9c6a74043c Merge pull request #1420 from joakim-hove/remove-eclipse-3dproperties 
Remove old 3D property implementation
 2020-01-20 11:35:08 +01:00
Joakim Hove
ce9d325719 Merge pull request #1418 from joakim-hove/trim-padded-string 
Add trim method to PaddedOutputString<N>
 2020-01-20 08:37:40 +01:00
Joakim Hove
28d77dacd8 Add templated method create trimmed copy of string with c_str() 2020-01-19 23:18:49 +01:00
Joakim Hove
691296f91a Remove old 3D property implementation 2020-01-19 23:04:46 +01:00
Bård Skaflestad
1132857324 Merge pull request #1407 from akva2/noecl_flush_schedule 
More serialization effort
 2020-01-17 15:35:51 +01:00
Arne Morten Kvarving
6986436073 make TimeStampUTC constructible from variables 
also add accessor
 2020-01-17 10:08:50 +01:00
Arne Morten Kvarving
df5baad233 fixed: return by const ref 2020-01-17 10:08:50 +01:00
Arne Morten Kvarving
13db196c5c fixed: missing CTFKind parameter in Connection 2020-01-17 10:08:50 +01:00
Arne Morten Kvarving
c4936d55e1 fixed: update UDAValue constructors for new dim member 2020-01-17 10:08:50 +01:00
Arne Morten Kvarving
7ac2febae2 changed: allow disabling sanity check in Dimension constructor 
while this makes sense to do in general, it causes issues
when reconstructing after deserialization.
we have dimensions with '/' and '*' in the name that was
constructed through newComposite.
 2020-01-17 10:08:50 +01:00
Arne Morten Kvarving
828cd2ee9a fixed: add missing initializer 2020-01-17 10:08:50 +01:00
Bård Skaflestad
33fdacea54 Merge pull request #1415 from berland/wconhist-fix 
Clean up item names in json for WCONHIST
 2020-01-16 16:56:50 +01:00
Bård Skaflestad
7fb66a589e Merge pull request #1416 from akva2/janitoring 
quell signed/unsigned comparison warnings
 2020-01-16 15:48:25 +01:00
Arne Morten Kvarving
2951bf01d4 quell signed/unsigned comparison warnings 2020-01-16 14:54:48 +01:00
Håvard Berland
81701b72ba Clean up item names in json for WCONHIST 
Consistency with other keywords
Change corresponding code that reads this.
 2020-01-16 13:45:02 +01:00