OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-02-20 11:48:35 -06:00
Code Issues Packages Projects Releases Wiki Activity
3,265 Commits 27 Branches 61 Tags 309 MiB
ee156794b6
Commit Graph

3265 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Magne Sjaastad
ee156794b6 Added standalone unit test for opm-parser 2016-06-16 18:10:08 +02:00
Jacob Støren
7378472ac9 #756 Syncronize from curves to gui selection. Removed "None" option 2016-06-16 16:55:02 +02:00
Jacob Støren
cf287160df #756 Curve creation and syncronization with filter and selection. 2016-06-16 16:55:02 +02:00
Jacob Støren
45cf15a941 Caf: PtrFields must not return any childObjects. Fixed Legend definition Object below EclipseCellColor as a consequence. Discovered due to Summary Plot case pointer 2016-06-16 16:55:02 +02:00
Jacob Støren
6f7432c0e7 #756 Cleaned up after refactoring. 2016-06-16 16:55:02 +02:00
Jacob Støren
214f013499 Caf: Fixed issues regarding custom type in fields with multi selection 2016-06-16 16:55:02 +02:00
Jacob Støren
ce2112fbc6 #756 Refactoring the filter data into a separate object as a PdmChild 2016-06-16 16:55:02 +02:00
Jacob Støren
e1fa9aa9f3 Caf: Corrected the spesialization of field of vector and list equality compare, which is supposed to be pr. element 2016-06-16 16:55:02 +02:00
Jacob Støren
8d15fa1b84 #756 WIP: Curve Filter beeing created 2016-06-16 16:55:02 +02:00
Jacob Støren
a37449d99d Used the new Ert support to retreive the summary lgr names and ijk values 2016-06-16 16:55:02 +02:00
Jacob Støren
cb81fc1aaa #756 Startingpoint for Curve Filter in place, with command to create 2016-06-16 16:55:02 +02:00
Jacob Støren
3167f97394 #756 WIP: Added class stubs for the CurveFilter 2016-06-16 16:55:02 +02:00
Jacob Støren
2687a794fd Merge pull request #763 from OPM/summary-plot 
Merging the new Summary Plot and OPM-Parser integration into dev
 2016-06-14 15:27:51 +02:00
Magne Sjaastad
98683944b7 Reapplied fix for synthetic Odb files 2016-06-13 14:57:27 +02:00
Magne Sjaastad
da76b01611 Updated ERT, opm-common and opm-parser 
ERT 80650d05d49b419ec74ba316312313dfc6ba0875
opm-common e7db252f3e310a04718f315e6cdb9d6c428c5762
opm-parser 817722b99baa62cc63a5f859cc90b951f0b0636e
 2016-06-13 14:18:50 +02:00
Magne Sjaastad
6a8ffb7c6b Commented out local file path in unit test 2016-06-13 13:02:12 +02:00
Magne Sjaastad
7adaa4b45c Integrated opmjson directly in opm-parser, removed dependency to opm-common 2016-06-13 12:27:28 +02:00
Magne Sjaastad
718e724760 Include JSON files directly in opm-parser, opm-parser has now no dependencies 2016-06-13 10:39:57 +02:00
Magne Sjaastad
7bde4db3c2 Added list of test files 2016-06-13 10:14:13 +02:00
Jacob Støren
73e72623d2 Set to compile internal libraries statically by default 2016-06-12 15:47:41 +02:00
Jacob Støren
64aea7285d Fixed BUILD_SHARED_LIBS related build sytem problems on linux. Now working with both on and off. 2016-06-12 02:03:48 +02:00
Jacob Støren
b714882a16 Cotire: Added support for dll copying on MSVC 2016-06-10 15:10:10 +02:00
Jacob Støren
2bb2758523 #755 Used the same order as ERT on the display, - and search strings for Summary Variables 2016-06-10 14:11:22 +02:00
Magne Sjaastad
a7ed8f297f cotire : Added unity build of cafUserInterface 2016-06-10 14:03:22 +02:00
Magne Sjaastad
ef64dc9b62 cotire : Boolean variables are now unique globally in the project 2016-06-10 14:01:41 +02:00
Magne Sjaastad
cdc6bbeab5 cotire : Exclude main project from build when unity build is present 2016-06-10 12:49:36 +02:00
Jacob Støren
80d7ae7262 #755 Curve Gui adjusted according to input from CFB. Now working as intended. 2016-06-10 12:30:20 +02:00
Jacob Støren
7419ad5089 Caf: Added default tab order in the property editor widgets. 2016-06-10 12:18:26 +02:00
Jacob Støren
e21ddfe74a #755 First simple version of the proposed GUI. Type and Quantity name filter working. 2016-06-09 11:08:12 +02:00
Jacob Støren
c2e62c60ba caf: Added an option on ui fields to not add their value to the list of options if the option does not exist. 2016-06-09 11:08:12 +02:00
Jacob Støren
336828e48d #755 WIP: Started to adapt to using the smspec node from eclipse. Established Rim prototype of "filter" concept for summary variables 2016-06-09 11:08:12 +02:00
Magne Sjaastad
a4ff316941 cotire : Disabled precompiled headers and made sure the unity build compiles 2016-06-08 12:18:36 +02:00
Magne Sjaastad
954edd8ec1 Added missing library 2016-06-08 12:15:46 +02:00
Magne Sjaastad
c046e52aff cotire : Boolean variables are now unique in the project and not local to file they are defined in 2016-06-08 12:13:49 +02:00
Magne Sjaastad
7742fbe325 Encapsulate the JSON code in a namespace to avoid issues with JSON classes used in opm-parser 2016-06-06 10:43:36 +02:00
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