Commit Graph

1461 Commits

Author SHA1 Message Date
Andreas Lauser
a5f334977c add the higher-level infrastructure for the SPECHEAT keyword
This changes the JSON definition of the SPEHEAT keyword from a blob to
a table, adds a SpecHeatTable class and wires it into the
TableManager.
2017-11-25 18:08:28 +01:00
Tor Harald Sandve
f90ed86124 Add TUNING_CHANGE event for TUNING 2017-11-23 14:22:36 +01:00
Tor Harald Sandve
7aaad448d4 Add support for WEFAC 2017-11-21 09:55:07 +01:00
Joakim Hove
7f02fdc409 Merge pull request #1153 from andreabrambilla/master
Added missing include in Equil.hpp
2017-11-06 17:08:41 +01:00
Andrea Brambilla
8620ad485a Added missing include in Equil.hpp
When running test in opm-parser, this never showed up as a problem since
Equil.hpp seems to be always included after <vector> is included (either
directly or by including other files). However, this can become a
problem when using opm-parser in other projects (eg, sunbeam)
2017-11-06 15:13:26 +01:00
Joakim Hove
612e255d4f Extracted Schedule and SummaryConfig, 2017-10-24 09:27:42 +02:00
Joakim Hove
77fcc865de Extracted SummaryConfig out from EclipseState 2017-10-24 09:13:21 +02:00
Kai Bao
4e6bf8f019 obtaining the depth for the completions based on segment information 2017-10-16 21:53:49 +02:00
Joakim Hove
2c7d4dec41 Merge pull request #1135 from totto82/shutCompletionsFix
Fix shut well logic when WELOPEN and COMPDAT is combined
2017-10-05 14:27:34 +02:00
Tor Harald Sandve
eb4f0b68d6 Fix shut well logic when WELOPEN and COMPDAT is combined
Do not shut well if all completions are shut using WELOPEN but new
completions are opened using COMPDAT in the same time step.
2017-10-03 08:26:09 +02:00
Joakim Hove
f82a6fd281 Removed unused function tracking first RFT. 2017-09-28 08:38:55 +02:00
Joakim Hove
a580259d99 Changed summaryconfig constructor. 2017-09-25 10:05:09 +02:00
Joakim Hove
6379cec8e0 Changed Transmult constructor 2017-09-24 15:43:29 +02:00
Joakim Hove
28f62a019f Removed GridDims from EclipseState. 2017-09-24 09:22:54 +02:00
Joakim Hove
df12c44963 Moved SummaryConfig to EclipseState root. 2017-09-24 02:35:36 +02:00
Joakim Hove
4c3aacc685 Moved SummaryConfig to EclipseState root. 2017-09-24 02:22:16 +02:00
Joakim Hove
726f7e9507 MOved SimulationConfig to EclipseState root. 2017-09-24 02:09:51 +02:00
Joakim Hove
6b3db2f9fe Removed EclipseState::getSchedule( ) calls. 2017-09-24 01:46:05 +02:00
Joakim Hove
4b3c06cbcc Fixed bug in time dependence of RFT configuration. 2017-09-08 23:33:52 +02:00
Joakim Hove
1bc7f306d9 Added method DynamicState::update_elm() 2017-09-08 23:33:50 +02:00
Joakim Hove
44d4aa64cc Added Schedule::getWells( group, time) overload
The new Schedule::getWells( group, time) overload will recursively scan
th group tree rooted at 'group' and return all the wells in that tree.
2017-07-25 20:19:12 +02:00
Joakim Hove
20f34386c9 Merge pull request #1104 from joakim-hove/timemap
Timemap
2017-07-03 13:22:30 +02:00
Joakim Hove
b280ab9cdf Changed TimeMap::forward to use int64_t 2017-06-30 15:23:10 +02:00
Jens Ivar Jørdre
47bfce0f3a Remove Boost ptime and augment tests
Remove constructor and overloads using Boost ptime. Also remove methods
rendered obsolete by the removal of ptime dependency. Rename methods
whose name was initially set to differentiate from ptime counterparts,
an example of which being 'timeTFromEclipse' renamed to
'timeFromEclipse'.

Replace use of gmtime() with util_set_date_values_utc().

Change signature of addTStep(std::time_t) to addTStep(int64_t).

Change base of month indices returned from eclipseMonthIndices(). Now
indices are 1-based.

Simplify timeFromEclipse() (previously timeTFromEclipse()).

Add mkdatetime(), analogous to mkdate() but with also hour, minute
and second parameters.
2017-06-29 14:42:59 +02:00
Jens Ivar Jørdre
1646b3b994 Clean up code
Make use of static method mkdate() rather then using new static method
dateToTM().

Fix error in addTime(std::time_t)

