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
15,568 Commits 27 Branches 61 Tags 309 MiB
f3a3e04e1f
Commit Graph

369 Commits

Author SHA1 Message Date
Magne Sjaastad
b0ec2895be Enable unity build on opm-common 2020-11-16 14:55:45 +01:00
Magne Sjaastad
be23df1398 Split Sutbstitutes into cpp and header to make it possible to use unity build 2020-11-16 14:55:29 +01:00
Ruben Thoms
f563748e1b Included stdexcept. 2020-11-16 11:34:09 +01:00
Ruben Thoms
a180fc431b Include boost spirit in order to compile opm-common. 2020-11-16 11:34:09 +01:00
Magne Sjaastad
df2a6fb9d9 Update opm-common based on 2020.04 branch 
Use branch https://github.com/CeetronSolutions/opm-common/commits/windows-fixes-2020.04
Update from 34ff4827569bb04190743e7aae3404794ccd188a
 2020-11-16 11:34:09 +01:00
Magne Sjaastad
011174153e Minor compiler fixes 2020-11-16 11:34:09 +01:00
rubenthoms
0747547aaf Added CMake files for generating and including OPM-common as a ThirdParty library. 2020-11-16 11:34:09 +01:00
rubenthoms
9742317e98 Added tests for OPM-common. 2020-11-16 11:34:09 +01:00
rubenthoms
dd3a3efa19 Added directory for generated content from OPM-common, filled with the parser keywords. 2020-11-16 11:34:09 +01:00
rubenthoms
ca01feeb2f Added OPM-common as a ThirdParty library. 2020-11-16 11:34:09 +01:00
Magne Sjaastad
70dfdd9a41 #6869 Coarse Grid: Make sure empty coarsening cells are handled correctly 
Based on fix by Jean-Paul Balabanian <jpb@equinor.com>
 2020-11-03 04:34:40 -05:00
