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,603 Commits 25 Branches 60 Tags 288 MiB
8423b17832
Commit Graph

295 Commits

Author SHA1 Message Date
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
Pål Hagen
68662d2968 (#434) Building and linking NRLib with ResInsight 2015-09-11 17:03:11 +02:00
Pål Hagen
2b87c8c7d6 Added Qwt library and basic classes for well log viewer 2015-08-26 12:27:29 +02:00
Magne Sjaastad
57b005cdf2 Build system changes to be able to build using modularization fwk 2015-07-29 14:20:15 +02:00
Jacob Støren
ff79f1a8ba Added calculation of S1, S2 and S3 of Geomechanical stress tensor 
See #320
 2015-06-17 13:07:48 +02:00
Stein Dale
ed3d8b422a Removed ecl_lfs from target 2015-05-13 10:53:19 +02:00
Jacob Støren
4a21bb4a30 Added RimView, and sorted the libs in folders 2015-04-29 10:50:25 +02:00
Fredrik Gundersen
eea5ac6d1d Enable usage of external ERT source 
This change in cmakelist enables the usage of an external ERT source. You can now point to a later version of ERT and use this in sted of the one bundled in the ResInsight source.
 2015-01-09 08:52:42 +01:00
Andreas Lauser
d8cefc1023 fix build 
on my machine (openSUSE 13.1), it broke because the
CheckCSourceCompiles CMake module was not included...
 2014-08-14 10:56:45 +02:00
Magne Sjaastad
bf9ecc7c5f Changed how synchronization functions are detected 2014-04-15 11:50:04 +02:00
Magne Sjaastad
74d7ba276e Test if variable is defined before executing GCC test 2014-04-15 09:48:32 +02:00
Magne Sjaastad
922d76cd91 Set atomics workaround if needed 2014-04-15 08:51:18 +02:00
Magne Sjaastad
48d6986954 Added define used to allow non-threadsafe reference counter 2014-04-11 11:29:31 +02:00
Magne Sjaastad
ca1ef3a5fb Use upper case to be compatible with older cmake versions 2013-10-16 14:16:35 +02:00
Magne Sjaastad
f035f4a672 Improve error message if no Qt is found on the system. Also check for a 
minimum version of Qt 4.6.x
 2013-10-16 13:51:42 +02:00
magnesj
bbb33064b0 ERT: Turn off shared libs by default 2013-10-07 14:50:14 +02:00
Magne Sjaastad
c07875701a ERT: Integrated ERT/master from 
13c3c25fe1
 2013-10-07 14:50:14 +02:00
Magne Sjaastad
70b20324f6 Cleaned up main platform defines and simplified OpenMP configuration 2013-10-07 07:23:04 +02:00
sigurdp
bcc33397a3 Adapted cmake files to new directory structure 2013-09-20 16:21:46 +02:00
Jacob Støren
1e7c4a385a Buildsystem: Prefixed the resinsight vars to make them groupend and more accessible from the cmake gui. 
Also introduced an option to turn openmp on and off
p4#: 22257
 2013-08-30 15:37:29 +02:00
Vidar Lundberg
163ce74052 Added visualization of Well Paths in reservoir views. 
Added PDM objects for a list of well paths (RimWellPathCollection) and for individual well paths (RimWellPath).
RimWellPathCollection uses RivWellPathCollectionPartMgr to generate visualization parts for each well path in the collection.
RimWellPath handles geometry defined in RigWellPath, and RivWellPathPartMgr is used to generate visualization parts. The well path visualization parts are generated by reusing RivPipeGeometryGenerator (also used for well pipes).
Added features:
- Select Open Well Paths in File menu to open one or more well path files, file format supported is Statoil JSON format.
- Each well path has a label showing the name, and the PDM window will show additional info (Id, Source System, UTM Zone, Update Date and User, Survey Type, File Path).
- Possible to turn on / off visibility, set thickness, set color for individual well paths.
- List of well paths including specified parameters/settings will be stored in project file.
- Possible to clip all well paths at a specified distance to the reservoir as this is the relevant area to see, and if showing whole well path it may be problematic for auto zoom etc.
Known problems:
- Well paths are not shown in some types of reservoir views, for instance reservoir views showing well pipes. Will look into this later.
p4#: 21658
 2013-05-16 14:10:22 +02:00
Magne Sjaastad
e1b778d17f Reverted renaming of cmake variable, as it caused issues on Linux 
p4#: 21356
 2013-04-22 11:00:41 +02:00
Magne Sjaastad
a9bde4032b Added Doxygen configuration file and an CMake option to produce docs 
p4#: 21339
 2013-04-19 08:54:38 +02:00
Magne Sjaastad
987af95391 Harmonize branches on basis of project external pull requests 
p4#: 21273
 2013-04-12 15:27:18 +02:00
Magne Sjaastad
e5b7bbc5af Merge pull request #22 from OPM/internal 
Internal
 2013-04-12 04:06:49 -07:00
Magne Sjaastad
ca63b9163a Set the variable to override in the CMake cache, then the default value for the option in the sub project will have no effect. 
p4#: 21136
 2013-04-05 09:43:49 +02:00
Magne Sjaastad
4a8a24c433 Disable install of ERT libs and headers 
p4#: 21126
 2013-04-04 11:27:38 +02:00
Roland Kaufmann
e7613fe9ee Optionally enable system installation of binaries 
If the option PRIVATE_INSTALL is set to OFF, LSB-compliant paths are
used for the `install' target.
 2013-03-27 00:43:01 +01:00
Roland Kaufmann
e63c609111 Use $ORIGIN to load libs from program directory 
The RPATH attribute won't expand relative directories (such as ".")
neither can it be a semi-colon separated list; the old way of setting
it was wrong and would lead to libraries being loaded from system
directories instead.
 2013-03-27 00:38:59 +01:00
Jacob Støren
b33dd15372 Ert: Updated to 3f8166c4739fdfe654d3992920a36bf0a6981b4d 
Had to remove a krsj.txt file that caused trouble (again)
p4#: 20320
 2013-01-31 15:55:49 +01:00
Magne Sjaastad
571da22931 Removed obsolete USE_ECL_LIB, as ERT is now part of the source code tree 
p4#: 20253
 2013-01-25 14:28:42 +01:00
Jacob Støren
ebdf9ccdc3 Version number put into a separate file 
p4#: 20214
 2013-01-22 09:30:28 +01:00
Jacob Støren
bbec410144 Consolidated the root CMakeLists.txt. Removed the .cmake and _install.txt 
p4#: 20212
 2013-01-22 09:04:42 +01:00
Magne Sjaastad
2cf0e32d4b Updated ERT to GIT version a39d4b4a9e597532b2dbf845751a70ffe1de3805 
p4#: 20194
 2013-01-18 08:53:37 +01:00
Jacob Støren
c74619e79a Fixed cmakelist for Reservoirdatamodel test project 
p4#: 20190
 2013-01-17 21:26:12 +01:00
Magne Sjaastad
04006370ac Added ERT as source code based on https://github.com/Ensembles/ert/ and commit 7b53b5f61f5b47e8169b72098b562071df394bc3 
This is SVN commit 4117
Updated ResInsight cmakelists to build ERT and link directly
Removed precompiled ERT binaries
p4#: 20183
 2013-01-17 13:33:59 +01:00
Magne Sjaastad
1be475306d Updated version to 0.9.0 
p4#: 19312
 2012-10-25 14:08:39 +02:00
Magne Sjaastad
32944e660c Upped to 0.8.8 
p4#: 19186
 2012-10-16 10:40:41 +02:00
Magne Sjaastad
1622df540b When compiling 64-bit Windows, establish 32-bit Visual Studio 2010 environment and compile Octave plugin using this environment. 
p4#: 19011
 2012-10-04 12:12:58 +02:00
Magne Sjaastad
c4e5d9e842 Do not include Octave plugin for Windows 64-bit, as no precompiled Octave 64-bit is available. 
p4#: 18838
 2012-09-20 15:15:43 +02:00
CeetronResInsight
3f96c61c72 Change 18625 on 2012/09/11 by magne@ResInsight_magne_RHE5 
Decorate package name with either el5 or el6 when compiled on RHEL5/RHEL6
 2012-09-11 15:10:28 +02:00
CeetronResInsight
b3c142cc9a Change 18603 on 2012/09/11 by fredrik@fredrik_MBP-BootCamp 
Added glPointParameteri(GL_POINT_SPRITE_COORD_ORIGIN, GL_LOWER_LEFT); to get proper orientation of textures on point sprites
 2012-09-11 09:22:36 +02:00
Magne Sjaastad
27d8808c5c Version 0.8.6 2012-08-31 19:12:47 +02:00
unknown
2c9695e594 Updated to version 0.8.0 2012-06-26 16:10:41 +02:00
Alf B. Rustad
dfe97efb1b Initial commit of ResInsight version 0.4.8 2012-05-18 09:45:23 +02:00