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

10873 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bård Skaflestad
05bac5f59a
Merge pull request #2719 from OPMUSER/master 
Add WTEST to Allowed ACTIONX Keywords
 2021-09-29 18:41:28 +02:00
Bård Skaflestad
53dcb5c8a0
Merge pull request #2721 from blattms/fix-fs-proximare-gcc7 
Fix compilation with g++-7 lacking fs::proximate
 2021-09-29 18:40:00 +02:00
Bård Skaflestad
7ecbf4725a
Merge pull request #2714 from jalvestad/rstfieldctrl-r 
Improve Eclipse-compatible restart file. Output correct Guiderate control and FIELD level control
 2021-09-29 17:07:08 +02:00
Markus Blatt
49bfad1779 Fix compilation with g++-7 lacking fs::proximate 
Use Opm::prximate instead of fs::proximate. Fixes
compilation issue like
```
opm-common/src/opm/parser/eclipse/Deck/FileDeck.cpp: In member function ‘void Opm::FileDeck::dump_shared(std::ostream&, const string&) const’:
opm-common/src/opm/parser/eclipse/Deck/FileDeck.cpp:331:44: error: ‘proximate’ is not a member of ‘fs’
             std::string include_file = fs::proximate(block.fname, output_dir);
```
 2021-09-29 16:36:03 +02:00
OPMUSER
491275cfc7 Update SummaryConfigTests.cpp 2021-09-29 19:57:24 +08:00
OPMUSER
7d0bf1adde Remove FSIP from ALL keyword Vector List 
FSIP (Field Salt In-Place) is not part of the SUMMARY ALL keyword vector list.
 2021-09-29 19:08:06 +08:00
OPMUSER
97dd24c7ee Add WTEST to Allowed ACTIONX Keywords 
Add WTEST to allowed ACTIONX Keywords
 2021-09-29 18:54:03 +08:00
Joakim Hove
3369785c7d
Merge pull request #2715 from bska/restore-bhp-hist-limit 
Set Appropriate Restart BHP Limit for History Wells
 2021-09-28 21:52:43 +02:00
Bård Skaflestad
b97819a121 Set Appropriate Restart BHP Limit for History Wells 
Without this we would end up with very wrong BHP limits for this
case--e.g., upper BHP limit of 1 ATM for injectors--and this would
obviously mean that restarted runs do not converge.
 2021-09-28 12:01:59 +02:00
Bård Skaflestad
88b6cebb19 Fix Spelling 2021-09-28 12:01:59 +02:00
Joakim Hove
1db095c69b
Merge pull request #2717 from OPMUSER/master 
Add WECON to Allowed ACTIONX Keywords
 2021-09-28 11:57:26 +02:00
Bård Skaflestad
3c23f90cfe
Merge pull request #2711 from totto82/wtest_ref 
return unique vector of names and not a map with wells and reason
 2021-09-28 11:30:36 +02:00
OPMUSER
a0b6e7533b Add WECON to Allowed ACTIONX Keywords 2021-09-28 16:18:35 +08:00
Tor Harald Sandve
cb6db86afe return unique vector of names and not a map with wells and reason 2021-09-28 10:07:45 +02:00
Joakim Hove
caacf4e047
Merge pull request #2716 from joakim-hove/fix-udqstate-serialize-object 
Fix serializeObject in UDQState
 2021-09-28 09:54:02 +02:00
Joakim Hove
2edfbc42e1 Fix serializeObject in UDQState 2021-09-28 09:01:06 +02:00
Joakim Hove
b39e32a221
Merge pull request #2712 from joakim-hove/serialize-action-state 
Serialize Action::State
 2021-09-27 13:47:22 +02:00
Jostein Alvestad
77b86dfd3b final changes for corretions to IGRP[nwgmax+WInjActiveCMode] and IGRP[nwgmax+GConInjeWInjCMode] plus similar gas inj 2021-09-27 12:24:34 +02:00
Jostein Alvestad
b97931ddd5 first changes to improve guiderate output to restart file - enums mapping 2021-09-27 12:24:32 +02:00
Arne Morten Kvarving
94d15ca921
Merge pull request #2713 from akva2/fix_rh_rst_deck 
fix redhat packaging
 2021-09-27 08:14:54 +02:00
Arne Morten Kvarving
e8a8688a48 fix redhat packaging 
due to new man page
 2021-09-27 08:14:26 +02:00
