Commit Graph
60 Commits
Author SHA1 Message Date
Arne Morten Kvarving 2c2f848c54 remove unused function 2020-09-14 12:05:34 +02:00
Joakim Hove 03d387c12d Enable global storage for keywords 2020-09-09 21:41:08 +02:00
Atgeirr Flø Rasmussen 859182f7f0 The distribute_toplayer() is unused.
Note that there is still a member function of the same name.
2020-09-07 15:51:35 +02:00
Joakim Hove 7969dfd721 Fix bug with init/create of FIP keywords 2020-09-05 13:54:17 +02:00
Joakim Hove 42fcb4507f FieldProps::get_global<T> will fill with correct default value 2020-09-05 11:52:22 +02:00
Joakim Hove 4d29b2921a Remove use of designated initializer 2020-09-05 10:41:52 +02:00
Joakim Hove a765cd26ea Reorganised metadata for field properties 2020-09-04 14:31:40 +02:00
Joakim Hove e00516842c Allow FIPxxx keywords in FieldProps manager 2020-08-26 08:52:12 +02:00
Bård Skaflestad 83429bf908 Sat-Func Initializers: Pass TOLCRIT to Table-Scanning Layer
This is a pure API change.  The TOLCRIT value is not yet used as
part of determining the critical saturations.

While here, also add a unit test for getRawTableEndPoints() and
update the existing sat-func property unit tests to explicitly pass
TOLCRIT = 0 in preparation of adding actual TOLCRIT support.
2020-06-10 14:33:01 +02:00
Bård Skaflestad 83af852efe Capture SatFunc Controls In FieldProps
This is in preparation of threading the TOLCRIT value-defaulted or
not-through to the end-point scanning code.
2020-06-10 14:33:01 +02:00
Bård Skaflestad f0f3764b89 Sat-Func Initializers: Expose RawTableEndPoints to Caller
This commit requires that the callers of satfunc::init() calculate
the raw table end-points.  That, in turn, enables callers to cache
those end-point values to avoid repeated calculations.

Add a new member, m_rtep, to FieldProps to act as such a cache to
take advantage of the new ability.
2020-06-10 14:33:01 +02:00
Joakim Hove ebdffa2abb Ensure correct SI conversion for the scalar data in OPERATE keyword 2020-05-11 15:45:01 +02:00
Joakim Hove 9065bf2390 Remove dummy/unit dimension for NTG 2020-05-11 12:15:09 +02:00
Bård Skaflestad 146be0aa21 SOGCR: Pull SGOF Handling Into Initializer
This is in any case needed to calculate correct KRGR default values
in runs using family I saturation function keywords (S*OF) and also
removes the need to apply the special 'subtract_swl' operation in
this case.  Overall this is a simplification of the code since we
now have all saturation end-points available when initializing
saturation function field properties.
2020-04-29 13:33:51 +02:00
Joakim Hove 0cfc291039 Add function to calculate volume for all active cells - omp 2020-04-15 20:33:22 +02:00
Bård Skaflestad 19ecc3d30e Consider Active Phases When Initializing Satfunc Endpoints
This commit passes the run's notion of its active phases, an object
of type Opm::Phases, through to the initialisation layer for the
saturation functions' scaling properties.  In particular, this
allows us to discriminate between the phases and to not index into
tables or properties that would not be appropriate (e.g., maximum
gas saturation (SGU) in a simulation run without active gas).

Moreover, we now have enough information to know to look for SOF2 in
two-phase run using family II saturation function keywords.  These
changes are necessary in order to extend Flow's support for the
FILLEPS output request to two-phase runs.
2020-01-29 16:34:15 +01:00
Joakim Hove 141000b750 FieldProps parsing is section aware - handle MULT in EDIT 2020-01-02 15:27:22 +01:00
Joakim Hove 90d30e3bc9 Rename class Section -> DeckSection 2020-01-02 15:27:22 +01:00
Joakim Hove b95f7bd6bf Add integer property ISOLNUM 2019-12-23 12:23:41 +01:00
Joakim Hove c8b0da82c0 Merge pull request #1366 from joakim-hove/fp-spoly
Fp spoly
2019-12-20 17:24:08 +01:00
Joakim Hove cf3a4ffe25 Add keyword SSOL to FieldProps 2019-12-20 09:09:35 +01:00
Joakim Hove e50f05ca9a Add keyword SPOLYMW to FieldProps 2019-12-20 09:09:35 +01:00
Joakim Hove 33bcbb26e6 Add RS and RV to FieldProps 2019-12-20 09:09:35 +01:00
Joakim Hove b3dfe95b43 Add SPOLY keyword to FieldProps 2019-12-20 09:09:35 +01:00
Joakim Hove 4f11b7846c Add support for MULTREGP in FieldProps::porv implementation 2019-12-20 07:28:48 +01:00
Joakim Hove 46999f418f Refactored FieldProps
- The lowest level get method is called init_get() - this will unconditionally
  create new keyword. The init_get() method is private.

