OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-02-11 16:06:04 -06:00
Code Issues Packages Projects Releases Wiki Activity
6,067 Commits 29 Branches 61 Tags 290 MiB
a5e684ffee
Commit Graph

515 Commits

Author SHA1 Message Date
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
Magne Sjaastad
25e6aec94a Merge branch 'dev' into fishbones 2017-05-15 13:37:09 +02:00
Bjørnar Grip Fjær
bf704caa16 #1475 Move well path import to own module 2017-05-10 12:19:46 +02:00
Jacob Støren
141ce6b54b #1381 Well Flow Plots show phase split (Oil Gas Water) 
Flow rates are explained in the plots as Surface/reservoir flow rates. Unit for field is [stb]/day for all fluids
 2017-05-08 16:02:42 +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
Bjørnar Grip Fjær
0848e9f8eb #1433 Fix export property to file for flow diagnostics properties 2017-04-27 10:54:07 +02:00
Magne Sjaastad
be42bbcb98 Add missing include on Linux 2017-04-26 14:19:55 +02:00
Bjørnar Grip Fjær
cf18f5324f #165 Keep original days since simulation start 2017-04-26 09:41:04 +02:00
astridkbjorke
a5e3e864fb pre-proto - Cleanups in code. Renamings and adding functions global index in array of RigStimPlanCell for simplified interaction with these 2017-04-25 16:08:44 +02:00
Bjørnar Grip Fjær
63cd817b85 #964 Improve code robustness in defineEditorAttribute 2017-04-25 10:31:56 +02:00
Magne Sjaastad
448f59983e #1396 Update file reader based on API changes in ERT 2017-04-24 21:54:55 +02:00
Magne Sjaastad
74133bacd0 Improved reporting of timestep mismatch 2017-04-24 13:03:52 +02:00
astridkbjorke
ed03d1fb8e #1417 - pre-proto - Adding function for calculating perforation length in center cell - need to be extended for cases where perforation interval goes outside the center stimPlan cell. 2017-04-21 09:41:52 +02:00
astridkbjorke
8351c6f9d0 #1415 - pre-proto - Adding function for identifying the StimPlanCell though which the well pass, and use this cell in calculation of radial transmissibility to well. Some error in pointers not yet sorted out... 2017-04-21 09:41:52 +02:00
Jacob Støren
2745d857d0 #1381 Wip: Well Alloc Plots split by phase without flow diagnostics 
This is implemented, but turned off as Ert did not seem to deliver correct phase flow rates. Can be enabled as soon as Ert is improved and updated.
 2017-04-20 16:22:33 +02:00