Remove obsolete method dateToTm() and TODO comments.
2017-06-27 13:15:44 +02:00
Joakim Hove
416959c359 Merge pull request #1097 from joakim-hove/explicit-keyworlist
Added EclipseGrid method to get corner positions.
2017-06-27 09:41:24 +02:00
Joakim Hove
3c9f56a146 Initialize TEMPI property from RTEMP keyword. 2017-06-26 18:32:52 +02:00
Jens Ivar Jørdre
c9af992b71 Add support for 64 bit time steps
Replace internal use of boost::posix_time::ptime with std::time_t.
2017-06-26 14:37:35 +02:00
Joakim Hove
009e00ed61 Added EclipseGrid method to get corner positions. 2017-06-23 17:05:11 +02:00
Tor Harald Sandve
80d07d4191 Merge pull request #1091 from totto82/runSpec
Add polymer to phase class in Runspec
2017-06-20 16:20:09 +02:00
Joakim Hove
16e12b0a65 Added TimeMap::forward( ) 2017-06-19 10:54:34 +02:00
Joakim Hove
e802737ec4 Changed from boost datetim to std::time_t. 2017-06-19 10:54:33 +02:00
Joakim Hove
f299984280 Changed TimeMap::operator[] to return std::time_t 2017-06-19 10:54:33 +02:00
Joakim Hove
b6afb2ab8c Removed date accessor from IOconfig/RestartConfig. 2017-06-18 16:55:22 +02:00
Tor Harald Sandve
bb0f4f2886 Add polymer to phase class in Runspec
Also add test for solvent in RunspecTests.
2017-06-16 14:01:10 +02:00
Arne Morten Kvarving
b353126acf pass by reference 2017-06-09 17:38:42 +02:00
Arne Morten Kvarving
aa21cd8b13 quell cppcheck warnings for non-explicit constructor
- the implicit casts from std::string/char* is part of the design for
the view class so we do not want to disable those.
- intializer list constructors should be implicitly called
2017-06-09 17:38:42 +02:00
Arne Morten Kvarving
1eae9ed8c7 explicitly add default constructor to quell warnings 2017-06-09 17:38:42 +02:00
Arne Morten Kvarving
18f15e7432 mark constructors as explicit 2017-06-09 17:38:42 +02:00
Joakim Hove
494cb74124 Limited support for cylindrical grids.
For cylindrical grids based on the keyword set DRV, DTHETAV, DZV and
TOPS the EclipseGrid implementation will create a cornerpoint
representation of the grid.
2017-06-08 08:26:43 +02:00
Joakim Hove
fbb2ce73cd Added circle property to EclipseGrid 2017-06-08 07:01:25 +02:00
Jørgen Kvalsvik
e884b0664c Redesign cmake
Tune the makefile according to new principles, which adds a few bells
and whistles and for clarity.

Synopsis:

* The dependency on opm-common is completely gone. This is reflected in
  travis and appveyor as well. No non-kitware cmake modules are used.
* Directories are flattened, quite a bit - source code is located in the
  lib/ directory if it belongs to opm-parser, and external/ if third
  party.
* The sibling build feature is implemented through cmake's
  export(PACKAGE) rather than implicitly looking through source files.
* Targets explicitly set required public and private include
  directories, compile options and definitions, which cmake will handle
  and propagate
* opm-parser-config.cmake for downstream users is now provided.
* Dependencies are set up using targets. In the future, when cmake 3.x+
  can be used, these should be either targets from newer Find modules,
  or interface libraries.
* Fewer system specific assumptions are coded in, instead we assume
  cmake or users set up system specific details.
* All module wide configuration and looking up libraries is handled in
  the root makefile - all sub directories only set up libraries and
  compile options for the module in question.
* Targets are defined and links handled transitively because cmake now
  is told about them. ${module_LIBRARIES} variables are gone.

This is largely guided by the principles outlined in
https://rix0r.nl/blog/2015/08/13/cmake-guide/

Most source files are just moved - if they have some content change then
it's nothing more than include fixes or similar in order to make them
compile.
2017-06-01 15:29:23 +02:00
Joakim Hove
430b216027 Merge pull request #1069 from jijordre/field_oil_efficiency
Add unit test for field oil efficiency (aka FOE)
2017-06-01 12:06:27 +02:00
Jens Ivar Jørdre
699f84f009 Add unit test for field oil efficiency (aka FOE) 2017-05-31 11:33:21 +02:00
Joakim Hove
5565bead86 Fixed mismerge. 2017-05-31 11:14:07 +02:00
Joakim Hove
3d66efa262 Handle meta keyword PERFORMA.
When adding a ECL_SMSPEC_MISC_TYPE we protect against adding metakeyword
like 'PERFORMA' and 'ALL'.
2017-05-31 09:44:03 +02:00
Joakim Hove
4ce5681a21 SummaryConfig will internalize MISC keywords. 2017-05-31 09:44:02 +02:00
Joakim Hove
79ee673465 Merge pull request #1066 from joakim-hove/summary-rpr
Summary rpr
2017-05-31 09:10:09 +02:00
Joakim Hove
b9823a4c2e Changed region expansion in Rxxx SUMAMRY keywords.
If the region keywords from the SUMMARY section, like e.g. RPR, are
specified without explicit region numbers a summary key is added for all
region values from 1..NTFIP, irrespective of which region values are
actually present.
2017-05-25 23:39:45 +02:00
Joakim Hove
66efc1fd1f Small function which returns number of FIP regions 2017-05-24 21:05:42 +02:00