OilfieldToolsNet/opm-common
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
9,039 Commits 18 Branches 75 Tags
ce463e6020d724dce35350df98942ff81b958188
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Joakim Hove ce463e6020 Extract functions for production and injection when creating IGRP 2020-10-05 10:44:33 +02:00
Joakim Hove 296538c724 Minor rewrite for checking group type 2020-10-05 09:31:02 +02:00
Joakim Hove 47715ae7ae Move function in source file 2020-10-04 16:01:37 +02:00
Joakim Hove f8d988d1dd Rename variable gseqIndex -> insert_index 2020-10-04 16:01:22 +02:00
Joakim Hove aa54bc67de Load group->parent_group when loading from restart file 2020-10-04 16:00:50 +02:00
Joakim Hove 5b3a76172b Store parent_group index when loading restart group 2020-10-04 16:00:15 +02:00
Joakim Hove c2522fd5ce Create symbol for IGRP parent group index 2020-10-04 15:59:53 +02:00
Joakim Hove 007ef0e94f Load well alq value when loading from restart file 2020-10-04 15:33:20 +02:00
Joakim Hove 528548ebce Set predictionMode for Injection and Production objects 2020-10-04 15:33:18 +02:00
Joakim Hove 0ab50fbc95 Merge pull request #1977 from wito/test-warning-noise-fix 
Test Compilation Warning Noise Fix
 2020-10-02 07:56:14 +02:00
Joakim Hove c0336d5eb7 Remove leftover template<...> 2020-10-01 16:59:50 +02:00
Joakim Hove 96ce078dfd Merge pull request #1983 from joakim-hove/private-fmt 
Mkae sure fmtlib is not a dependency in the public api
 2020-10-01 15:24:15 +02:00
Joakim Hove fbf88e8ce1 Merge pull request #1984 from joakim-hove/remove-value 
Remove homemade optional - use std::optional
 2020-10-01 15:23:55 +02:00
Joakim Hove 6dc84b67df Remove homemade optional - use std::optional 2020-10-01 13:53:58 +02:00
Joakim Hove 0475ccdb77 Merge pull request #1978 from joakim-hove/schedule-skriprest-refactor 
Changes in schedule iterate section for restarts
 2020-10-01 07:47:50 +02:00
Joakim Hove 5f45f20be6 Merge pull request #1982 from blattms/fix-some-valgrind-warnings 
Fix some warnings when running with valgrinds MPI wrapper.
 2020-09-30 19:43:30 +02:00
Joakim Hove 8c351440e8 Mkae sure fmtlib is not a dependency in the public api 2020-09-30 18:17:57 +02:00
Joakim Hove 26f91f0ce0 Merge pull request #1981 from akva2/janitoring 
Some janitoring
 2020-09-30 14:45:11 +02:00
Joakim Hove 42f1278db3 Changes in restart TimeMap and Schedule::iterateSection 
This commit changes two aspects of restarts where well and group information is
assembled from the restart file:

 o We require the restart date to be present in the Schedule file as a DATES
   keyword.

 o SKIPREST behavior is implemented unconditionally for restarts with restart
   files, even if the SKIPREST keyword is not present.
 2020-09-29 23:00:16 +02:00
Joakim Hove 1ae7026a4b Merge pull request #1946 from joakim-hove/parsecontext-opm-error 
Parsecontext opm error
 2020-09-29 22:15:04 +02:00
Joakim Hove 8e247ca6e8 Use new ParseCOntext signature 2020-09-29 15:37:14 +02:00
Joakim Hove 2a812ab7ce Use OpmInputError 2020-09-29 15:37:14 +02:00
Joakim Hove a44b174b6b Remove info messages from Schedule 2020-09-29 15:37:14 +02:00
Joakim Hove 0512ab88b4 ParseContext will throw OpmInputError 2020-09-29 15:37:14 +02:00
Joakim Hove e01400fa18 Add KeywordLocation argument to ParseContext::handleError() 2020-09-29 09:56:07 +02:00
Joakim Hove 94b4c509b1 Add KeywordLocation argument to UDQ parser 2020-09-29 09:56:07 +02:00
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
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
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
Joakim Hove 4b8b35e0f0 only warn about unknown summary nodes. 2020-09-28 14:04:39 +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
Joakim Hove ab68722eca Merge pull request #1960 from wito/schedule-keyword-handlers 
Moves keyword handlers from Schedule.cpp to KeywordHandlers.cpp
 2020-09-25 13:45:05 +02:00
