OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-02-25 18:55:39 -06:00
Code Issues Packages Projects Releases Wiki Activity
9,385 Commits 27 Branches 61 Tags 309 MiB
c716529542
Commit Graph

136 Commits

Author SHA1 Message Date
Magne Sjaastad
1a1661b12d System : Add compiler flag c++14 to avoid using too new language features 2018-11-02 11:36:46 +01:00
Jacob Støren
5bf5e6c99d Remove libslvs from the code base, including some cleanup. 2018-10-16 09:20:44 +02:00
Jacob Støren
c5b5980da3 Add SolveSpaceLib libslvs with an S-Curve test to ResInsight 2018-06-15 14:47:42 +02:00
Gaute Lindkvist
53cf8a80cd Stop building docs as part of "ALL". 2018-04-18 11:33:04 +02:00
Magne Sjaastad
25a1823f35 Merge branch 'dev' into cmake-improvements 2018-02-28 08:47:01 +01:00
Magne Sjaastad
ca0087eb55 Build System VizFwk : Use target_* and remove includes 2018-02-28 07:42:19 +01:00
Magne Sjaastad
233df05f68 Build System : Remove obsolete includes and update depending includes 2018-02-27 20:00:56 +01:00
Magne Sjaastad
f4bae6f796 Fracture : Remove RESINSIGHT_ENABLE_PROTOTYPE_FEATURE_FRACTURES from CMake files 2018-02-26 21:11:14 +01:00
Magne Sjaastad
1df20d1b10 Improve cmake tooltip text and mark as advanced 2018-01-05 14:21:02 +01:00
Magne Sjaastad
0f30433286 Make sure ResInsight compiles if HDF5 is not available on Linux 2018-01-05 07:06:55 +01:00
Magne Sjaastad
706740ca5b Improve RESINSIGHT_ENABLE_PROTOTYPE_FEATURE_SOURING 
Set default ON
 2018-01-04 13:53:50 +01:00
Magne Sjaastad
efd321f2c6 Improve RESINSIGHT_ENABLE_PROTOTYPE_FEATURE_FRACTURES 
Set default on and mark as advanced
 2018-01-04 13:51:54 +01:00
Magne Sjaastad
c976091336 Expression Parser: Add exprtk to ThirdParty 2017-10-12 10:52:30 +02:00
Jacob Støren
8859726d61 Update so version number for installed libecl so to 2.3 2017-10-03 08:30:19 +02:00
Magne Sjaastad
7da886db11 System : Move packaging config to ResInsight project 2017-08-23 07:21:00 +02:00
Magne Sjaastad
a609556be9 HDF5 : Link with dynamic libraries on Windows 2017-08-22 22:30:31 +02:00
Magne Sjaastad
1ee068cd6a System : Add 'fractures' to package name 2017-08-22 14:42:22 +02:00
Magne Sjaastad
f483e1aa37 System : Always show HDF5 path on Windows 2017-08-22 14:08:17 +02:00
Magne Sjaastad
75f5c6ab3b Set RESINSIGHT_ENABLE_PROTOTYPE_FEATURE_FRACTURES default off 2017-08-22 10:03:53 +02:00
Magne Sjaastad
be5106a146 Set RESINSIGHT_ENABLE_PROTOTYPE_FEATURE_FRACTURES to ON for pre-proto branch 2017-08-22 09:35:54 +02:00
Magne Sjaastad
de6e6858fa Include Clipper library inside ifdef USE_PROTOTYPE_FEATURE_FRACTURES 2017-08-21 22:05:15 +02:00
Magne Sjaastad
553b3bf63e Add flag RESINSIGHT_ENABLE_PROTOTYPE_FEATURE_FRACTURES 2017-08-21 15:24:20 +02:00
Magne Sjaastad
dde03dcc8c 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
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
6ddf8aae27 Use EXTERNAL_LINK_LIBRARIES for external binaries 2017-08-17 09:12:27 +02:00
Magne Sjaastad
534572345d 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
d5d5cedbf5 Remove explicit include of Ert 
Ert includes are implicit defined by tartget_link_library
 2017-08-09 08:31:18 +02:00
Magne Sjaastad
fb158b29bd Build System : Include hdf5 in package name 2017-08-08 13:07:49 +02:00
Magne Sjaastad
cc4789d79c 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
8c7bd87050 Build System : Add ERT lib to list of third party libs 2017-07-31 14:08:43 +02:00
Magne Sjaastad
59543d1708 Build System : Remove references to obsolete ERT libs 2017-07-31 14:07:59 +02:00
Bjørnar Grip Fjær
0e8d76d05c Fix proper include paths for new libecl version. 2017-06-22 13:46:46 +02:00
Bjørnar Grip Fjær
9b5d8a7f21 Update ResInsight CMake configuration for latest libecl 2017-06-22 11:52:11 +02:00
Magne Sjaastad
a45aee0cc2 Merge branch 'fishbones' into pre-proto 2017-05-23 10:28:42 +02:00
Jacob Støren
df269931c9 Add subset of Eigen, and method to condense transmisibilities 
Not yet fully tested.
 2017-05-12 14:41:38 +02:00
Magne Sjaastad
6a5f924c0f Update version of Ert so-files to be installed 2017-04-26 13:03:57 +02:00
Magne Sjaastad
c35e79c3b5 Merge branch 'dev' into pre-proto 2017-04-20 13:40:56 +02:00
Magne Sjaastad
2b4efc4b5c 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
e1ca217422 Removed dependency on 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
Magne Sjaastad
3007a62238 System : Improved control of cotire 2017-03-29 08:13:45 +02:00
Magne Sjaastad
aedf184d14 Merge remote-tracking branch 'refs/remotes/origin/dev' 
Conflicts:
	ApplicationCode/ProjectDataModel/RimEclipseWell.cpp
 2017-01-26 14:30:13 +01:00
Magne Sjaastad
329bed71a4 Removed linking of ert_utilxx included in d71476b1aa 
This library contains shared pointer code, and is not needed to link with
 2017-01-26 14:21:24 +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
09dacf1928 System : Set solution folder property at correct location 2017-01-23 12:59:24 +01:00
Magne Sjaastad
699c2a1103 Added nightcharts pie plotting library 2017-01-23 12:59:24 +01:00
Magne Sjaastad
d71476b1aa System : Improved organization of ThirdParty libraries 2017-01-23 12:59:24 +01:00