OilfieldToolsNet/opm-common
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
9,490 Commits 18 Branches 75 Tags
f5cc5bc3f25c8c8b9ca867bde420ac345e567519
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Atgeirr Flø Rasmussen 3c1e3b5a30 Merge pull request #2054 from joakim-hove/groups-active-cmode 
Rename group production control mode variable
 2020-10-27 11:52:42 +01:00
Atgeirr Flø Rasmussen fd59f1685a Silence shadowing warnings. 2020-10-19 09:06:38 +02:00
Atgeirr Flø Rasmussen de5e91c80c Merge pull request #2001 from atgeirr/silence-warnings 
Fix struct/class warning.
 2020-10-06 19:32:35 +02:00
Atgeirr Flø Rasmussen a56eb48b85 Fix struct/class warning. 2020-10-06 15:54:11 +02:00
Atgeirr Flø Rasmussen fbe723a874 Merge pull request #1952 from joakim-hove/cir-negative 
Cir negative
 2020-09-25 14:06:22 +02:00
Atgeirr Flø Rasmussen 045f527c5d Merge pull request #1940 from bska/nodepress-summary-output 
Prepare for Outputting Network Node Pressure to Summary File
 2020-09-21 09:21:59 +02:00
Atgeirr Flø Rasmussen 891fda8e79 Merge pull request #1921 from akva2/implement_node_serialize_object 
fixed: implement Node::serializeObject
 2020-09-16 09:42:10 +02:00
Atgeirr Flø Rasmussen 859182f7f0 The distribute_toplayer() is unused. 
Note that there is still a member function of the same name.
 2020-09-07 15:51:35 +02:00
Atgeirr Flø Rasmussen 1cdebaef30 Merge pull request #1902 from atgeirr/fix-missing-include 
Add missing <string> include.
 2020-09-03 11:29:22 +02:00
Atgeirr Flø Rasmussen 873ad61e23 Add missing <string> include. 2020-09-03 10:41:20 +02:00
Atgeirr Flø Rasmussen e719812e9b Merge pull request #1833 from bska/disable-debug-output 
Group Data: Conditionally Enable Debug Output
 2020-06-22 22:17:36 +02:00
Atgeirr Flø Rasmussen 3cda13c7a2 Merge pull request #1831 from akva2/fix_missing_config_h_include 
fixed: include config.h for HAVE_OPENMP
 2020-06-19 14:55:49 +02:00
Atgeirr Flø Rasmussen 146e5930e2 Merge pull request #1828 from joakim-hove/remove-unused 
Remove unused variable
 2020-06-19 06:54:51 +02:00
Atgeirr Flø Rasmussen e08a3666e3 Merge pull request #1818 from atgeirr/fix-nupcol-runspec 
Handle NUPCOL in RUNSPEC correctly
 2020-06-11 20:50:30 +02:00
Atgeirr Flø Rasmussen 0c6d1c31d7 Implement and use Runspec::nupcol(). 2020-06-11 07:44:49 +02:00
Atgeirr Flø Rasmussen 80f6a5d1ed Add failing test for NUPCOL in RUNSPEC. 2020-06-10 13:17:04 +02:00
Atgeirr Flø Rasmussen 229a619a85 Merge pull request #1812 from akva2/move_timestamp 
changed: move build timestamp to separate header
 2020-06-08 12:52:19 +02:00
Atgeirr Flø Rasmussen 937747323d Ensure clang uses the normal standard headers. 
Clang defines __GNUC__ to 4, as that represents its level of
support for the GNU C dialect. The gcc compiler does not provide
a macro indicating the compiler separately from the dialect supported.
We must therefore use the __clang__ macro to avoid false positives.
 2020-05-29 14:31:37 +02:00
Atgeirr Flø Rasmussen 1a1bb29a13 Merge pull request #1800 from atgeirr/bump-version 
Bump version number
 2020-05-29 13:34:28 +02:00
Atgeirr Flø Rasmussen f783282f49 Bump version number 2020-05-28 16:50:26 +02:00
Atgeirr Flø Rasmussen 7cff27c801 Merge pull request #1788 from atgeirr/fix-missing-openmp 
Let make_lodsmry also work without OpenMP.
 2020-05-14 19:11:51 +02:00
Atgeirr Flø Rasmussen 28f3df5259 Let make_lodsmry also work without OpenMP. 2020-05-14 16:58:51 +02:00
Atgeirr Flø Rasmussen 1593df2a32 Add missing <array> include. 2020-05-14 13:45:46 +02:00
Atgeirr Flø Rasmussen 5e985cfaf3 Fix start-time of ACTIONX actions. 2020-05-05 10:09:09 +02:00
Atgeirr Flø Rasmussen 3cb39f8bd4 We do not handle lists of groups. 
Addressed by removing such a list (replace with the single
group matching pattern) in a test case.
 2020-05-05 08:28:10 +02:00
