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
5bebfed4cf Fix Mismatched Tags 
'RstState' is a 'struct' and should be forward declared as such.
While here, also fix a shadowing variable warning.
 2021-07-16 11:29:56 +02:00
Bård Skaflestad
c72a90ef6e
Merge pull request #2572 from plgbrts/gaswater5 
fix for two phase gas-water system
 2021-07-15 11:55:31 +02:00
Paul Egberts
64051c254f shorten threeP and twoP formulation 2021-07-14 14:10:13 +02:00
Paul Egberts
bddbc252db allow for two phase gas-water system 2021-07-14 11:50:43 +02:00
Bård Skaflestad
dd2f215132
Merge pull request #2571 from OPM/esmry_ms 
new member function in ESmry
 2021-07-13 17:22:30 +02:00
Torbjørn Skille
7b89e9dbf8 new member function in ESmry 
- checking if all timesteps are avaliable
- This will not be the case if RPTONLY has been used with eclipse
 2021-07-13 16:14:21 +02:00
Joakim Hove
3d154ee668
Merge pull request #2568 from OPMUSER/Jason_Updates 
Update TRACERS JSON
 2021-07-10 10:50:08 +02:00
OPMUSER
a0050ed896 Update TRACERS JSON 
Added item for checking, no other changes.
 2021-07-10 09:11:47 +08:00
Joakim Hove
8b2b70bdf3
Merge pull request #2567 from OPMUSER/Jason_Updates 
JSON Revised Definitions
 2021-07-09 12:03:29 +02:00
OPMUSER
0e693e68e3 BOOST_AUTO_TEST_CASE( WCHONHIST ) 
Change number of entries from 11 to 12.
 2021-07-09 16:00:54 +08:00
OPMUSER
147acc1445 JSON Revised Definitions 
Mostly item and comments, except for:
NODEPROP
WCONHIST
 2021-07-08 15:25:47 +08:00
Bård Skaflestad
0f2b338805
Merge pull request #2551 from bska/basic-5-freq-6 
Use Previous Output Time to Decide Next Output Time
 2021-07-07 22:08:35 +02:00
Bård Skaflestad
ed5a9db25b Use Previous Output Time to Decide Next Output Time 
This commit switches the criterion for BASIC=4 and BASIC=5 to using
the difference between the previous and the next output time instead
of "just" the next output time.  The original criteria

    year % freq == 0
    month % freq == 0

don't do what we want.  BASIC=4 and BASIC=5 should output every
'freq' year (=4) or 'freq' month (=5) of simulated time.
 2021-07-07 15:06:10 +02:00
Bård Skaflestad
1c49dcc3db Whitespace Adjustments 
In preparation of fixing restart output times.
 2021-07-07 14:37:21 +02:00
Bård Skaflestad
045d407aed
Merge pull request #2559 from bska/write-restart-file-events 
Add Utility to Track Restart Output Events
 2021-07-07 14:36:11 +02:00
Bård Skaflestad
e8c59932b3 Add Utility to Track Restart Output Events 
This commit adds a new helper object

    Opm::WriteRestartFileEvents

that identifies when a restart file output event occurs as well as
the most recent output event prior to a particular report step.  We
implement this facility in terms of a dense bit vector that wastes
up to 63 bits of space.  Most of the logic is devoted to finding the
most recent previous output event, of which the core routine is
counting the number of leading zero bits in a 64 bit value.  We've
elected to implement this in a portable manner using binary search,
although most implementations provide efficient intrinsics for this
operation, e.g., GCC's __builtin_clzl.  In C++20 we can use the new
function std::countl_zero() from <bit>.
 2021-07-06 14:26:09 +02:00
Joakim Hove
833d036074
Merge pull request #2549 from OPMUSER/Jason_Updates 
Update Various JSON Definitions
 2021-07-05 22:54:31 +02:00
Joakim Hove
68d4f3d730
Merge pull request #2555 from goncalvesmachadoc/patch-3 
Add BCAD
 2021-07-05 19:51:09 +02:00
Joakim Hove
458b1d0396
Merge pull request #2558 from joakim-hove/remove-test 
Remove test check for number of items in record
 2021-07-05 19:50:21 +02:00
Joakim Hove
6ad1d4020c Remove superfluos test 2021-07-05 16:01:31 +02:00
Joakim Hove
7946532f8c
Merge pull request #2557 from joakim-hove/udq-load-rst 
Create UDQConfig object when loading from restart file
 2021-07-03 23:26:48 +02:00
Joakim Hove
56facd6a49 Create UDQConfig object when loading from restart file 2021-07-03 10:29:36 +02:00
Bård Skaflestad
1e8356cc86
Merge pull request #2553 from osae/tracerUnits 
Some support for non-default tracer amount units.
 2021-07-02 12:14:00 +02:00
