OilfieldToolsNet/opm-common
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
9,007 Commits 18 Branches 75 Tags 73 MiB
e8423d3b25
Commit Graph

9007 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Joakim Hove
e8423d3b25
Merge pull request #1969 from wito/keyword-handler-try-catch 
Exception Catch and Release
 2020-09-29 09:54:41 +02:00
Joakim Hove
751e25ff97
Merge pull request #1963 from joakim-hove/tran-calc-condense 
Tran calc condense
 2020-09-29 09:34:28 +02:00
Joakim Hove
a8e3ecef7d
Merge pull request #1974 from totto82/fixRocktab 
Set number of columns in ROCKTAB to three
 2020-09-29 06:57:48 +02:00
Bård Skaflestad
d55d05e552
Merge pull request #1884 from goncalvesmachadoc/outputProdEnergy 
Add WEPT and WEPR to Summary
 2020-09-28 21:52:53 +02:00
Joakim Hove
8848fde48e Collapse multi record operations on TRAN in one operation 
The main content of this commit is that for keywords with multiple TRAN
modifications like

  MULTIPLY
     TRANX 1.50 1 10 1 10 1 1 /
     TRANX 2.50 1 10 1 10 2 2 /
  /

The different operations are collapes to one entry in tran calculator.

This commit also explicitly throws a std::logic_error() exception if TRAN
manipulations are attempted with the OPERATE keyword or one of the region
keywords ADDREG, MULTIREG, EQUALREG or OPERATER.
 2020-09-28 21:44:21 +02:00
Tor Harald Sandve
fc7ccd1603 Set number of columns in ROCKTAB to three 
Throw if unsuppored directional and stress option is used
 2020-09-28 20:54:19 +02:00
Joakim Hove
de61bdefff
Merge pull request #1972 from asnyv/rtemp 
UNTESTED: Added size: 1 to RTEMP and RTEMPA
 2020-09-28 18:32:31 +02:00
Joakim Hove
8e8ba14397
Merge pull request #1973 from bska/uconv-static-tables-size-check 
Unit Conversion Tables: Add Size Consistency Checking
 2020-09-28 18:14:28 +02:00
Joakim Hove
f331add35b
Merge pull request #1966 from joakim-hove/tran-calc-init 
Tran calc init
 2020-09-28 16:55:07 +02:00
Joakim Hove
5fbf725ea8
Merge pull request #1970 from blattms/make-tran-mod-tests-run 
Make transmissibility modifier tests run
 2020-09-28 16:54:08 +02:00
Williham Williham Totland
f5a3ab2cee Removes (stated) support for named arguments in OpmInputError::format due to UTR test failure. 2020-09-28 16:04:35 +02:00
Cintia Goncalves Machado
76a04c8e48 rebasing 2020-09-28 15:59:20 +02:00
Bård Skaflestad
b7418b419e Unit Conversion Tables: Add Size Consistency Checking 
This commit adds a minimum amount of compile-time size checking for
the various arrays that go into defining the conversion factors and
unit strings.  Using static_assert() we guarantee that the arrays at
least have the expected size lest the translation unit fail to
compile.
 2020-09-28 15:37:28 +02:00
