Commit Graph

3230 Commits

Author SHA1 Message Date
Magne Sjaastad
4fd8e2503c Added cotire to speed up build times 2016-06-06 09:56:45 +02:00
Magne Sjaastad
e603773417 Added missing pragma once 2016-06-06 07:13:53 +02:00
Magne Sjaastad
1c044da54a Always use static libraries for opm libs and NRlib 2016-06-05 18:45:53 +02:00
Jacob Støren
94bf950278 Boost is set to be staticly linked on MSVC and dynamic on linux
On MSVC force user to add the paths to the boost directories
2016-06-03 16:25:48 +02:00
Magne Sjaastad
c69ffc2a3d #734 Must hardcode all ERT filenames because the search with GLOB returns empty list when compiled for the first time in a new folder 2016-06-02 13:55:27 +02:00
Magne Sjaastad
5c9e8a8075 #734 Always compile ERT as shared library on Linux 2016-06-02 12:50:42 +02:00
Magne Sjaastad
a08a4eb5ef Added custom wrapper for json files to control install features of json 2016-06-02 11:31:41 +02:00
Magne Sjaastad
cecd942989 Several Linux fixes 2016-06-02 09:57:25 +02:00
Magne Sjaastad
024b730803 Fixed typo 2016-06-02 09:38:22 +02:00
Magne Sjaastad
60b71cc078 Force build of ERT CXX wrappers in CMake 2016-06-02 09:36:11 +02:00
Magne Sjaastad
9b6e422d0c #742 Integrated opm-parser and added basic unit test 2016-06-01 15:53:21 +02:00
Magne Sjaastad
2892653298 #742 Added custom-opm-parser, compiles on Windows 2016-06-01 15:53:21 +02:00
Magne Sjaastad
758b4a452b #742 Added custom-opm-common to ThirdParty 2016-06-01 15:53:21 +02:00
Magne Sjaastad
54c98ca9f8 #742 NRLib now uses Boost from CMake 2016-06-01 15:53:21 +02:00
Magne Sjaastad
bffad18f9c #742 Added dependency to Boost 2016-06-01 15:53:21 +02:00
Jacob Støren
40388b308b #739 Added summary case classes. Use those from the summary curves. Made save/restore work again for the summary plots. File format for Summary stuff are changed. 2016-05-31 13:48:22 +02:00
Jacob Støren
5732b5008f Cached result variables in the summary reader
Fixed late field initialization
Additional cleanup and rename
2016-05-31 13:48:22 +02:00
Jacob Støren
286c434d3a caf: Added assert to guard against forgetting to add the fields using the init field macros 2016-05-31 13:48:22 +02:00
Jacob Støren
d90a6041aa caf: Added CAF_PDM_ABSTRACT_SOURCE_INIT alias 2016-05-31 13:48:22 +02:00
Magne Sjaastad
e3fd05145f #734 Fixed issue on Linux when compiling in-source ERT 2016-05-26 21:40:19 +02:00
Magne Sjaastad
31cb06089d #734 Added support for linking with both custom and system installed external ERT library 2016-05-26 21:23:16 +02:00
Magne Sjaastad
d4dfdc9754 Fixed unit tests 2016-05-26 15:17:49 +02:00
Magne Sjaastad
1929798532 Moved include_directory from main to ApplicationCode. Include of Eclipse hearder files must now be prefixed with ert/<module_name> 2016-05-26 14:55:59 +02:00
Jacob Støren
f0dc0abada #739 Cleaned up RimSummaryCurve.h a bit. 2016-05-26 14:23:29 +02:00
Jacob Støren
e8c70e7047 Updated the simple test project 2016-05-26 13:19:23 +02:00
Jacob Støren
ae615901b8 #739 Moved windowsGeometry data to the RimViewWindow base class
Introduced an interface for setting and getting mdiWindow Geometry
Changed file keywords from GraphPlot etc to SummaryPlot
Added a summary plot QwtPlot descendant
Added handling of delete of the MDI window
2016-05-26 13:17:26 +02:00
Jacob Støren
38c15f57f2 #739 Show sum plot on creation. Load when opening project. Delete on close project 2016-05-25 14:05:31 +02:00
Jacob Støren
f8729a035c Rename variable 2016-05-25 13:54:06 +02:00
Jacob Støren
31e8009a6e #739 First crude but working version of Summary plotting 2016-05-25 13:15:17 +02:00
Jacob Støren
a33929505d Updated the plantuml of the plot related classes 2016-05-25 11:56:39 +02:00
Jacob Støren
bb6454126a Added a test project with some well log extraction curves 2016-05-24 14:07:01 +02:00
Jacob Støren
c32bad52ff #739 Added a common base class to represent and handle ViewWindows 2016-05-24 11:06:42 +02:00
Jacob Støren
cb8f2e47f5 #739 Aligned more to the way of the RimPlotCurve 2016-05-24 11:06:42 +02:00
Jacob Støren
e469eb1483 #739 Moved code creating curve from datetime and double data 2016-05-24 11:06:42 +02:00
Magne Sjaastad
a4fd584fb1 Added compiler directive for C++11 2016-05-24 10:28:04 +02:00
Jacob Støren
c98f9af4dc #739 Moved the new RimPlotCurve class to a separate set of files 2016-05-23 17:33:44 +02:00
Jacob Støren
c2759e47b2 #739 Renamed and trimmed inside RimPlotCurve 2016-05-23 17:13:03 +02:00
Jacob Støren
a2ed19c687 #739 Splitted RimWellLogCurve into a RimPlotCurve base class for use with summary plot curves 2016-05-23 15:44:15 +02:00
Jacob Støren
24edb0501e WIP: Started to create the summary plot Rim data structures. 2016-05-09 12:16:55 +02:00
Magne Sjaastad
21f8b722b1 Redirect stdout and stderr to console using freopen_s
Previous redirection code does not work on VS2015, this commit works on
both VS2010 and VS2015
2016-05-04 15:11:42 +02:00
Magne Sjaastad
8f3b88c798 Commented out unit test with local path 2016-05-04 14:32:28 +02:00
Magne Sjaastad
5640621049 Added EclipseSummaryAddress 2016-05-04 14:11:04 +02:00
Magne Sjaastad
ec202310b7 Added summary related class diagrams 2016-05-04 08:14:21 +02:00
Magne Sjaastad
2a24034cc2 Commented out tests including local file path 2016-04-20 08:29:23 +02:00
Magne Sjaastad
2b7a6d546c Added missing include 2016-04-20 08:24:57 +02:00
Magne Sjaastad
4b33c31a0f (#736) Added support for basic metadata and basic value queries 2016-04-20 08:05:35 +02:00
Magne Sjaastad
1d9405b266 ERT: Disable compile of CXX wrappers
CXX wrappers are using newer C++ syntax, disable this feature until
relevant compilers are verified
2016-04-19 15:09:13 +02:00
Magne Sjaastad
362dd50e9b Updated internal ERT
Copied ERT from

614a4295ad
2016-04-19 14:48:14 +02:00
Magne Sjaastad
6e52a4101a Updated to 1.6.1-dev after relase of 1.6.0 2016-01-11 13:40:58 +01:00
Magne Sjaastad
a3ceda3cfe Merge pull request #716 from OPM/master
Pull release related changes from master into dev
2016-01-11 13:31:05 +01:00