OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-02-11 16:06:04 -06:00
Code Issues Packages Projects Releases Wiki Activity
10,329 Commits 29 Branches 61 Tags 290 MiB
0f636fcc81
Commit Graph

248 Commits

Author SHA1 Message Date
Jacob Støren
7156b99b88 #2608 #2609 Add disabled Solvespace S-curve calculation. Use simplified S-curve calculation. Cleaned up Gui to only whats supported. 2018-07-04 17:02:20 +02:00
Bjørn Erik Jensen
08ad8a98db Qwt fix. Fix plotting of interval series having only one sample 2018-07-04 09:15:29 +02:00
Jacob Støren
c5b5980da3 #3049 Add SolveSpaceLib libslvs with an S-Curve test to ResInsight 2018-06-15 14:47:42 +02:00
Bjørn Erik Jensen
6ee84b598c #3042 OPM flowdiag apps update from repo. Commit 24ff768dc509b6c6bbd0121ef46a5932fae92961 2018-06-12 14:36:08 +02:00
Magne Sjaastad
4ca615e74a #2957 Crash with LGR model 
Guard nullptr access in well_state.cpp
 2018-05-31 08:30:04 +02:00
Bjørn Erik Jensen
e8d586054c ecllib: Temp fix to avoid assert. This fix will be included in the next ecllib release 2018-05-22 14:58:42 +02:00
Bjørn Erik Jensen
ff628fa9dd #2852 OPM flowdiag upgrade. Copy from repos 2018-05-07 14:37:32 +02:00
Bjørn Erik Jensen
7a7a8bed0e Apply two ecllib patches after upgrade 2018-05-04 14:24:53 +02:00
Bjørn Erik Jensen
d2e48ef153 Update ecllib from statoil master repo commit 0188b08081eb1ac4ade89ac224b8128b4c9b0481 2018-05-04 14:24:53 +02:00
Bjørn Erik Jensen
c9a1eeef03 Apply two ecllib patches after upgrade 2018-04-16 08:45:53 +02:00
Bjørn Erik Jensen
cdc613f334 #2699 Update ecllib from statoil master repo commit b31b055af2d6b887f47aec84c65ec497a5d12973 2018-04-16 08:43:56 +02:00
Bjørn Erik Jensen
d0905c518b libecl. Local quick-fix to prevent crash under Windows when restart file is located in different directory 2018-04-10 13:11:58 +02:00
Bjørn Erik Jensen
c71ab4e88d #2317 Apply fix for synthetic ODB files 2018-04-09 11:24:31 +02:00
Bjørn Erik Jensen
75d505c9f6 #2011 libecl: Add INSTALL_ERT to control install targets 2018-04-09 11:22:39 +02:00
Bjørn Erik Jensen
b72091bb94 #2661 Update ecllib from statoil master repo 2018-04-09 08:48:36 +02:00
Bjørn Erik Jensen
a833b5a2d7 libecl. Local quick-fix to prevent summary restart file import under Windows 2018-03-20 14:32:54 +01:00
Magne Sjaastad
233df05f68 #2536 Build System : Remove obsolete includes and update depending includes 2018-02-27 20:00:56 +01:00
Magne Sjaastad
4f20273e55 #2536 Build System : Add target_include_directories to clipper, exprparser, qwt 2018-02-27 18:56:12 +01:00
Magne Sjaastad
72a3b731bc #2536 Build System : Add target_include_directories to boost-Subset 2018-02-27 18:49:24 +01:00
Jacob Støren
09cd140bba #2375 Updated opm-flowdiagnostics-applications to 5bcd6d99259a63f5cd820db541b45c4f07aec808 including fixes for Relperm and PVT curves 2018-01-24 16:37:32 +01:00
Magne Sjaastad
39168a9be8 #2317 Apply fix for synthetic ODB files 2018-01-04 20:38:16 +01:00
Jacob Støren
20164ec003 #2270 Updated opm-flowdiagnostics-applications to 44f7e47ecdc87ba566ab4146629de49039a73b2e to fix crash 2017-12-19 15:07:10 +01:00
sigurdp
64fe9e9a3b Upgraded opm-flowdiagnostics-applications to d76ec747cf22aa4d235f6a6c83c3a814adcf5cb2 2017-12-13 10:06:39 +01:00
sigurdp
09c09a7386 Upgraded opm-flowdiagnostics-applications to a773bcfc963705679ecc28f58048fc38936fbbc6 2017-12-11 11:15:09 +01:00
Jacob Støren
2a3f82875c Upgraded opm-flowdiagnostics-applications to cf8a5d2381776a8887d61f825b40f03b1d1cc4b0 2017-12-05 13:50:26 +01:00
Jacob Støren
2a41b4fbb8 #1994 Update opm-flowdiagnostics-applications to cd614100f3d5b8fcf1fd783e929630f11251682e 2017-11-30 00:07:35 +01:00
Jacob Støren
5efe0f705e #2174 Upgrade opm-flowdiagnostics-applications to 75b333335f6cd055d3130d460c6d87444fb7aed4 
to get more of the PVT/RelPerm functionality.
 2017-11-22 15:28:38 +01:00
