Commit Graph
100 Commits
Author SHA1 Message Date
Magne Sjaastad 5eb4eafb6e Merge branch 'dev' into hdf-prototype 2017-08-14 10:47:44 +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 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 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
Magne Sjaastad 2778c1d22c Merge pull request #1638 from OPM/release-2017.05-patch
Release 2017.05.2
2017-06-21 13:45:58 +02:00
Magne Sjaastad 8e47d82038 Improve layout in header file 2017-06-20 15:01:30 +02:00
Magne Sjaastad b9ee3d6d4a Add const and remove dependency to RimView 2017-06-19 22:53:19 +02:00
Magne Sjaastad 210bdab4c3 Remove scale transform 2017-06-19 22:15:28 +02:00
Magne Sjaastad 994198d388 Add characteristicCellSize to RimView 2017-06-19 20:55:58 +02:00
Magne Sjaastad b5b13789b4 Add const to several geomech functions 2017-06-19 20:49:06 +02:00
Magne Sjaastad 31bde3eb9a #1599 Do not use file extention in getSaveFilename() as this causes issues on KDE desktop 2017-06-19 10:48:47 +02:00
Magne Sjaastad 36b4ad8860 #1440 Add timeStepDates() to RimCase 2017-06-16 17:20:08 +02:00
Magne Sjaastad 759067367b #1440 Add const to time string functions 2017-06-16 16:45:14 +02:00
Magne Sjaastad 15848a82dc #1440 Build time step format string on open 2017-06-16 16:40:35 +02:00
Magne Sjaastad 07e1acac15 #1440 Add const to date access functions 2017-06-16 16:29:16 +02:00
Magne Sjaastad 42dc881cec #1620 Fix copyright text and reorder includes 2017-06-16 15:47:46 +02:00
Magne Sjaastad 6cd0f0ebd2 #1440 Use view as basis for appending dynamic parts 2017-06-16 08:56:02 +02:00
Magne Sjaastad e50f876cf0 Add infrastructure for dynamic parts to well path part managers 2017-06-15 14:07:04 +02:00
Magne Sjaastad 5739e7e09e Add well path manager to RimView 2017-06-15 14:06:38 +02:00
Magne Sjaastad 3404ce90f8 Fix missing include on Linux 2017-06-14 08:27:25 +02:00
Magne Sjaastad a1446a7018 Added regexp used to detect missing copyright headers 2017-06-14 07:54:37 +02:00
Magne Sjaastad 12bbaa898d Added several missing copyright headers 2017-06-14 07:53:28 +02:00
Magne Sjaastad 5a6c3638ee #1596 Move RiaDefines to Application 2017-06-13 15:46:27 +02:00
Magne Sjaastad cf859e7c16 #1596 Rename from RimDefines to RiaDefines 2017-06-13 15:41:52 +02:00
Magne Sjaastad 3ca22692b9 #1596 Move RiaEclipseUnitTools to Application/Tools 2017-06-13 15:28:58 +02:00
Magne Sjaastad 5fa2f6cfbe #1596 Rename to RiaEclipseUnitTools 2017-06-13 15:25:52 +02:00
Magne Sjaastad 263015cdff #1596 Move several files from Application to Application/Tools 2017-06-13 15:15:40 +02:00
Magne Sjaastad 13a350f62a #1466 Fix spelling and set default Cv value to 1.5 2017-06-09 16:02:39 +02:00
Magne Sjaastad e1f4dbfcf8 Renamed to nameField() to avoid duplication of name() 2017-06-08 13:31:53 +02:00
Magne Sjaastad 9759354148 Made RimNamedObject more robust and made name field private 2017-06-08 10:09:39 +02:00
Magne Sjaastad 4ee63784e8 Fix type warning on Windows 2017-06-07 10:13:00 +02:00
Magne Sjaastad ce6acaf20e #1567 Fix issue for command line option '--case' 2017-06-07 07:18:44 +02:00
Magne Sjaastad d927ffced1 Updated version to pre-proto.15 2017-06-06 11:01:35 +02:00
Magne Sjaastad 0c4dc6a087 #1525 Check if data is available before creating curve 2017-05-30 09:13:46 +02:00
Magne Sjaastad 07696e49cc (#1525) Use single curves to represent production rates
Use colors from RimSummaryCurveAppearanceCalculator
2017-05-29 14:52:19 +02:00
Magne Sjaastad cfe7b683be #1525 Make color functions static and public 2017-05-29 14:31:06 +02:00
Magne Sjaastad 2898884c0b #1513 Update point of interest 2017-05-23 09:24:03 +02:00
Magne Sjaastad a72658a88d Trigger redraw when fishbone collection checkbox is manipulated 2017-05-22 11:29:13 +02:00
Magne Sjaastad 276f81a20e #1513 Avoid double dynamic_cast 2017-05-22 08:08:45 +02:00
Magne Sjaastad f05728e76d #1513 Improve placement of camera based on bb dir and extent 2017-05-22 07:59:49 +02:00
Magne Sjaastad 29bf25c56b #1513 Fishbones : Add 'Fly to Object' for fishbones and perforations 2017-05-21 09:15:54 +02:00
Magne Sjaastad 4c19123b2d #1495 Move feature to leaf object 2017-05-20 20:34:07 +02:00
Magne Sjaastad 1acc54d059 #1474 Ask user to automatically set scale to 1 for fishbones 2017-05-20 20:21:19 +02:00
Magne Sjaastad 6e78c0b2cc Fix computation of measured depth when picking in 3D 2017-05-20 20:10:03 +02:00
Magne Sjaastad 123b404809 #1495 Move features from well path to sub objects 2017-05-20 14:47:13 +02:00
Magne Sjaastad ecddaffeb4 #1495 Move features from well path to sub objects 2017-05-20 14:31:25 +02:00