OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-02-11 07:56:08 -06:00
Code Issues Packages Projects Releases Wiki Activity
4,385 Commits 29 Branches 61 Tags 290 MiB
fa638243ab
Commit Graph

279 Commits

Author SHA1 Message Date
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
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
astridkbjorke
703bdb9669 pre-proto - Rename 2017-01-12 13:29:18 +01:00
astridkbjorke
89bf71b664 #1041 - pre-proto - Adding new functions transformMatrix (for calculating transform Matrix for fracture) and getPotentiallyFracturedCells (finding all cells in bounding box for fracture geometry) in RimFracture. Relevant code is updated to use these functions. 2017-01-12 12:19:52 +01:00
Jacob Støren
3d7d3096eb #1123 Fixed missing timestep problem. Using Report Step Number, not timestep index. 2017-01-12 12:07:07 +01:00
astridkbjorke
44aefe6ed7 pre-proto - Rename RimFractureDefinition to RimFractureEllipseDefinition 2017-01-12 10:33:33 +01:00
astridkbjorke
97cdf836cd #1092 - pre-proto - Update export function to be able to handle multple cells for each fracture. Calculated / exported values not yet correct. 2017-01-11 14:32:42 +01:00
astridkbjorke
a7ecea983c #1092 - pre-proto - Adding function writeFracturesToTextFile which replaces old functions which were separate for SimWellFractures and WellPathFractures. 2017-01-11 14:32:42 +01:00
astridkbjorke
9f82319a86 #1092 - pre-proto - Adding feature for exporting COMPDAT file for well path fractures. 2017-01-11 14:32:42 +01:00
astridkbjorke
524f39e434 #1092 - pre-proto - Saving file with COMPDAT keyword for sim well fractures. Transmissibilities still dummy values. 2017-01-11 14:32:42 +01:00
astridkbjorke
9bba00999e #1092 - pre-proto - Added feature for exporting fracture data to file. File is written, but not with any useful information yet. 2017-01-11 14:32:42 +01:00
Magne Sjaastad
9cd17ec508 Merge dev into pre-proto 
Conflicts:
	ApplicationCode/ProjectDataModel/RimEclipseView.cpp
	ApplicationCode/ProjectDataModel/RimEclipseView.h
 2017-01-10 10:09:44 +01:00
Magne Sjaastad
8970d93a4d #1068 Renamed to RigEclipseCaseData 2017-01-10 09:51:39 +01:00
Magne Sjaastad
50b9fe0ece #1068 Removed obsolete include of RigCaseData 2017-01-10 09:20:03 +01:00
Magne Sjaastad
93032a23eb #1068 Avoid include of RigActiveCellInfo.h in RigCaseData.h 2017-01-10 09:20:03 +01:00
Magne Sjaastad
ccd4cb24c9 #1068 Avoid include of RigMainGrid.h in RigCaseData.h 2017-01-10 09:20:03 +01:00
Jacob Støren
ebddaa31e6 #1054 Added sensible information to the Result Info window when picking Flow Diag results. 
Also rolled out the use of resultVariableUiName() to places that should use it.
 2017-01-04 13:13:06 +01:00
Magne Sjaastad
db3f7d6650 #1069 : pre-proto - Added empty files related to RigFracture 2017-01-02 14:13:34 +01:00
Jacob Støren
39ff269e5f Merge branch 'dev' of https://github.com/OPM/ResInsight.git 2016-12-20 14:43:28 +01:00
Magne Sjaastad
432dbcdeac Fixed compare between signed and unsigned values 2016-12-16 11:05:32 +01:00
Jacob Støren
ec5ad417f3 #1035 Renamed overloaded methods in result accessor to make it easier to see where the flow interception must come. 2016-12-14 14:51:53 +01:00
Magne Sjaastad
aa061a0725 #926 Removed unused code 2016-11-28 07:06:28 +01:00
Magne Sjaastad
4642e7abcd #926 Eclipse Input Data : Added support for display of keyword names of more than eight characters 2016-11-28 07:00:55 +01:00
Magne Sjaastad
5dbe2d322d #926 Eclipse Input Data : Import custom keyword data 2016-11-25 16:56:26 +01:00
Magne Sjaastad
b7e1da798e #926 : Removed unused code 2016-11-25 16:56:26 +01:00
Magne Sjaastad
d8b15e1446 #996 Updates related to changes in ERT API 2016-11-22 21:14:24 +01:00
Jacob Støren
5d04ac198b #859 Added time from start of simulation option 2016-11-22 11:14:02 +01:00
Magne Sjaastad
1e7e0fdc7a #931 : Avoid null pointer access 2016-10-25 09:00:52 +02:00
Magne Sjaastad
60b2788374 #157 Parse and use PATHS alias when reading faults 2016-10-24 11:41:29 +02:00
Magne Sjaastad
3bdefca77e Fixed Linux build 2016-10-21 10:06:56 +02:00
Magne Sjaastad
7a9c0871e8 (#928) Remove import of faults using opm-parser 2016-10-21 09:52:31 +02:00
Magne Sjaastad
1fd5ffb522 #928 Refactoring and simplification of code 2016-10-21 08:48:33 +02:00
Magne Sjaastad
dbb928c8b1 #828 Report and ignore connections with K-value larger than grid size 2016-10-21 08:08:07 +02:00
Magne Sjaastad
da38067f66 Removed invalid assert 2016-10-17 10:54:08 +02:00
Magne Sjaastad
5d77fab776 #804 Changes related to API changes in ERT 2016-10-13 13:40:44 +02:00