OilfieldToolsNet/ResInsight
4
0 Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2026-10-12 16:32:12 -05:00
Code Issues Packages Projects Releases Wiki Activity
5,606 Commits 59 Branches 85 Tags
56a04de2ff7557186adbf1c1e8edf0b1bdd68951
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Magne Sjaastad 56a04de2ff Merge remote-tracking branch 'origin/dev' into pre-proto 2017-08-22 09:36:05 +02:00
Magne Sjaastad be5106a146 #1794 Set RESINSIGHT_ENABLE_PROTOTYPE_FEATURE_FRACTURES to ON for pre-proto branch 2017-08-22 09:35:54 +02:00
Magne Sjaastad de6e6858fa #1794 Include Clipper library inside ifdef USE_PROTOTYPE_FEATURE_FRACTURES 2017-08-21 22:05:15 +02:00
Magne Sjaastad 2d11a34928 #1794 Remove unused features related to delete of fracture objects 2017-08-21 21:02:43 +02:00
Magne Sjaastad 26149f1b5e #1794 Several fixes to make fracture configuration compile 2017-08-21 20:54:48 +02:00
Magne Sjaastad 4718caed9a #1794 Put all fracture command ids inside ifdefs 2017-08-21 20:44:28 +02:00
Magne Sjaastad 553b3bf63e #1794 Add flag RESINSIGHT_ENABLE_PROTOTYPE_FEATURE_FRACTURES 2017-08-21 15:24:20 +02:00
Magne Sjaastad dde03dcc8c #1794 Rename flag to RESINSIGHT_ENABLE_PROTOTYPE_FEATURE_SOURING 2017-08-21 11:49:49 +02:00
Magne Sjaastad 51c30448e9 Merge remote-tracking branch 'origin/dev' into pre-proto 2017-08-21 10:42:11 +02:00
Magne Sjaastad 4eed4b4261 #1794 Exclude some files to be able to use Cotire 2017-08-21 10:01:07 +02:00
Magne Sjaastad 4d0dde088b #1795 Fix copy of Qt DLLS 
Use one list of all DLLs to copy (both Qt and Odb). For some reason, the Qt copy did not work
 2017-08-18 15:29:19 +02:00
Magne Sjaastad 34f3a0686d System : Exclude ResInsight.qrc 2017-08-18 13:21:39 +02:00
Magne Sjaastad 0d4e566e93 System : Use list to define cotire excludes 2017-08-18 12:40:42 +02:00
Magne Sjaastad bfb1daec42 System : Removed obsolete cotire excludes 2017-08-18 10:21:28 +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 6fee321771 Disable tests accessing local paths 2017-08-17 14:40:52 +02:00
Magne Sjaastad f89c1e052c MSVC : Disable warning for ResInsight 2017-08-17 14:06:57 +02:00
Magne Sjaastad 55f23b0902 MSVC : Disable warnings for opm-flowdiag 2017-08-17 14:06:57 +02:00
Magne Sjaastad 6188f507f2 MSVC : Disable warnings for libecl 2017-08-17 14:06:57 +02:00
Magne Sjaastad 4ebd51da56 System : Disable warning 4190 caused by libecl 2017-08-17 14:06:57 +02:00
Magne Sjaastad 83e663ae13 System : Add caf namespace prefix 2017-08-17 14:06:57 +02:00
Magne Sjaastad 6ddf8aae27 #1786 Use EXTERNAL_LINK_LIBRARIES for external binaries 2017-08-17 09:12:27 +02:00
Magne Sjaastad 534572345d #1786 Add build option RESINSIGHT_USE_HDF5, default off 
Moved HDF config to top level cmake file
 2017-08-17 08:39:02 +02:00
