Commit Graph

1815 Commits

Author SHA1 Message Date
Magne Sjaastad
3b914c7ac0 Fixed missing dash in Linux startup script
https://github.com/OPM/ResInsight/issues/271
2015-01-25 22:14:20 +01: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
Magne Sjaastad
8de0f468ac Fixed invalid foreach syntax 2015-01-09 08:37:22 +01:00
Magne Sjaastad
9ded05212f Merge branch 'pr/268' into dev 2015-01-09 08:05:23 +01:00
Magne Sjaastad
053a9c4d78 Improved parsing of fault face text strings
See https://github.com/OPM/ResInsight/issues/263
2015-01-09 07:42:49 +01:00
Roland Kaufmann
6d38344261 Don't validate shader programs on MacOS X
If the paint event is called before the view is visible, validation
of the shader program will cause an error on MacOS X 10.8 and forward,
stating that the operation was ignored.
2015-01-01 19:46:25 +01:00
Roland Kaufmann
4378f4886a Add application icon into the executable bundle 2015-01-01 19:46:25 +01:00
Roland Kaufmann
9fb9f84a7a Build resulting executable as a bundle on MacOS X
This will allow us to launch it from the Finder and add it to the dock
2015-01-01 19:46:25 +01:00
Roland Kaufmann
eac27f149a Enable in-package substitute of tr1/tuple
In clang 6.0 the tr1/tuple header is not present, and this cause a
compilation error inside of the gtest framework. However, if we set a
define, it will use its own substitute of tr1/tuple, which is sufficient
for the unit tests.
2015-01-01 19:46:25 +01:00
Roland Kaufmann
b019ad260d Duplicate MacOS X framework voodoo for mkoctfile
When CMake encounter a framework in the list passed to
include_directories, it will change this into an -F option. We have to
do the same when we want to pass this list to the mkoctfile custom
command.
2015-01-01 19:46:25 +01:00
Roland Kaufmann
e0da9a611f Remove copy ctor of atomic counter on OS X
This is not present on any of the other platforms so it is not needed,
but it uses a removed method (to receive the value) so it won't compile.
2015-01-01 19:46:24 +01:00
Roland Kaufmann
b25290bebd Complete instantiated types
RivReservoirPartMgr uses a Collection of RivGridPartMgr. The Collection
indirectly causes the release() method of the Object base class of
RivGridPartMgr to be called as part of its destructor, but this is not
allowed for incomplete types and RivGridPartMgr is only forward-declared
at the time of the instantiation (in RivReservoirPartMgr).