Jacob Støren
9f9fb21cbe #2034 Update opm-flowdiagnostics to 7e2be931d4 
Remove monkeypatch
Fixes Exception
 2017-10-27 14:39:03 +02:00
Jacob Støren
57a5f7fc66 #2011 libecl: Add INSTALL_ERT to control install targets 2017-10-26 17:16:42 +02:00
Jacob Støren
04404c3b2c #2011 Update libecl to 89f6c44aa0 to fix RFT file reading and missing dyn nnc handling 2017-10-26 17:16:36 +02:00
Magne Sjaastad
f61c83a659 #2031 Curve Calculator : Sort variable names by the order they first appear 2017-10-23 13:31:57 +02:00
Magne Sjaastad
d903226db6 Fix typo in comment 2017-10-23 13:07:49 +02:00
Magne Sjaastad
7c0c45b7b9 Curve Calculator : Do not report detected variables as lowercase 2017-10-19 11:23:30 +02:00
Magne Sjaastad
39dc4c0c06 #2015 Update opm-flowdiagnostics-applications to 64d079b736cd70c7139d5e79fb0080233f47db4b 2017-10-17 08:33:07 +02:00
Magne Sjaastad
a3cd62d315 #1977 Expression Parser : Add error text if expression compiling fails 2017-10-13 12:22:40 +02:00
Magne Sjaastad
445048c24b #1985 Curve Calculator : Simplify interface to expression parser 2017-10-12 10:52:30 +02:00
Magne Sjaastad
c976091336 #1985 Expression Parser: Add exprtk to ThirdParty 2017-10-12 10:52:30 +02:00
Jacob Støren
a8121fb0c4 #1988 Remove assumed wrong test to make the new version of flow diag to actually work 2017-10-11 18:05:53 +02:00
Jacob Støren
4d097a3149 #1988 Update flow diag libraries to handle multiple connections in same well, and have PVT Rel Perm support. 2017-10-11 18:05:53 +02:00
sigurdp
00985b00c3 Testing commit 2017-10-11 13:38:46 +02:00
Bjørn Erik Jensen
19e5e61cb7 LasWell. Parse DATE token from LAS well information section 2017-10-05 16:26:39 +02:00
Jacob Støren
13c011edeb libecl: Add INSTALL_ERT to control install targets 2017-10-02 17:19:36 +02:00
Jacob Støren
c8b329ddc3 Update libecl to 2e36798b43. For better memory usage reading wells 2017-10-02 17:11:36 +02:00
Magne Sjaastad
19be1c09a4 #1748 libecl : Add INSTALL_ERT to control install targets 2017-08-29 11:03:45 +02:00
Magne Sjaastad
7e316edf17 #1768 Update libecl to b17c5ffbf2f82594b01037d39ca9440252a10536 2017-08-29 11:03:45 +02:00
Bjørnar Grip Fjær
b66e957e28 #1800 Ensure auto-scaling of QWT plots with date scale will not miss points in the upper end of the plot 2017-08-22 11:48:37 +02:00
Bjørnar Grip Fjær
46919b463d #1800 Ensure auto-scaling of QWT plots with date scale and week resolution will not miss points in the upper end of the plot 2017-08-22 11:48:37 +02:00
Magne Sjaastad
51c30448e9 Merge remote-tracking branch 'origin/dev' into pre-proto 2017-08-21 10:42:11 +02:00
Magne Sjaastad
f7a333092d System : Hide warnings from boost and NRLib 2017-08-18 10:01:54 +02:00
Magne Sjaastad
afaf6e0d87 Nightcharts : Add return statement to silence warning 2017-08-18 10:01:54 +02:00
Magne Sjaastad
55f23b0902 MSVC : Disable warnings for opm-flowdiag 2017-08-17 14:06:57 +02:00
Magne Sjaastad
d5d5cedbf5 #1686 Remove explicit include of Ert 
Ert includes are implicit defined by tartget_link_library
 2017-08-09 08:31:18 +02:00
Magne Sjaastad
590e2ed753 #1748 libecl : Add INSTALL_ERT to control install targets 2017-08-08 11:23:30 +02:00
Bjørnar Grip Fjær
527151ba23 Do not add OpenMP C-flags as linker arguments for libecl 2017-06-22 14:20:16 +02:00
Bjørnar Grip Fjær
956798afd6 #1641 Update libecl to latest revision from master 2017-06-22 11:51:46 +02:00
Jacob Støren
33b037a80b #1440 Merge dev into pre-proto (WellPath viz restructure and constness) 
Had to do quite a bit constness fiddeling to make the merge work
 2017-06-22 10:42:07 +02:00
Jacob Støren
690d86b876 #1624 Update opm-flowdiagnostics-applications to c78f50897cea10ed56c7eadd1a1b23aa5ffbc56e that handles none-unified restart files 2017-06-20 09:07:57 +02:00
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