OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2026-09-03 20:53:13 -05:00
Code Issues Packages Projects Releases Wiki Activity
3,298 Commits 53 Branches 83 Tags
85fab1e749fbeabd3b65a2871c160d3cb5df4e28
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Magne Sjaastad 85fab1e749 Improved text display of messages from opm-parser 2016-06-24 12:19:19 +02:00
Magne Sjaastad 04a12ce592 (#743) Removed input property collection 2016-06-24 11:42:15 +02:00
Magne Sjaastad 6a4ef00c41 (#743) Hide "Add Input Property" 2016-06-23 15:59:47 +02:00
Magne Sjaastad 830db2c6ec (#743) Added import of Input Case using opm-parser 2016-06-23 14:36:33 +02:00
Magne Sjaastad eb6d3e0e8f (#743) Updated opm-parser with support for missing include files 2016-06-23 13:49:44 +02:00
Magne Sjaastad 2f83194a5e #769 Fixed compile issues on Linux 2016-06-19 12:41:13 +02:00
Magne Sjaastad 470410b4a7 Linux fix 2016-06-16 18:16:38 +02:00
Magne Sjaastad e57bbb2402 Modified compiler flags to make opm-parser unit test compile 2016-06-16 18:10:50 +02:00
Magne Sjaastad ee156794b6 Added standalone unit test for opm-parser 2016-06-16 18:10:08 +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
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
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
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
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
Magne Sjaastad a4fd584fb1 Added compiler directive for C++11 2016-05-24 10:28:04 +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

https://github.com/Ensembles/ert/commit/614a4295ad1aa4e7687c95e1ecdb92f76e5f0c87
 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
Magne Sjaastad 2e86198d40 Update README.md 
Updated tested platforms
 2016-01-11 13:23:20 +01:00
Magne Sjaastad a61a3b3e1f Update README.md 
Updated tested platforms
 2016-01-11 13:18:31 +01:00
Magne Sjaastad bde4d86b6b Merge pull request #715 from OPM/dev 
Pull request for 1.6.0 for dev to master
 2016-01-11 12:10:04 +01:00
Magne Sjaastad cb16f3c322 Fixed issues when loading Odb-projects into ResInsight with no Odb support 2016-01-11 10:08:47 +01:00
Magne Sjaastad 4476e60816 Set version number to 1.6.0 for release 2016-01-11 09:23:09 +01:00
Magne Sjaastad 59407db2e9 Merge pull request #714 from OPM/master 
Merge pull request #631 from OPM/dev
 2016-01-11 09:14:35 +01:00
Magne Sjaastad 5fb04e9526 [System] Added support for display of regression images on top of each other in regression report 
Use a slider concept (using CSS) to switch between generated and base
image
 2016-01-11 08:00:05 +01:00
Magne Sjaastad 7b24b3a96b (#713) Removed temporary workaround for NNC data import in ECLIPSE 2015 2016-01-08 09:25:38 +01:00
Magne Sjaastad 1c4c1d254e (#711) Use most recent activated Eclipse view if a well log plot is active 
Octave scripts must have an Eclipse view to communicate with. If a WLP
is active, evaluate recently used views to find the most recently
Eclipse view used.
 2016-01-06 23:01:27 +01:00
Magne Sjaastad f00ecd9a5a System : Include runtime dlls on Windows 
msvcp/msvcr/vcomp is now included in the install package on Windows
 2015-12-22 15:00:27 +01:00
Magne Sjaastad 5296add1cb [Fwk] Fix for missing use of command framework for tree view model 2015-12-22 14:10:50 +01:00
Magne Sjaastad 390b04be3b [Fwk] Fixed typo 2015-12-22 13:32:48 +01:00
Magne Sjaastad 33c53830f6 [Fwk] Integrated improvements to command mananger 2015-12-22 13:00:13 +01:00
Magne Sjaastad ed3951fd0d [AppFwk] Added CMakefile used to test AppFwk 2015-12-22 11:41:11 +01:00
Magne Sjaastad b9286dcd1d [AppFwk] Updated destructors in unit tests to make sure memory is released correctly 2015-12-22 11:10:50 +01:00
Magne Sjaastad 72459a339f Upped to 1.5.109-RC 2015-12-17 14:51:16 +01:00
Magne Sjaastad e8cf78c2af (#710) Clamp currentFrameIndex to available frame indices 2015-12-17 14:40:01 +01:00
Magne Sjaastad 0a15ccf577 Fixed missing selection of well path in project tree when clicking on a well path in 3D view 2015-12-16 09:46:08 +01:00
Magne Sjaastad 7bcf6bfd89 Upped to 1.5.104-RC Release candidate 2015-12-11 10:55:37 +01:00
Magne Sjaastad 9c8a75a237 Do not modify fault settings when preparing for regression test 2015-12-11 10:45:48 +01:00
Magne Sjaastad 6b070c6b12 (#704) Do not delete simulation wells as part of paste operation 
Sync of wells happens in loadDataAndUpdate ->
syncronizeWellsWithResults, and potentially missing wells will be
deleted. LoadDataAndUpdate must also happen after references are
resolved
 2015-12-11 10:20:15 +01:00
Magne Sjaastad c0d08dd37f Fixed up regression introduced in 28a0e1107c 
Loading of result is supposed to happen only for
RimWellLogExtractionCurve
 2015-12-11 10:10:36 +01:00
Magne Sjaastad 34862d39b0 (#703) Make sure simulation wells are read before resolving references 2015-12-10 23:09:33 +01:00
Magne Sjaastad 061de66597 Clamp time step when changing case for well log extraction curve 2015-12-10 22:33:17 +01:00
Magne Sjaastad 64b3281382 (#703) Fixed resolve of PtrField after the object copy was inserted into PdmStructures 2015-12-09 18:34:48 +01:00
Magne Sjaastad 4713014d26 (#700) Build bounding box search tree when grid is loaded 2015-12-09 15:36:37 +01:00
Magne Sjaastad 47bb20368a System : Fixed memory leaks 2015-12-09 13:52:25 +01:00
Magne Sjaastad a86d24df97 Fwk : Added DEBUG assert to detect when data is present in child fields 
Added assert for ChildArrayField and ChildField
 2015-12-09 13:34:13 +01:00
Magne Sjaastad 5e6fc505d0 (#694) Fixed missing assigment 2015-12-09 12:26:32 +01:00
Magne Sjaastad a608904bea (#697) Added combo box for selection of point and line style 2015-12-09 12:21:57 +01:00
Magne Sjaastad c67a413926 (#464) Set logarithmic scale if PERM is selected as single curve 2015-12-09 11:33:10 +01:00
Magne Sjaastad b80639436c (#460) Show grid using logarithmic scale div 2015-12-09 11:33:10 +01:00
Magne Sjaastad dd78842ad4 (#460) Use smallest positive value as axis limit when autoscaling log 2015-12-09 11:33:09 +01:00
Magne Sjaastad a31973e655 Made posNegClosestToZero a static function 2015-12-09 11:33:09 +01:00
Magne Sjaastad 28a0e1107c Improved result accessor factory 
Moved clamping of time step to zero for static results into factory
 2015-12-09 11:33:08 +01:00
Magne Sjaastad e9b18e05fe (#697) Set color for point symbols 2015-12-09 11:33:07 +01:00
Magne Sjaastad 8e0e16447e (#460) Added logarithmic x-axis for tracks 2015-12-09 11:33:07 +01:00
Magne Sjaastad 2a53054f2d (#697) Added line, symbol and line_symbol as curve style 2015-12-09 11:33:06 +01:00
Magne Sjaastad a8d1dfa329 (#696) Fixed missing display of ternary config for separate fault result 2015-12-08 17:43:07 +01:00
Magne Sjaastad 75b476c063 (#696) Select legend definition when clicking on legend in 3D view 2015-12-08 17:25:48 +01:00
Magne Sjaastad c8ecf78c8c (#694) Removed assert when finding projected point on well path segment 2015-12-08 15:33:42 +01:00
Magne Sjaastad b4e7e27f76 Fixed issued reported by CppDepends 2015-12-07 12:53:36 +01:00
Magne Sjaastad 5eb38fe203 (#691) Added option to keep the depth range fixed 2015-12-07 12:03:33 +01:00
Magne Sjaastad dc6a50ec3c Renamed from setCurrentObjectInTreeView to selectAsCurrentItem 2015-12-07 10:07:51 +01:00
Magne Sjaastad a2bfc12c57 (#674) Clicking on items in 3D view selects corresponding item in tree view/property panel 
Clicking on 3D Info box and legends for cell result, separate fault
result and cell edge selects corresponding items in tree view
 2015-12-07 09:59:19 +01:00
Magne Sjaastad e65facd590 (#404) Added RicViewerEventInterface and moved well path text display into a separate class 2015-12-04 15:15:54 +01:00
Magne Sjaastad 27206cab3b (#404) Added display of picked well path text in Result Info 2015-12-04 15:15:54 +01:00
Magne Sjaastad 622e49fe69 (#404) Compute well segment index from triangle index 2015-12-04 15:15:53 +01:00