Commit Graph

4861 Commits

Author SHA1 Message Date
Jostein Alvestad
949fb3d944 Add summary vectors for group and field for restart 2018-09-19 16:01:58 +02:00
Jostein Alvestad
86ca704d75 Further changes to implement group output to the restart file.
Starting to use the SummaryState class to include summary data
2018-09-19 16:01:57 +02:00
Jostein Alvestad
53d19e8a44 Further changes to implement group data (IGRP and SGRP)
Plus updating source code to the latest github version of the rest of the OPM code
2018-09-19 16:01:57 +02:00
Jostein Alvestad
f7d975920b Added changes to serialize IGRP and SGRP and write to restart file 2018-09-19 16:01:56 +02:00
Jostein Alvestad
531581762f Further additions and changes to implement preparation and writing of group data to the restart file 2018-09-19 16:01:56 +02:00
Jostein Alvestad
402a5f0965 Initial changes to implement group data into writing of restart file 2018-09-19 16:01:55 +02:00
Jostein Alvestad
79d0081369 Added changes to include no of groups in InteHEAD 2018-09-19 16:01:55 +02:00
Jostein Alvestad
0f26e2e958 Initial changes to add group data to restart output
While here also add changes to include no of groups in InteHEAD
2018-09-19 16:01:55 +02:00
Jostein Alvestad
9cf9bf310d Added changes to serialize IGPR and SGRP and write to restart file
Well info at correct step for save & load RESTART

Retrieve number of wells and completions at the beginning of the
simulated step. Otherwise a well introduced at the same time step as the
report will be included - even though there doesn't exist any simulated
data yet.

This issue would trigger a throw if WRFTPLT was added at the same time
step as a well is introduced in the schedule section.

Removed one DATES item in FIRST_SIM.DATA. The
EclipseReadWriteWellStateData in test_Restart compared state at T1,
which did not include any well data as it was. No other tests were
affected.

Added new implementation of serialize_ICON

The new function has been added to the file WriteRestartHelpers, and
intended to take over for the local function 'serialize_ICON' in
`restartIO.cpp` when `restartIO::save()` is to be updated.  The purpose
of the new implementation is to be compatible with Eclipse.

Handle wildcard in group keywords

Added function getGroups(pattern) to allow records with wildcard.

Included the functionality for GCONPROD, GCONINJE and GEFAC - currently
the only group keywords that should accept wildcards.

Add key string to RestartKey

Pass dimension information for extra fields in restart

