Commit Graph

226 Commits

Author SHA1 Message Date
Magne Sjaastad
716bb3184b System : Replace tab with four spaces 2018-03-12 11:12:39 +01:00
Magne Sjaastad
8e8c168405 #2546 Well Connection Factors : Several changes related to data access
Moved rig classes from command feature into ReservoirDataModel\Completions\
2018-03-12 11:07:46 +01:00
Magne Sjaastad
26884d97b6 #2536 Merge branch 'cmake-improvements' into dev 2018-02-28 11:05:12 +01:00
Magne Sjaastad
7b5963d75c #2536 Build System : Add list of internal ResInsight libraries 2018-02-28 10:54:53 +01:00
Magne Sjaastad
25a1823f35 Merge branch 'dev' into cmake-improvements 2018-02-28 08:47:01 +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
f4bae6f796 #2529 Fracture : Remove RESINSIGHT_ENABLE_PROTOTYPE_FEATURE_FRACTURES from CMake files 2018-02-26 21:11:14 +01:00
Magne Sjaastad
ad97b19c30 #2509 Fracture : Exclude files when fracture config is not active 2018-02-21 10:41:11 +01:00
Magne Sjaastad
fb95d896ef #2509 Fracture : Add copy / paste of ellipse fracture template 2018-02-20 07:20:25 +01:00
Jacob Støren
911571e267 #2337 Window Edge axis overlay item working. 2018-02-09 14:08:55 +01:00
Magne Sjaastad
d208f63255 Add .clang-format to cmakelist 2018-02-07 08:54:53 +01:00
Magne Sjaastad
20652a0597 #2423 Export Completions : Move folder one level up 2018-01-31 10:20:47 +01:00
Magne Sjaastad
f0f7c954cc #2423 Export Completions : Move files to separate folder 2018-01-31 10:20:47 +01:00
Magne Sjaastad
03de2aba5b #2332 2D Intersection View: Command to create view 2018-01-17 11:05:31 +01:00
Magne Sjaastad
1df20d1b10 #2313 Improve cmake tooltip text and mark as advanced 2018-01-05 14:21:02 +01:00
Magne Sjaastad
ecdc4b10ba System : VS2017 add definition _SILENCE_TR1_NAMESPACE_DEPRECATION_WARNING
https://github.com/google/googletest/issues/1036
2017-12-18 08:38:46 +01:00
Bjørnar Grip Fjær
a335fd0f21 #1788 Create preliminary user interface to show Flooded PV 2017-08-31 16:23:39 +02:00
Magne Sjaastad
7da886db11 #1794 System : Move packaging config to ResInsight project 2017-08-23 07:21:00 +02:00
Magne Sjaastad
f5ffbc1f1a #1810 Improve copy and install of DLLs on Windows 2017-08-22 22:31:13 +02:00
Magne Sjaastad
553b3bf63e #1794 Add flag RESINSIGHT_ENABLE_PROTOTYPE_FEATURE_FRACTURES 2017-08-21 15:24:20 +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
f89c1e052c MSVC : Disable warning for ResInsight 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
5eb4eafb6e Merge branch 'dev' into hdf-prototype 2017-08-14 10:47:44 +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
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
8c7bd87050 #1712 Build System : Add ERT lib to list of third party libs 2017-07-31 14:08:43 +02:00
Bjørnar Grip Fjær
bf23529b55 #1665 Add parameter and basic framework for executing command file 2017-07-26 16:41:17 +02:00
Magne Sjaastad
15e805fba3 #1670 Move commands to ExportCommands folder 2017-06-29 22:37:00 +02:00
Jacob Støren
ba84b9ec5a #1666 Add CommandFileInterface system 2017-06-29 13:19:06 +02:00
Bjørnar Grip Fjær
9bea767cdf #1663 Octave interface to get NNC-pair information 2017-06-29 09:07:21 +02:00
Magne Sjaastad
263015cdff #1596 Move several files from Application to Application/Tools 2017-06-13 15:15:40 +02:00
Bjørnar Grip Fjær
960948e684 Move perforation commands to completion commands 2017-06-07 15:57:57 +02:00
Bjørnar Grip Fjær
ffb084a78b #1532 Move completion related data models into separate completions folder 2017-05-30 14:50:43 +02:00
Bjørnar Grip Fjær
bd74a942fd #1532 Move completion related commands to own completion commands folder 2017-05-30 14:25:41 +02:00
Bjørnar Grip Fjær
5a8a632082 #1451 Add command for adding new perforation interval 2017-05-12 10:01:59 +02:00
Magne Sjaastad
414733899e Fishbones : Add model and visualization 2017-05-05 12:23:29 +02:00
Magne Sjaastad
d364e045aa Merge branch 'dev' into hdf-prototype 2017-04-20 13:05:04 +02:00
Magne Sjaastad
3d7c6a4234 Always use HDF5 when building (consider as option later) 2017-04-06 13:10:43 +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