Commit Graph

221 Commits

Author SHA1 Message Date
Jørgen Kvalsvik
38f9103e43 Widen rates bitmask to 32 bits. 2016-10-21 12:13:20 +02:00
Joakim Hove
0cb12fff56 Merge pull request #112 from joakim-hove/solution-default-arg
Using constructor in default argument creation.
2016-10-20 19:38:18 +02:00
Joakim Hove
9336045966 Using constructor in default argument creation. 2016-10-20 18:20:50 +02:00
Jørgen Kvalsvik
9f41044447 Remove CornerpointChopper.hpp 2016-10-19 13:44:33 +02:00
Jørgen Kvalsvik
c07fe44d5e Update to shared_ptr-less parser interface. 2016-10-19 13:44:33 +02:00
Atgeirr Flø Rasmussen
a8639b8822 Merge pull request #105 from andlaus/opm-parser_units
adapt to the rename of the unit system header in opm-parser
2016-10-18 15:25:32 +02:00
Jørgen Kvalsvik
8ac5dc553f Implement Solution via std::map 2016-10-17 07:06:23 +02:00
Joakim Hove
79e7ce643d Using data::Solution for simulator <-> output.
Will use one common container for both the solution data required for the
restart, e.g. PRESSURE and SWAT and also the auxillary data like KRG and
FIP which is intended as extra information in the restart file, or
alternatively the summary file.
2016-10-17 07:04:06 +02:00
Joakim Hove
79a03c26d0 Using CelldataConatiner in opm-output. 2016-10-17 07:01:51 +02:00
Joakim Hove
c60f21af84 New class for simulator -> output data exchange. 2016-10-17 06:59:00 +02:00
Andreas Lauser
117af55887 adapt to the rename of the unit system header in opm-parser 2016-10-10 17:27:18 +02:00
Joakim Hove
eb929077a2 Moved Cells.hpp and Wells.hpp opm/output/data/ 2016-10-06 16:29:20 +02:00
Jørgen Kvalsvik
f94ecc09a3 Schedule::getGroup returns reference, not pointer 2016-10-05 14:52:25 +02:00
Joakim Hove
2cf038e3b7 Merge pull request #94 from totto82/output_solvent
Output SSOL to restart file if present
2016-09-29 12:43:27 +02:00
Tor Harald Sandve
f3b9c88a53 Add support for output of solvent in summary file
The following keywords are implemented
[F,G,W,C]N[P,I][R,T]
FNPR, WNIR etc.
2016-09-28 15:03:15 +02:00
babrodtk
9ad8fcae19 Ignore non-restart variables when writing restart 2016-09-28 09:11:48 +02:00
babrodtk
231613c32a Added boolean flag for writing cell data to restart files 2016-09-28 09:11:48 +02:00
Jørgen Kvalsvik
687a4ca262 Removed unused private member. 2016-09-25 22:02:08 +02:00
Jørgen Kvalsvik
725aaac746 Overwrite UNRST file on first restart write.
Replaces checking if the report step is zero with maintaining some state
and determining if any given step is the first time an UNRST file is
written to or not. Extends the test to also cover this case. New
behaviour will remove all time steps from a pre-existing UNRST file from
the restart step being started from, but preserve all steps leading up
to that point.
2016-09-25 22:01:41 +02:00
Jørgen Kvalsvik
c0d99d2c5c Revert "Remove unused grid argument in RFT::writeTimeStep()."
This reverts commit 1a5f80ddf3bb0a86ba06f713ca71cf4bf044168f.
2016-09-25 22:00:30 +02:00
Atgeirr Flø Rasmussen
a9f5fcdfd5 Silence various warnings.
Mostly shadowing, also unused variable and unused argument.
2016-09-23 15:02:36 +02:00
Atgeirr Flø Rasmussen
07986d8fd4 Fix compile error: ambiguous call to std::abs(). 2016-09-23 15:01:42 +02:00
Atgeirr Flø Rasmussen
eb85e1b02c Remove unused grid argument in RFT::writeTimeStep(). 2016-09-23 15:00:16 +02:00
Tor Harald Sandve
bf892a7976 Output SSOL to restart file if present 2016-09-22 14:54:10 +02:00
Arne Morten Kvarving
ed9c800fa7 Merge pull request #90 from akva2/restructure_test_utilities_and_add_integration_test
Restructure test utilities and add integration test
2016-09-20 12:40:16 +02:00
Joakim Hove
fc1a11af70 Use ecl_util_make_date() to create time_t value. 2016-09-19 19:28:06 +02:00
Arne Morten Kvarving
a403a8d21c Changed to two applications for comparison
- restartRegressionTest, initRegressionTest was squashed to one
 application, which also supports integration test as well as test
 of restart files (non-unified) and .RFT files.

- summaryRegressionTest was renamed compareSummary -- now it can
 execute an integration test as well as regression test. Also other
 improvements were made.
2016-09-19 14:36:03 +02:00
Petter Taule
3bb1cda00c Added integration tests in compare libraries
- The compare library summaryIntegrationTest.cpp and header was added,
 which implements a integration test for summary files.

- The summary regression test was enhanced with extended
 functionality.

- EclFilesComparator.cpp with header file now includes an integration
 test for SGAS, SWAT and PRESSURE in UNRST files, and also the
 regression test was improved with cell volume check, as well as checks of more
 keyword types.
