OilfieldToolsNet/opm-common
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
4,740 Commits 18 Branches 75 Tags
03b3be48b06b9e75616a412c3b3326460efd2ad7
Commit Graph

4740 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bård Skaflestad
03b3be48b0 Restart *WEL Arrays: Add Foundational Helper Classes 
This commit adds new helper classes,

    Opm::RestartIO::Helpers::CharArrayNullTerm<NChar>
    Opm::RestartIO::Helpers::WindowedArray<T>
    Opm::RestartIO::Helpers::WindowedMatrix<T>

the first of which represents a nul-terminated character string of
'NChar' user data (total array size is NChar + 1).  Mainly intended
for representing Fortran-compatible characters arrays--especially
for ZWEL and similar restart vectors (e.g., ZGRP).

The second two simplify working with subsets of large linear arrays,
particularly those that represent N items per well, group, or
segment.  The WindowedArray is a linear array of windows (N items
per window) packed into a std::vector<T> and the WindowedMatrix
additionally imposes a Row-by-Colum structure which is useful for
the case of N windows (each of size K) for each of M entities (e.g.,
K items for each of N connections for each of M wells).
 2018-07-12 10:44:27 +02:00
Bård Skaflestad
b9c68bdc6e InteHEAD: Prune Duplicate Assignments 2018-07-12 10:44:27 +02:00
Bård Skaflestad
7680d1900f Merge pull request #461 from bska/extra-conn-props 
Provide Effective Kh Product as an Extra Connection Property
 2018-07-12 10:36:01 +02:00
Bård Skaflestad
0be3f2c76f Unit Tests: Supply Enough Parameters for data::Connection 
We must provide cell_pressure, cell_saturation_water,
cell_saturation_gas, and effective_Kh.

Forgotten in commit 687f108.
 2018-07-12 00:46:46 +02:00
Bård Skaflestad
d4c49398c5 Recognize Effective Kh in INPUT Unit System 
Forgotten in commit 687f108

Pointy Hat: [at]bska
 2018-07-12 00:03:01 +02:00
Bård Skaflestad
687f108285 Unit System: Recognize Units for Effective Kh Product 
While here, also add check for all (current) unit conversion
constants for METRIC, FIELD, and LAB unit conventions and extend the
existing PVT-M checks to cover effective Kh too.
 2018-07-11 22:07:38 +02:00
Bård Skaflestad
48047f8c7a Restart Output (Wells): Store Effective 'Kh' Product 
Mostly to forward to SCON array.

While here, also fix 'Missing initializer' warnings in the
'get_completions' unit test.
 2018-07-10 17:37:49 +02:00
Bård Skaflestad
3466776c1a Connection: Capture Effective 'Kh' Value from COMPDAT 
Needed for restart output (especially, SCON), and also useful for
computing the connection transmissibility factor (WI) in some cases
if not supplied in COMPDAT.
 2018-07-10 17:23:04 +02:00
Joakim Hove
19afcbf769 Merge pull request #458 from joakim-hove/ACTIONX 
Add schema for ACTIONX keyword
 2018-07-10 10:59:26 +02:00
Joakim Hove
e4d39dc722 Add schema for ACTIONX keyword 2018-07-10 09:35:13 +02:00
Arne Morten Kvarving
c7c2480c01 Merge pull request #455 from blattms/make-calling-prereq-function-possible-without-fuss 
Make calling prereq function possible without fuss
 2018-07-09 14:40:33 +02:00
Markus Blatt
90cbad1163 Better mark extra code section in opm-project-config.cmake.in 2018-07-06 11:02:50 +02:00
Markus Blatt
5b5d895380 Fix calling function from OpmPackage in package configuration file. 
Find package_deps is called from <opm-module-name>-prereqs.cmake that is
included in our package configuration files. So it has to be defined early on.
We do this in the package confguration file of opm-common which needs to
be found before any other OPM module.

This fixes the CMake Error seen be e.g. dumux:
CMake Error at opm-grid/opm-grid-prereqs.cmake:37 (find_package_deps):
  Unknown CMake command "find_package_deps".
 2018-07-06 11:02:15 +02:00
Atgeirr Flø Rasmussen
c38100a491 Merge pull request #453 from GitPaean/support_whistctl 
handling the over-writing control part of WHISTCTL
 2018-07-04 16:17:13 +02:00
Kai Bao
b5ff9bc393 handling the over-writing control part of WHISTCTL 
for producers. The termination flag part is not handled yet.
 2018-07-04 14:50:08 +02:00
Arne Morten Kvarving
3186a2d01a Merge pull request #449 from dr-robertk/PR/have-suitesparse-umfpack 
[bugfix][Finddune-istl] Add HAVE_SUITESPARSE_UMFPACK for newer dune-istl versions.
 2018-07-02 16:01:03 +02:00
Robert Kloefkorn
13d1ce4fbf [bugfix][Finddune-istl] Add HAVE_SUITESPARSE_UMFPACK for newer dune-istl 
versions.
 2018-07-02 15:56:03 +02:00
Joakim Hove
4144d761dd Merge pull request #431 from lars-petter-hauge/support_polymer_keys 
Support polymer keys
 2018-07-02 09:39:35 +02:00
