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

2049 Commits

Author SHA1 Message Date
Joakim Hove
e2ef6bc662 Simplify test fixture 2021-03-24 09:40:04 +01:00
Bård Skaflestad
37aee167eb Merge pull request #2377 from joakim-hove/rst-test-fix 
Fix test assert and temporarily disable
 2021-03-23 15:51:06 +01:00
Joakim Hove
227a07ed06 Fix test assert and temporarily disable 2021-03-23 11:40:32 +01:00
Joakim Hove
8258d65900 Update test fixtures 2021-03-23 09:33:06 +01:00
Joakim Hove
6609ca265c Merge pull request #2372 from joakim-hove/summary-state-connections 
Add special treatment of connection variables in SummaryState
 2021-03-23 07:22:45 +01:00
Joakim Hove
5b3787ec46 Add special treatment of connection variables in SummaryState 2021-03-21 15:20:45 +01:00
Jostein Alvestad
278cd0a240 eliminated WellDims and used WellTableDims instead 2021-03-19 13:59:40 +01:00
Jostein Alvestad
d0f177d94c corrections to inteHead - rockopts, well lists 2021-03-19 13:59:39 +01:00
Bård Skaflestad
89e3efb2e4 Record Dynamic Well Status in Output Wells 
This commit adds a new data member

    Well::Status dynamicStatus

to the data::Well object.  This member records the simulator's
notion of a well's open/shut/stop status and is especially needed to
support WECON-type status changes once the simulator maintains both
open and shut wells.

While here, also change multiple summary primitives to not look up
the same values repeatedly.
 2021-03-18 17:26:33 +01:00
Joakim Hove
27b4110314 Merge pull request #2355 from totto82/guideRateInj 
Add guiderate for injection groups
 2021-03-18 17:04:34 +01:00
Joakim Hove
d02ae5e650 Make sure action results contain well for fully specified condition 2021-03-17 10:08:35 +01:00
Tor Harald Sandve
5f30a969f0 clean-up the interface of the guiderates 2021-03-16 15:53:35 +01:00
Joakim Hove
17639d821d Remove special mnemomics from testing 2021-03-15 22:33:16 +01:00
Atgeirr Flø Rasmussen
675cb40dd4 Silence a few warnings. 2021-03-15 14:19:15 +01:00
Tor Harald Sandve
8941cc7c02 Add guiderate for injection groups 2021-03-15 12:29:20 +01:00
Joakim Hove
654a78a541 Merge pull request #2339 from joakim-hove/sched-state-sim-step 
Sched state sim step
 2021-03-11 15:23:02 +01:00
Joakim Hove
56d3d1a7d3 Merge pull request #2335 from totto82/addInjectionTypeChangedEvent 
Add event for injection type changed
 2021-03-10 15:58:59 +01:00
Joakim Hove
0a5301d949 Merge pull request #2319 from jalvestad/rst_wsegaicd 
Changes to output Restart data for the WSEGAICD keyword (Eclipse compatible restart file)
 2021-03-10 14:59:49 +01:00
Joakim Hove
90839c0e16 Remove unneccesary function RestartConfig::getKeyword() 2021-03-10 13:23:16 +01:00
Joakim Hove
bfb1b7d7e5 Merge pull request #2337 from joakim-hove/gconinje-guiderate 
Gconinje guiderate
 2021-03-10 13:17:32 +01:00
Joakim Hove
6e7d9102c7 Rename enum Group::GuideRateTarget -> Group::GuideRateProdTarget 2021-03-10 09:54:50 +01:00
Bård Skaflestad
6d18b3b7e6 ActiveIndexByColumn: Remove 'build' Method 
Do construction work in constructor instead.

Suggested by: [at]joakim-hove
 2021-03-10 09:54:14 +01:00
Joakim Hove
d673f2e555 Add member first_in_month and first_in_year to ScheduleState 2021-03-10 09:49:13 +01:00
Joakim Hove
b151c85f6c Add month_num and year_num members to ScheduleState 2021-03-10 09:26:02 +01:00
Bård Skaflestad
d2028e4851 Add Special Purpose Active Cell Enumeration by Columns 
The protocol for outputting an aquifer's active cell IDs to the
restart file requires that the cells be enumerated according to
their column.  In particular, the aquifer's notion of a model's
active cells correspond to a cell ordering of the form

    for (i = 0; i < Nx; ++i)
        for (j = 0; j < Ny; ++j)
            for (k = 0; k < Nz; ++k)
                use(X(i, j, k))

