Magne Sjaastad
|
56a04de2ff
|
Merge remote-tracking branch 'origin/dev' into pre-proto
|
2017-08-22 09:36:05 +02:00 |
|
Magne Sjaastad
|
553b3bf63e
|
#1794 Add flag RESINSIGHT_ENABLE_PROTOTYPE_FEATURE_FRACTURES
|
2017-08-21 15:24:20 +02:00 |
|
Bjørnar Grip Fjær
|
6c0f4fa0c0
|
#1806 Ensure time steps are calculated when opening project with saved flow characteristics plot
|
2017-08-21 13:09:06 +02:00 |
|
Magne Sjaastad
|
51c30448e9
|
Merge remote-tracking branch 'origin/dev' into pre-proto
|
2017-08-21 10:42:11 +02:00 |
|
Magne Sjaastad
|
7dfcfde1d1
|
#1744 Load and update data for fractures when loading project file
|
2017-08-14 22:16:03 +02:00 |
|
Magne Sjaastad
|
5eb4eafb6e
|
Merge branch 'dev' into hdf-prototype
|
2017-08-14 10:47:44 +02:00 |
|
Magne Sjaastad
|
0ba1746755
|
Merge branch 'dev' into pre-proto
|
2017-08-11 16:14:00 +02:00 |
|
Magne Sjaastad
|
839e3e1d00
|
#1755 Use namespace instead of class to encapsulate structures
|
2017-08-11 14:28:43 +02:00 |
|
Magne Sjaastad
|
89684c243f
|
#1755 Use namespace RiaDefines instead of class
|
2017-08-11 14:28:42 +02:00 |
|
Magne Sjaastad
|
c4aa625d33
|
#1755 Move porosity model enum to separate file
|
2017-08-11 14:27:56 +02:00 |
|
Bjørnar Grip Fjær
|
eee4a65497
|
Merge remote-tracking branch 'origin/dev' into pre-proto
|
2017-08-08 14:24:42 +02:00 |
|
Bjørnar Grip Fjær
|
37456bfa9b
|
#1730 Include more information in snapshot filenames
|
2017-08-04 11:25:42 +02:00 |
|
Magne Sjaastad
|
c481a275ee
|
Merge branch 'dev' into pre-proto
|
2017-08-04 10:37:35 +02:00 |
|
Bjørnar Grip Fjær
|
a59735de87
|
#1730 Move snapshot features to separate files
|
2017-08-03 16:22:02 +02:00 |
|
Magne Sjaastad
|
9cd7dcdd91
|
#1665 Add processEvents() when waiting for external octave process
|
2017-08-03 11:31:15 +02:00 |
|
Bjørnar Grip Fjær
|
7179aaeac9
|
Merge branch 'dev' into pre-proto
|
2017-08-01 12:44:11 +02:00 |
|
Bjørnar Grip Fjær
|
3dad356d7d
|
#1710 Use usleep on Linux and Sleep on windows
|
2017-07-31 11:26:21 +02:00 |
|
Bjørnar Grip Fjær
|
48401d5a85
|
#1710 #1665 Wait for octave process to finish when executing through command file interface
|
2017-07-31 11:10:43 +02:00 |
|
Bjørnar Grip Fjær
|
94703d72c2
|
#1665 Send any log-output during argument parsing to console
|
2017-07-31 11:10:42 +02:00 |
|
Bjørnar Grip Fjær
|
c02c39d59d
|
#1665 Add replaceCase command to command file interface
|
2017-07-28 11:28:55 +02:00 |
|
Bjørnar Grip Fjær
|
bbb4c80b1b
|
#1665 Add setStartDir command to command file interface
|
2017-07-26 16:57:43 +02:00 |
|
Bjørnar Grip Fjær
|
bf23529b55
|
#1665 Add parameter and basic framework for executing command file
|
2017-07-26 16:41:17 +02:00 |
|
Magne Sjaastad
|
d265f79242
|
#1670 Fix wrong include path
|
2017-06-29 22:41:34 +02:00 |
|
Bjørnar Grip Fjær
|
6dac618af0
|
#1642 Batch : Replace folder for input files
|
2017-06-28 20:36:11 +02:00 |
|
Bjørnar Grip Fjær
|
a9d64edd57
|
#1643 Allow filename including extension for --case command line parameter
|
2017-06-27 14:49:33 +02:00 |
|
Bjørnar Grip Fjær
|
17593fba92
|
#1602 Include sim well fractures when calculating completion type results
|
2017-06-21 11:06:38 +02:00 |
|
Bjørnar Grip Fjær
|
78c948ea89
|
#1623 Schedule invalidation of completion type results instead of immediate calculation
|
2017-06-20 16:40:50 +02:00 |
|
Bjørnar Grip Fjær
|
7c99a2573a
|
Merge branch 'dev' into pre-proto
|
2017-06-20 13:26:52 +02:00 |
|
Bjørnar Grip Fjær
|
d3f512f783
|
#1593 Use well path unit system for completions on well path
|
2017-06-20 10:51:01 +02:00 |
|
Jacob Støren
|
bd3d060c96
|
#1567 Fix on patch branch
|
2017-06-16 17:03:25 +02:00 |
|
Bjørnar Grip Fjær
|
31a64e50ac
|
#1602 Completion Type : Add fracture category
|
2017-06-16 09:44:39 +02:00 |
|
Jacob Støren
|
1911092cb7
|
Merge dev into pre-proto
|
2017-06-14 23:25:55 +02:00 |
|
Jacob Støren
|
cb72a4bfa4
|
Fix linux compile error
|
2017-06-14 14:16:20 +02:00 |
|
Jacob Støren
|
84597a992d
|
Add condictivity conversion method
From pre-proto branch, to delete it there. Unused for now
|
2017-06-14 11:15:59 +02:00 |
|
Magne Sjaastad
|
a8b8e061d7
|
#1596 Merge dev into pre-proto
|
2017-06-14 07:25:34 +02:00 |
|
Magne Sjaastad
|
5a6c3638ee
|
#1596 Move RiaDefines to Application
|
2017-06-13 15:46:27 +02:00 |
|
Magne Sjaastad
|
cf859e7c16
|
#1596 Rename from RimDefines to RiaDefines
|
2017-06-13 15:41:52 +02:00 |
|
Magne Sjaastad
|
3ca22692b9
|
#1596 Move RiaEclipseUnitTools to Application/Tools
|
2017-06-13 15:28:58 +02:00 |
|
Magne Sjaastad
|
263015cdff
|
#1596 Move several files from Application to Application/Tools
|
2017-06-13 15:15:40 +02:00 |
|
Magne Sjaastad
|
dd912b4f97
|
Merge branch 'dev' into pre-proto
|
2017-06-08 14:09:03 +02:00 |
|
Magne Sjaastad
|
ce6acaf20e
|
#1567 Fix issue for command line option '--case'
|
2017-06-07 07:18:44 +02:00 |
|
Magne Sjaastad
|
a45aee0cc2
|
Merge branch 'fishbones' into pre-proto
|
2017-05-23 10:28:42 +02:00 |
|
Magne Sjaastad
|
84b922ba82
|
#1476 Include isFile() when checking if a file exists
|
2017-05-11 09:23:13 +02:00 |
|
Bjørnar Grip Fjær
|
a08dbc91ba
|
#1446 Ensure batch execution does not crash when closing ResInsight
|
2017-05-04 14:28:32 +02:00 |
|
Bjørnar Grip Fjær
|
c845eefb96
|
#1447 Moved Default Z Scale Factor to Default Settings
|
2017-05-03 13:44:37 +02:00 |
|
Bjørnar Grip Fjær
|
0c07493dc1
|
#1414 New eclipse tab and fixed capitalization in preferences
|
2017-04-27 13:16:44 +02:00 |
|
Magne Sjaastad
|
63b07b1152
|
#1430 When closing top level windows, do not close project if other is visible
|
2017-04-25 15:01:31 +02:00 |
|
Bjørnar Grip Fjær
|
63cd817b85
|
#964 Improve code robustness in defineEditorAttribute
|
2017-04-25 10:31:56 +02:00 |
|
Magne Sjaastad
|
7efe0a996a
|
#1384 Add missing population of view windows
|
2017-04-24 21:40:46 +02:00 |
|
Magne Sjaastad
|
c23ac3c8ae
|
#1384 Regression test : Add resize of plot windows
|
2017-04-24 09:39:54 +02:00 |
|