Verify that the extra container has THPRES
2018-09-19 16:01:54 +02:00
Jostein Alvestad
a284acc3ed Further additions and changes to implement preparation and writing of group data to the restart file 2018-09-19 16:01:54 +02:00
Jostein Alvestad
19bb0e0077 Additional changes to create restart group data in general and igrp data in particular 2018-09-19 16:01:53 +02:00
Jostein Alvestad
89b11dfd26 Further changes to write group data to restart file 2018-09-19 16:01:53 +02:00
Jostein Alvestad
2552750bed Initial changes to implement group data into writing of restart file 2018-09-19 16:01:52 +02:00
Jostein Alvestad
7b2c36bde5 Added changes to include no of groups in InteHEAD 2018-09-19 16:01:52 +02:00
Jostein Alvestad
b9bb0ae60a Initial changes to add group data to restart output plus adding changes to include no of groups in inteHEAD 2018-09-19 16:01:51 +02:00
Arne Morten Kvarving
4c6d4ee201
Merge pull request #498 from joakim-hove/komodo
Komodo: cmake config changes
2018-09-19 09:08:53 +02:00
Joakim Hove
906ff3f4b5 Add ability to CMAKE variable DIST_PREFIX before find_package(opm--) 2018-09-19 09:07:05 +02:00
Joakim Hove
238d3ddb58 Move CMAKE_MODULE_PATH manipulations before @OPM_PROJECT_EXTRA_CODE@ 2018-09-17 09:12:29 +02:00
Joakim Hove
42745e0bfc
Merge pull request #493 from joakim-hove/default-ecl-compatible
Make ecl compatible restart files default
2018-09-15 11:09:44 +02:00
Bård Skaflestad
4e593da140
Merge pull request #497 from totto82/start2
Write restart when SAVE keyword is in the schedule file
2018-09-14 19:54:25 +02:00
Joakim Hove
662d673c44
Merge pull request #496 from joakim-hove/summary-start-at1
Summary start at1
2018-09-14 17:13:45 +02:00
Tor Harald Sandve
fdc4b0142e Write restart when SAVE keyword is in the schedule file 2018-09-14 13:36:22 +02:00
Arne Morten Kvarving
142994dde6
Merge pull request #491 from akva2/improve_lto
improve lto support
2018-09-14 12:30:16 +02:00
Arne Morten Kvarving
d58001f608 improve lto support
need to use the wrappers for ar and ranlib, or static
libraries are problematic.
2018-09-14 10:29:59 +02:00
Joakim Hove
7dccd13c50
Merge pull request #492 from totto82/minpvfil
fix unit of minpvfil
2018-09-13 19:08:45 +02:00
Joakim Hove
fb5e1229ef
Merge pull request #495 from joakim-hove/remove-include
Remove include + use plain C api for test_area
2018-09-13 19:07:37 +02:00
Joakim Hove
d30fc975e3
Merge pull request #444 from lars-petter-hauge/support_ctfac
Support CTFAC
2018-09-13 18:21:24 +02:00
Joakim Hove
36af2aadb5 Will not write summary data for report step == 0 2018-09-13 18:08:57 +02:00
Joakim Hove
cf754c499d White space change 2018-09-13 18:07:37 +02:00
Joakim Hove
9d7ec59e9e Use plain C api for test area 2018-09-13 17:25:33 +02:00
Joakim Hove
eded8bacfc Remove unused include 2018-09-13 17:11:49 +02:00
Lars Petter Øren Hauge
87e3beb601 Support CTFAC in output 2018-09-13 10:23:47 +02:00
Joakim Hove
079d946723 Make ecl compatible restart files default 2018-09-12 18:02:47 +02:00
Joakim Hove
492a240f09
Merge pull request #488 from joakim-hove/opm-formatted-rst
Add opm_formatted property to the IOConfig
2018-09-12 12:57:26 +02:00
Tor Harald Sandve
e6c0ccb5bf fix unit of minpvfil 2018-09-12 11:44:33 +02:00
Joakim Hove
71d92c3dc8 Add opm_formatted property to the IOConfig 2018-09-12 11:34:57 +02:00
Bård Skaflestad
2ea1b7860f
Merge pull request #490 from bska/fix-index-oob
Ensure Correctly Sized ACTNUM Vector
2018-09-12 10:09:24 +02:00
Bård Skaflestad
9fd5ce396b Ensure Correctly Sized ACTNUM Vector
Size must be equal to number of global (Cartesian) cells.
2018-09-12 09:46:53 +02:00
Arne Morten Kvarving
bff3c0bff1
Merge pull request #489 from joakim-hove/ignore-extra-kwII
Add option to ignore extra keywords in the regresstion testing
2018-09-11 16:09:53 +02:00
Joakim Hove
7cd29ea7d7 Add option to ignore extra keywords in the regresstion testing 2018-09-11 13:34:51 +02:00
Arne Morten Kvarving
a3c9943a5e
Merge pull request #487 from joakim-hove/fix-shared-build
Fix build of tests when using shared library
2018-09-11 13:27:06 +02:00
Joakim Hove
552c390465
Merge pull request #464 from joakim-hove/peaceman-formula
Peaceman formula
2018-09-11 13:18:40 +02:00
Joakim Hove
9f9041dcae Fix build of tests when using shared library 2018-09-10 18:33:47 +02:00
Joakim Hove
c870172a30
Merge pull request #484 from joakim-hove/use-c-smspec
Using plain C api for smspec_nodes
2018-09-10 17:51:23 +02:00
Arne Morten Kvarving
80918f030b
Merge pull request #486 from akva2/combine_compare_apps
Combine comparison applications into one
2018-09-10 11:06:31 +02:00
Joakim Hove
1d55e923f9
Merge pull request #483 from joakim-hove/use-c-testare
Use c testare
2018-09-10 10:15:23 +02:00
Arne Morten Kvarving
cb525c5c75 changed: fold compareSummary into compareECL application 2018-09-10 08:42:26 +02:00
Joakim Hove
4a5b71d8c1 Include Peaceman calculation in Connection class
- The calculation of well connection transmissibility CF and effective
   permeability is calculated.

 - The Connection objects are immutable; should never be updated.

 - The properties of the Connection class are just plain properties, have
   removed getter methods and the use of Value<double>.
2018-09-09 11:16:42 +02:00
Joakim Hove
ff939b44f2 Add testdecks SPE1 and SPE9 2018-09-09 11:16:42 +02:00
Joakim Hove
9e8110e67b Add Peaceman utility functions from opm-simulators 2018-09-09 11:16:42 +02:00