Joakim Hove 629b561f75 Merge pull request #1957 from totto82/salinity 
Add keyword SALINITY with unit molality
 2020-09-25 12:28:19 +02:00
Joakim Hove 003537ea77 Merge pull request #1959 from akva2/janitoring 
add missing initializer to quell warning
 2020-09-25 09:52:52 +02:00
Joakim Hove b6f192b7f2 Merge pull request #1958 from joakim-hove/smry-cmp-verbose 
Add error message when comparing summary and rsm files
 2020-09-25 08:50:32 +02:00
Joakim Hove 2985072083 Add error message when comparing summary and rsm files 2020-09-24 16:45:59 +02:00
Joakim Hove b9f95089b9 Merge pull request #1949 from joakim-hove/error-prepare 
Error prepare
 2020-09-24 07:33:22 +02:00
Joakim Hove c7d8d17bf0 Merge pull request #1938 from bska/support-nonmonotone-bo 
Support Non-Monotonic Saturated Oil FVF in PVTO
 2020-09-24 07:19:45 +02:00
Joakim Hove 4114302055 Merge pull request #1954 from akva2/mark_libfmt_system 
changed: mark libfmt headers as system to avoid warnings
 2020-09-23 23:06:45 +02:00
Joakim Hove 2e20dc5d43 Merge pull request #1923 from totto82/co2storage 
Add CO2STOR keyword in Runspec section
 2020-09-23 14:36:18 +02:00
Joakim Hove 7d226bf600 Merge pull request #1926 from joakim-hove/udq-in-actionx 
Udq in actionx
 2020-09-23 14:35:01 +02:00
Joakim Hove 341d14519b Allow negative injection rates for completions 2020-09-23 13:17:55 +02:00
Joakim Hove 6eb9eb8414 Merge pull request #1950 from joakim-hove/deckoutput-dont-split 
Special case output of UDQ and ACTIONX keywords - no split
 2020-09-23 12:29:42 +02:00
Joakim Hove 9887cc01af Merge pull request #1882 from bska/add-guiderate-restart 
Unconditionally Output Guiderates to Restart File
 2020-09-23 12:00:27 +02:00
Joakim Hove aefa3cd9d2 Support defining new UDQ keywords inside ACTIONX block 2020-09-23 11:30:09 +02:00
Joakim Hove 59b59ce3ee Add location member to Welldims class 2020-09-23 11:06:03 +02:00
Joakim Hove b184b0e9e5 Merge pull request #1942 from joakim-hove/opm-error 
Opm error
 2020-09-22 18:01:14 +02:00
Joakim Hove 0bbcee1cc8 Merge pull request #1944 from bska/nodepress-summary-output-2 
Add Support for 'GPR' (Network Node Pressure) Summary Keyword
 2020-09-22 14:44:14 +02:00
Joakim Hove d300e54700 Special case output of UDQ and ACTIONX keywords - no split 2020-09-22 14:22:06 +02:00
Joakim Hove 719af02142 Add custom exception OpmInputError 2020-09-22 13:48:26 +02:00
Joakim Hove f604f94e89 Document format placeholders in KeywordLocation 2020-09-22 12:38:09 +02:00
Joakim Hove 11d5128cbf Use KeywordLocation instead of passing keyword and filename separately 2020-09-22 09:55:45 +02:00
Joakim Hove fe2f5ee185 Keep track of maximum size of RawRecord 2020-09-22 09:55:45 +02:00
Joakim Hove 0530b9b1a3 Merge pull request #1943 from wito/schedule-keyword-functions 
Schedule Keyword Handler Dispatch
 2020-09-22 09:32:47 +02:00
Joakim Hove ee4ac770af Merge pull request #1941 from joakim-hove/rm-sim-container 
Remove unused class SimulationDataContainer
 2020-09-21 11:15:36 +02:00