Bård Skaflestad
71961c21b4 Merge pull request #446 from atgeirr/use-opm-cellvolumes 
Use OPM cell volume calculations.
 2018-07-02 09:26:22 +02:00
Atgeirr Flø Rasmussen
1b8e1b3197 Fix test failure by reinstating IJK check. 2018-07-02 00:08:36 +02:00
Atgeirr Flø Rasmussen
1e4e565380 Address review comment: do not call data() needlessly. 2018-07-02 00:08:16 +02:00
Joakim Hove
fa002c4408 Merge pull request #445 from atgeirr/improve-performance-of-MULTREGTScanner 
Massively improve the startup time for Flow
 2018-07-01 17:42:09 +02:00
Atgeirr Flø Rasmussen
9d5a43d4e6 Use const reference instead of copying map. 
Also use at() instead of operator[], the at() is
guaranteed to succeed by the checks of the lines above it.
 2018-07-01 14:07:28 +02:00
Atgeirr Flø Rasmussen
6eb363e8e1 Also use OPM cell volume calc in comparison program. 2018-06-29 15:57:15 +02:00
Atgeirr Flø Rasmussen
98e3bbcf1d Changes to make the code compile and run. 2018-06-29 15:57:15 +02:00
Joakim Hove
976bfdab35 Use opm-internal algorithm for volume calculation 2018-06-29 15:57:15 +02:00
Bård Skaflestad
ca79b16b26 Merge pull request #443 from atgeirr/error-and-warning-fixes 
Error and warning fixes
 2018-06-29 15:50:37 +02:00
Atgeirr Flø Rasmussen
65639b0a03 Make it possible to create Input unit systems, add test. 2018-06-29 10:56:34 +02:00
Atgeirr Flø Rasmussen
986abc1bdc Silence various warnings (shadowing, unused args or funcs). 2018-06-29 10:56:13 +02:00
Lars Petter Øren Hauge
5c68a0aaa8 Support CCI(R/T) 2018-06-29 09:45:14 +02:00
Lars Petter Øren Hauge
7a91bebd61 Support FCI(R/T) 2018-06-29 09:45:14 +02:00
Lars Petter Øren Hauge
102bd6b728 Support GCI(R/T) 2018-06-29 09:45:14 +02:00
Lars Petter Øren Hauge
fc3bc714fc Support WCI(R/T) 2018-06-29 09:45:14 +02:00
Atgeirr Flø Rasmussen
89e95b0789 Segment class: fix warnings and operator!= bug. 
While silencing warnings in this class, it became apparent that
operator!=() was buggy, it was just a copy of operator==().
 2018-06-28 17:01:27 +02:00
Atgeirr Flø Rasmussen
ffa4a8ef7b Include required <array> header. 2018-06-28 14:45:30 +02:00
Joakim Hove
1f7a2d5459 Merge pull request #435 from joakim-hove/completion-support2 
Completion support2
 2018-06-28 09:58:36 +02:00
Atgeirr Flø Rasmussen
3ffcff1773 Merge pull request #442 from atgeirr/make-volume-check-optional 
Add more flexibility to compareECL.
 2018-06-27 18:55:06 +02:00
Atgeirr Flø Rasmussen
cfb3d34467 Add more flexibility to compareECL. 
In particular:
 - Grid comparison will now also check that the active cells are the same,
   not just that the number of active cells is identical.
 - In the grid comparison, checking volumes is now optional, from compareECL
   this feature is used by passing the '-V' option on the command line.
 2018-06-27 15:22:55 +02:00
Joakim Hove
b109ab7822 Merge pull request #423 from akva2/codegen_rebuilds 
changed: use a two-tiered process for code gen
 2018-06-27 13:27:33 +02:00
Joakim Hove
5c55957718 Merge pull request #437 from rolk/0437_isatty 
Include vendor-specific header for isatty function
 2018-06-27 11:22:45 +02:00
Joakim Hove
4d3c143af4 Silnce warning 2018-06-26 12:36:49 +02:00
Joakim Hove
3a46555b6d Reorder connection members to quell warning 2018-06-26 12:36:49 +02:00
Joakim Hove
a5cc1cfe48 Remove stale private functions 2018-06-26 12:36:49 +02:00
Joakim Hove
6095fda39f Access connection direction directly 2018-06-26 12:36:49 +02:00
Joakim Hove
a8d1545947 Acces Connection sat table id directly 2018-06-26 12:36:49 +02:00
Joakim Hove
c212af9253 Remove stale function Connection::sameCoordinate() 2018-06-26 12:36:49 +02:00
Joakim Hove
6461cc2a81 Remove stale function Connection::fixDefaultIJ() 2018-06-26 12:36:49 +02:00
Joakim Hove
8895ee171a Remove function Connection::shift_complnum() 2018-06-26 12:36:49 +02:00
Joakim Hove
90f6b46837 Remove stale method Well::addConnections( ) 2018-06-26 12:36:49 +02:00
Joakim Hove
04a3a9ada5 WIP: cleaun up access methods 2018-06-26 12:36:49 +02:00