OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-01-01 03:37:15 -06:00
Code Issues Packages Projects Releases Wiki Activity
17,594 Commits 25 Branches 60 Tags 288 MiB
28c46a4201
Commit Graph

294 Commits

Author SHA1 Message Date
Gaute Lindkvist
f7aed637f8 Require CMake 3.6 2020-10-20 11:05:10 +02:00
Gaute Lindkvist
9afac51bca #6567 Remove use of GNU GSL 2020-09-24 08:05:25 +02:00
Gaute Lindkvist
af84ae7432 #6472 Use CMake's CMAKE_CXX_STANDARD flag to require C++11 
* This should not hurt anywhere but may fix MacOS build issues
 2020-09-23 13:58:41 +02:00
Kristian Bendiksen
3b788cbbdf #6491 Silence "unused parameter" warnings. 2020-09-14 21:46:27 +02:00
Kristian Bendiksen
02944f4eca Add ifdefs for OpenMP usage. 2020-09-14 21:46:27 +02:00
Gaute Lindkvist
5ae0e6a511 Fix build issues with test app by making CAF CVF-datatype scripting optional 2020-09-08 13:44:55 +02:00
Magne Sjaastad
6e160fb594 #6398 System : Add unity build to Qwt and flowdiagnostics 2020-08-29 10:30:56 +02:00
Magne Sjaastad
2901ad2c54 #6398 System : Remove cotire 2020-08-29 10:30:56 +02:00
Magne Sjaastad
08723f403f Replace tabs with spaces 2020-06-16 22:07:14 +02:00
Magne Sjaastad
d2ccc684a5 Disable install of GSL 2020-06-16 22:07:14 +02:00
Magne Sjaastad
35c6e8b109 gha : Remove hardcoded VMAKE_INSTALL_PREFIX 2020-06-16 22:07:14 +02:00
Gaute Lindkvist
77090bce6a Update only Third Party git submodules that are used 2020-06-03 15:41:17 +02:00
Magne Sjaastad
9158f65ed2 Bundling of HDF5 : Include symlinks in addition to binary file 2020-05-28 14:27:56 +02:00
Magne Sjaastad
805c735ad3 buildcache : Remove Z7 from release build 
Avoid debug symbols in release build. Faster build and smaller object files.
 2020-05-21 18:34:18 +02:00
Magne Sjaastad
fd475589a5 Build : Adjust compiler flags for debug builds 
buildcache requires compiler flag /Z7 to be set for MSVC. Adjust these flags to be able to use caching for debug builds.
 2020-05-14 09:27:27 +02:00
Magne Sjaastad
e3115bfef9 Add support for compiler launcher using buildcache 
Use CMAKE_CXX_COMPILER_LAUNCHER if buildcache is found in path
 2020-05-08 11:28:55 +02:00
Magne Sjaastad
a1eb707b02 Add test project including cvf and fix compile issues 2020-05-08 11:28:55 +02:00
Magne Sjaastad
25ba7c380c CMake : Move all Gsl projects into solution folder Thirdparty/GSL 2020-04-27 11:10:39 +02:00
Gaute Lindkvist
c801d768d3 Removed qwt from source code tree and added submodule 2020-04-24 15:12:43 +02:00
Magne Sjaastad
616af75df3 #4035 System : Remove term souring from cmake and UI 
Use general term HDF5 when required
 2020-04-24 11:40:22 +02:00
Magne Sjaastad
4b372b438e System : Remove support for Qt4 2020-04-24 11:40:22 +02:00
Magne Sjaastad
e4547b8e0d Set GSL to OFF by default 
Build server in Equinor is not updated with required minimum version for CMake, set GSL off by default
 2020-04-23 14:48:20 +02:00