2016-09-14 13:09:38 +02:00
Joakim Hove
204ca5932b Outputwriter: use EclipseGrid
- The outputwriter will now take a a separate EclipseGrid instance as
  input argument, it is assumed that calling scope has already made sure
  ACTNUM and ZCORN are correct.

- All active/inactive cell mappings are based on the grid argument, the
  naked int* with global / active cell mappings has been completely
  removed.
2016-09-08 08:38:39 +02:00
babrodtk
ec43c9c86f Fixed warnings 2016-09-06 07:54:21 +02:00
Joakim Hove
e9344a2591 Renamed constants '_ITEM' -> '_INDEX' 2016-08-29 12:43:38 +02:00
Joakim Hove
33ae96f2af Summary will output region pressure: RPR 2016-08-26 12:50:40 +02:00
Joakim Hove
2aa9dfbf48 Added optional argument simProps to writeTimestep.
The simProps argument is vector of field properties which have been
initialized / calculated by the simulator. Examples of such properties
include the relative permeabilites KRG, KRO and KRW and the fluid in
place vectors FIPOIL and FIPGAS.
2016-08-20 19:26:35 +02:00
Joakim Hove
4bfacb144d Moved argument 'sub_step' to 2. in argument list. 2016-08-20 19:26:35 +02:00
Joakim Hove
667307f417 EclipseWriter: write restart with double.
In restart files generated by Eclipse the solution fields, i.e. pressure
and saturations are written in 32 bits precision using floats. For
compatibility that is the default behavior in opm/flow as well, but with
this patch it is optionally possible to write the solution fields with
64 bit double precision.

The resulting files will probably be incompatible with third party
applications, so this should be done with extreme caution.
2016-08-18 15:43:07 +02:00
Jørgen Kvalsvik
5a84bb6ce5 Use RestartConfig instead of IOConfig 2016-08-10 16:56:08 +02:00
jokva
a77a9646a1 Merge pull request #74 from pgdr/ioconf-usecase
Minor cfg() api use case
2016-08-09 11:42:41 +02:00
Pål Grønås Drange
e4a2da1b7b Minor usecase of state.cfg().io() instead of ioconfig shared_ptr 2016-08-09 09:37:46 +02:00
Pål Grønås Drange
7d2de9117c InitConfig is reference, use ref EclipseState constructor 2016-08-08 10:03:58 +02:00
Atgeirr Flø Rasmussen
dd6a364043 Add missing include directives.
These are required for std::accumulate (numeric) and
std::abs (cmath).
2016-08-01 15:47:23 +02:00
Joakim Hove
b883e011db Merge pull request #66 from jokva/simpler-dsl-fwcth-keyword
Write units to Summary file.
2016-07-27 23:37:30 +02:00
Petter Taule
163f5a5cf5 Added applications using the regression test libraries
Added restartRegressionTest.cpp, initRegressionTest.cpp, rftRegressionTest.cpp, summaryRegressionTest.cpp, and modifying CMakeLists_files.cmake to include these.
2016-07-22 09:19:46 +02:00
Petter Taule
51c7a97af5 Added regression test libraries
Added EclFilesComparator.cpp, summaryComparator.cpp and summaryRegressionTest.cpp and corresponding header files. Also including these files in CMakeLists_files.cmake, and adding boost tests in the tests directory.
2016-07-22 09:19:46 +02:00
jokva
6ef249b9a7 Revert "C++ regression test of eclipse files (initial, unified restart and summary)" 2016-07-21 16:37:18 +02:00
Petter Taule
2f69ec7e23 Added applications using the regression test libraries
Added restartRegressionTest.cpp, initRegressionTest.cpp, rftRegressionTest.cpp, summaryRegressionTest.cpp, and modifying CMakeLists_files.cmake to include these.
2016-07-21 16:02:41 +02:00
Petter Taule
23a1171d6d Added regression test libraries
Added EclFilesComparator.cpp, summaryComparator.cpp and summaryRegressionTest.cpp and corresponding header files. Also including these files in CMakeLists_files.cmake, and adding boost tests in the tests directory.
2016-07-21 16:01:50 +02:00
Jørgen Kvalsvik
f84fb39d69 Summary keywords from model2 to be supported
Additional Summary keywords from model2 that we wish to support has been
added to the test summary deck.
2016-07-20 15:07:03 +02:00
Jørgen Kvalsvik
2158ea92bf FWCTH support 2016-07-19 14:44:35 +02:00
Jørgen Kvalsvik
9fc3fcfc38 Simplify DSL; unit conversion to quantity maths
By moving the unit conversion to the low-level arithmetic rather than
the high level functions, the DSL is simplified by inferring result
types rather than requiring explicit conversions. This means the
formulae are more lisp-like and more natural, since there is no more
need for liq_vol and fiends.

An added benefit is that multiplication now is commutative also with
respect to units, so the wonky left-hand-side-converts semantics are
gone.
2016-07-19 14:42:11 +02:00
Jørgen Kvalsvik
1ae6508f7f Write textual representation of unit in Summary
Write the corresponding unit type (as a string) to the values written in
the Summary file.

Accomplished by running every registered function as the ert entry is
created and obtaining the string representation of the result. The
computation is called with empty, dummy structures.
2016-07-19 14:39:40 +02:00