OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-02-25 18:55:39 -06:00
Code Issues Packages Projects Releases Wiki Activity
5,040 Commits 27 Branches 61 Tags 309 MiB
a45aee0cc2
Commit Graph

353 Commits

Author SHA1 Message Date
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
astridkbjorke
4f645758b3 #1364 - pre-proto - Fixing bugs in calculation of upscaled cond values 2017-03-31 10:25:24 +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
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
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
Jacob Støren
c2eff1b733 Linux compile fixes 2016-09-28 15:07:19 +02:00
Magne Sjaastad
0a523a252a #828 Report and clamp invalid K-values for well connections 2016-09-08 15:21:40 +02:00
Jacob Støren
5260a3f870 #478 Allowed static results (INIT-file) to not have values for LGRs 2016-08-22 17:00:57 +02:00
Magne Sjaastad
cea77a4299 Merged in changes from maintenace branch 2016-08-12 14:53:04 +02:00
Magne Sjaastad
e754a04275 #727 Fixed issue for dual porosity case and simplified logic related to valid result names 2016-08-12 14:24:41 +02:00
Magne Sjaastad
4bfef4ead0 Merged in changes from maintenance branch 2016-08-04 11:12:53 +02:00
Jacob Støren
12e9768939 Fixed a crash if the summary header file is not available 2016-08-03 10:43:45 +02:00
Magne Sjaastad
09c711da01 (#727) Missing Dynamic parameters not reported for intital time step 2016-07-15 09:07:14 +02:00
Magne Sjaastad
f7117ae0e2 #789 Add properties from standalone files to opm-parser Input Cases 2016-07-12 18:54:55 +02:00
Magne Sjaastad
4cb91128e7 #788 opm-parser: Read faults as part of reading input data 2016-07-12 14:08:05 +02:00
Magne Sjaastad
adb6c74f3a #788 Opm-parser: Binary eclipse case now uses opm-parser to read fault data 2016-07-06 09:49:31 +02:00
Magne Sjaastad
94efe9b14c Test for NULL before assigning string 2016-06-29 10:43:36 +02:00
Magne Sjaastad
85fab1e749 Improved text display of messages from opm-parser 2016-06-24 12:19:19 +02:00
Magne Sjaastad
830db2c6ec (#743) Added import of Input Case using opm-parser 2016-06-23 14:36:33 +02:00
Jacob Støren
27f6b980fe #778 Display unit on Y-Axis. Added unit to legend. Cosmetics on Curve Filter Prop-panel 2016-06-22 14:34:56 +02:00
Jacob Støren
5c09935ac5 #782 Avoid creating curves for none existing data. 2016-06-21 15:56:09 +02:00
Jacob Støren
a37449d99d Used the new Ert support to retreive the summary lgr names and ijk values 2016-06-16 16:55:02 +02:00
Jacob Støren
2bb2758523 #755 Used the same order as ERT on the display, - and search strings for Summary Variables 2016-06-10 14:11:22 +02:00
Jacob Støren
80d7ae7262 #755 Curve Gui adjusted according to input from CFB. Now working as intended. 2016-06-10 12:30:20 +02:00
Jacob Støren
e21ddfe74a #755 First simple version of the proposed GUI. Type and Quantity name filter working. 2016-06-09 11:08:12 +02:00
Jacob Støren
336828e48d #755 WIP: Started to adapt to using the smspec node from eclipse. Established Rim prototype of "filter" concept for summary variables 2016-06-09 11:08:12 +02:00
Magne Sjaastad
7742fbe325 Encapsulate the JSON code in a namespace to avoid issues with JSON classes used in opm-parser 2016-06-06 10:43:36 +02:00
Magne Sjaastad
e603773417 Added missing pragma once 2016-06-06 07:13:53 +02:00
Jacob Støren
40388b308b #739 Added summary case classes. Use those from the summary curves. Made save/restore work again for the summary plots. File format for Summary stuff are changed. 2016-05-31 13:48:22 +02:00
Jacob Støren
5732b5008f Cached result variables in the summary reader 
Fixed late field initialization
Additional cleanup and rename
 2016-05-31 13:48:22 +02:00
Magne Sjaastad
1929798532 Moved include_directory from main to ApplicationCode. Include of Eclipse hearder files must now be prefixed with ert/<module_name> 2016-05-26 14:55:59 +02:00