Atgeirr Flø Rasmussen b9cdaafed3 Add missing include statement. 2020-04-30 11:55:32 +02:00
Atgeirr Flø Rasmussen 3d9a12efcb Add 'wellgraph' utility program. 2020-04-25 12:37:21 +02:00
Atgeirr Flø Rasmussen 4b1609b20a Merge pull request #1712 from joakim-hove/group-control2 
Separate flags for available_for_group_control for injectors and producers
 2020-04-17 16:40:23 +02:00
Atgeirr Flø Rasmussen 0cdd6ba3d8 Merge pull request #1692 from joakim-hove/action-exit 
Action exit
 2020-04-15 17:11:15 +02:00
Atgeirr Flø Rasmussen f494f6d5ce Merge pull request #1696 from joakim-hove/explicit-schedule 
Add explicit to one argument Schedule constructor
 2020-04-14 13:23:26 +02:00
Atgeirr Flø Rasmussen 11f555c156 Address performance issue for DX/DY/DZ/TOPS grids. 
The sumIdir() and sumJdir() methods were called inside loop
nests over i and j. Since the methods themselves were linear in
nx and ny, respectively, this was a quadratic algorithm. Performance
only becomes an issue for large (> 10k) values of NX or NY, which
was thought not to ever happen. This assumption was wrong.
 2020-04-14 11:28:07 +02:00
Atgeirr Flø Rasmussen 3111505ed6 Merge pull request #1661 from joakim-hove/connections-wellpi 
WPIMULT: directly multiply the connection transmissibility factor
 2020-03-31 18:59:46 +02:00
Atgeirr Flø Rasmussen 4c5b03b83e Use braces to force correct parsing. 
Without this, clang thinks it is a declaration, not a function call.
 2020-03-27 10:11:12 +01:00
Atgeirr Flø Rasmussen fce6eeca1b Make the FIELD group unavailable for higher level control. 2020-03-26 12:07:06 +01:00
Atgeirr Flø Rasmussen 2d52268bf8 Fix type mismatch error for EclEntry. 2020-03-24 08:05:34 +01:00
Atgeirr Flø Rasmussen 4a88b87958 Merge pull request #1626 from totto82/fixGuideRat 
fix bug in guiderate model
 2020-03-23 17:51:10 +01:00
Atgeirr Flø Rasmussen 0b0fab781b Add missing header inclusion. 2020-03-23 17:49:43 +01:00
Atgeirr Flø Rasmussen 2805f862db Compile-error fix: do not narrow double->bool in init list. 2020-03-23 14:34:27 +01:00
Atgeirr Flø Rasmussen ce930d0158 Add virtual destructor for EclipseState class. 2020-03-11 15:19:47 +01:00
Atgeirr Flø Rasmussen be2337e2c1 Add GuideRate::has(). 2020-03-11 15:19:47 +01:00
Atgeirr Flø Rasmussen 1cbb1ddaf7 Merge pull request #1530 from akva2/foam_config_change 
changed: don't enforce foam model limits in parser
 2020-03-04 14:18:32 +01:00
Atgeirr Flø Rasmussen 92eb721e85 Add missing <string> include. 2020-03-04 13:51:49 +01:00
Atgeirr Flø Rasmussen dbb78a509b Merge pull request #1520 from atgeirr/add-group-availability 
Add Group::isAvailableForGroupControl() method.
 2020-02-28 10:03:04 +01:00
Atgeirr Flø Rasmussen 1a0f47f274 Add Group::isAvailableForGroupControl() method. 
The method has very similar intended usage as the method of the
same name in the Well class.
 2020-02-27 14:56:31 +01:00
Atgeirr Flø Rasmussen 8b110916e6 Add overloads to eval() and get() for simpler generic usage. 2020-02-24 16:05:48 +01:00
Atgeirr Flø Rasmussen dae7b2f331 Merge pull request #1504 from akva2/remove_opmfil 
remove unused enum entry OpmFIL
 2020-02-24 13:31:29 +01:00
Atgeirr Flø Rasmussen f35529d7ff Silence warnings. 
- One class vs struct declaration.
 - Unused variables in a test.
 2020-02-21 10:49:41 +01:00
Atgeirr Flø Rasmussen 4a16f6022d Use upper case to look up month numbers. 
This means we accept strings such as "Sep" and "oCT" as valid months,
not just "SEP" and "OCT".
 2020-02-19 09:37:28 +01:00
Atgeirr Flø Rasmussen fa5050f18a Merge pull request #1474 from joakim-hove/schedule-add-rst-argument 
Schedule add rst argument
 2020-02-14 14:00:20 +01:00
