Commit Graph

478 Commits

Author SHA1 Message Date
Magne Sjaastad
553b3bf63e #1794 Add flag RESINSIGHT_ENABLE_PROTOTYPE_FEATURE_FRACTURES 2017-08-21 15:24:20 +02:00
Magne Sjaastad
51c30448e9 Merge remote-tracking branch 'origin/dev' into pre-proto 2017-08-21 10:42:11 +02:00
Magne Sjaastad
c0e3349632 Merge remote-tracking branch 'origin/dev' into hdf-prototype 2017-08-15 15:34:23 +02:00
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
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
Bjørnar Grip Fjær
6747289a89 #1763 Hide soursim file field and result category if HDF5 support is not compiled in 2017-08-11 15:49:38 +02:00
Bjørnar Grip Fjær
63bb85b998 #1387 Command to delete existing sour sim data from ResInsight 2017-08-11 15:37:46 +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
Jacob Støren
ec4362b247 #1692 Put SourSimRL Results in a separate result type
#1693 Started to separate code for SourSim and Eclipse results data.
2017-07-07 13:31:14 +02:00
Jacob Støren
f96fdc27e7 Guard dynamic nnc access against missing restart file(s) 2017-07-04 13:50:22 +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
44f0234096 #1661 Octave interface for getting static and dynamic NNC result values from ResInsight 2017-06-29 11:19:07 +02:00
Bjørnar Grip Fjær
de414c4277 #1645 Load dynamic NNC results from restart file 2017-06-26 10:25:08 +02:00
Bjørnar Grip Fjær
7b7af2b197 #1641 Use new interface for reading trans values from libecl 2017-06-22 16:03:55 +02:00
Bjørnar Grip Fjær
faf225d8c3 Merge branch 'master' into hdf-prototype 2017-06-22 10:56:36 +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
Jacob Støren
e4abc737cd #1514, #1506 Fix several wellpath stimplan intersection bugs.
First numbers to file achieved, but they are wrong and too few
2017-05-26 17:37:48 +02:00
Jacob Støren
a51c21787d #1506 Last step in complete transmissibility export WellPaths/Stimplan fractures
Untested
2017-05-23 12:02:37 +02:00
Magne Sjaastad
a45aee0cc2 Merge branch 'fishbones' into pre-proto 2017-05-23 10:28:42 +02:00
Jacob Støren
0b0747a8ec #1506 Fixes linux compile errors and some warnings 2017-05-23 07:35:51 +02:00
Jacob Støren
6cbbed15bf #1514 Add Wellpath StimPlanGrid intersector. Fix errors in polyline polygon intersection. Add tests for Polyline polygon intersection 2017-05-22 18:11:03 +02:00
Bjørnar Grip Fjær
ee81f49ab1 #1465 Export location of completions, with necessary restructuring 2017-05-22 13:24:06 +02:00
astridkbjorke
cf2cc5b2b5 #1487 - pre-proto - starting to use trans condenser in export function. Adding transmissibilities to condenser and getting output trans from eclipse cells to well. Not yet summarizing values from multiple fractures or printing COMPDAT values. 2017-05-22 12:46:57 +02:00
astridkbjorke
d12e7747bc #1487 - pre-proto- Removing area factor in calculation for radial tranmissibility to well, and re-ordering functions in RifFractureExport 2017-05-19 15:16:40 +02:00
Jacob Støren
3271f9b32f #1487 Remove obsolete RigStimPlanFractureCell class 2017-05-19 14:57:37 +02:00
Jacob Støren
ba2f9c335c #1506 Add pseudocode for COMPDAT export of total transmissibility 2017-05-19 14:14:08 +02:00
Jacob Støren
7e847361d1 #1487 Move darchy constant into RigEclipseCaseData, where it belongs 2017-05-19 11:41:49 +02:00
astridkbjorke
d1b3d619d3 #1487 - pre-proto - Moving RigStimPlanUpscallingCalc to separate file 2017-05-19 11:31:57 +02:00
Bjørnar Grip Fjær
b23996a75f #1464 Fishbones MSW : Export well segments 2017-05-19 11:28:36 +02:00
astridkbjorke
061ceb06b2 #1487 - pre-proto - move functions related to upscaling from StimPlan to Eclipse grid to a separate class, and making planCellIntersectionPolygons function static 2017-05-19 11:02:11 +02:00
Jacob Støren
5a6508dc93 #1487 Removed use of obsolete equation methods in RigFractureTransCalc 2017-05-19 10:26:07 +02:00
Jacob Støren
fab3e6e361 #1487 Simplify interface for printCOMPDATvalues 2017-05-19 09:15:39 +02:00
Jacob Støren
e1edcb8bcb #1487 Replace wellpath and simwell with well name in argument list in FractureExport methods. 2017-05-19 08:46:25 +02:00
astridkbjorke
c7354e8548 #1487 - pre-proto - Making functions for calculating relevant transmissibilities static, and using cell sizes, conductivities etc as inputs instead of entire RigStimPlanCell 2017-05-18 15:14:45 +02:00
Jacob Støren
c914071d33 #1487 Rename export method 2017-05-18 14:50:28 +02:00
Jacob Støren
8365d3b0b3 #1487 Rename to RifFractureExportTools 2017-05-18 14:40:47 +02:00
Jacob Støren
d298963d94 #1487 Remove vector<FractureData> from RigFracture 2017-05-16 17:26:40 +02:00
Jacob Støren
cac9a9ed03 #1487 Move the EclToStPlCellTransCalc to a new file 2017-05-16 16:18:56 +02:00
Jacob Støren
ab121fe80a Prefix calculator with Rig 2017-05-16 16:04:32 +02:00
astridkbjorke
4cb77642f3 #1487- pre-proto - Using EclipseToStimPlanCellTransmissibilityCalculator instead of RigFractureTransCalc for calculating Matrix-to-fracture transmissibilities for stimPlan cells. 2017-05-16 15:37:30 +02:00
astridkbjorke
de2d78828b 1487 - pre-proto - removing const from m_case in EclipseToStimPlanCellTransmissibilityCalculator nad updating function for calculating transmissibilities in fracture to have relevat values as input instead of RigStimPlanFracTemplateCell 2017-05-16 13:55:24 +02:00
Magne Sjaastad
69116784ff Refactoring to be able to compile on Linux 2017-05-16 13:36:14 +02:00
Magne Sjaastad
43e50bd8d2 Updated copyright headers 2017-05-16 12:49:36 +02:00
astridkbjorke
9c4b0776d3 #1487 - pre-proto - Starting refactoring to prepare for Transmissibility condenser 2017-05-16 10:55:31 +02:00
Bjørnar Grip Fjær
0b872dbf3a #1462 Add support for exporting WPIMULT 2017-05-16 09:43:41 +02:00
Bjørnar Grip Fjær
46d8f83424 #1462 Export completion data for laterals 2017-05-15 16:04:53 +02:00
Bjørnar Grip Fjær
acb050e9fb #1489 Create Eclipse output file formatter 2017-05-15 16:04:53 +02:00
astridkbjorke
13df0d33b9 pre-proto - Small update in output formatting 2017-05-15 14:25:04 +02:00
astridkbjorke
deb64c862c pre-proto - Renaming contributingEclipseCell to globalIndeciesToContributingEclipseCells 2017-05-15 14:25:04 +02:00
astridkbjorke
c6b329ea00 pre-proto - Rename RigStimPlanCell to RigStimPlanFracTemplateCell 2017-05-15 14:20:18 +02:00
astridkbjorke
45321d0821 pre-proto - Rename RigFractureStimPlanCellData to RigStimPlanFractureCell 2017-05-15 14:20:18 +02:00
Jacob Støren
df9e434c74 Use double "s" in Transmissibilities, create cpp file for transmissibility condenser 2017-05-15 14:13:59 +02:00
Magne Sjaastad
57a521f59d #1475 Add missing includes for Linux 2017-05-15 14:06:40 +02:00
Magne Sjaastad
1a075470cf #1475 Use caf::Utils::fileExists 2017-05-15 13:40:13 +02:00