Joakim Hove 79ae4c7935 Remove unused class SimulationDataContainer 2020-09-21 08:18:51 +02:00
Joakim Hove ac40c65f64 Merge pull request #1933 from joakim-hove/throw-same 
Rethrow the same exception
 2020-09-18 15:28:05 +02:00
Joakim Hove b8c4a2ed83 Merge pull request #1937 from joakim-hove/embed-fmtlib 
Embed fmtlib
 2020-09-18 15:26:44 +02:00
Joakim Hove b09db0325d Use fmtlib for string formatting in opmhash 2020-09-18 11:23:43 +02:00
Joakim Hove 4e5aed45d7 Embed fmtlib source code 2020-09-18 11:23:30 +02:00
Joakim Hove 3004e14e9a Remove use fmtlib package from build system 2020-09-18 11:19:41 +02:00
Joakim Hove f9d43e738a Merge pull request #1936 from akva2/fix_packaging_libfmt 
fix packaging files for libfmt
 2020-09-18 10:14:05 +02:00
Joakim Hove f51533907f Merge pull request #1935 from bska/final-runsum-only 
Don't Write RSM File for Substeps
 2020-09-18 07:22:17 +02:00
Joakim Hove 629da97d61 Rethrow the same exception 2020-09-17 18:54:31 +02:00
Joakim Hove 403fd09e69 Merge pull request #1930 from joakim-hove/fmtlib 
Add build dependency on fmtlib
 2020-09-17 15:40:39 +02:00
Joakim Hove 9e7c808524 Add libfmt dependencies to package specifications 2020-09-17 15:31:16 +02:00
Joakim Hove bafdbc35cc Add dependency to header only fmtlib 2020-09-17 14:57:40 +02:00
Joakim Hove 519e65d32c Add documentation 2020-09-17 11:46:17 +02:00
Joakim Hove 8499c9d1cd Add tran_active() query function 2020-09-17 11:46:17 +02:00
Joakim Hove 4bd9b7212f Add serialization of FieldProps TRAN calculators 2020-09-17 11:46:17 +02:00
Joakim Hove ecee4a7d36 Adds a calculator for modifying field properties in the edit section. 
Previously modifications were applied directly to the field
properties. Unfortunately, for unset TRANX this resulted in
modifying 1.0 even if the simulator is calculating
transmissibilities itself. This was one of the reasons
why we got wrong results (others are in the simulator code).

Now these operations recorded in a calculator which can later be
applied to compressed arrays using apply_tran.
 2020-09-17 11:40:56 +02:00
Joakim Hove c334245d08 Unconditionally add "TIMESTEP" to SummaryState 2020-09-16 19:33:04 +02:00
Joakim Hove 0d85293fcc Merge pull request #1925 from akva2/fix_nupcol_serialization 
fixed: serialization nupcol in Runspec
 2020-09-16 17:12:03 +02:00
Joakim Hove b61f87ddaa Add message function to KeywordLocation 2020-09-16 15:14:44 +02:00
Joakim Hove d283f1858f Add keyword member to KeyworLocation 2020-09-16 14:24:06 +02:00
Joakim Hove bef5a4c27b Renamed class Location -> KeywordLocation 2020-09-16 14:06:54 +02:00
Joakim Hove a023d4b437 DynamicState::find will return std::optional<std::size_t> 2020-09-16 11:59:03 +02:00
Joakim Hove e03a97b539 DynamicState::update_equal() will return index of next value 2020-09-16 09:55:09 +02:00
Joakim Hove ae8dc1a770 Merge pull request #1920 from totto82/scaleAlq 
scaling of the Alq values
 2020-09-16 09:27:59 +02:00
Joakim Hove 03f9a73f43 Make sure R__xxx keywords are recognized in Summary writer 2020-09-14 23:05:03 +02:00
Joakim Hove 5557debd9c Merge pull request #1916 from joakim-hove/summary-config-keywords 
Add method SummaryConfig::keywords( pattern )
 2020-09-14 10:55:27 +02:00
Joakim Hove 791726398e Fix warning 2020-09-14 09:17:53 +02:00