instead of the common ordering, sometimes referred to as "natural
ordering"

    for (k = 0; k < Nz; ++k)
        for (j = 0; j < Ny; ++j)
            for (i = 0; i < Nx; ++i)
                use(X(i, j, k))

which is employed elsewhere.

This commit adds a special purpose mapping facility which will
translate active cell IDs from natural ordering to the columnar
enumeration.  The facility is intentionally bare-bones because we
do not expect to use it outside of the restart writing code, and
only in a limited fashion within that context.  We will however
consider adding more features if the need arises.
 2021-03-10 09:23:23 +01:00
Tor Harald Sandve
456e94d524 Add event for injection type changed 2021-03-10 08:40:03 +01:00
Joakim Hove
34ddba52d7 Add member sim_step to ScheduleState 2021-03-10 08:08:43 +01:00
Joakim Hove
69c198271f Merge pull request #2327 from joakim-hove/summary-invalid-fipnum 
Summary invalid fipnum
 2021-03-10 07:32:43 +01:00
Bård Skaflestad
796318409d Partially Internalise AQUDIMS in Runspec 
This commit internalises the items NANAQU (5) and NCAMAX (6) of the
AQUDIMS keyword into a new structure

    AquiferDimensions

hooked up to the 'Runspec' class.  This is in preparation of adding
restart output for analytic aquifers (Carter-Tracy and Fetkovich).
 2021-03-09 22:29:00 +01:00
Joakim Hove
b197ac7a3f Merge pull request #2317 from joakim-hove/parserkeywords-container 
Add container of builtin keywords
 2021-03-09 20:11:33 +01:00
Jostein Alvestad
941de32084 changes to boost test values due to changes in the test-dataset 2021-03-09 15:50:00 +01:00
Jostein Alvestad
e96778c440 changes in test-dataset and initial adaptions to the new data set, plus corrections for ScalingFactor 2021-03-09 15:49:58 +01:00
Jostein Alvestad
8a5a159450 Added changes to output restart data to support WSEGAICD input 2021-03-09 15:49:55 +01:00
Joakim Hove
f584901da4 Add class Builtin with all the compiled keywords 2021-03-09 12:22:39 +01:00
Joakim Hove
0d07a250d8 Use schedule object in testing of restart configuration 2021-03-09 12:19:46 +01:00
Joakim Hove
2dbf7ff281 Use multiline string literals 2021-03-09 08:25:36 +01:00
Joakim Hove
9369690615 Add overide output interval argument to RestartConfig 2021-03-08 18:16:42 +01:00
Joakim Hove
9d18afb45e Add optional argument to override output interval - EBOS paramstyle 2021-03-08 17:43:04 +01:00
Joakim Hove
18dca82a8b Handle empty regions in summary region results 2021-03-08 16:29:56 +01:00
Joakim Hove
47f292bd93 Handle undefined fipnum definition in summary keywords like RPR__ABC 2021-03-08 12:30:41 +01:00
Joakim Hove
8a901f2700 Merge pull request #2326 from joakim-hove/summary-add-fp 
Add fieldprops argument to SummaryConfig constructor
 2021-03-08 12:25:13 +01:00
Joakim Hove
48b366b1f9 Add fieldprops argument to SummaryConfig constructor 2021-03-08 08:23:01 +01:00
Joakim Hove
b5183b1d76 Hide RestartConfig as private member of Schedule class 2021-03-07 11:27:09 +01:00
Joakim Hove
c01a880388 Remove functionality from DynamicState 2021-03-06 07:49:02 +01:00
Joakim Hove
fc28ff36f1 Reduce TimeMap usage 2021-03-06 07:49:02 +01:00
Joakim Hove
a713783b48 Merge pull request #2320 from joakim-hove/vfp-uda 
Handle UDA values for ALQ in WCONPROD / WCONHIST
 2021-03-05 12:29:19 +01:00
Joakim Hove
910c37c4e1 Merge pull request #2321 from joakim-hove/icd-maxrate-optional 
Use std::optional<double> for ICD maximum flow rate
 2021-03-05 12:28:49 +01:00
Joakim Hove
586d15653b SummaryConfig: allow region numbers beyond NUMFIP 2021-03-05 08:39:37 +01:00
Joakim Hove
b38d5166ce Use std::optional<double> for ICD maximum flow rate and scaling 2021-03-04 19:28:48 +01:00
Joakim Hove
3205423fc5 Accept UDA input for ALQ in WCONPROD / WCONHIST 2021-03-04 14:01:28 +01:00