Atgeirr Flø Rasmussen 4516b23a14 Merge pull request #1410 from joakim-hove/group-multiple-phases 
Support multiple phases in group injection
 2020-02-14 11:10:37 +01:00
Atgeirr Flø Rasmussen 5ab15783e2 Fix operator==() of UDQFunctionTable. 2020-02-13 15:04:02 +01:00
Atgeirr Flø Rasmussen 74129a2866 Silence a few warnings, remove some end-of-line whitespace. 2020-02-13 09:13:29 +01:00
Atgeirr Flø Rasmussen 3ee092792c Remove duplicate warnings for unhandled summary keywords. 2020-01-24 12:27:32 +01:00
Atgeirr Flø Rasmussen b3f8209542 Silence some warnings. 2020-01-13 10:07:33 +01:00
Atgeirr Flø Rasmussen 7c77d9e2a7 Merge pull request #1351 from joakim-hove/weltarg-unit-conversio 
Temporarily bypass the unit conversion in handleWELTARG
 2019-12-18 13:56:02 +01:00
Atgeirr Flø Rasmussen 6c1c6e2c13 Merge pull request #1350 from akva2/janitoring 
add a default to quell unhandled value in switch warning
 2019-12-17 13:40:13 +01:00
Atgeirr Flø Rasmussen 64fd78694e Merge pull request #1347 from akva2/janitoring 
Some janitoring
 2019-12-17 08:44:04 +01:00
Atgeirr Flø Rasmussen bff545696a Merge pull request #1325 from joakim-hove/grid-mem 
Grid mem
 2019-12-16 09:38:21 +01:00
Atgeirr Flø Rasmussen c343651f44 Merge pull request #1257 from GitPaean/support_wsegvalv 
Support wsegvalv
 2019-12-11 21:07:11 +01:00
Atgeirr Flø Rasmussen 3645151309 Merge pull request #1251 from GitPaean/support_wsegsicd_rebase 
Support WSEGSICD rebase
 2019-12-05 12:43:32 +01:00
Atgeirr Flø Rasmussen e4e3b3bde8 Use seekg() rather than ignore() to skip ahead. 2019-11-27 10:17:30 +01:00
Atgeirr Flø Rasmussen 0ea0f07b20 Merge pull request #1225 from atgeirr/fix-abs 
Fix abs() ambiguity, add copyright headers.
 2019-11-14 23:11:01 +01:00
Atgeirr Flø Rasmussen 87a0e0e402 Fix abs() ambiguity, add copyright headers. 2019-11-14 13:09:35 +01:00
Atgeirr Flø Rasmussen 6d83672f94 Merge pull request #1217 from joakim-hove/rename-well2 
Rename Well2 -> Well and  Group2 -> Group
 2019-11-14 10:33:45 +01:00
Atgeirr Flø Rasmussen 4fc71e352e Merge pull request #1205 from totto82/defaultNUPCOL 
Change default NUPCOL to 12
 2019-11-08 17:38:20 +01:00
Atgeirr Flø Rasmussen b787a1a259 Fix TimeMap::isTimestepInFirstOfMonthsYearsSequence() method. 2019-11-08 17:26:02 +01:00
Atgeirr Flø Rasmussen d6cd0ff871 Merge pull request #1197 from atgeirr/add-regula-falsi-bisection 
Add combined regula falsi + bisection method, and test.
 2019-11-05 13:00:36 +01:00
Atgeirr Flø Rasmussen 2951df2bfb Add combined regula falsi + bisection method, and test. 2019-11-05 10:33:02 +01:00
Atgeirr Flø Rasmussen 4cc54aa324 Add missing <string> include, necessary on clang. 2019-10-24 15:44:34 +02:00
Atgeirr Flø Rasmussen cf26ecac5e Merge pull request #1138 from bska/transpose-density-table 
TAB Vector (INIT): Store Phase Density Data By Columns
 2019-10-21 23:06:27 +02:00
Atgeirr Flø Rasmussen d4cfa5127f Merge pull request #1097 from akva2/enable_flow_variants 
changed: build flow variants on jenkins
 2019-10-14 12:59:30 +02:00
Atgeirr Flø Rasmussen 51b3d14851 Merge pull request #1044 from joakim-hove/deck-sistate 
DeckItem - use same store for both si and raw
 2019-09-30 23:14:37 +02:00
Atgeirr Flø Rasmussen 0edd5c2207 Merge pull request #1035 from joakim-hove/equil-data 
Changed EquilRecord to take SI values instead of DeckRecord
 2019-09-24 08:28:17 +02:00
Atgeirr Flø Rasmussen a5e897bdc7 Merge pull request #1039 from akva2/janitoring 
fixed: remove unused variable
 2019-09-23 15:59:32 +02:00
