Commit Graph

5830 Commits

Author SHA1 Message Date
Joakim Hove
6376e4dcc6
Merge pull request #810 from bska/drop-libeclrestart
Drop "libeclrestart"
2019-06-14 11:17:26 +02:00
Bård Skaflestad
b630ecfb5b RestartIO: Drop LibECLRestart Component
It is no longer needed since both save() and load() now use ERst and
EclOutput.
2019-06-13 16:06:48 +02:00
Bård Skaflestad
8cdc72549d RestartIO: Prune Unused Headers in Public Interface 2019-06-13 16:06:48 +02:00
Bård Skaflestad
6aea354ff4
Merge pull request #811 from tskille/master
Use tolerances from command line for restart array SWEL
2019-06-13 15:32:09 +02:00
Torbjørn Skille
66e8068494 Use tolerances from command line for restart array SWEL 2019-06-12 19:06:52 +02:00
Joakim Hove
193eeca5ff
Merge pull request #797 from bska/load-using-ERst
Reimplement RestartIO::load() in Terms of Class ERst
2019-06-12 13:50:22 +02:00
Bård Skaflestad
d1ec2e151c RestartIO::load: Prune 'sim_step' Where Possible 2019-06-12 12:03:55 +02:00
Bård Skaflestad
3d6ace0f97 RestartIO: Reimplement load() in Terms of ERst
This commit reimplements the private RestartFileView class in terms
of the ERst class.  The latter supports all operations we currently
need, although we can no longer use a 'const' object since loading
arrays mutates the ERst instance.

Most changes here are fairly mechanic and most of the new complexity
concerns how to identify a vector (keyword) of a particular element
type.  We make special concessions for INTEHEAD, since this vector
plays a central role in accessing the other data vectors.  The
mutability of RestartFileView is underscored by using shared_ptr<>
in the various helper facilities.
2019-06-12 12:03:55 +02:00
Bård Skaflestad
71c046bef4
Merge pull request #808 from joakim-hove/injection-unitsystem
Add UnitSystem member to Well2 class
2019-06-12 11:46:45 +02:00
Bård Skaflestad
0a3d26e9be
Merge pull request #806 from joakim-hove/UDAValue-reset
Uda value reset
2019-06-12 11:02:48 +02:00
Joakim Hove
edbc9d2af7 UDAValue: add reset() methods 2019-06-12 10:13:01 +02:00
Joakim Hove
44e21101bc UDAValue: the get<double>() method will return SI values 2019-06-12 10:13:01 +02:00
Joakim Hove
f3abbf4981 UDAValue: add method assert_numeric() 2019-06-12 10:13:01 +02:00
Bård Skaflestad
ba2a12e876
Merge pull request #795 from joakim-hove/use-eval-timestep
Use eval timestep
2019-06-11 20:34:31 +02:00
Atgeirr Flø Rasmussen
1c14c0d921
Merge pull request #807 from GitPaean/tesing_master
some white space cleaning up
2019-06-11 15:50:28 +02:00
Joakim Hove
3961f724db Add UnitSsystem member to Well2 class 2019-06-08 12:39:22 +02:00
Kai Bao
0c43f49f13 some white space cleaning up 2019-06-07 14:57:54 +02:00
Joakim Hove
08305b6e30 Extract Summary::eval() out from Summary::add_timestep() 2019-06-07 14:45:18 +02:00
Joakim Hove
51bd7a197d
Merge pull request #805 from OPM/joakim-hove-patch-1
Update url to equinor repo in submodule
2019-06-07 09:06:52 +02:00
Joakim Hove
498a1bb677
Update url to equinor repo in submodule 2019-06-07 08:43:28 +02:00
Joakim Hove
bab231287e
Merge pull request #804 from markusdregi/submodule_fix
Move .gitmodules to root
2019-06-07 08:27:09 +02:00
Markus Fanebust Dregi
ebcac44715 Move .gitmodules to root 2019-06-07 08:26:15 +02:00
Joakim Hove
edfacf2af8
Merge pull request #801 from joakim-hove/uda-operator<<
Add operator<< support to UDAValue
2019-06-06 17:14:08 +02:00
Joakim Hove
40b556112f Add operator<< support to UDAValue 2019-06-06 15:58:36 +02:00
Bård Skaflestad
7413ce5a40
Merge pull request #800 from joakim-hove/add-report-step-accessor
Add public access to report_step in RestartView()
2019-06-06 13:35:13 +02:00
Joakim Hove
66fee23319 Add public access to report_step in RestartView() 2019-06-06 12:19:10 +02:00
Bård Skaflestad
dff91dd742
Merge pull request #798 from joakim-hove/summary-total-fixup
Update total check in SummaryState
2019-06-06 11:06:54 +02:00
Joakim Hove
82f88ce973 Update total check in SummaryState 2019-06-06 09:39:33 +02:00
Bård Skaflestad
b1067dbc98
Merge pull request #793 from joakim-hove/serialize-summary-state
Add serialization of SummaryState
2019-06-05 15:45:13 +02:00
Bård Skaflestad
4cde0ac8a8
Merge pull request #796 from bska/ERst-separate-files
Teach ERst About Separate Restart Files
2019-06-04 23:53:06 +02:00
Bård Skaflestad
a3074d12b5 Teach ERst About Separate Restart Files
This commit makes class 'Opm::EclIO::ERst' able to open separate
restart files (*.X000n, *.F000n).  Specifically, we refactor the
existing class constructor body into a new helper function
'initUnified'.  We add a new helper function 'initSeparate' that
builds the requisite indices in the case of a single report step,
and make the constructor body call 'initUnified' or 'initSeparate'
depending on whether or not the SEQNUM keyword exists in the restart
stream.