- Introduced FieldDataManager which keeps track of data pointer and status.

- Refactored get( ) implementation
2019-12-19 15:06:20 +01:00
Joakim Hove 6c46e50142 Add special case *SWL* subtraction to *SOGCR* keywords 2019-12-16 12:11:06 +01:00
Joakim Hove 819f30eabc Rewrite writeInit to use FieldPropsManager 2019-12-16 12:11:06 +01:00
Joakim Hove 2abbc474a4 Add support for keywords THxxxx in FieldProps 2019-12-16 08:23:44 +01:00
Joakim Hove a56e4daac7 Add RTEMPVD based initialization of the TEMPI keyword 2019-12-15 19:29:43 +01:00
Arne Morten Kvarving 715d368d94 fix initialization list order 2019-12-12 10:59:59 +01:00
Joakim Hove 20cd54b939 Merge pull request #1324 from joakim-hove/fp-get-temp
Add FieldPropsManager::get_copy() which does not add to container
2019-12-11 12:24:29 +01:00
Joakim Hove 6d7b621fb8 Add FieldPropsManager::get_copy() which does not add to container 2019-12-11 08:02:10 +01:00
Joakim Hove 2fb0cd599b PORV is treated more as a regular keyword 2019-12-10 14:06:14 +01:00
Joakim Hove 0f609083c3 Add support for OPERATE in FieldProps 2019-12-10 11:43:05 +01:00
Joakim Hove e96f49c5f9 Implement FieldProps::reset_actnum() instead of reset_grid() 2019-12-08 23:37:51 +01:00
Joakim Hove 63bf6b26c7 Satfunc initializers get cell_depth instead of grid argument 2019-12-08 15:09:55 +01:00
Joakim Hove fa939f585f Add default init for TRAN keywords + dimension 2019-12-07 15:07:22 +01:00
Joakim Hove b7f8d72bbe Add autocreation of saturation functions from get<T>(keyword) 2019-12-07 13:37:58 +01:00
Joakim Hove f4882522cb Add optional global flag to FieldPropsManager::porv() 2019-12-06 08:47:08 +01:00
Joakim Hove 4d3567bffd Initialize saturation functions in FieldProps 2019-12-05 08:49:47 +01:00
Joakim Hove 206e0b3b25 Merge pull request #1299 from joakim-hove/transmult-fp
Use std::vector<double> instead of GridProperty<double> in TransMult
2019-12-04 10:22:32 +01:00
Joakim Hove 34d4514164 Enable FieldProps for EclipseState::initTransMult() 2019-12-04 07:39:04 +01:00
Joakim Hove 87ddebd192 Special case ACTNUM and PORV in the FieldProps keys() method 2019-12-03 17:21:28 +01:00
Joakim Hove 1090328ee3 Add methods porv() and actnum() to FieldPropsManager 2019-12-03 08:47:23 +01:00
Joakim Hove 0a56331b28 Remove grid member from FieldProps 2019-12-02 11:47:28 +01:00
Joakim Hove 296288bce4 Remove FieldProps->tables member 2019-12-01 18:01:01 +01:00
Joakim Hove 61fd4e0c88 FieldProps::default_region() - public property 2019-11-29 18:15:35 +01:00
Tor Harald Sandve fddaa46e98 add lwsltnum 2019-11-29 08:42:08 +01:00
Joakim Hove 5cd4814de1 Enable ROCKNUM in FieldProps 2019-11-28 15:14:31 +01:00