Commit Graph

40 Commits

Author SHA1 Message Date
Joakim Hove
f299984280 Changed TimeMap::operator[] to return std::time_t 2017-06-19 10:54:33 +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
477fa5a988 Combine test files, reduce number of targets
In an effort to reduce the numbers of targets built, and consequently
the repeated work and overhead of compiling boost test, a series of
test programs are combined to larger modules.

Every target typically has a constant cost of 3-6s, depending on the
computer, just for the make to set up dependencies and for the compiler
to parse and compile the testing framework and other dependencies. Each
set of tests typically add very little, so significant savings are
achieved by merging targets.

When tested on a 2015 i5m laptop, this reduced serial, single-core
compile time from ~14m45s to ~11m15s.
2017-06-01 15:29:23 +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
Kristian Flikka
b36f000377 Moved tests from one base location, into per-topic folders 2013-05-06 14:46:29 +02:00
Kristian Flikka
bf3be4695d Refactoring, prefixing parser setup classes with Parser. 4 space indent. 2013-05-06 12:13:49 +02:00
Joakim Hove
105012ad7e More reorg/merge fixes 2013-05-06 09:54:31 +02:00
Joakim Hove
40e6a35332 ??? 2013-05-06 09:48:29 +02:00
Joakim Hove
60abc2c397 Merged in documentation 2013-05-06 09:44:00 +02:00
Joakim Hove
be7e6e0cad Added basic ParserRecordItem class 2013-05-03 17:06:53 +02:00
Kristian Flikka
86fe804655 Downgraded BOOST requirement to 1.36, not tested, but should be ok. Tested on 1.45 2013-04-10 10:41:14 +02:00
Kristian Flikka
8b32658e54 Refactoring, more consts, etc. Comments from Joakim 2013-04-08 14:32:17 +02:00
Kristian Flikka
477551c8d7 Split Statoil dependent test in separate file 2013-04-08 10:47:25 +02:00
Kristian Flikka
76b8df09ad Changed the logic in raw-reading, only adding keyword after it is finished. Simplified special casing for INCLUDE. Reset keyword pointer when keyword finished 2013-04-08 10:07:24 +02:00
Kristian Flikka
c76767b9aa Adding recursive reading of Include files. Fixed a performance bug when appending strings to a record 2013-04-05 16:14:43 +02:00
Kristian Flikka
041ac87337 Removed unused variable 2013-04-04 15:54:55 +02:00
Kristian Flikka
0d5ce81809 Merge pull request 2 from joakim-hove/master - Added code to add Keywords to parser class 2013-04-04 14:17:12 +02:00
Kristian Flikka
aa8cd7b4ca Added a thin container for knowledge about keywords with fixed number of records. Changed some getter methods to return reference 2013-04-04 13:30:50 +02:00
Kristian Flikka
3adb09cb5a Review updates: Keyword can have numbers, comment lines can start with space, data can start at pos 0 on line, must explicitly have end-of-keyword control 2013-04-04 09:56:00 +02:00
Joakim Hove
f3e14aa76b Added Keywords map to Parser 2013-04-03 11:38:06 +02:00
Joakim Hove
57c6946c07 Merged data/ -> RawDeck/ source code reorganisation 2013-04-03 09:27:55 +02:00
Kristian Flikka
d24f487d18 Refactoring for readability. Added a couple of unit tests 2013-04-02 15:42:19 +02:00
Joakim Hove
295b1929ab Added subdirectory Parser/ + added ParserRecordSize as element in ParserKW 2013-04-02 15:19:32 +02:00
Kristian Flikka
2be8700e66 Moved data to RawDeck, added gmon.out to gitignore 2013-04-02 13:39:41 +02:00
Joakim Hove
36053bd91c Added symlink to test-data 2013-04-02 13:05:24 +02:00
Joakim Hove
e860091f30 Merged changes from Kristian 2013-04-02 12:58:12 +02:00
Kristian Flikka
8432334106 Changed working directory of tests to be project source dir. Added symlink to statoil data in testdata folder 2013-04-02 12:34:44 +02:00
Kristian Flikka
7002348e8e Added splitting of record into items in a string vector. Added tests. Must enhance readability of this splitting code before review 2013-03-26 14:31:05 +01:00
Kristian Flikka
4f65285828 Changed more heap and smart pointers 2013-03-26 10:27:48 +01:00
Kristian Flikka
2f7cc609d0 Changed to heap allocation and boost smart pointers 2013-03-26 10:00:06 +01:00
Kristian Flikka
990648e95b More tests, changed logging, and adding record 2013-03-25 17:17:09 +01:00
Kristian Flikka
ed0d04fcc6 Added classes for holding the raw deck structure 2013-03-22 15:35:40 +01:00
Joakim Hove
05cea003be Added ParserKW skeleton and ParserConst.hpp 2013-03-21 15:37:40 +01:00
Kristian Flikka
e7d1444ad4 Added tests and Record class. Moved BOOST_ROOT into CMakeLists file 2013-03-21 13:18:52 +01:00
Kristian Flikka
aa43fef0e9 Renamed keyword data class, and added test file 2013-03-21 09:27:57 +01:00
Kristian Flikka
9ad7f77107 Changed KeywordRawData to a one-per-keyword object, moved into data folder 2013-03-21 09:02:40 +01:00
Kristian Flikka
ce0990e5ca Fixed a bug when keywords had trailing spaces. Now trimming right side of string. 2013-03-20 17:35:03 +01:00
Kristian Flikka
488d7655f7 Moved files into structure similar to opm-core. Added KeywordRawData class to store 0th pass objects 2013-03-20 16:29:51 +01:00