Commit Graph

562 Commits

Author SHA1 Message Date
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
astridkbjorke
4a2bf34ec1 pre-proto - Rename progrss indicator and update to range-based for-loop 2017-01-19 11:03:04 +01:00
Magne Sjaastad
36bcdab426 Merge remote-tracking branch 'refs/remotes/origin/dev'
Conflicts:
	ApplicationCode/ModelVisualization/RivPipeGeometryGenerator.h
	ApplicationCode/ProjectDataModel/RimEclipseWell.cpp
	ApplicationCode/ProjectDataModel/RimEclipseWell.h
	ApplicationCode/UserInterface/RiuViewerCommands.cpp
2017-01-18 12:19:07 +01:00
Magne Sjaastad
e0ba009e34 Cleaned up includes
Removed includes to cvfLibCore and friends. Removed several includes from header files.
2017-01-17 15:11:02 +01:00