Asgeir Nyvoll
74c3bf82fb Added size: 1 to RTEMP and RTEMPA 2020-09-28 14:27:22 +02:00
Bård Skaflestad
8d89d277cd Warn about network nodes without networks. 2020-09-28 14:05:40 +02:00
Joakim Hove
4b8b35e0f0 only warn about unknown summary nodes. 2020-09-28 14:04:39 +02:00
Williham Williham Totland
f76a71cbee Simplifies logging of error using formatException(). 2020-09-28 13:30:15 +02:00
Cintia Goncalves Machado
e23e229fda addCumToSummaryState 2020-09-28 13:21:19 +02:00
Cintia Goncalves Machado
4e3f5cd0ca addWTICHEA 2020-09-28 13:21:19 +02:00
Cintia Goncalves Machado
5032d28a0f addWTPCHEA 2020-09-28 13:21:19 +02:00
Cintia Goncalves Machado
af1043612a addWEIs 2020-09-28 13:21:19 +02:00
Cintia Goncalves Machado
72efad2a8f finalizeSummary 2020-09-28 13:21:19 +02:00
Cintia Goncalves Machado
dd4de4130a addEnergyRatetoUnitSystem 2020-09-28 13:21:19 +02:00
Cintia Goncalves Machado
4a721cffbb addWEPTandWEPRtoSummary 2020-09-28 13:21:18 +02:00
Williham Williham Totland
805300dd49 Adds some documentation to OpmInputError.hpp. 2020-09-28 13:16:45 +02:00
Williham Williham Totland
9a66acbb5d Extends OpmInputError to be initialisable from an existing exception. 2020-09-28 13:16:45 +02:00
Williham Williham Totland
742c90cabc Extends Opm::OpmInputError::OpmInputError() to accept additional format arguments. 2020-09-28 13:16:45 +02:00
Williham Williham Totland
7cb15bd64d Adds missing test_OpmInputError_format.cpp 2020-09-28 13:16:44 +02:00
Williham Williham Totland
2900da4489 Allow Opm::OpmInputError::format() to accept additional arguments. 
This removes the need to call `fmt::format()` multiple times on a string, thus eliminating error-prone multi-level escapes when formatting strings.
 2020-09-28 13:16:44 +02:00
Williham Williham Totland
05c3d997ac Catches and logs exceptions in Opm::Schedule::handleNormalKeyword() 2020-09-28 13:16:44 +02:00
Joakim Hove
3036441c8c
Merge pull request #1967 from joakim-hove/throw-opm-error 
Throw opm error
 2020-09-28 12:50:36 +02:00
Joakim Hove
a4038b3d9e Wrap SummaryConfig construction in try catch 2020-09-28 11:29:27 +02:00
Joakim Hove
5b6e9f7c92 Wrap Schedule construction in try catch 2020-09-28 09:22:56 +02:00
Joakim Hove
1168e616cd Wrap EclipseState construction in try catch 2020-09-27 23:24:30 +02:00
Joakim Hove
c1ea966548 Add static function OpmInputError::format() 2020-09-27 22:14:53 +02:00
Joakim Hove
8c2ed38cf4 Parse differentiates between OpmInputError and std::exception 2020-09-27 22:00:37 +02:00
Joakim Hove
8e55f3138b Add multi record test 2020-09-27 10:16:32 +02:00
Joakim Hove
d57d9ea18f Utility function for operation dependent SI conversion 2020-09-27 10:16:32 +02:00
Joakim Hove
6de1067c45 Make sure to initialize FieldProps::keyword_info for assignment 2020-09-27 10:16:32 +02:00
Joakim Hove
b95fbc4919 Rewrite test to iterate over cartesian coordinates 2020-09-27 10:16:32 +02:00
Joakim Hove
42c711210e Remove stale struct FieldPropsManager::Meminfo 2020-09-27 10:16:32 +02:00
Joakim Hove
6ee4e5ce9a
Merge pull request #1962 from wito/schedule-keyword-cleanup 
Various Code Consistency Changes in Schedule.
 2020-09-27 10:16:10 +02:00
Joakim Hove
66a9138006
Merge pull request #1965 from joakim-hove/rsm-cmp-eps 
Increase the epsilon used for comparing summary and rsm files
 2020-09-25 23:28:38 +02:00
Joakim Hove
ac4157a66c Increase the epsilon used for comparing summary and rsm files 2020-09-25 22:08:05 +02:00
Bård Skaflestad
83cfe4b50c
Merge pull request #1964 from wito/iterator-reference-fix 
Range Variable Correction
 2020-09-25 18:22:44 +02:00
Williham Williham Totland
6a8f3e16c0 Corrects range variable to a reference. 2020-09-25 16:20:22 +02:00
Williham Williham Totland
2e8e613722 Makes use of braces consistent within if-else sections. 2020-09-25 15:10:23 +02:00
Williham Williham Totland
e8595a6076 Various whitespace fixes. 2020-09-25 15:07:20 +02:00
Williham Williham Totland
24296bf7ee Extracts variables that depend only on record to the outer loop. 2020-09-25 15:06:08 +02:00
Williham Williham Totland
e0344b828d Consts variables. 2020-09-25 15:06:08 +02:00