Magne Sjaastad
16a1caf4c0
Merge remote-tracking branch 'origin/dev' into pre-proto
2017-08-15 15:26:36 +02:00
Magne Sjaastad
4bda27c627
#1771 Add missing allocation of well path
2017-08-15 15:20:08 +02:00
Magne Sjaastad
0ba1746755
Merge branch 'dev' into pre-proto
2017-08-11 16:14:00 +02:00
Magne Sjaastad
c1fe8a7e6c
#1691 Rename to RigEclipseResultInfo
2017-08-11 15:10:08 +02:00
Magne Sjaastad
89684c243f
#1755 Use namespace RiaDefines instead of class
2017-08-11 14:28:42 +02:00
Magne Sjaastad
8f3a7a5867
#1691 Map from filtered time step indices to well result indices
2017-08-11 14:27:58 +02:00
Magne Sjaastad
c4aa625d33
#1755 Move porosity model enum to separate file
2017-08-11 14:27:56 +02:00
Magne Sjaastad
88bbea6339
#1755 Remove porosity enum from RifReaderInterface
2017-08-11 14:27:22 +02:00
Magne Sjaastad
ad09441da1
#1691 Add RigTimeStepInfo
2017-08-11 14:26:16 +02:00
Magne Sjaastad
78da4c6469
#1691 Add time step filter to RimCase and use from RimEclipseResultCase
2017-08-11 14:24:54 +02:00
Magne Sjaastad
624f14da46
Prefix enum values with RIF_
...
FLOAT causes Cotire compile to fail
2017-08-11 14:24:54 +02:00
Magne Sjaastad
66c28d8cee
#1691 File Interface : Add support for time step filtering
2017-08-11 14:24:54 +02:00
Magne Sjaastad
9223282db4
#1691 Remove caching of time step related data
2017-08-11 14:24:54 +02:00
Magne Sjaastad
b1e9e84784
#1691 Removed unused function and cleaned up includes and whitespace
2017-08-11 14:24:54 +02:00
astridkbjorke
50eb8b7225
#1617 Adding conductivity scaling factor to StimPlan fracture templates, and scaling the conductivity values in file with this value.
2017-08-03 13:40:35 +02:00
astridkbjorke
0dfc76dd3e
#1678 Setting fracture template unit for stimplan based on unit on grid (ft or m) instead of unit for conductivity (which may be missing in the file).
2017-07-03 11:00:06 +02:00
Bjørnar Grip Fjær
581adbc588
Merge branch 'dev' into pre-proto
2017-06-21 16:41:33 +02:00
Bjørnar Grip Fjær
db65917822
#1635 Use capital 'E' in scientific notation
2017-06-21 16:41:07 +02:00
Bjørnar Grip Fjær
8f06115730
Merge branch 'dev' into pre-proto
2017-06-21 16:38:57 +02:00
Bjørnar Grip Fjær
53ee396c03
#1635 Use scientific numbers for transmissibility in completion data export
2017-06-21 16:25:41 +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
1d405384ee
Remove obsolete code: StimPlaneUpscaling and Transmissibilities
2017-06-14 11:25:43 +02:00
Jacob Støren
f87a186648
#1585 Privatize data members in FractureDefinition
2017-06-14 09:28:56 +02:00
Magne Sjaastad
a8b8e061d7
#1596 Merge dev into pre-proto
2017-06-14 07:25:34 +02:00
Magne Sjaastad
d7ce607000
Add missing include on Linux
2017-06-13 16:04:43 +02:00
Magne Sjaastad
449813df06
Fix signed/unsigned compare
2017-06-13 16:04:29 +02:00
Magne Sjaastad
cf859e7c16
#1596 Rename from RimDefines to RiaDefines
2017-06-13 15:41:52 +02:00
Jacob Støren
11276d8b84
#1585 Move code from StimPlanTemplate to StimPlanXmlReader
2017-06-13 15:07:16 +02:00
Jacob Støren
a2de4efb66
#1585 Remove RigFracture. No caching of transformed triangles related to each fracture instance
2017-06-12 12:52:39 +02:00
Jacob Støren
95dd87f23c
#1585 Moved obsolete RigFracturedEclipseCellExportData to obsoleted code
2017-06-12 09:30:01 +02:00
Jacob Støren
dceae0581e
#1585 Major renaming of fracture related methods and members
2017-06-09 17:21:59 +02:00
Magne Sjaastad
96981d1ab4
Fix mix of signed / unsigned compare
2017-06-09 15:55:47 +02:00
Magne Sjaastad
8064d44e8e
Remove unused class
2017-06-09 13:20:39 +02:00
Jacob Støren
4c873b6925
#1493 Remove old export fracture on selected wellpaths feature
2017-06-01 17:09:04 +02:00
astridkbjorke
e6fea6130b
#1507 Setting up fractureGrid for ellipse fracture template, and adapting transmissibility calculation to be able to handle both ellipse and stimplan fractures. Missing setup of fractureCells for ellipse when loading old project.
2017-06-01 14:06:41 +02:00
Bjørnar Grip Fjær
935299b3df
Merge branch 'fishbones' into pre-proto
2017-06-01 12:32:36 +02:00
Bjørnar Grip Fjær
1aedf92efc
Merge branch 'dev' into fishbones
2017-06-01 09:02:38 +02:00
astridkbjorke
a1738d8e3a
#1487 Renaming functions for calculating transmissibilities. Simplifying names and using fractureCell instead of stimPlanCell in names
2017-05-31 09:16:49 +02:00
astridkbjorke
7f00de3e0b
#1487 Renmaing local variables. Using fractureCell instead of stimPlanCell etc
2017-05-31 08:49:04 +02:00
Bjørnar Grip Fjær
1112f6a2e0
#1532 Rename RifEclipseOutputTableFormatter to RifEclipseDataTableFormatter
2017-05-30 15:00:14 +02:00
astridkbjorke
406bf96f3f
#1487 RigFractureGrid inherits from cvf::Object, and RimStimPlanFractureTemplate fractureGrid() is returning a pointer
2017-05-30 14:57:21 +02:00
Bjørnar Grip Fjær
5cafccdc80
#1523 Completions : Import perforation intervals from file
2017-05-30 11:56:18 +02:00
astridkbjorke
a8b6543c3c
#1487 Renaming RigStimPlanFracTemplateCell to RigFractureCell
2017-05-30 11:52:19 +02:00
astridkbjorke
8cf5f6983f
#1487 Renaming. Removing stimPlan from names in RigFractureGrid
2017-05-30 11:35:52 +02:00
astridkbjorke
0458ac38d7
#1487 Small fixes after merge
2017-05-30 10:00:04 +02:00
Jacob Støren
258ec8a728
#1526 , #1482 Use kSm3 and BOE as units for Gas in Well Alloc Plots
2017-05-29 22:53:44 +02:00
astridkbjorke
8ca5a5a90a
#1487 - pre-proto - Adding class RigFractureGrid, which now holds RigStimPlanFracTemplateCells and functions for accessing these.
2017-05-29 14:16:45 +02:00
Jacob Støren
38315f7bc2
#1506 Fix stimPlan getGlobalIndexFromIJ() errors
...
Misunderstandings of row/column count and CellCounts and point counts. Quite an obfuscation to use j as fast index, and CellCountI = ColumnCount - 2. The names are not quite enlightening.
2017-05-27 17:59:48 +02:00
Jacob Støren
6cdf13a2bc
#1506 Add debug output of total transmissibility info to COMPDAT file
2017-05-27 17:51:34 +02:00