Joakim Hove
f05fbe281a Add serializer support for UDQState 2021-09-25 11:51:34 +02:00
Joakim Hove
cb5eef07a6 Serialize Action::State 2021-09-25 08:29:27 +02:00
Arne Morten Kvarving
beb78ca1f9
Merge pull request #2710 from akva2/fix_semicolon 
fixed: sneaky ; was supposed to be :
 2021-09-24 22:27:45 +02:00
Joakim Hove
5a3eca0fe5
Merge pull request #2684 from joakim-hove/file-deck 
rst_deck: application to create a deck prepared for restart
 2021-09-24 18:46:45 +02:00
Joakim Hove
04dd44488b
Merge pull request #2709 from joakim-hove/rst-update-tuning-bug 
Fix out of bounds write
 2021-09-24 18:45:42 +02:00
Joakim Hove
cc0b9add62 Add integration testing of rst_deck 2021-09-24 14:19:25 +02:00
Joakim Hove
24f31e6358 Add application rst_deck 2021-09-24 14:19:25 +02:00
Arne Morten Kvarving
ed445c9bb2 fixed: do not keep tacking on PYTHONPATH for each build configuration 2021-09-24 14:02:11 +02:00
Joakim Hove
d94db10da4 Fix out of bounds write 2021-09-24 08:34:24 +02:00
Joakim Hove
294d98b9bd Add container FileDeck to represent a deck with file awareness 2021-09-23 21:46:10 +02:00
Joakim Hove
a172879395 Assemble DeckTree during parse process 2021-09-23 14:24:35 +02:00
Joakim Hove
6f94580ff1 Add class DeckTree to mange include file hierarchy 2021-09-23 14:24:35 +02:00
Joakim Hove
a39c707282
Merge pull request #2705 from joakim-hove/opmhash-multi 
Add multi deck comparison to opmhash
 2021-09-23 14:23:59 +02:00
Bård Skaflestad
b807f39357
Merge pull request #2706 from joakim-hove/use-strtod 
Use strtod
 2021-09-23 11:26:34 +02:00
Joakim Hove
4910e75d63 Avoid try catch when parsing floating point numbers in UDQ 2021-09-23 10:23:25 +02:00
Joakim Hove
97455adfa6 Add utility function to parse string -> double without exception 2021-09-23 10:23:25 +02:00
Bård Skaflestad
f21239c5a7
Merge pull request #2707 from akva2/set_python_path 
set python path in jenkins build script
 2021-09-23 10:01:13 +02:00
Arne Morten Kvarving
cc4cc85361 fixed: support cmake 3.13 
the Python3 find module only sets Python3_VERSION_XXX,
not PYTHON_VERSION_XXX
 2021-09-23 08:43:30 +02:00
Arne Morten Kvarving
7a65fe951e set python path in jenkins build script 2021-09-23 08:29:38 +02:00
Bård Skaflestad
e0e26df2ae
Merge pull request #2701 from goncalvesmachadoc/fieldInPlace 
add field volumes in place to summary
 2021-09-22 21:53:58 +02:00
Joakim Hove
1a7e2edf52 Add multi deck comparison to opmhash 2021-09-22 18:23:35 +02:00
Joakim Hove
ceb03e889d
Merge pull request #2698 from joakim-hove/load-action-state 
Load action state
 2021-09-22 12:35:52 +02:00
Joakim Hove
a8afa7a50f Load run_count and last runtime for actionx from restart file 2021-09-22 00:27:59 +02:00
Joakim Hove
d338325147
Merge pull request #2699 from joakim-hove/numerical-month 
Round numerical month values to integer before comparison
 2021-09-22 00:27:35 +02:00
Joakim Hove
33a791d499
Merge pull request #2696 from joakim-hove/actionx-strip-quotes 
Remove quotes before creating ACTIONX AST
 2021-09-22 00:27:16 +02:00
Joakim Hove
745fe11b87
Merge pull request #2704 from joakim-hove/use-proximate 
Use fs:proximate() due to missing fs::relative()
 2021-09-21 14:59:14 +02:00
Joakim Hove
0213cbad17
Merge pull request #2702 from joakim-hove/deck-tree-commitsII 
Deck tree commits ii
 2021-09-21 13:43:05 +02:00
Joakim Hove
7f9f20b84e
Merge pull request #2700 from hakonhagland/pybind_shared 
Use std::shared_ptr as holder type for some Pybind11 classes
 2021-09-21 13:33:42 +02:00
Joakim Hove
1f0c3133c6 Use Opm::proximate() due to missing fs::relative() 2021-09-21 13:20:15 +02:00