Atgeirr Flø Rasmussen 6100a90e49 Merge pull request #1009 from tskille/EclipseGrid2 
ERT/libecl routines used in the EclipseGrid class has been replace by…
 2019-09-23 15:55:28 +02:00
Atgeirr Flø Rasmussen 93e4c2ffec Add .clang-format specification. 2019-09-18 14:15:21 +02:00
Atgeirr Flø Rasmussen 48aba21941 Merge pull request #1016 from joakim-hove/deck-constructor 
Deck constructor
 2019-09-16 08:59:20 +02:00
Atgeirr Flø Rasmussen 1c6e5f5099 Merge pull request #1002 from akva2/remove_option 
remove unused opm-common module specific OPM_PREFIX_PATH option
 2019-09-09 10:38:21 +02:00
Atgeirr Flø Rasmussen 752a9e2501 Make StreamLog throw if it fails to open file. 2019-09-06 13:11:54 +02:00
Atgeirr Flø Rasmussen 1588f3227e Add missing include. 2019-09-05 13:52:42 +02:00
Atgeirr Flø Rasmussen be795af931 Merge pull request #979 from joakim-hove/actionx-dynamic 
Convert Schedule::Actions to a DynamicState<Actions>
 2019-09-04 14:25:06 +02:00
Atgeirr Flø Rasmussen a9cff8f7a1 Merge pull request #970 from akva2/rename_ewoms 
changed: rename ewoms to opm-models
 2019-08-23 16:21:12 +02:00
Atgeirr Flø Rasmussen 079cb5fd0b Merge pull request #960 from joakim-hove/rm-printf 
Remove printf debug
 2019-08-19 12:34:50 +02:00
Atgeirr Flø Rasmussen b0ad018a74 Remove an unused call that is very slow. 2019-08-14 23:02:50 +02:00
Atgeirr Flø Rasmussen eb1d00f9dc Merge pull request #941 from atgeirr/make-prodinjprops-public 
Make two headers public again.
 2019-08-13 12:28:35 +02:00
Atgeirr Flø Rasmussen d20c58da07 Make two headers public again. 2019-08-13 11:56:17 +02:00
Atgeirr Flø Rasmussen b9cdb9fb78 Minor modifications requested by reviewer. 2019-08-06 14:14:00 +02:00
Atgeirr Flø Rasmussen 8c9674856a Bugfix: multiple bugs in dealing with SLGOF dealt with. 2019-08-06 11:10:57 +02:00
Atgeirr Flø Rasmussen 6aabb6958d Merge pull request #883 from atgeirr/allow-no-foamfsc 
Allow FOAM without FOAMFSC
 2019-07-05 09:24:13 +02:00
Atgeirr Flø Rasmussen 3f5f4c1b40 Merge pull request #885 from atgeirr/use-fixed-libecl-jenkins 
Set default commit to use for libecl to a known OPM-compatible commit
 2019-07-04 17:42:27 +02:00
Atgeirr Flø Rasmussen 54c8e107b7 Do not use master branch for libecl by default. 2019-07-04 16:35:48 +02:00
Atgeirr Flø Rasmussen c3dcedc392 Allow FOAM without FOAMFSC 
This is necessary to support the table-based gas mobility reduction model.
In order to extend support to the function-based model the FOAMFSC-related
things have been kept.
 2019-07-04 12:57:43 +02:00
Atgeirr Flø Rasmussen e877de94bb Merge pull request #882 from atgeirr/add-wfoam-support 
Add WFOAM support
 2019-07-04 11:16:46 +02:00
Atgeirr Flø Rasmussen 5144456aa4 Address review comments. 
- Use const reference to the dynamic state in handleWFOAM() and handleWPOLYMER().
 - Throw if trying to set foam or polymer injection properties on a production well.
 - Update some tests that failed due to the point above.
 2019-07-04 09:23:11 +02:00
Atgeirr Flø Rasmussen 5f8d24c431 Add tests for WFOAM. 2019-07-03 12:39:35 +02:00
Atgeirr Flø Rasmussen 13bd564edf Add WFOAM support to Schedule and Well2. 2019-07-03 12:39:35 +02:00
Atgeirr Flø Rasmussen 0aaf9823c1 Merge pull request #879 from atgeirr/add-foammob 
Add FOAMMOB and friends
 2019-07-03 12:38:33 +02:00
Atgeirr Flø Rasmussen f48462841f Add table support for FOAMMOB. 2019-07-03 11:12:12 +02:00
Atgeirr Flø Rasmussen 89acca0fd7 Add FOAMMOB, FOAMOPTS and WFOAM keywords. 2019-07-03 11:12:12 +02:00
Atgeirr Flø Rasmussen 1cd6ebb403 Merge pull request #877 from atgeirr/add-foamrock 
Add FOAMROCK including FoamConfig support and test.
 2019-07-02 17:53:51 +02:00