Magne Sjaastad a961221c2c Merge remote-tracking branch 'origin/hdf-prototype' into dev 2017-08-17 07:30:01 +02:00
Magne Sjaastad c0e3349632 Merge remote-tracking branch 'origin/dev' into hdf-prototype 2017-08-15 15:34:23 +02:00
Magne Sjaastad 16a1caf4c0 Merge remote-tracking branch 'origin/dev' into pre-proto 2017-08-15 15:26:36 +02:00
Magne Sjaastad 4bda27c627 #1771 Add missing allocation of well path 2017-08-15 15:20:08 +02:00
Magne Sjaastad 362eb249b5 #1756 Allow 'Include Fractures' to be un-checked 2017-08-14 22:30:22 +02:00
Magne Sjaastad 7dfcfde1d1 #1744 Load and update data for fractures when loading project file 2017-08-14 22:16:03 +02:00
Magne Sjaastad f756d1d2cb #1764 Use helper function to load data and create result accessor 2017-08-14 19:27:44 +02:00
Magne Sjaastad 3cf4bb25dc #1764 If no NTG values are defined on file, use 1.0 as NTG value 2017-08-14 19:03:01 +02:00
Magne Sjaastad b09797bb84 Merge branch 'hdf-prototype' of https://github.com/OPM/ResInsight into hdf-prototype 2017-08-14 10:51:22 +02:00
Magne Sjaastad 5eb4eafb6e Merge branch 'dev' into hdf-prototype 2017-08-14 10:47:44 +02:00
Magne Sjaastad f6c785cd07 Do not compare signed with unsigned 2017-08-11 16:36:14 +02:00
Magne Sjaastad 3644f4eb76 Do not compare signed with unsigned 2017-08-11 16:17:40 +02:00
Magne Sjaastad 0ba1746755 Merge branch 'dev' into pre-proto 2017-08-11 16:14:00 +02:00
Magne Sjaastad a99eae7c24 Linux : Fix compiler issues 2017-08-11 15:22:40 +02:00
Magne Sjaastad f096f78a55 Linux : Fix compile issue 2017-08-11 15:18:20 +02:00
Magne Sjaastad c1fe8a7e6c #1691 Rename to RigEclipseResultInfo 2017-08-11 15:10:08 +02:00
Magne Sjaastad 21fd00389c Fixes after merge 2017-08-11 14:55:01 +02:00
Magne Sjaastad 839e3e1d00 #1755 Use namespace instead of class to encapsulate structures 2017-08-11 14:28:43 +02:00
Magne Sjaastad 89684c243f #1755 Use namespace RiaDefines instead of class 2017-08-11 14:28:42 +02:00
Magne Sjaastad 8f3a7a5867 #1691 Map from filtered time step indices to well result indices 2017-08-11 14:27:58 +02:00
Magne Sjaastad 68e52e1838 #1755 Cleaned up includes 2017-08-11 14:27:57 +02:00
Magne Sjaastad c4aa625d33 #1755 Move porosity model enum to separate file 2017-08-11 14:27:56 +02:00
Magne Sjaastad 56afc497b3 Add missing includes 2017-08-11 14:27:23 +02:00
Magne Sjaastad 88bbea6339 #1755 Remove porosity enum from RifReaderInterface 2017-08-11 14:27:22 +02:00
Magne Sjaastad ad09441da1 #1691 Add RigTimeStepInfo 2017-08-11 14:26:16 +02:00
Magne Sjaastad 6b90a94458 #1691 Rename to RigResultInfo 2017-08-11 14:26:15 +02:00
Magne Sjaastad 3253c8968e #1691 Move RigResultInfo into separate file 2017-08-11 14:26:15 +02:00
Magne Sjaastad 78da4c6469 #1691 Add time step filter to RimCase and use from RimEclipseResultCase 2017-08-11 14:24:54 +02:00
Magne Sjaastad 624f14da46 Prefix enum values with RIF_ 
FLOAT causes Cotire compile to fail
 2017-08-11 14:24:54 +02:00
Magne Sjaastad 5775c3bb20 Remove duplicate definitions of file names 2017-08-11 14:24:54 +02:00
Magne Sjaastad 66c28d8cee #1691 File Interface : Add support for time step filtering 2017-08-11 14:24:54 +02:00
Magne Sjaastad 9223282db4 #1691 Remove caching of time step related data 2017-08-11 14:24:54 +02:00
Magne Sjaastad b1e9e84784 #1691 Removed unused function and cleaned up includes and whitespace 2017-08-11 14:24:54 +02:00
Magne Sjaastad 7cf1c82142 Add system documentation for Eclipse binary file import 2017-08-09 15:03:12 +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 acd7b4784d #1747 Build System : Make variable available to both current and parent scope 2017-08-08 13:51:32 +02:00
Magne Sjaastad fb158b29bd #1747 Build System : Include hdf5 in package name 2017-08-08 13:07:49 +02:00
Magne Sjaastad cc4789d79c #1686 Remove setting of BUILD_PYTHON and ERT_BUILD_CXX 
These flags are set to correct values by default in libecl, it is not required to set these in ResInsight cmake
 2017-08-08 11:45:16 +02:00
Magne Sjaastad 590e2ed753 #1748 libecl : Add INSTALL_ERT to control install targets 2017-08-08 11:23:30 +02:00
Magne Sjaastad 1655585f1e #1676 Remove option RESINSIGHT_ENABLE_HDF5 
Always link HDF library files if HDF is available. Windows : Use root folder to HDF as path for include and library files
 2017-08-08 09:05:47 +02:00