Add two new unit tests to exercise the new ability.
2019-06-04 11:01:13 +02:00
Joakim Hove
6af9b00bee
Merge pull request #792 from bska/save-using-EclOutput
Re-implement RestartIO::save() in Terms of OutputStream::Restart
2019-06-03 22:57:39 +02:00
Joakim Hove
ec20274fa3 Add serialization of SummaryState 2019-06-03 14:55:38 +02:00
Bård Skaflestad
8d65ba4e49 OutputStream::Restart: Don't Mention 'prepareStep'
The member function does not exist.
2019-06-03 14:19:48 +02:00
Bård Skaflestad
16e49a0223 RestartIO: Reimplement save() in Terms of OutputStream::Restart
This commit switches the file handling operations of the gateway
function RestartIO::save() to using the OutputStream::Restart
component.  Briefly, this means replacing write_kw() function calls
with calls to Restart::write(), especially since the latter natively
handles PaddedString<8> data.
2019-06-03 14:19:48 +02:00
Bård Skaflestad
c98bf7d4c8 Ecl Output: Add write<>() Support for PaddedOutputString<8>
This is in preparation of using the EclOutput output facility in

    RestartIO::save()
2019-06-03 14:19:48 +02:00
Bård Skaflestad
725ac521ba Promote 'CharArrayNullTerm' to EclIO::PaddedOutputString
Space-padded vectors of N (usually 8) characters is the typical
representation of character data in ECLIPSE output files.  Support
this type natively in the ECLIPSE IO library.
2019-06-03 14:19:48 +02:00
Bård Skaflestad
82b0a2d82b ECLIPSE I/O: Rename Namespace Opm::ecl -> Opm::EclIO
This reduces the risk of conflicting with the 'ecl' namespace from
LibECL, especially when the latter name is used from within the Opm
namespace.
2019-06-03 14:19:48 +02:00
Bård Skaflestad
cb106240bf
Merge pull request #794 from joakim-hove/summary-state-totals
Correctly detect totals in SummaryState
2019-06-03 14:17:34 +02:00
Joakim Hove
89c8cb886b Correctly detect totals in SummaryState 2019-06-03 12:42:51 +02:00
Bård Skaflestad
9aee2bee71
Merge pull request #668 from joakim-hove/udq-fieldset
UDQ field and group variables
2019-06-03 12:01:37 +02:00
Bård Skaflestad
0757bd97cf
Merge pull request #791 from bska/restart-output-code-reformat
Restart Output Code Reformatting
2019-05-29 11:07:17 +02:00
Bård Skaflestad
add1a96d99 Restart Well Data: Restore Indentation
Whitespace only.
2019-05-29 09:28:40 +02:00
Bård Skaflestad
8eda3aaa15 Restart::save(): Prune 'sim_step' Where Possible
Enabled by commit 94b16025.
2019-05-29 09:12:58 +02:00
Joakim Hove
32a1c3b5da
Merge pull request #762 from joakim-hove/well-controls
Well controls
2019-05-29 06:46:47 +02:00
Arne Morten Kvarving
7ec2ee9bff
Merge pull request #789 from akva2/fix_filesystem_generic
fixed: avoid usage of boost::filesystem::path::generic()
2019-05-28 09:11:37 +02:00
Arne Morten Kvarving
c9d1c50986 fixed: avoid usage of boost::filesystem::path::generic()
this is not supported in older version of boost::filesystem.
furthermore, it was always an experimental feature and
and has been deprecated in newer versions.

generic_string is available in all versions, so use that.
2019-05-28 06:28:57 +02:00
Joakim Hove
48c363dafa
Merge pull request #783 from bska/add-restart-io-operations
Add Restart I/O Operations to New ECLIPSE I/O Classes
2019-05-27 23:06:54 +02:00
Bård Skaflestad
a2ec7d7f6d OutputStream::Restart: Pull File Creation Into Constructor
Then we don't have to store copies of the 'formatted' and 'unified'
flags, and are also able to remove the 'prepareStep()' function.  We
will reintroduce these features if we decide to add support for
keeping the output stream open between separate restart output
requests (i.e., between calls to EclipseIO::writeTimeStep()).
2019-05-27 21:00:52 +02:00
Bård Skaflestad
df1a011b78 Redo Public Interface of OutputStream::Restart
In particular, make the stream() function into a private detail of
the implementation and add an overload set for outputting keyword
data and messages to the underlying output stream.  Update unit test
accordingly.

Suggested by: Atgeirr F. Rasmussen
2019-05-27 21:00:52 +02:00