OilfieldToolsNet/opm-common
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
10,592 Commits 18 Branches 75 Tags 73 MiB
34f9d88c32
Commit Graph

10592 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bård Skaflestad
e7c223bc00
Merge pull request #2544 from OPMUSER/Jason_Updates 
JSON updates
 2021-06-27 17:06:09 +02:00
OPMUSER
82e0c608d2 FixJSON typos for EDITNNC, FOAMFSC, FOAMOPTS 
Fix JSON typos for or EDITNNC, FOAMFSC, FOAMOPTS keywords
 2021-06-26 16:16:03 +08:00
Joakim Hove
f7427c9ae8
Merge pull request #2539 from joakim-hove/udq-rst-selector 
Alternative selector implementation for UDQAssign loaded from rst
 2021-06-26 09:41:54 +02:00
Bård Skaflestad
24c04a0b0d
Merge pull request #2543 from joakim-hove/udq-state-refactor 
Refactor UDQ state to use plain maps
 2021-06-25 22:02:38 +02:00
Bård Skaflestad
f4d5a80fcc
Merge pull request #2468 from osae/tracerWell 
Support for tracer summary curves, WT(I/P)(R/T/C).
 2021-06-25 17:47:56 +02:00
Bård Skaflestad
fc98b2a2dc
Merge pull request #2518 from jalvestad/rstfile-corr 
Corrections to eclipse-compatible restart file
 2021-06-25 17:25:59 +02:00
Joakim Hove
3fa67b21b3 Alternative selector implementation for UDQAssign loaded from rst 2021-06-25 15:25:48 +02:00
Joakim Hove
44e056a84e
Merge pull request #2496 from bska/aqunum-initpress-array 
Collect Type-Specific Aquifer Data in Single Structure
 2021-06-25 15:23:48 +02:00
Joakim Hove
0f9c2c2cf3 Refactor UDQState to use plain maps internally 2021-06-25 15:09:42 +02:00
Joakim Hove
c5bed1a023 Add COMPLUMP and WPIMULT as AXTIONX enabled keywords 2021-06-25 14:33:34 +02:00
OPMUSER
8542fe4128 Fix VISREF Replace semicolon with comma 2021-06-25 18:12:17 +08:00
OPMUSER
5010ebb57e EDITNNC, FOAMFSC, FOAMOPTS and VISCREF 
Added item and comments. VISCREF was missing the oil API column.
 2021-06-25 18:06:27 +08:00
Bård Skaflestad
4e14cb68e1 Collect Type-Specific Aquifer Data in Single Structure 
This commit adds a new helper class,

    Opm::data::TypeSpecificData

which holds type-specific sub-structures for Carter-Tracy,
Fetkovich, and Numerical aquifers.  We implement this facility in
terms of a std::variant<> of simple structures.  In turn, use the
type-specific data for numerical aquifers to fill in the initial
aquifer cell pressures where not available in the input data.
 2021-06-25 11:55:56 +02:00
Joakim Hove
d875715cff
Merge pull request #2541 from OPMUSER/Jason_Updates 
AQUCON, AQUCT, EHYSTR, NETWORK, NNC and UDQDIMS Changes
 2021-06-25 11:45:18 +02:00
Joakim Hove
b5d2a224bf
Merge pull request #2542 from bska/use-restart-file-view 
Reimplement RstState::load In Terms of RestartFileView
 2021-06-25 09:54:29 +02:00
Bård Skaflestad
c32aa48b32 Reimplement RstState::load In Terms of RestartFileView 
This is in preparation of unconditionally loading analytic aquifer
information from the restart file.  Update callers to new API.
 2021-06-25 09:20:55 +02:00
Bård Skaflestad
62893dfcdc RestartFileView: Add Keyword Accessors for 'bool' 
Needed to load logical vectors like 'LOGIHEAD'.
 2021-06-25 09:14:44 +02:00
OPMUSER
68d3b4ce1f AQUCON, AQUCT, EHYSTR, NETWORK, NNC and UDQDIMS Changes 
Added item counter for checking and comment for E300 parameters.
 2021-06-25 12:43:50 +08:00
Bård Skaflestad
1c2212487d
Merge pull request #2540 from bska/prune-close-brace-semicolon 
Prune Needless Trailing ';' On Certain Close Braces
 2021-06-25 00:59:36 +02:00
Bård Skaflestad
cbe149a783 Prune Needless Trailing ';' On Certain Close Braces 
Removes warning "extra ';'" in GCC's "-Wpedantic" mode.
 2021-06-24 23:58:27 +02:00