Gaute Lindkvist
87b631a23e Make GNU GSL optional 2020-04-22 10:52:02 +02:00
Gaute Lindkvist
60419f0985 Working Correlation Plot prototype 2020-04-17 13:54:21 +02:00
Magne Sjaastad
f216bf8d6a
Python doc improvements (#5669) 
* Add tests to xml data type inspection
* Add baseline for testing of PdmScripting
* #5631 Generate doc for Python
 2020-03-12 07:45:52 +01:00
Gaute Lindkvist
b2f55a3101 Make scriptability a CAF-feature 2020-03-05 08:40:46 +01:00
Magne Sjaastad
fddc15b1d8 #5370 Unity Build : Add config for ResInsight 2020-01-23 13:41:31 +01:00
Jacob Støren
d32db574cb #5318 Surface Intersection geometry with results 2020-01-17 13:24:25 +01:00
Magne Sjaastad
5d3082d4e2 #5056 AppFwk : Include cafCommandFeatures in ResInsight 2019-11-15 15:33:31 +01:00
Magne Sjaastad
32b5d7696d
System : Remove build warnings (#4963) 2019-11-01 10:00:07 +01:00
Magne Sjaastad
8a7dee705a System : Move include and compiler defs to ApplicationCode 2019-09-16 13:29:44 +02:00
Magne Sjaastad
8c189922e0 System : Move include of Eigen into ApplicationCode 2019-09-16 13:18:56 +02:00
Jacob Støren
236b0cb3d4 Support cmake version < 3.12 on the OBJECT type library cafCommandFeatures 2019-09-02 13:39:48 +02:00
Magne Sjaastad
b3c00c2038 Mark several cmake options as advanced 2019-08-12 09:52:19 +02:00
Magne Sjaastad
194c8b7278 Avoid linking ResInsight with catch2 2019-08-07 15:09:52 +02:00
Jacob Støren
ecd0c625d2 Put the strange chatch2 from libecl into the Thirdparty folder 2019-08-07 09:38:42 +02:00
Magne Sjaastad
a521748eda CMake : Propagate Qt4/Qt5 flag to AppFwk and VizFwk, use FORCE 2019-06-26 09:19:36 +02:00
Magne Sjaastad
546c5aef82 CMake : Propagate Qt4/Qt5 flag to AppFwk and VizFwk, add to cache 2019-06-26 08:14:54 +02:00
Magne Sjaastad
a6e1098716 CMake : Propagate Qt4/Qt5 flag to AppFwk and VizFwk 2019-06-26 08:00:42 +02:00
Magne Sjaastad
a4973dbb62 Revert "#4426 Linux : Avoid copy of libecl sym links" 
This reverts commit 055c1489b1.
 2019-06-25 14:31:59 +02:00
Magne Sjaastad
4de0799b2e #4426 Linux : Write out full path to source library file 2019-06-25 13:06:28 +02:00
Magne Sjaastad
055c1489b1 #4426 Linux : Avoid copy of libecl sym links 
Rename the libecl so file to match the file name ResInsight is depending on
 2019-06-24 19:56:00 +02:00
Magne Sjaastad
74718c38fc #4473 Qt5 : Set Qt5 as default Qt version 
Still possible to use Qt4 by RESINSIGHT_BUILD_WITH_QT5=OFF
 2019-06-07 12:32:22 +02:00
Gaute Lindkvist
6691dca4ca #4448 Clean up ResInsight Qt5-checks 2019-05-28 15:58:49 +02:00
Gaute Lindkvist
6ba9d42b45 #4448 Move Resinsight from -std=c++0x to -std=c++11 on GNU CXX 2019-05-28 15:58:49 +02:00
Gaute Lindkvist
8f3eb6a748 Add Qt5 test to AppFwk main CMakeLists.txt and update CAF to use CEE_USE_QT5 2019-05-28 15:58:48 +02:00
Magne Sjaastad
45c5a950a4 #4266 : libecl : Update version number in generated so 2019-05-10 09:10:28 +02:00
Magne Sjaastad
387d7cf7c2 System : Use appropriate mode when displaying a cmake message 2019-04-08 12:32:14 +02:00
Magne Sjaastad
dcac03dfd1 #4302 Install : Bundle HDF5 libraries 2019-04-08 12:26:52 +02:00
Magne Sjaastad
288ee59587 #4066 System : Improve cmake macros for cotire 2019-02-11 07:13:08 +01:00
Magne Sjaastad
9a88c33de0 #4061 VizFwk : Use variable CAF_USE_QT5 2019-02-08 11:28:14 +01:00
Magne Sjaastad
6f7730c1f5 #4061 VizFwk : Use variable CEE_USE_QT5 2019-02-08 11:02:26 +01:00
Magne Sjaastad
8bb13f4e15 #4020 System : Add ri_apply_cotire() and make available for targets 2019-02-01 06:55:44 +01:00
Magne Sjaastad
ca267a7f44 System : Add option RESINSIGHT_BUILD_WITH_QT5 2019-01-07 13:58:34 +01:00
Magne Sjaastad
53ef8dbed9 #3932 System : Add FindOctave 2019-01-07 12:44:36 +01:00
Magne Sjaastad
648250290e System : Add AppFwk unit tests using RESINSIGHT_INCLUDE_APPFWK_TESTS 2018-12-20 10:42:16 +01:00
Gaute Lindkvist
17e12a92a0 Update CMake to only look for Qt5 if RESINSIGHT_BUILD_WITH_QT5 is set 2018-12-10 15:10:46 +01:00
Gaute Lindkvist
6cee9eb9e6 #3752 Upgrade ResInsight CMake-system to support both Qt5 and Qt5 2018-11-30 09:47:53 +01:00
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 #3382 Remove libslvs from the code base, including some cleanup. 2018-10-16 09:20:44 +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
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 #2536 Build System VizFwk : Use target_* and remove includes 2018-02-28 07:42:19 +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
1df20d1b10 #2313 Improve cmake tooltip text and mark as advanced 2018-01-05 14:21:02 +01:00
Magne Sjaastad
0f30433286 #2313 Make sure ResInsight compiles if HDF5 is not available on Linux 2018-01-05 07:06:55 +01:00
Magne Sjaastad
706740ca5b #2313 Improve RESINSIGHT_ENABLE_PROTOTYPE_FEATURE_SOURING 
Set default ON
 2018-01-04 13:53:50 +01:00
Magne Sjaastad
efd321f2c6 #2313 Improve RESINSIGHT_ENABLE_PROTOTYPE_FEATURE_FRACTURES 
Set default on and mark as advanced
 2018-01-04 13:51:54 +01:00
Magne Sjaastad
c976091336 #1985 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 #1794 System : Move packaging config to ResInsight project 2017-08-23 07:21:00 +02:00
Magne Sjaastad
a609556be9 #1810 HDF5 : Link with dynamic libraries on Windows 2017-08-22 22:30:31 +02:00
Magne Sjaastad
1ee068cd6a #1809 System : Add 'fractures' to package name 2017-08-22 14:42:22 +02:00
Magne Sjaastad
f483e1aa37 #1794 System : Always show HDF5 path on Windows 2017-08-22 14:08:17 +02:00
Magne Sjaastad
75f5c6ab3b #1794 Set RESINSIGHT_ENABLE_PROTOTYPE_FEATURE_FRACTURES default off 2017-08-22 10:03:53 +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
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
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 #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
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
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
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
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 #1641 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 #1481 Add subset of Eigen, and method to condense transmisibilities 
Not yet fully tested.
 2017-05-12 14:41:38 +02:00
Magne Sjaastad
6a5f924c0f #1431 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 #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
e1ca217422 #1371 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 #1116 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
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
Magne Sjaastad
f7437438d1 Merged branch maintenance-enhancements into dev 2016-12-13 22:38:01 +01:00
Magne Sjaastad
eb43c82c55 System : Fixed issue when building without Octave 2016-12-13 22:04:02 +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
bc493298e2 Flow: Integrated from the FlowDiag branch Step 1. 2016-12-08 17:11:47 +01:00
Magne Sjaastad
97d053cc68 #1014 System : Install files directly in Install folder without extra ResInsight folder 2016-12-01 11:23:52 +01:00
Magne Sjaastad
18abc03825 #1014 System : Include odb and octave in package name 2016-12-01 08:26:58 +01:00
Magne Sjaastad
10ddf1eccc #1014 System : Use RESINSIGHT_MAJOR_VERSION and RESINSIGHT_MINOR_VERSION 2016-11-30 17:36:22 +01:00
Magne Sjaastad
706241db5c Improved how external ERT is used 2016-10-14 10:03:53 +02:00
Magne Sjaastad
473626b9bb #804 Use CMAKE_INSTALL_LIBDIR for path to ERT libraries and updated file references to 2.1 2016-10-13 15:15:12 +02:00
Magne Sjaastad
5a0e8cdce6 #804 Ert removed devel from source code path 2016-10-13 13:40:44 +02:00
Arne Morten Kvarving
71a4e6bc7b fixed: compilation issues with boost < 1.57 
due to c++11 name mangling issues in boost::filesystem,
you cannot build a program with c++11 if boost was built for c++03.

workaround this by using boost's internal hack to do so,
disabling the exposure of c++11 scoped enums which is the cause
of the problems.
 2016-10-10 11:22:43 +02:00
Magne Sjaastad
5420960b22 #826 Added opm-flowdiagnostics libary with a basic test 2016-09-05 15:23:24 +02:00
Magne Sjaastad
1101db5787 (#805) Added category legend and mapper 2016-08-05 17:23:50 +02:00
Magne Sjaastad
e57bbb2402 Modified compiler flags to make opm-parser unit test compile 2016-06-16 18:10:50 +02:00
Magne Sjaastad
718e724760 Include JSON files directly in opm-parser, opm-parser has now no dependencies 2016-06-13 10:39:57 +02:00
Jacob Støren
73e72623d2 Set to compile internal libraries statically by default 2016-06-12 15:47:41 +02:00
Jacob Støren
64aea7285d Fixed BUILD_SHARED_LIBS related build sytem problems on linux. Now working with both on and off. 2016-06-12 02:03:48 +02:00
Magne Sjaastad
a7ed8f297f cotire : Added unity build of cafUserInterface 2016-06-10 14:03:22 +02:00
Magne Sjaastad
954edd8ec1 Added missing library 2016-06-08 12:15:46 +02:00
Magne Sjaastad
4fd8e2503c Added cotire to speed up build times 2016-06-06 09:56:45 +02:00
Jacob Støren
94bf950278 Boost is set to be staticly linked on MSVC and dynamic on linux 
On MSVC force user to add the paths to the boost directories
 2016-06-03 16:25:48 +02:00
Magne Sjaastad
c69ffc2a3d #734 Must hardcode all ERT filenames because the search with GLOB returns empty list when compiled for the first time in a new folder 2016-06-02 13:55:27 +02:00
Magne Sjaastad
5c9e8a8075 #734 Always compile ERT as shared library on Linux 2016-06-02 12:50:42 +02:00
Magne Sjaastad
a08a4eb5ef Added custom wrapper for json files to control install features of json 2016-06-02 11:31:41 +02:00
Magne Sjaastad
60b71cc078 Force build of ERT CXX wrappers in CMake 2016-06-02 09:36:11 +02:00
Magne Sjaastad
9b6e422d0c #742 Integrated opm-parser and added basic unit test 2016-06-01 15:53:21 +02:00
Magne Sjaastad
2892653298 #742 Added custom-opm-parser, compiles on Windows 2016-06-01 15:53:21 +02:00
Magne Sjaastad
758b4a452b #742 Added custom-opm-common to ThirdParty 2016-06-01 15:53:21 +02:00
Magne Sjaastad
54c98ca9f8 #742 NRLib now uses Boost from CMake 2016-06-01 15:53:21 +02:00
Magne Sjaastad
bffad18f9c #742 Added dependency to Boost 2016-06-01 15:53:21 +02:00
Magne Sjaastad
e3fd05145f #734 Fixed issue on Linux when compiling in-source ERT 2016-05-26 21:40:19 +02:00
Magne Sjaastad
31cb06089d #734 Added support for linking with both custom and system installed external ERT library 2016-05-26 21:23:16 +02:00
Magne Sjaastad
1929798532 Moved include_directory from main to ApplicationCode. Include of Eclipse hearder files must now be prefixed with ert/<module_name> 2016-05-26 14:55:59 +02:00
Magne Sjaastad
a4fd584fb1 Added compiler directive for C++11 2016-05-24 10:28:04 +02:00
Magne Sjaastad
1d9405b266 ERT: Disable compile of CXX wrappers 
CXX wrappers are using newer C++ syntax, disable this feature until
relevant compilers are verified
 2016-04-19 15:09:13 +02:00
Magne Sjaastad
c72e047b23 (#687) Moved FileInterface tests into ApplicationCode/UnitTests 2015-12-03 11:11:07 +01:00
Magne Sjaastad
563dd8c04f (#687) Moved tests from ModelVisualization into ApplicationCode/UnitTests 2015-12-03 10:53:12 +01:00
Magne Sjaastad
df604f7e12 Commented out test project 2015-11-26 14:22:53 +01:00
Magne Sjaastad
941d117fbf [Fwk] Updated Cvf test application 2015-11-26 14:22:49 +01:00
Magne Sjaastad
11c76b9fcc (#613) Disable compile of python wrappers 2015-10-30 10:03:09 +01:00
Pål Hagen
095d974e38 (#435) WIP - Reading metadata from LAS files 2015-09-14 16:33:28 +02:00