A similar problem occurs in the use of RigStatisticsDataCache in the
type RigCaseCellResultsData.
2015-01-01 19:46:24 +01:00
Roland Kaufmann
90249e1158 Use pthreads on MacOS X too
MacOS X is POSIXy enough for this to be a suitable choice
2015-01-01 19:46:24 +01:00
Magne Sjaastad
fe84daefc5 Updated to 1.3.2-dev after release of 1.3.1 2014-11-07 18:34:12 +01:00
Magne Sjaastad
0f88443f2f Updated to 1.3.1 2014-11-07 17:55:13 +01:00
Magne Sjaastad
0dcba178fd Do not show NNC text at all in progress bar when NNC import is disabled 2014-11-06 09:35:39 +01:00
Magne Sjaastad
f2c75c7f59 Updated ERT to bbab02e02630924471760a7e9357825ad414e2e9
Integrated fix for MSW reading of large wells
2014-11-05 17:23:07 +01:00
Magne Sjaastad
619b7a211a Fix for dates before 1970 2014-10-29 09:34:57 +01:00
Magne Sjaastad
cff0313519 Bugfix: Do not change mesh mode when adding a range filter 2014-10-29 08:13:37 +01:00
Magne Sjaastad
d9d4fdab3f Compute placeholder results when creating grid case group 2014-10-28 18:33:23 +01:00
Magne Sjaastad
043584b1b1 Faults : Improved robustness of fault names including space 2014-10-28 11:07:59 +01:00
Magne Sjaastad
5bb0b99ace Rename 2014-10-28 10:17:02 +01:00
Magne Sjaastad
79b45e7008 Create placeholder results for main case in case group 2014-10-28 10:15:20 +01:00
Magne Sjaastad
55b5da018c Ternary : Clamp texture coordinates to avoid texture edge issues 2014-10-28 09:39:26 +01:00
Magne Sjaastad
da31522ae9 Removed invalid include 2014-10-27 14:09:19 +01:00
Magne Sjaastad
babe812ebc Fixed memory leak 2014-10-27 12:25:52 +01:00
Magne Sjaastad
5b5d0ffa5a Show generated static result for all time steps 2014-10-27 08:00:23 +01:00
Magne Sjaastad
31261a800f Removed obsolete code and added comments 2014-10-27 07:19:04 +01:00
Magne Sjaastad
3b7919a913 Fix for executing a script on result cases with no view 2014-10-27 06:53:50 +01:00
Magne Sjaastad
2509fa974f Performance : Now possible to disable load of SOIL on load 2014-10-24 11:38:47 +02:00
Magne Sjaastad
a5e4e756af Updated ERT, now possible to read simplified MSW
Updated ERT to 3ac60303aa2dc58aed9420a24d9a881fec32076b
2014-10-24 11:19:54 +02:00
Magne Sjaastad
63a5dd24fe Added support for fault face using IJK in addition to XYZ 2014-10-09 20:36:27 +02:00
Magne Sjaastad
b93053b089 Updated ERT to 946e512ac17c1e2469892072a925428c0a012fa1 2014-10-09 20:13:04 +02:00
Magne Sjaastad
a8ce90e404 Always compute grid faults 2014-09-26 08:15:22 +02:00
Magne Sjaastad
af55878f07 Updated version string to 1.3.1-dev after release of 1.3.0 2014-09-24 17:30:46 +02:00
Magne Sjaastad
85934c46ec Set ResInsight 1.3 by removing -dev from version string 2014-09-24 13:29:02 +02:00
Magne Sjaastad
b046a0354d Converted assert to if statement when no NNC data is present 2014-09-24 13:28:08 +02:00
Magne Sjaastad
212b41f854 Updated help text 2014-09-24 07:21:26 +02:00
Magne Sjaastad
2d36af4f06 Updated file header for new files 2014-09-24 07:14:52 +02:00
Magne Sjaastad
b4df5419b1 Updated file header for modified files 2014-09-23 15:04:57 +02:00
Magne Sjaastad
57ade584b2 Updated about dialog 2014-09-23 14:34:03 +02:00
Magne Sjaastad
eb43a1e6ae Removed documentation folder. Doc is now available at resinsight.org 2014-09-23 13:46:20 +02:00
Jacob Støren
6e55ca82e2 Fixed Problem regarding negative riTrans values
The reason was a bit sloppy detection of whether the surface normals was
pointing outwards or inwards in a cell.
The cells can be turned inside out due to depth/Z or mapaxis conditions.
2014-09-23 12:26:08 +02:00
Magne Sjaastad
b58862ad93 Do not try to set combined transmissibility if no nnc data is present 2014-09-23 11:41:27 +02:00
Magne Sjaastad
c7888bc2d3 Fixed missing cell result color for static cell results 2014-09-23 10:43:38 +02:00
Jacob Støren
74f927e13f riTRAN/MULT :Improved handling of invalid operations 0/0 etc. 2014-09-09 15:21:09 +02:00
Jacob Støren
c9065eeed9 Made mean calculation handle inf and nan 2014-09-09 15:20:16 +02:00
Jacob Støren
ed202cc7cf Combined TRAN results: Now set to 0.0 on border to inactive cells / grid border 2014-09-09 14:02:03 +02:00
Jacob Støren
fff8f0c89b Changed gui name of Fault Result to Separate Fault Result 2014-09-09 13:07:40 +02:00
Jacob Støren
2f22624228 Fixed problems in auto nnc on/off
Consolidated Gui into Fault
2014-09-09 13:07:01 +02:00