Jostein Alvestad
0452a0c867 corrections for errors occurred during rebase - move of code to UDQDims.cpp 2021-06-24 23:24:15 +02:00
Jostein Alvestad
72e4891ac5 Correction for inj_phase - index plus function name change 2021-06-24 23:21:39 +02:00
Jostein Alvestad
4633a4c498 correction to test for when to output IGPH 2021-06-24 23:21:19 +02:00
Joakim Hove
ed66a05c54
Merge pull request #2535 from joakim-hove/rstfile-corr-udq 
UDQ output updates
 2021-06-24 16:58:27 +02:00
Joakim Hove
0d170d7339
Merge pull request #2534 from joakim-hove/udq-rst-preparation 
Update UDQ parsing - preparation for restart load
 2021-06-24 15:42:54 +02:00
Joakim Hove
31731a3a2a
Merge pull request #2538 from akva2/print_opm_tests_rev 
print revision of opm-tests
 2021-06-24 15:25:09 +02:00
Arne Morten Kvarving
085ec57759 print revision of opm-tests 2021-06-24 14:40:01 +02:00
Joakim Hove
6041a16339
Merge pull request #2536 from OPMUSER/Jason_Updates 
WELLDIMS Fix Up
 2021-06-24 12:46:08 +02:00
OPMUSER
9c6d1e5395 WELLDIMS Fix Up 
Fix missing entry and defaults to eliminate false warning messages.
 2021-06-24 17:23:49 +08:00
Joakim Hove
81f6e7dcd7
Merge pull request #2530 from OPMUSER/Jason_Updates 
Jason updates #2
 2021-06-24 11:10:39 +02:00
OPMUSER
41b7d05285 Correct TABDIMS and ROCKCOMP 2021-06-24 15:51:52 +08:00
Joakim Hove
e73b613582 UDQ output updates 2021-06-24 09:18:34 +02:00
Joakim Hove
3f47cd536d Improve UDQToken pretty output 2021-06-24 01:29:39 +02:00
Joakim Hove
e1c780ee62 Update UDQ parsing - preparation for restart load 2021-06-24 01:08:54 +02:00
Joakim Hove
3b41815974
Merge pull request #2533 from blattms/janitor 
Remove warnings about unsigned-signed comparison and init order.
 2021-06-23 16:30:37 +02:00
Markus Blatt
48d73bbc6e Remove warnings about unsigned-signed comparison and init order. 2021-06-23 14:42:44 +02:00
Joakim Hove
0d060fad24
Merge pull request #2527 from tskille/parser 
Functionality for parsing only selected sections of a data deck
 2021-06-23 14:04:42 +02:00
Joakim Hove
3b7f43f7c4
Merge pull request #2529 from joakim-hove/nnc-json 
Update JSON scheme for NNC
 2021-06-23 13:38:54 +02:00
Bård Skaflestad
91a852dc53
Merge pull request #2519 from joakim-hove/udq-rst 
Udq rst
 2021-06-23 12:03:25 +02:00
Joakim Hove
ccf23ab301 Update JSON scheme for NNC 2021-06-23 11:53:28 +02:00
Joakim Hove
1e5a1311c4 Load UDQ data from restart files 2021-06-23 08:12:25 +02:00
Joakim Hove
ba21904558
Merge pull request #2524 from joakim-hove/jostein-commits 
Jostein commits
 2021-06-23 08:11:31 +02:00
Bård Skaflestad
cc55180797
Merge pull request #2525 from joakim-hove/keyword-sections 
Keyword sections
 2021-06-23 00:34:42 +02:00
Bård Skaflestad
f3de7bde0f
Merge pull request #2472 from bska/centralise-aquprop-calculations 
Centralise Aquifer PVT Property Calculations and Use Simulator's Values for Restart Output
 2021-06-22 20:38:07 +02:00
Ove Sævareid
e7104a4b16 Guard against undefined values. 2021-06-22 20:17:14 +02:00
Ove Sævareid
30d446d41b Tests for tracer summary. 2021-06-22 20:17:14 +02:00
Ove Sævareid
5a22e9c782 Tracer read/write/get. 2021-06-22 20:17:14 +02:00
Ove Sævareid
7f062f213f Comments and cleanup 2021-06-22 20:17:14 +02:00
Ove Sævareid
785d360fed Untangling tracer summary. 2021-06-22 20:17:14 +02:00
Ove Sævareid
94c6c4942c Support for tracer summary curves, WT(I/P)(R/T/C). 2021-06-22 20:17:14 +02:00