Magne Sjaastad bc4edf6db3 #1676 #1388 Windows : Add path to HDF5 files and link with HDF5 static libs 2017-08-08 07:19:15 +02:00
Magne Sjaastad ca1e08a1a4 #1676 Disable HDF5 by default 2017-08-08 07:07:28 +02:00
Magne Sjaastad a3ba1991db #1739 Ellipse Fracture : Recompute the fracture grid when opening project 2017-08-04 14:35:16 +02:00
Magne Sjaastad 3c5016cb8c #1724 Fix merge issues 2017-08-04 10:45:04 +02:00
Magne Sjaastad c481a275ee Merge branch 'dev' into pre-proto 2017-08-04 10:37:35 +02:00
Magne Sjaastad 88186619db #1724 Apply fix on dev branch 2017-08-04 10:31:55 +02:00
Magne Sjaastad 6ddfab6823 #1724 Removed unused code 2017-08-04 10:24:30 +02:00
Magne Sjaastad 1adba2caf7 #1724 Removed unused code 2017-08-04 10:21:07 +02:00
Magne Sjaastad e35bcf1f58 #1724 Fix mapping from picked triangle index to segment index 2017-08-04 10:07:53 +02:00
Magne Sjaastad bf3636a9df #1732 Update path to StimPlan xml if required 2017-08-03 13:21:19 +02:00
Magne Sjaastad 9cd7dcdd91 #1665 Add processEvents() when waiting for external octave process 2017-08-03 11:31:15 +02:00
Magne Sjaastad ffdafcfb97 #1708 Fishbones : Fix use of rand() for orientation of subs on Linux 2017-08-01 14:36:13 +02:00
Magne Sjaastad 8c7bd87050 #1712 Build System : Add ERT lib to list of third party libs 2017-07-31 14:08:43 +02:00
Magne Sjaastad 59543d1708 #1712 Build System : Remove references to obsolete ERT libs 2017-07-31 14:07:59 +02:00
Magne Sjaastad 7e42efaa8f Cast to size_t to silence warnings on Linux 2017-07-31 08:08:53 +02:00
Magne Sjaastad eef40fdeaa Added missing #pragma once 2017-07-31 08:00:41 +02:00
Magne Sjaastad 3bbc1c9885 System - Add pthread to unit test link parameters 2017-07-19 16:28:17 +02:00
Magne Sjaastad ac3abc78da System - Add missing include on Linux 2017-07-19 16:26:11 +02:00
Magne Sjaastad 78a779424f #1677 Store dialog data in project file 2017-06-30 16:14:15 +02:00
Magne Sjaastad f8f57d3184 #1670 Use PtrField instead of PdmPointer 2017-06-30 16:13:38 +02:00
Magne Sjaastad 5a7755fe0c System : PdmPtrField - Remove PdmPointer interface and add operator() 2017-06-30 15:06:01 +02:00
Magne Sjaastad 917ee860d2 #1670 Minor UI adjustments 2017-06-30 12:49:12 +02:00
Magne Sjaastad d265f79242 #1670 Fix wrong include path 2017-06-29 22:41:34 +02:00
Magne Sjaastad b2b4ab95ba #1670 Add command feature "Export CARFIN" 2017-06-29 22:37:00 +02:00
Magne Sjaastad ec990b5e2c Add static cast from size_t to int 2017-06-29 22:37:00 +02:00
Magne Sjaastad 803c0f7ab0 #1670 Add VecIjk to AppFwk 2017-06-29 22:37:00 +02:00
Magne Sjaastad 407547d454 #1670 Add cell range UI 2017-06-29 22:37:00 +02:00
Magne Sjaastad 15e805fba3 #1670 Move commands to ExportCommands folder 2017-06-29 22:37:00 +02:00
Magne Sjaastad 468d5134cb #1670 Move grid functions from RimCellRangeFilterCollection to RigReservoirGridTools 2017-06-29 22:37:00 +02:00
Magne Sjaastad 7cc95c3fa8 #1670 Add const and move some functions to private section 2017-06-29 22:37:00 +02:00
Magne Sjaastad 70d3c501a4 #1668 Use "Export" instead of "OK" in export dialogs 2017-06-28 10:13:59 +02:00
Magne Sjaastad 286ec08b05 #1668 Use title "Export Well Segments" 2017-06-28 10:11:56 +02:00
Magne Sjaastad 37a04dd376 #1651 Set default value to 1.0 for Install Success Rate 2017-06-23 17:19:06 +02:00
Magne Sjaastad 4c7f9d4d31 Merge branch 'master' into dev 2017-06-21 17:42:28 +02:00
Magne Sjaastad 7dd0360284 Merge pull request #1639 from OPM/release-2017.05-patch 
Set version number to 2017.05.2
 2017-06-21 13:49:05 +02:00
Magne Sjaastad 9f76f851b8 Set version number to 2017.05.2 2017-06-21 13:48:08 +02:00