rubenthoms
1941a1f3d3
Boost and Eigen to vcpkg (#6817) 
* Moved boost subset installation to vcpkg.

* Moved Eigen to vcpkg.

Added packages to vcpkg-response files.
Removed unnecessary include_directories() calls.


Removed comments.

* Use target_link_library instead of boost_libraries

Co-authored-by: Magne Sjaastad <magne.sjaastad@ceetronsolutions.com>
 2020-10-25 09:22:19 +01:00
Gaute Lindkvist
18d250ebf1 Moved VCPKG into ThirdParty 2020-10-20 11:05:27 +02:00
Gaute Lindkvist
78ba28e916 Update Boost-subSet to 1.74.0 to fix C++17 incompatibility issues 2020-10-20 11:05:10 +02:00
Gaute Lindkvist
e797c5ccdf Add GSL headers as third party library (header only) 2020-10-20 11:05:10 +02:00
Gaute Lindkvist
0354664b8f Get rid of warning of CMake policy CMP0042 by copying in new libecl code 2020-10-20 11:05:10 +02:00
Gaute Lindkvist
3834fdb382 Revert "Move RiuQssSyntaxHighlighter.h from MOC-headers to regular headers" 
This reverts commit 2064ec6bf0.
 2020-10-19 10:48:17 +02:00
Gaute Lindkvist
2064ec6bf0 Move RiuQssSyntaxHighlighter.h from MOC-headers to regular headers 2020-10-19 10:30:34 +02:00
Magne Sjaastad
2cfa900041 #6514 Dark Theme : Fix text color in nightcharts 2020-09-25 14:32:06 +02:00
Ruben Manuel Thoms
87bc6acd65 Added a GUI theme selector in preferences and a new class for handling GUI changes. 
Added a new feature for editing style sheets and variable colors and see immediately the result.
Made Qwt plots (and items) stylable.
Added icons, improved styling possibilities of QMinimizePanel, fixed minor bugs in RicThemeColorEditorFeature.
 2020-09-25 14:32:06 +02:00
Gaute Lindkvist
9afac51bca #6567 Remove use of GNU GSL 2020-09-24 08:05:25 +02:00
Gaute Lindkvist
12c264b2a6 Update some comments in PdmObjectMethod 2020-08-07 13:01:29 +02:00
Stein Inge Dale
edc4b39acb Color Legend : Added RAINBOW for better depth visualization (issue #6168) 
- Included RAINBOW color legend
- RAINBOW set as default when creating a new contour plot
 2020-08-06 11:20:17 +02:00
Ruben Manuel Thoms
40a4e57129 Qt 5.15 adjustments related to the change of location of QPainterPath 2020-08-04 14:01:38 +02:00
Gaute Lindkvist
00c02dbf16 Upgrade to Qwt 6.1.5 2020-08-04 11:57:54 +02:00
Kristian Bendiksen
817ae0290c #6029 Upgrade gtest to v1.10 for ApplicationCode/. 2020-06-03 22:06:29 +02:00
Gaute Lindkvist
f199297f12 #5915 improve performance of NNC computation and limit to active cells 2020-05-13 12:19:03 +02:00
Magne Sjaastad
ba65ba08c6 Update qwt submodule 2020-04-24 17:01:55 +02:00
Gaute Lindkvist
c801d768d3 Removed qwt from source code tree and added submodule 2020-04-24 15:12:43 +02:00
Magne Sjaastad
4b372b438e System : Remove support for Qt4 2020-04-24 11:40:22 +02:00
Magne Sjaastad
21361b7bc6 Revert back to required CMake 2.8.12 2020-04-23 13:32:16 +02:00
Gaute Lindkvist
5d469e6bef Change to use ampl/gsl rather than lindkvis/gsl 2020-04-22 17:07:56 +02:00
Gaute Lindkvist
9fcfe4fa84 Merge branch 'dev' into feature-analysis-plots-initial 2020-04-22 16:17:09 +02:00
Magne Sjaastad
dbe782a9a0 LibEcl : Add missing include for latest VS2019 2020-04-18 09:20:40 +02:00
Gaute Lindkvist
60419f0985 Working Correlation Plot prototype 2020-04-17 13:54:21 +02:00
Magne Sjaastad
4e3a894464 #5370 Unity Build : Add config for AppFwk 2020-01-23 13:37:29 +01:00
Magne Sjaastad
89c306cb5a #5325 Summary Import : Avoid abort for incomplete summary data 2020-01-10 14:28:46 +01:00
Gaute Lindkvist
47b93dc0d1
Implement pdf rendering (#5250) 
* First PDF creation support

* Reimplement info box

* Set title and make overlay frame margins more unified

* Remove a style sheet that was never meant to be applied to Project Tree

* Update RiuDraggableOverlayFrame when changing content

* Default page layout in Preferences

* undo removal of elision

* Remove friend class assignment in cafCategoryMapper

* the required methods have been made public

* Fix up after review

* Remove spurious const on by-value return

* Fix compile errors on Linux

* Fix size adjustment of legends with plot resizing
 2019-12-18 12:25:19 +01:00
Gaute Lindkvist
285433cbb8 #4927 Blind attempt at improving reliability of smspec import 2019-11-28 08:03:59 +01:00
Gaute Lindkvist
9b2c5c1382 Fix build issue in opm-flowdiagnostics for VS2019 2019-11-26 14:36:42 +01:00
Magne Sjaastad
157219e63d #5015 libecl : Make sure *.UNSMRY is closed properly after data is read 
Earlier attempts to fix this caused major performance issues. Now closing the file stream when reading of vector data is completed, seems to work as expected.
 2019-11-08 11:12:06 +01:00
Magne Sjaastad
4c9048cd6a Revert "#5015 libecl : Make sure *.UNSMRY is closed properly after data is read" 
This reverts commit f1070cdb82.
 2019-11-08 11:05:14 +01:00
Magne Sjaastad
f1070cdb82 #5015 libecl : Make sure *.UNSMRY is closed properly after data is read 2019-11-08 08:58:33 +01:00
Magne Sjaastad
18eee02bb1 #4966 tNav Crash on import : Guard null pointer access in flow diag library 2019-11-02 07:38:23 +01:00
Magne Sjaastad
32b5d7696d
System : Remove build warnings (#4963) 2019-11-01 10:00:07 +01:00
Gaute Lindkvist
7e5d358fa1 Simplified code following further review 2019-10-24 14:13:19 +02:00
Gaute Lindkvist
7bbe505d39 #4762 Fix ecl_grid_reset_actnum in the libecl-team suggested way 2019-10-24 14:13:19 +02:00
Gaute Lindkvist
1255c877d7 Revert "#4762 Fix reset_actnum libecl crash on load" 
We will check in a different fix on recommendation by libecl team

This reverts commit 047136e8b8.
 2019-10-24 14:13:19 +02:00
Magne Sjaastad
5930478a90 #4914 Flow Diag : Improve robustness when reading PVT data 
https://github.com/OPM/opm-flowdiagnostics-applications/pull/98
 2019-10-23 13:24:47 +02:00
Gaute Lindkvist
047136e8b8 #4762 Fix reset_actnum libecl crash on load 2019-09-25 17:49:58 +02:00
Magne Sjaastad
528d4523bd System : Disable warnings 2019-09-16 21:23:11 +02:00
Magne Sjaastad
29184f4475 System : Disable warnings 2019-09-16 13:33:05 +02:00
Magne Sjaastad
ecf5a67074 System : Upgrade to Qwt 6.1.4 
Avoid use of deprecated Qt functions like QString::null
 2019-09-13 10:07:49 +02:00
Bård Skaflestad
99ce43ccdb Support Creating ECLGraph from "ecl_grid_type*" 
This commit introduces a new static function

  ECLGraph::load(const ecl_grid_type*, const ECLInitFileData&)

This is in order to simplify constructing the backing graph from
ResInsight's .EGRID input--especially to have consistent view of
a model's active cells irrespective of which simulator created
the result set.
 2019-06-17 19:31:48 +02:00
Magne Sjaastad
936fab3e32 libecl : Improve comment 2019-06-03 09:11:03 +02:00
Magne Sjaastad
dcf33d9289 #4453 Dual Porosity : Use ACTNUM value 3 when creating values from PORV 2019-05-31 14:53:36 +02:00
Gaute Lindkvist
6691dca4ca #4448 Clean up ResInsight Qt5-checks 2019-05-28 15:58:49 +02:00
Magne Sjaastad
1d574fd8c7 #4266 : opm-flowdiagnostics-applications : Update to f57942a8cdf57422fabf3a4423d02a3e46e0be4e 2019-05-09 10:09:06 +02:00
Magne Sjaastad
819744a03b #4266 : opm-flowdiagnostics : Update to 8bb60d6111063f2b7557502ecaa329a2d5c13b41 2019-05-09 10:06:27 +02:00
Magne Sjaastad
2af89b57de #4266 : libecl : Applied patch for geomech 2019-05-09 09:27:36 +02:00
Magne Sjaastad
e8c214a7e9 #4266 : libecl : Applied patch to avoid recompile at each commit 2019-05-09 09:26:31 +02:00
Magne Sjaastad
6f78404f92 #4266 : libecl : Applied patch related to install 2019-05-09 09:25:31 +02:00
Magne Sjaastad
a31d8cbea6 #4266 : libecl : Fix several crash issues 2019-05-09 08:41:06 +02:00
Magne Sjaastad
96a7f02abe #4266 : flow diagnostics: Update related to API changes 2019-05-09 08:41:02 +02:00
Magne Sjaastad
04091ad77d #4266 Update libecl 
Use commit 0e1e780fd6f18ce93119061e36a4fca9711bc020

Excluded multibuild folder, as this caused git issues
 2019-05-09 08:40:32 +02:00
Bård Skaflestad
4ad130ae47 PVT Interpolants: Give More Meaningful Diagnostic if Missing 
This commit refines the error message emitted if a particular
phase does not have a PVT interpolant--e.g., if the INIT file
does not provide PVT data.  Previously we would generate a
message akin to

    Region Index 0 Outside Valid Range (0 .. (size_t)-1)

which is not very helpful to users in diagnosing the issue.  The
new message does at least indicate that there is no interpolant
for the accompanying phase and also emits the (1-based) region
index for context.
 2019-04-16 15:27:31 +02:00
Bård Skaflestad
8d27e0cd01 Don't Calculate Scaled Curves if EPS Data Unavailable 
This commit captures the result set's availability of EPS data
in a new data member,

    bool ECLSaturationFunc::Impl::haveEPSData_

We need this piece of information to identify whether a null
'eps_' data member corresponds to missing EPS data or failure to
form the backing EPS data object.  In the first case, it is fine
to output the unscaled curves while throwing an exception in the
latter case is more appropriate.

This restores ResInsight's ability to show unscaled saturation
function curves if the backing EPS data is not output to the
result set's INIT file.
 2019-04-10 17:53:50 +02:00
Magne Sjaastad
aa72b384f1 #4289 libecl : Apply external ACTNUM instead of combining with file ACTNUM 2019-04-05 11:20:57 +02:00
Magne Sjaastad
738fc8e283 #4268 libecl : Apply patch for handling of null pointer in util_access 2019-04-02 11:20:43 +02:00
Gaute Lindkvist
29e2305c05 #4259 Apply libecl patch for exporting MAPAXES 2019-04-02 08:20:10 +02:00
Magne Sjaastad
684526ef33 #4268 libecl : Guard null pointer access on Windows 2019-04-01 14:43:04 +02:00
Magne Sjaastad
e1d842d3a4 #4211 libecl : Fix for access of data out of bounds 2019-03-22 08:32:23 +01:00
Magne Sjaastad
dfd4539786 #4172 libecl : Guard null pointer access 2019-03-05 21:11:14 +01:00
Magne Sjaastad
b120d0a2c1 #4172 libecl : Return std::string instead of NULL 
libecl crashes when NULL is returned from a function returning std::string
 2019-03-05 21:10:39 +01:00
Bård Skaflestad
3ebb106623 Max 2P Sat-Sum: Don't Dereference Null Pointer 
A simulation run might not activate all three phases.  We therefore
must guard against querying the connate saturations of the missing
phase.

Pointy hat: Bard.Skaflestad@sintef.no
Thanks to: Magne Sjåstad
 2019-02-13 23:35:51 -06:00
Magne Sjaastad
288ee59587 #4066 System : Improve cmake macros for cotire 2019-02-11 07:13:08 +01:00
Magne Sjaastad
2fd54b1d0a #4061 : Harmonize how to find Qt5 2019-02-08 13:22:33 +01:00
Magne Sjaastad
0a2b9241ae #4061 Harmonize how Qt5 is found 2019-02-08 11:28:51 +01:00
Magne Sjaastad
5fd80920c8 Merge remote-tracking branch 'origin/master' into dev 2019-02-04 15:48:36 +01:00
Magne Sjaastad
bd6bbe9da9 #4020 System : Use ri_apply_cotire() 2019-02-01 06:56:11 +01:00
Magne Sjaastad
24628e8ca4 #3937 libecl : Workaround to avoid crash for some summary files 2019-01-31 09:21:10 +01:00
Magne Sjaastad
e0ce64e11c #3937 libecl : Workaround to avoid crash for some summary files 2019-01-31 09:20:19 +01:00
Magne Sjaastad
dfac372a9c #4028 Fix performance issues 2019-01-31 09:13:29 +01:00
Magne Sjaastad
55b215e66b #4028 NNC fix 
9d68e3bc60
 2019-01-31 09:06:16 +01:00
Magne Sjaastad
a4b9b3db12 #3982 System : Remove debug output and add comment 2019-01-21 21:52:58 +01:00
Magne Sjaastad
a03e92c7b3 #3982 System : Avoid recompile of libecl at every commit 
set git info to zero
 2019-01-21 21:46:51 +01:00
Magne Sjaastad
fca21efe05 #3982 System : Avoid recompile of libecl at every commit 2019-01-21 21:37:22 +01:00
Bård Skaflestad
6839c1cf77 ECLFluxCalc: Remove Unused 'useEPS' Constructor Parameter 
Recent developments have rendered this parameter unused.  Remove
it to make API simpler.  The library now always loads arrays as
if the caller requests end-point scaling behaviour and we defer
effects of actual end-point scaling until client code queries
the flux calculator at run time.
 2018-12-21 13:14:45 +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
83c5f63291 #3754 Qt4/Qt5 CMake build configuration for Nightcharts and ExpressionParser 2018-11-30 09:47:53 +01:00
Gaute Lindkvist
cc672eb31b #3752 Upgrade Qwt to 6.1.3 to support Qt5 2018-11-30 09:47:53 +01:00
Magne Sjaastad
4d924e2d17
Merge pull request #3682 from bska/refactor-flux-calc 
Refactor Flux Calculator to Eliminate Warnings and Reduce Clutter
 2018-11-14 15:28:47 +01:00
Magne Sjaastad
9589d0fbb7 System : Remove warning from header file in boost subset 2018-11-14 15:27:48 +01:00
Bård Skaflestad
daa6604e3d Flux Calculator: Use 'phaseSaturation' Result Set Query 
This simplifies the implementation of the 'phaseProperties' member
function and, in particular, restores the original code symmetry
amongst the individual phase cases.
 2018-11-14 14:40:06 +01:00
Bård Skaflestad
c15432d1b2 Saturation Functions: Add Public Query for Phase Saturations 
Simplifies retrieving the phase saturation values in the context of
computing phase fluxes at cell interfaces.
 2018-11-14 14:40:06 +01:00
Bård Skaflestad
5347c475be Saturation Functions: Create Helpers for Retrieving Sw and Sg 
Limits the amount of magic keyword references to the result vectors
SWAT and SGAS.
 2018-11-14 14:40:06 +01:00
Bård Skaflestad
f17b38c479 FluxCalc Interface: Rewrap Doxygen Documentation 
Mostly to follow common style elsewhere in library.
 2018-11-14 14:40:06 +01:00
Bård Skaflestad
5167299797 DeadOilConstCompr: Re-adjust Whitespace and Comments 
No functional changes.
 2018-11-14 14:40:06 +01:00
Bård Skaflestad
3c3dfb3dc1 Refactor Constant Compr. Index to Separate Helper 
Limits the use of magic constants in the middle of the main logic.
 2018-11-14 14:40:06 +01:00
Bård Skaflestad
3d5dca4693 Surface Density: Explicitly Recognise Failure Path 
Use the "throw if invalid phase" approach.
 2018-11-14 14:40:06 +01:00