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,861 Commits 29 Branches 61 Tags 290 MiB
c914071d33
Commit Graph

321 Commits

Author SHA1 Message Date
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
Magne Sjaastad
5640621049 Added EclipseSummaryAddress 2016-05-04 14:11:04 +02:00
Magne Sjaastad
4b33c31a0f (#736) Added support for basic metadata and basic value queries 2016-04-20 08:05:35 +02:00
Jacob Støren
0e8191d6eb (#712) Set well head connection status to closed always as they are no part of the connection table in Eclipse 
This to remedy that ERT returns open as connection status for well heads.
 2016-01-07 14:24:59 +01:00
Jacob Støren
6db74465b6 Removed debug output 2015-12-14 09:53:59 +01:00
Magne Sjaastad
c72e047b23 (#687) Moved FileInterface tests into ApplicationCode/UnitTests 2015-12-03 11:11:07 +01:00
Jacob Støren
7b9f2b41ed CppCheck fixes, Errors Warnings and performance 2015-11-27 16:37:26 +01:00
Magne Sjaastad
9429458d32 Rename from cells to globalCellArray 2015-11-24 14:21:02 +01:00
Magne Sjaastad
4971304bf9 (#597) Fixed how fraction of day is used to adjust time step date 2015-11-23 08:37:45 +01:00
Magne Sjaastad
7a6c4c06b9 System : Removed unused variables 2015-10-26 11:09:57 +01:00
Magne Sjaastad
7d02c794b7 System : Removed elements after unique has been called 2015-10-26 10:18:58 +01:00
Magne Sjaastad
01224dd5e6 System : Removed unused variables 2015-10-26 10:18:57 +01:00
Magne Sjaastad
0405584bb6 System : Replaced tab with four spaces in ApplicationCode and subfolders 2015-10-23 15:46:25 +02:00
Magne Sjaastad
061288f1c3 (#495) Removed use of StdInclude 2015-09-25 15:57:50 +02:00
Magne Sjaastad
90762d0f0f Use uiCapability/xmlCapability instead of capability<caf::PdmUiFieldHandle>()(capability<caf::PdmXmlFieldHandle>() 2015-08-05 13:27:36 +02:00
Magne Sjaastad
737936d846 Major modularization adjustments 
Use uiField() when issuing setUi....() commands
Use PdmChildArrayField instead of PdmPointersFielc
Use PdmChildField instead of PdmField to pdm pointer objects
Use PdmChildArrayField instead of PdmField< std::list< caf::PdmPointer<
type > > >
Use PdmObjectHandle instead of PdmObject
Replaced parentFields(std::vector)  with parentField()
Use PdmUiPropertyViewDialog instead of PdmUiPropertyDialog
 2015-07-31 18:58:23 +02:00
Jacob Støren
24fb7ac584 Hack to be able to read synthetic odb related Eclipse cases 2015-06-10 10:34:05 +02:00
Stein Dale
85f62ec1d4 Moved code to new library: ResultStatisticsCache 
Moved  RigStatisticsCalculator.h/.cpp, RigStatisticsDataCache.h/.cpp,
RigStatisticsMath.h/.cpp to new library ResultStatisticsCache.
ResInsight and some unit tests now link with this new library.
 2015-05-11 13:25:05 +02:00
Jacob Støren
4a21bb4a30 Added RimView, and sorted the libs in folders 2015-04-29 10:50:25 +02:00
Jacob Støren
a5fba8f3f4 Fixes to match new Ert 2015-04-14 15:47:51 +02:00
Jacob Støren
02e47c6679 Guard against reading nnc data if none are available 
See Issue #278. (Not fixing the issue, just improving code)
 2015-02-24 14:57:23 +01:00
Magne Sjaastad
8de0f468ac Fixed invalid foreach syntax 2015-01-09 08:37:22 +01:00
Magne Sjaastad
9ded05212f Merge branch 'pr/268' into dev 2015-01-09 08:05:23 +01:00
Magne Sjaastad
053a9c4d78 Improved parsing of fault face text strings 
See https://github.com/OPM/ResInsight/issues/263
 2015-01-09 07:42:49 +01:00
Roland Kaufmann
eac27f149a Enable in-package substitute of tr1/tuple 
In clang 6.0 the tr1/tuple header is not present, and this cause a
compilation error inside of the gtest framework. However, if we set a
define, it will use its own substitute of tr1/tuple, which is sufficient
for the unit tests.
 2015-01-01 19:46:25 +01:00
Magne Sjaastad
0dcba178fd Do not show NNC text at all in progress bar when NNC import is disabled 2014-11-06 09:35:39 +01:00
Magne Sjaastad
619b7a211a Fix for dates before 1970 2014-10-29 09:34:57 +01:00
Magne Sjaastad
043584b1b1 Faults : Improved robustness of fault names including space 2014-10-28 11:07:59 +01:00
Magne Sjaastad
2509fa974f Performance : Now possible to disable load of SOIL on load 2014-10-24 11:38:47 +02:00
Magne Sjaastad
a5e4e756af Updated ERT, now possible to read simplified MSW 
Updated ERT to 3ac60303aa2dc58aed9420a24d9a881fec32076b
 2014-10-24 11:19:54 +02:00
Magne Sjaastad
63a5dd24fe Added support for fault face using IJK in addition to XYZ 2014-10-09 20:36:27 +02:00
Magne Sjaastad
b93053b089 Updated ERT to 946e512ac17c1e2469892072a925428c0a012fa1 2014-10-09 20:13:04 +02:00
Magne Sjaastad
2d36af4f06 Updated file header for new files 2014-09-24 07:14:52 +02:00