Bård Skaflestad
43829de62d
Merge pull request #2550 from bska/separate-boost-test-params 
Separate Test Command Line Arguments from Runner Arguments
 2021-07-01 22:57:59 +02:00
Bård Skaflestad
85f809c42b Separate Test Command Line Arguments from Runner Arguments 
When passing parameters to test runners based on Boost.Test we need
to distinguish the parameters that are intended for the test case
and those that are intended for the Boost.Test framework (e.g.,
"--run_test=").
 2021-07-01 16:27:26 +02:00
Bård Skaflestad
f9f54d9cea
Merge pull request #2556 from bska/fix-udq-restart-indexing 
Don't Use Common Start Offset for UDQ Restart Variables
 2021-07-01 16:25:19 +02:00
Bård Skaflestad
cb862b5fa5 Don't Use Common Start Offset for UDQ Restart Variables 
The arrays are sized according to the number of variables of each
category (well, group, field), not the number of UDQs.
 2021-07-01 14:23:02 +02:00
Bård Skaflestad
b8e9f2d766 Split UDQ Definition Strings Out of Main Loop 
Mainly for reduced mental load when reading the body.
 2021-07-01 14:21:10 +02:00
Bård Skaflestad
3a2d37b92a
Merge pull request #2546 from joakim-hove/udq-rst 
Udq rst
 2021-07-01 14:19:35 +02:00
Cintia Goncalves Machado
29af0809b7
Add BCAD 
BSIP was written twice.
 2021-07-01 10:49:31 +02:00
Joakim Hove
6af909778c Load UDQConfig and UDQState from restart data 2021-07-01 07:31:48 +02:00
Joakim Hove
f108463265 Split UDQ tokens also on ' ' 2021-07-01 07:31:03 +02:00
Joakim Hove
1c478078b8 Implement rst udq with std::variant<> for DEFINE and ASSIGN 2021-07-01 07:30:21 +02:00
Joakim Hove
a045550121 Add std::initializer_list constructor for NameOrder 2021-07-01 07:25:54 +02:00
Joakim Hove
1e4a940e70 Add WellMatcher constructor which takes list of wells 2021-07-01 07:25:25 +02:00
Ove Sævareid
e9458705d0 Some formatting of unit names. 2021-06-30 19:04:16 +02:00
Arne Morten Kvarving
0f953dfef8
Merge pull request #2554 from akva2/rh_boost_doc 
fix redhat packaging
 2021-06-30 15:09:57 +02:00
Arne Morten Kvarving
155ab84649 fix redhat packaging 
- use system level boost instead of boost 1.48 now that RHEL6 is dead
- take care of new doc installation
 2021-06-30 15:01:09 +02:00
OPMUSER
189db2490a Add NMESSAGE Summary keyword 
Add NMESSAGE summary keyword and declarations in config file.
 2021-06-30 18:38:13 +08:00
Bård Skaflestad
b39ab05f9f
Merge pull request #2537 from GitPaean/new_update_guide_rates_together 
[new attempt] update the guide rates for all the wells at the same time.
 2021-06-30 12:37:52 +02:00
OPMUSER
f1e7efeb39 JSON Keyword Updates 
COMPDAT, GCONINJE and GCONPROD
 2021-06-30 18:32:32 +08:00
Ove Sævareid
9013b7dca5 Some support for non-default tracer amount units. 2021-06-30 12:22:52 +02:00
Bård Skaflestad
c492cc5c0b
Merge pull request #2545 from joakim-hove/actionx-enable-complump-wpimult 
Add COMPLUMP and WPIMULT as AXTIONX enabled keywords
 2021-06-30 11:54:10 +02:00
OPMUSER
9133b6125d Update Various JSON Definitions 
AQUCON, AQUCT, AQUFETP, EQUIL, MESSAGES, PLYMAX, REGDIMS, and RESTART
 2021-06-29 19:17:52 +08:00
Bård Skaflestad
b4eeca78fa
Merge pull request #2548 from jalvestad/rstcorr-test 
Added test data for IGRP - availablility for higher order control
 2021-06-29 09:14:33 +02:00
Kai Bao
23d0185acd update the guide rates for all the wells at the same time. 2021-06-28 23:11:11 +02:00
Jostein Alvestad
98641b3e93 first version of extended IGRP tests 2021-06-28 13:32:50 +02:00
Jostein Alvestad
01b3c8ee64 initial changes to make extended unit tests for AggregateGroupData 2021-06-28 13:32:49 +02:00
Jostein Alvestad
b747a5edbb corrections for errors occurred during rebase - move of code to UDQDims.cpp 2021-06-28 13:32:43 +02:00
Jostein Alvestad
84023e650f correction to test for when to output IGPH 2021-06-28 13:29:42 +02:00