OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-02-15 01:53:46 -06:00
Code Issues Packages Projects Releases Wiki Activity
5,120 Commits 26 Branches 61 Tags 309 MiB
ef64057990
Commit Graph

141 Commits

Author SHA1 Message Date
Bjørnar Grip Fjær
935299b3df Merge branch 'fishbones' into pre-proto 2017-06-01 12:32:36 +02:00
Jacob Støren
4e091641a4 #1483 Update opm-flowdiagnostics and ..-applications 
to b6e59ddcd2fe, and ccaaa4dd1b55 respectively.

In order to include flowCapacityStorageCapacityCurve with max pv fraction threshold
 2017-05-29 13:08:32 +02:00
Magne Sjaastad
a45aee0cc2 Merge branch 'fishbones' into pre-proto 2017-05-23 10:28:42 +02:00
Jacob Støren
50c182aa26 #1514 Add polyline/polygon intersection method 
To be used for wellpath stimplan intersection
 2017-05-22 15:34:50 +02:00
Jacob Støren
df269931c9 #1481 Add subset of Eigen, and method to condense transmisibilities 
Not yet fully tested.
 2017-05-12 14:41:38 +02:00
Magne Sjaastad
776e0ff1c4 #1372 Fix compile error on Windows 2017-05-12 12:20:27 +02:00
Magne Sjaastad
3c07eafab2 #1372 Update flow diagnostics and flow diagnostics applications 2017-05-12 12:17:11 +02:00
Jacob Støren
74a90e204c #1396 Apply patch fix-synthetic-odb-cases 2017-05-08 13:43:31 +02:00
Jacob Støren
f5d1d2d1f9 #1396 Update libEcl to 06a39878636af0bc52582430ad0431450e51139c 
To include phase split well connection rates and some summary intersect support. Supposedly Final update before release.
 2017-05-08 13:37:39 +02:00
Magne Sjaastad
64d41fa109 #1396 Apply patch fix-synthetic-odb-cases 2017-04-25 13:30:09 +02:00
Magne Sjaastad
9dfeef69bf #1396 Add define for updated ERT API used from opm-flowdiag-app 2017-04-24 21:56:04 +02:00
Magne Sjaastad
c701750330 #1396 Update to libert from https://github.com/Statoil/libecl 2017-04-24 21:53:45 +02:00
Jacob Støren
938c8ff69a Update opm-flowdiagnostics-application to include handling of new Ert 2017-04-24 14:42:18 +02:00
Magne Sjaastad
c35e79c3b5 Merge branch 'dev' into pre-proto 2017-04-20 13:40:56 +02:00
Magne Sjaastad
5b5fad46ac #1398 Added file previously hidden by .gitignore 2017-04-05 12:42:20 +02:00
Magne Sjaastad
cd60f80c76 #1398 Include preprocessor part 2017-04-05 12:28:26 +02:00
Magne Sjaastad
2b4efc4b5c #1398 Removed dependency on system boost, added subset of boost to ThirdParty 
Added a subset of boost to ThirdParty folder. Code extracted from version boost version 1.59.0
 2017-04-05 08:38:59 +02:00
Magne Sjaastad
d038ea7581 #1371 Removed opm-common and opm-parser 2017-04-04 13:53:44 +02:00
Magne Sjaastad
8255a3aaa3 Merge branch 'dev' into pre-proto 2017-04-03 07:34:56 +02:00
Jacob Støren
9a11949f67 Updated opm-flowdiagnostics-applications to SHA afd3f6c454f52dcfa0a6aa96be9823176a6daa48 2017-03-31 15:13:50 +02:00
Magne Sjaastad
3d67946976 Merge remote-tracking branch 'origin/dev' into pre-proto 2017-03-15 10:10:43 +01:00
Jacob Støren
ba2e4ca3f2 #1269 Updated opm-flowdiagnostics to a14dc4ba1302bcc1e0aeb35c5de6b4bd39bce98a to fix issue with fraction sums > 1.0 2017-03-03 15:07:26 +01:00
Magne Sjaastad
1753449772 Merge remote-tracking branch 'refs/remotes/origin/dev' 
Conflicts:
	ApplicationCode/ProjectDataModel/CMakeLists_files.cmake
	ApplicationCode/UserInterface/RiuViewerCommands.cpp
 2017-02-22 09:42:51 +01:00
Magne Sjaastad
0b806c7664 Fixed #1238 Pie chart not always complete 2017-02-21 14:44:18 +01:00
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