Magne Sjaastad
716bb3184b
System : Replace tab with four spaces
2018-03-12 11:12:39 +01:00
Magne Sjaastad
8e8c168405
#2546 Well Connection Factors : Several changes related to data access
...
Moved rig classes from command feature into ReservoirDataModel\Completions\
2018-03-12 11:07:46 +01:00
Magne Sjaastad
64845d796c
Fracture : Move code to cpp
2018-03-09 09:00:44 +01:00
Bjørn Erik Jensen
6942a99406
#2569 Fracture containment. Fix fracture border polygon calculation
2018-03-08 11:06:17 +01:00
Magne Sjaastad
454e0b31be
#2559 Fracture Template : Fix unit conversion for width and conductivity
2018-03-05 09:43:06 +01:00
Magne Sjaastad
bb0f026644
Whitespace
2018-03-02 14:09:46 +01:00
Magne Sjaastad
08995cf63e
#2483 Refactoring : Simplify generation of well branch geometry (2)
2018-03-02 14:07:31 +01:00
Magne Sjaastad
7bd0bdc612
#2483 Refactoring : Simplify generation of well branch geometry (1)
2018-03-02 14:07:23 +01:00
Bjørn Erik Jensen
2ac9aba485
#2494 Add height/width fracture scaling
2018-03-01 14:18:12 +01:00
Magne Sjaastad
25a1823f35
Merge branch 'dev' into cmake-improvements
2018-02-28 08:47:01 +01:00
Magne Sjaastad
89c090ba24
#2536 Build System : Remove obsolete code for cmake older than "2.8.2"
2018-02-28 08:05:00 +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
72b5f540e5
#2529 Fracture : Remove all #ifdef USE_PROTOTYPE_FEATURE_FRACTURES
2018-02-26 20:54:45 +01:00
Magne Sjaastad
7ce6177bc5
System : Add missing braces
2018-02-23 22:39:29 +01:00
Magne Sjaastad
ae064463a9
System : Add missing default statements
2018-02-23 22:39:14 +01:00
Magne Sjaastad
245ea2dac2
System : Use unsigned type as index
2018-02-23 22:38:46 +01:00
Magne Sjaastad
0006c786cf
System : Reorder initialization order to match declaration
2018-02-23 22:38:08 +01:00
Magne Sjaastad
c6b12b85e0
Merge fracture unit refactoring into dev #2509
...
Add display of M and F in front of fracture templates
Add convert of StimPlan templates
Add copy/paste of StimPlan templates
Remove obsolete unit conversion code
2018-02-21 10:15:56 +01:00
Magne Sjaastad
b0be540977
#2509 Fracture : Remove obsolete unit conversion code
2018-02-21 08:18:55 +01:00
Magne Sjaastad
4e737885e4
#2509 Fracture : Move unit conversion of top/bot perforation depth
2018-02-20 15:35:08 +01:00
Magne Sjaastad
35febab8db
#2509 Fracture : Add support for unit conversion of stimplan grid coords
2018-02-20 15:15:06 +01:00
Rebecca Cox
542c912df2
Merge patch into dev with fixes for #2403
2018-02-19 09:32:37 +01:00
Rebecca Cox
4d39136212
#2403 Extraction curves: Fix curves without vertical connections
2018-02-19 09:29:14 +01:00
Magne Sjaastad
1ae30ef11a
(clang-tidy) : modernize-use-nullptr
2018-02-18 18:56:43 +01:00
Magne Sjaastad
f9bded9c13
#2455 Fracture : Move code to cpp and restructure header
2018-02-14 13:34:38 +01:00
Bjørn Erik Jensen
7ddfaeb234
#2388 fractures. Support for asymmetric stim plan
2018-02-08 11:05:55 +01:00
Magne Sjaastad
a283a468c2
#2447 Fracture : Show fracture legend when only ellipse fractures are present
2018-02-06 12:42:13 +01:00
Bjørn Erik Jensen
c09dd0522b
Merge branch '2018.01.01-patch' into dev. #2086
2018-02-05 08:29:24 +01:00
Bjørn Erik Jensen
98a94c0525
#2086 Moved RifStringTools -> RiaStringEncodingTools
2018-02-02 15:44:28 +01:00
Bjørn Erik Jensen
d5116d8942
#2086 Fix well GUI name for well paths when extended ascii chars in name
2018-02-02 15:03:41 +01:00
Magne Sjaastad
c8e002d532
#2374 Fracture : Incomplete results when computing intersected StimPlan cells
2018-02-01 12:58:48 +01:00
Magne Sjaastad
33ef2948f4
Merge "Completion Export LGR" into dev
...
#2425 #1758 #2423
2018-01-31 13:38:05 +01:00
Rebecca Cox
b2bdd996d2
#2389 Fracture: Set perforation length and depth from file values
2018-01-31 12:25:58 +01:00
Magne Sjaastad
e989b3afc9
#2423 Export Completions : Move Rig*-files to completion export folder
2018-01-31 10:20:47 +01:00
Magne Sjaastad
e18a08a425
#1758 Use RigMainGrid in interface to CompletionDataGridCell
2018-01-31 10:20:47 +01:00
Magne Sjaastad
4516941d2c
#1758 Add RigCompletionDataGridCell
2018-01-31 10:20:47 +01:00
Magne Sjaastad
028b5303a7
#1758 Add support for export of COMPDATL for LGR grid
2018-01-31 10:20:47 +01:00
Magne Sjaastad
c0359f1776
#1758 Refactor IJKCellIndex
2018-01-31 10:20:47 +01:00
Magne Sjaastad
d5c1e1e898
#1758 Moved implementation to source and improved formatting
2018-01-31 10:20:47 +01:00
Rebecca Cox
bbcda37813
Merge remote-tracking branch 'origin/2018.01.01-patch' into dev
2018-01-29 14:47:04 +01:00
Rebecca Cox
f598e6905c
#2419 Do not make OpmFlowDiagStat if result is fracture (DUAL)
2018-01-29 14:41:07 +01:00
Magne Sjaastad
71deeb8954
Merge remote-tracking branch 'origin/2018.01.01-patch' into dev
2018-01-29 10:09:54 +01:00
Magne Sjaastad
ff0599df04
Guard for access of dynamic data with no time steps
2018-01-29 10:04:33 +01:00
Magne Sjaastad
78068e547d
Fix compiler warnings related to converting time_t to double
2018-01-26 08:25:50 +01:00
Magne Sjaastad
430b193437
#2402 Fracture : Compute conductivity scaling for all conductivity variants
2018-01-25 14:17:10 +01:00
Magne Sjaastad
001742cbd3
#2402 Fracture : Add support for multiple conductivities on a template
2018-01-25 14:17:10 +01:00
Magne Sjaastad
1e4b4dbf62
Merge remote-tracking branch 'origin/2018.01.01-patch' into dev
2018-01-25 11:14:09 +01:00
Rebecca Cox
a6333128e3
#2328 Fix crash when calculating "Water Flooded PV"
2018-01-24 16:32:48 +01:00
Rebecca Cox
e68f0e2be8
Merge branch '2018.01.01-patch' into dev
2018-01-24 08:33:47 +01:00
Rebecca Cox
9617481406
#2327 Formation RFT Plot: Read tvdss from well pick files
2018-01-24 08:21:22 +01:00