Magne Sjaastad
c35e79c3b5 Merge branch 'dev' into pre-proto 2017-04-20 13:40:56 +02:00
Magne Sjaastad
d364e045aa Merge branch 'dev' into hdf-prototype 2017-04-20 13:05:04 +02:00
astridkbjorke
94d10f547d #1403 - pre-proto - Adding stimPlan cells transmissibility in fracture to export. 2017-04-18 13:34:32 +02:00
Bjørnar Grip Fjær
b2d3a84862 #171 Add support for absolute UNIX paths for fault include files on Windows 2017-04-18 11:32:31 +02:00
Bjørnar Grip Fjær
b4de373d2f Remove unecessary conditional after assert 2017-04-06 13:03:27 +02:00
Bjørnar Grip Fjær
cb8b773f23 #1362 Support timesteps with higher resolution than seconds 2017-04-06 13:03:27 +02:00
astridkbjorke
abca5ed85b #1400 - pre-proto - Moving contributingEclipseCells and transmissibilities from RigStimPlanceCell to RigFractureStimPlanCellData, since the values will be different depending on placement of fracture. 2017-04-06 11:47:50 +02:00
astridkbjorke
b73e2bb63b pre-proto - Refactoring. Vector of RigStimPlanCells is now being owned by RimStimPlanFractureTemplate 2017-04-06 09:34:38 +02:00
astridkbjorke
faf36665f4 #1400 - pre-proto - Adding function for calculating transmissibilitiy from matrix for each stimPlan-cell (based on contribution from intersecting eclipse cells). 2017-04-05 14:40:54 +02:00
Magne Sjaastad
b94d8c21ad Fixed missing null pointer guard 2017-04-05 11:48:48 +02:00
Magne Sjaastad
c5ecc19516 #1371 opm-parser : Removed file interface and unit tests 2017-04-04 13:53:44 +02:00
Magne Sjaastad
d613639abc #1371 opm-parser : Removed unused code 2017-04-04 13:53:44 +02:00
Magne Sjaastad
b130dd691d #1356 Fixed compile without HDF library 2017-03-31 13:30:26 +02:00
Magne Sjaastad
24d4e6d094 #1356 Added possibility to change sour sim file for eclipse result case 2017-03-31 11:37:10 +02:00
Stein Inge Dale
14deedab77 WIP: improved file handling in case of no SourSimRL time step files. 2017-03-31 10:25:53 +02:00
astridkbjorke
4f645758b3 #1364 - pre-proto - Fixing bugs in calculation of upscaled cond values 2017-03-31 10:25:24 +02:00
Stein Inge Dale
b38f50c633 WIP: first prototype reading SourSimRL transient results (one timestep per file) 2017-03-31 09:40:51 +02:00
Stein Inge Dale
6a251fd258 WIP: First attempt to read multiple SourSimRL result files (restricted to one main file and a set of files containing one time step per file). 2017-03-29 11:45:40 +02:00
astridkbjorke
9d98a1d661 pre-proto - More refactoring. Moving planeCellIntersectionPolygons to RigFractureTransCalc, adding fracture, unit and case as members. 2017-03-27 10:16:01 +02:00
astridkbjorke
56e84a43eb pre-proto - Refactoring: Moiving functions related to transmissibility calculations from RimFracture to new class RigFractureTransCalc 2017-03-27 10:16:01 +02:00
astridkbjorke
d15d1a03a1 #1320 - pre-proto - Moving calculation of upscaled parameter from StimPlan for each cell to a separate method, for use in flow calculation. 2017-03-27 10:16:00 +02:00
astridkbjorke
0f86097870 #1320 - pre-proto - Performing harmonic mean upscaling for stimPlan values 2017-03-27 10:16:00 +02:00
astridkbjorke
28a794cc40 #1320 - pre-proto - Performing artithmetric upscaling of stimPlan values. 2017-03-27 10:16:00 +02:00
astridkbjorke
ffeb50b06a #1320 - pre-proto - Prototyping calculation of upscaled parameter values from stimPlan. Bug in calculation so output values are wrong. 2017-03-27 10:06:42 +02:00
Magne Sjaastad
34d9b1358e #1356 Do not check active cell count when reading result names 2017-03-24 11:17:12 +01:00
Stein Inge Dale
c4cd1972c4 WIP: Inclusion of HDF5 access functions 2017-03-24 10:06:49 +01:00
Magne Sjaastad
b29f664723 #1356 Application code for reading of HDF data into ResInsight 2017-03-23 08:21:06 +01:00
Magne Sjaastad
3d67946976 Merge remote-tracking branch 'origin/dev' into pre-proto 2017-03-15 10:10:43 +01:00
astridkbjorke
ccbc7c7021 #1278 - pre-proto - Converting data to case unit system for COMPDAT export 2017-03-06 15:14:11 +01:00
Jacob Støren
c22c2c9a00 #1292 Fixed CppCheck Issues in FileInterface 2017-03-06 11:20:28 +01:00
Jacob Støren
4312968124 Removed CppCheck Warnings 2017-03-03 17:09:30 +01:00
Jacob Støren
b00ad4ba4a Fixed some CppCheck Performance warnings 2017-03-03 16:23:20 +01:00
astridkbjorke
654df52512 #1262 - pre-proto - Adding logging to reading of StimPlan XML files and writing of COMPDAT files. 2017-02-28 10:02:41 +01:00
Magne Sjaastad
a10b96ba3e Merged branch dev into pre-proto 2017-02-17 11:38:32 +01:00
astridkbjorke
fa638243ab #1087 - pre-proto - Moving enum for unit system to RimDefines, and establishing default unit system for fracture template collection (used when creating new templates). 2017-02-17 10:11:32 +01:00
Magne Sjaastad
3b4fec6196 Fixed #1229 Handle reading of invalid summary file 2017-02-16 11:09:21 +01:00
astridkbjorke
3fac46b1a9 #1087 - pre-proto - Checking units of case and fractures in export, if mismatch is detected export is aborted. 2017-02-14 11:03:38 +01:00
astridkbjorke
fc96b33baa #1197 - pre-proto - Fixes in COMPDAT export 2017-02-10 13:31:23 +01:00
Magne Sjaastad
93954fece0 Merge remote-tracking branch 'refs/remotes/origin/dev' 
Conflicts:
	ApplicationCode/Commands/RicDeleteItemFeature.cpp
 2017-02-08 07:35:20 +01:00
Jacob Støren
bf0dd5d303 #1170 Read volume rate from Ert 2017-02-07 13:47:00 +01:00
astridkbjorke
30304a5f8a #1157 - pre-proto - Updating how the eclipseCase is handled for transmissibility calculation. Should now avoid segfault when calculating transmissibilities for well path fractures. 2017-02-02 08:50:54 +01:00
astridkbjorke
4c1f7776b9 pre-proto - Sorting includes 2017-01-31 15:58:13 +01:00
astridkbjorke
7d2ebd68bf #1092 - pre-proto - Reading in Dx, Dy, Dz and permeabilities before calculation of transmissibilities. 2017-01-31 12:26:30 +01:00
astridkbjorke
088d1591b6 #1141 - pre-proto - Writing intermediate calculations also when computed transmissibility is invalid. 2017-01-31 10:14:26 +01:00
astridkbjorke
6008e9eb4f #1092 - pre-proto - Updating formatting of exported COMPDAT file 2017-01-31 09:56:49 +01:00
astridkbjorke
07f5ea45d2 #1141 - pre-proto - Adding intermediate values from transmissibility calculation to the top of the COMPDAT export file. 2017-01-31 09:56:48 +01:00
astridkbjorke
035107b48b #1091, #1092 - pre-proto - Simplifying calulation of projected areas and updating export functionality to include intermediate results of transmissibility calculation 2017-01-27 12:12:08 +01:00
Magne Sjaastad
e845ae1ed8 Merge remote-tracking branch 'refs/remotes/origin/dev' 
Conflicts:
	ApplicationCode/CMakeLists.txt
	ApplicationCode/ProjectDataModel/CMakeLists_files.cmake
	ApplicationCode/ProjectDataModel/RimEclipseWell.h
	ApplicationCode/ReservoirDataModel/CMakeLists_files.cmake
 2017-01-24 15:23:02 +01:00
Jacob Støren
94f94af325 #1112 Added a flowrate to the well results. Waiting for ERT to include the reading. 2017-01-20 16:12:12 +01:00