OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-02-25 18:55:39 -06:00
Code Issues Packages Projects Releases Wiki Activity
4,400 Commits 27 Branches 61 Tags 309 MiB
a29f325125
Commit Graph

117 Commits

Author SHA1 Message Date
Magne Sjaastad
a10b96ba3e Merged branch dev into pre-proto 2017-02-17 11:38:32 +01:00
Jacob Støren
590f9995c8 1212 Turned off shadow, changed to radial edge gradient to make the colors more easy to read. 2017-02-16 11:39:02 +01:00
Magne Sjaastad
f9d8ab8bad Merge remote-tracking branch 'refs/remotes/origin/dev' 
Conflicts:
	ApplicationCode/ProjectDataModel/RimEclipseWellCollection.cpp
	ApplicationCode/Resources/ResInsight.qrc
 2017-02-16 10:18:39 +01:00
Jacob Støren
df35335744 #1172 Well Alloc plot: Sorted the tracers according to contribution. 2017-02-14 08:10:39 +01:00
Jacob Støren
4d1c4031ef #1173 Changed the legend text format in the pie chart 2017-02-13 08:44:29 +01:00
Jacob Støren
8596c3f79c #1206 Updated the opm-flowdiag libraries 2017-02-09 14:14:02 +01:00
Magne Sjaastad
93954fece0 Merge remote-tracking branch 'refs/remotes/origin/dev' 
Conflicts:
	ApplicationCode/Commands/RicDeleteItemFeature.cpp
 2017-02-08 07:35:20 +01:00
Jacob Støren
cc095644ce Reapplied fix for synthetic Odb files 2017-02-07 13:53:27 +01:00
Jacob Støren
a6b7bc7c41 Updated Ert to e2a5a9cc20705537d07822958d925e092a323367 to include new accesss to well rates 2017-02-07 13:44:59 +01:00
Magne Sjaastad
405cd382af Reorganized how clipper is included and deleted example files 2017-01-24 15:39:39 +01:00
Magne Sjaastad
e845ae1ed8 Merge remote-tracking branch 'refs/remotes/origin/dev' 
Conflicts:
	ApplicationCode/CMakeLists.txt
	ApplicationCode/ProjectDataModel/CMakeLists_files.cmake
	ApplicationCode/ProjectDataModel/RimEclipseWell.h
	ApplicationCode/ReservoirDataModel/CMakeLists_files.cmake
 2017-01-24 15:23:02 +01:00
Magne Sjaastad
699c2a1103 #1116 Added nightcharts pie plotting library 2017-01-23 12:59:24 +01:00
Magne Sjaastad
36bcdab426 Merge remote-tracking branch 'refs/remotes/origin/dev' 
Conflicts:
	ApplicationCode/ModelVisualization/RivPipeGeometryGenerator.h
	ApplicationCode/ProjectDataModel/RimEclipseWell.cpp
	ApplicationCode/ProjectDataModel/RimEclipseWell.h
	ApplicationCode/UserInterface/RiuViewerCommands.cpp
 2017-01-18 12:19:07 +01:00
astridkbjorke
2c90136a04 pre-proto - Adding clipper library version 6.4.0 to be used for polygon clipping 2017-01-16 09:40:26 +01:00
Jacob Støren
0cec31362b #1117 Temporary patch from @bska. Waiting for an update to the opm-flowdiagnostics library 2017-01-16 09:27:51 +01:00
Jacob Støren
95206315fa opm-flowdiagnostics updated to 80190c28ae0fd4a82cfe88c827559029982db83b 
opm-flowdiagnostics-applications updated to 01ecb8fc22cb70d883edaad398bffc49878859c3
Which fixes error in TOF calculations.
 2017-01-05 14:57:25 +01:00
Jacob Støren
2692abe7fe Renamed catalog to avoid build-server problems due to too long path 2016-12-09 16:25:43 +01:00
Jacob Støren
e25f6cb84d Updated unit test of flow-diag to allign with the example in the flowdiag-app library. 2016-12-08 17:11:47 +01:00
Jacob Støren
147cb5ebe0 Updated opm-flowdiagnostics-applications to sha: 27adc8964f997d0bb508e254b6ff43ad1e1e76bf 2016-12-08 17:11:47 +01:00
Jacob Støren
77180d91cb Opdated opm-flowdiagnostics to sha: d409aedbf96c996c3886e3fd91abd4d8c3b0c601 2016-12-08 17:11:47 +01:00
Jacob Støren
bc493298e2 Flow: Integrated from the FlowDiag branch Step 1. 2016-12-08 17:11:47 +01:00
Magne Sjaastad
f20a8d7dc8 #926 Eclipse Input Data : Do not abort for keywords with more than eight characters 2016-11-25 16:56:26 +01:00
Magne Sjaastad
07e47ce153 #996 Reapplied fix for synthetic Odb files 2016-11-22 21:14:24 +01:00
Magne Sjaastad
9178659449 #996 Updated ERT to 2016.10 2016-11-22 21:14:24 +01:00
Jacob Støren
323f7893cb Made the output from g-test a bit more readable 2016-10-17 15:15:27 +02:00
Magne Sjaastad
ae0da542e2 #804 Reapplied fix for synthetic Odb files 2016-10-13 14:07:17 +02:00
Magne Sjaastad
83e000c91f #804 Updated opm-parser based on 
a3496df501a4369fd827fbf0ff893d03deff425f
 2016-10-13 13:40:44 +02:00
Magne Sjaastad
0306168bb4 #804 Updated opm-common based on 
1216bc052542f24ec6fcfbe1947d52e6300ff754
 2016-10-13 13:40:43 +02:00
Magne Sjaastad
3b4f1620a5 #804 Updated ERT based on 6287acdb0d039ce13eb9956b67035280a3de9539 2016-10-13 13:40:43 +02:00
Magne Sjaastad
88e40aa2d9 #886 LAS Export: Set the STEP if the data is resampled 2016-09-23 10:20:05 +02:00
Jacob Støren
cdfec7a04f #876 Avoid empty lines in LAS export file 2016-09-13 11:47:42 +02:00
Jacob Støren
382bf84036 #875 Fixed wrong number of digits after punctation for numbers < 1000 2016-09-12 15:57:55 +02:00
Magne Sjaastad
5420960b22 #826 Added opm-flowdiagnostics libary with a basic test 2016-09-05 15:23:24 +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
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
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
1c044da54a Always use static libraries for opm libs and NRlib 2016-06-05 18:45:53 +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
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
362dd50e9b Updated internal ERT 
Copied ERT from

614a4295ad
 2016-04-19 14:48:14 +02:00
Magne Sjaastad
7b24b3a96b (#713) Removed temporary workaround for NNC data import in ECLIPSE 2015 2016-01-08 09:25:38 +01:00
Jacob Støren
38be5baca1 NRLib: Fixed missing precision in LAS file export 2015-11-06 15:07:09 +01:00