OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-01-27 16:57:01 -06:00
Code Issues Packages Projects Releases Wiki Activity
13,696 Commits 31 Branches 61 Tags 287 MiB
f9ff4c73df
Commit Graph

981 Commits

Author SHA1 Message Date
Kristian Bendiksen
44b9e52e1b #4965 Fix crash when importing Eclipse input case. 
Added guard to avoid importing faults from the input property files when
faults already exists in the eclipse case. Faults can theoretically appear
in any of the files, but reading and appending them to the existing fault
collection is not currently supported.
 2019-11-05 13:32:13 +01:00
Kristian Bendiksen
f1e987f0b9 Extract method for reading input property data for remaing keywords. 2019-11-05 12:23:26 +01:00
Kristian Bendiksen
9c53cfb44f Extract more methods from RifEclipseInputPropertyLoader::loadAndSyncronizeInputProperties. 2019-11-05 12:23:26 +01:00
Kristian Bendiksen
c3dc8376be Extract two utility methods to make loadAndSyncronizeInputProperties smaller. 2019-11-05 12:23:26 +01:00
Kristian Bendiksen
ce15aa1b5e Extract utility for loading input properties from file. 2019-11-05 12:21:29 +01:00
Magne Sjaastad
57cab2457e clang-format : Set PenaltyBreakAssignment to 130 2019-11-04 15:08:09 +01:00
Magne Sjaastad
7c8cf60dba clang-format : Set AllowAllParametersOfDeclarationOnNextLine to false 2019-11-04 14:35:41 +01:00
Magne Sjaastad
96a26662fc Janitor : Apply clang-format fixes on codebase in ApplicationCode 2019-11-04 11:34:34 +01:00
Magne Sjaastad
cd054f2170 Janitor : Use const ref when possible (2) 2019-11-03 14:08:21 +01:00
Magne Sjaastad
b46124efd7 Janitor : Use const ref when possible 2019-11-03 12:19:24 +01:00
Magne Sjaastad
93f6bc8c72 Janitor : Remove invalid conditionals 2019-11-03 11:43:46 +01:00
Magne Sjaastad
67e7bb0cf3
Fixes detected by cppcheck (#4974) 
* Janitor : Remove obsolete pointer to dialog

* Janitor : Remove unused functions

* Janitor : Remove unused functions

* Janitor : Add explicit to constructors

* Janitor : Remove unused variables

* Janitor : Remove unused functions related to summary plot templates

* clang-tidy : Use nullptr instead of 0

* clang-tidy : Fix usage of virtual and override

* Upped to version 2019.08.2-dev.05

* Janitor : Remove unused variables

* Janitor : Clean up several cppcheck issues

* Janitor : Add cppcheck config files

* Janitor : Use const when possible
 2019-11-03 08:37:03 +01:00
Magne Sjaastad
18c52b0e18 Janitor : Avoid using .. when referencing include files 2019-10-30 09:12:13 +01:00
Magne Sjaastad
cb7e948fef #4904 Multiple restart-files : Fix wrong time step date 2019-10-23 12:43:34 +02:00
Kristian Bendiksen
e692dfaf4f Add method to change default marker in RifTextDataTableFormatter. 2019-10-22 21:58:45 +02:00
Gaute Lindkvist
b3dd2109ac #4819 Add separate header prefix for RifTextDataTableFormatter. 2019-10-22 08:43:07 +02:00
Kristian Bendiksen
3cbbf1fd6e
Merge pull request #4870 from OPM/system-refactor-EclipseDataTableFormatter-rename 
Rename RifEclipseOutputDataTable* to RifTextDataTable*
 2019-10-22 08:27:32 +02:00
Magne Sjaastad
d59cdfa6ec
Merge pull request #4895 from OPM/fix-cumulative-curve-statistics-resample 
Fix cumulative curve statistics resampling
 2019-10-19 13:33:26 +02:00
Magne Sjaastad
3f617c93d2 #4893 Import Observed FMU data : Add error message 2019-10-18 14:36:53 +02:00
Magne Sjaastad
537184328a #4877 Refactor and rename to RiuSummaryQuantityNameInfoProvider 2019-10-18 14:28:02 +02:00
Magne Sjaastad
1cab88e9c5 #4877 Detect correct accumulation type for statistics curves 2019-10-18 14:22:15 +02:00
Magne Sjaastad
61db98ef04 #4874 Dual Porosity : Missing active cells in some cases 2019-10-16 11:11:01 +02:00
Gaute Lindkvist
d681b75d24 Rename RifEclipseOutputDataTable* to RifTextDataTable* 2019-10-15 17:05:46 +02:00
Magne Sjaastad
482d437505 #4835 Python Cell Results : Not possible to write data if no dynamic data is present 2019-10-08 10:39:22 +02:00
Magne Sjaastad
856596c366
Merge pull request #4791 from OPM/fix-e300-wrong-date 
#4770 Incorrect reporting of date for E300 in combination with lab units
 2019-09-27 14:41:48 +02:00
Magne Sjaastad
acb3c3e23b #4770 Incorrect reporting of date for E300 in combination with lab units 
User reports issues with import of dynamic properties for E300 simulation. E100 works as expected. For some reason, the date for all time steps for the E300 simulations is identical. This fix detects the situation, and use the double value from days vector as offset.
 2019-09-27 14:04:13 +02:00
Gaute Lindkvist
f2be5c00fd #4783 Ensemble RFT: make sure we get some default data sources. 2019-09-27 10:06:36 +02:00
Gaute Lindkvist
2a20f84f1f
#4732 Support error bars for observed RFT data (#4760) 
* #4732 Fix missing refresh for ensemble RFT

* WIP

* #4732 Fix missing refresh for ensemble RFT

* WIP

* Make sure Observed RFT data is loaded on startup

* Make error bars work for RFT plots

* #4761 Add labels with formation and value/error to observed data points

* Changes after review
 2019-09-25 17:48:19 +02:00
Gaute Lindkvist
c6dbc34183 Fix QString arg issue in Ensemble RFT error message 2019-09-19 10:53:06 +02:00
Gaute Lindkvist
596c18b903 #4731 Fix more crashes for ensemble RFT data import 2019-09-19 10:46:35 +02:00
Magne Sjaastad
36303aa7bd #4710 Qt5 : Use QString() instead of QString::null 2019-09-13 10:02:52 +02:00
Magne Sjaastad
fe9e567825 #4683 clang-format on all files in ApplicationCode 2019-09-06 10:57:22 +02:00
Magne Sjaastad
ef80f5b629 #4683 System : Remove obsolete include of cvfBase.h 2019-09-06 10:52:54 +02:00
Gaute Lindkvist
2c5ca4ce46 Import and plot of FMU RFT data works 2019-08-26 12:52:07 +02:00
Gaute Lindkvist
f76c67dab3 Ensemble RFT: reduce number of points in statistics curves -> makes them less squiggly 2019-08-26 11:58:31 +02:00
Gaute Lindkvist
71da659506 #4580 Import Eclipse RFT data as part of ensemble import 2019-08-26 11:56:36 +02:00
Magne Sjaastad
c5542463aa #4581 Summary Plot: Add isHistoryQuantity 2019-08-16 14:37:34 +02:00
Jacob Støren
93b4101831 #4003 Use the preferences settings when creating default summary plots. 
Refactored to make assigning default curve appearance easier.
 2019-08-09 13:15:32 +02:00
Magne Sjaastad
ec1cf83b4e #4483 Summary Plot: Data source for well segment number and completions 2019-08-05 21:53:48 +02:00
Gaute Lindkvist
17ee6627bb #4520 Report identical fault errors only once. 2019-07-26 11:36:40 +02:00
Gaute Lindkvist
a7879813c9 #4459 Fix memory leak in RFT Reader 2019-07-26 10:40:25 +02:00
Gaute Lindkvist
000ce6db52 #4509 Guard access to gui application code in import and well path code to avoid crashes in console mode 2019-07-25 15:54:20 +02:00
Magne Sjaastad
c802ba1f98 #4495 Active Cells : Remove unused function 2019-06-23 18:39:04 +02:00
Magne Sjaastad
5dc4e08a03 #4504 Framework : Add CSV text formatter 2019-06-23 18:05:51 +02:00
Magne Sjaastad
a3d521e272 #4402 Ensembles: Remove Preference import option 'Separate Case' for Origin ensembles 2019-06-21 09:11:10 +02:00
Magne Sjaastad
7c054c47f2 #4495 Active Cells : Handle active cells for dual porosity models based on PORV 2019-06-20 15:08:20 +02:00
Magne Sjaastad
515b2a4237 #4495 Active Cells : Use PORV or ACTNUM from statistics computations 2019-06-20 15:01:20 +02:00
Magne Sjaastad
ada2fb1480 #4495 Active Cells : Add helper class to import active cells 2019-06-20 15:01:08 +02:00
Magne Sjaastad
df69bc2d8d Whitespace 2019-06-20 15:00:50 +02:00
Magne Sjaastad
3b8348ddba #4495 Active Cells : Add const to methods 2019-06-20 12:31:23 +02:00
Magne Sjaastad
ff16156c2a #4434 Flow Diag adjustments : Use active cells from PORV in Flow Diag 2019-06-18 10:58:07 +02:00
Magne Sjaastad
8ce19c742e #4404 Derived Ensemble: Fix stepping based on data source 2019-06-07 14:41:55 +02:00
Magne Sjaastad
0cb2194bfb #4445 Active cells : Always use PORV if present 2019-05-23 14:14:51 +02:00
Magne Sjaastad
ca42f9a4ad Remove unused functions 2019-05-09 13:37:54 +02:00
Magne Sjaastad
1ac2429f62 #4266 Updates related to libecl API changes 2019-05-09 08:40:57 +02:00
Magne Sjaastad
abe292024c #4266 Apply formatting 2019-05-09 08:40:50 +02:00
Magne Sjaastad
987cb92f43 #4017 Automatic parsing of date-time format in CSV Observed Time History Data 2019-04-29 13:35:09 +02:00
Gaute Lindkvist
496678cab3 #4373 Provide more error messages when importing input grids 2019-04-26 13:42:35 +02:00
Gaute Lindkvist
ea77618110 Remove unused code in RifReaderEclipseOutput::readWellCells 2019-04-26 08:28:53 +02:00
Magne Sjaastad
efc7cca5c7 #4355 Dual Porosity : Guard data access for fracture data values 2019-04-24 12:39:47 +02:00
Magne Sjaastad
3d3e6064b1 #4348 System , cppcheck : Remove unused functions 2019-04-21 09:36:25 +02:00
Magne Sjaastad
b786c2c5f3 #4348 System , cppcheck : Remove unused functions 2019-04-21 07:53:52 +02:00
Magne Sjaastad
8cefcbb562 #4348 System , cppcheck : Remove unused variables 2019-04-20 15:11:21 +02:00
Magne Sjaastad
3c2f4eb692 #4348 System , cppcheck : Remove unused variables 2019-04-20 14:14:29 +02:00
Magne Sjaastad
4ec289a7fa #4348 System , cppcheck : Remove unused variables 2019-04-20 14:01:47 +02:00
Magne Sjaastad
b8ff8a2de8 #4287 Preferences : Rename from fault file prefix to general prefix 2019-04-04 20:28:36 +02:00
Magne Sjaastad
a812190af3 #4281 Saturation pressure plots : Delay loading of EQUIL until required 2019-04-04 19:38:15 +02:00
Gaute Lindkvist
1b815711b4 Add comments and checks to Export Sector Model keywords code 2019-04-02 09:56:56 +02:00
Gaute Lindkvist
5164a61c55 #4259 Implement mapaxes keyword with possibility to export in local coordinates 2019-04-02 08:20:10 +02:00
Gaute Lindkvist
3b8daa4939 #4248 Add option for making invisible cells inactive in Export Sector Model 2019-04-02 08:20:10 +02:00
Magne Sjaastad
014f389fe3 Whitespace 2019-04-01 14:43:55 +02:00
Magne Sjaastad
0f636fcc81 Whitespace 2019-03-29 08:28:31 +01:00
Magne Sjaastad
0d99010227 Remove unused variable 2019-03-29 08:28:22 +01:00
Gaute Lindkvist
42ff8bde78 #4246 Report error and stop importing faults with a name longer than 8 characters or with a space in the name 2019-03-28 20:31:45 +01:00
Gaute Lindkvist
49c66d0a5f #4218 Read units from Eclipse input grids 2019-03-22 15:28:03 +01:00
Magne Sjaastad
32419b1e00 #4217 Summary : Fix memory leak for vector of time_t values 2019-03-22 13:47:12 +01:00
Gaute Lindkvist
97e847a9d1 #4217 Fix memory leak in summary import 2019-03-22 11:43:13 +01:00
Gaute Lindkvist
646d79ce57 #4209 Support other units than metric when exporting input grid. 2019-03-22 10:37:40 +01:00
Gaute Lindkvist
f8102797c1 #4208 Store last used folder when exporting Sector Model + warning for LGRs 2019-03-21 14:45:47 +01:00
Gaute Lindkvist
677f42591b #4204 Export faults as part of visible grid export 
#4204 Enable reading of faults from a different file than the main grid file
 2019-03-21 14:45:47 +01:00
Gaute Lindkvist
88d2ad2c35 Refactor grid export and fault export 2019-03-21 14:45:47 +01:00
Magne Sjaastad
59c83157d1 Merge branch 'annotation-items' into dev 2019-03-19 15:00:30 +01:00
Gaute Lindkvist
28e6bf8d2d Export Sector model: write floats to file instead of doubles 2019-03-19 11:43:43 +01:00
Gaute Lindkvist
dd5402756c #4203 Support cell refinement for Sector Export 2019-03-19 10:49:09 +01:00
Gaute Lindkvist
f09f487635 #4143 First implementation of export sector model 2019-03-18 12:56:09 +01:00
Magne Sjaastad
75688703d4 #4195 Grid Cross Plot: Adjustments 2019-03-12 22:49:31 +01:00
Magne Sjaastad
0527fd8030 #4195 Grid Cross Plot: Add import of equil 2019-03-12 18:35:12 +01:00
Gaute Lindkvist
22f7bf7c21 Update RifReaderEclipseOutput and RimEclipseCase to use new progress tasks 2019-03-12 14:34:22 +01:00
Magne Sjaastad
f7600199c7 Fix whitespace and includes 2019-03-12 09:22:48 +01:00
Magne Sjaastad
246326229e #4189 RFT Plot : Move common code to RifEclipseRftAddress 2019-03-12 09:22:48 +01:00
Gaute Lindkvist
e72f57072c #4185 Implement data export for Grid Cross Plot 2019-03-12 09:19:01 +01:00
Magne Sjaastad
70c3b4df71 Whitespace 2019-03-11 11:45:35 +01:00
Magne Sjaastad
42f93d3a5a #4169 Saturation-Pressure plot : Read keyword data and add test files 2019-03-05 14:18:57 +01:00
Magne Sjaastad
ea9503d065 #4169 Saturation-Pressure plot : Whitespace 2019-03-05 14:18:57 +01:00
Magne Sjaastad
ffc3515b49 #3937 Summary : Improve robustness for well and lgr name 
A char pointer is communicating the names from libecl, and this pointer must be tested before assigning to a std::string
 2019-01-31 09:20:19 +01:00
Jacob Støren
a3660cd496 #3958 Refactoring: Rename modifiable result access to make it easier to track in the code. The existing overloads made things harder to read. 2019-01-29 08:35:42 +01:00
Jacob Støren
dbb2a564a2 #3958 Refactoring: RigCaseCellResultsData: Remove the final result index based interface 2019-01-28 16:18:28 +01:00
Jacob Støren
3e3d3871ed #3958 Refactoring: Remove scalarResultIndex from RigEclipseResultAddress 
and real external use (outside CaseCellResultsData)
Regression tests OK.
 2019-01-25 16:19:15 +01:00
Jacob Støren
ccfee8f34a #3958 Starting refactoring of eclipse results addressing 
Preparations for time diff results
 2019-01-25 16:19:13 +01:00
Gaute Lindkvist
f0731ace6f Fix compile warnings in RifEclipseDataTableFormatter 2019-01-23 09:41:25 +01:00
Magne Sjaastad
9850e75048 Add missing include 2019-01-18 16:07:50 +01:00
Gaute Lindkvist
4cd43d76d2 #3975 Avoid wrapping header lines in eclipse output + well plan 2019-01-18 14:55:12 +01:00
Magne Sjaastad
d460d3d77d #3944 clang-tidy : Apply modernize-deprecated-headers 2019-01-11 08:14:53 +01:00
Magne Sjaastad
6db80f40b9 #3856 Update copyright headers 2019-01-09 15:29:24 +01:00
Magne Sjaastad
6f3097dd5f Merge remote-tracking branch 'origin/2018.11.01-patch' into dev 2018-12-21 08:46:27 +01:00
Gaute Lindkvist
5c9b8b36f9 #3910 Add compdat export test with 132 line length and 133 line length. 2018-12-20 10:18:13 +01:00
Gaute Lindkvist
4e5925808a #3910 Unit test for table formatter and split text 2018-12-20 09:50:05 +01:00
Magne Sjaastad
cad072ba0b #3902 Summary Stepping : Fix issues for well name, region and well group name 2018-12-18 22:55:35 +01:00
Gaute Lindkvist
9851a2d938 #3853 Add line shift to compdat export table rows if the line exceeds 132 characters 2018-12-18 17:09:43 +01:00
Gaute Lindkvist
8821a37b90 #3853 Remove zero padding and unnecessary space at beginning and end of row for WSEGAICD 2018-12-12 15:07:04 +01:00
Gaute Lindkvist
41dc8feca3 #3849 Shorten column space for WSEGAICD table to 1 2018-12-11 16:57:05 +01:00
Gaute Lindkvist
5c66b901c3 #3752 ResInsight code changes to build on both Qt4 and Qt5 2018-11-30 09:47:53 +01:00
Bjørn Erik Jensen
4c9f3cff0f #3770 Import perforations. Fix spaces in well name issue 2018-11-28 09:23:09 +01:00
Magne Sjaastad
314c20a04a #3735 Summary plot : Improve stepping for well path name 2018-11-22 15:24:18 +01:00
Bjørn Erik Jensen
5354caef13 #3690 Missing Summary Data. Set well name for segment vectors in eclipse summary reader 2018-11-21 09:24:53 +01:00
Magne Sjaastad
3b9cdf5a92 #3588 Intersect : Add support for import of Intersect data 2018-11-13 09:52:28 +01:00
Bjørn Erik Jensen
2bd70b705e #3464 Well Path Export. Add support for setting custom comment prefix in formatter 2018-11-01 10:08:19 +01:00
Bjørn Erik Jensen
9cddc02066 #3576 Fix after ecllib upgrade 2018-10-30 13:48:24 +01:00
Magne Sjaastad
76a48a8f87 #3531 Temporary LGR : Add helper methods for grid and cell count 2018-10-23 15:28:04 +02:00
Bjørn Erik Jensen
9d90f54d5f #3474 LGR Export. Create temporary LGR. Take 1 2018-10-19 10:44:07 +02:00
Magne Sjaastad
6346ed012c clang-tidy : Remove redundant 'virtual' and add 'override' 2018-10-18 19:45:57 +02:00
Magne Sjaastad
726658d642 #3512 System : Remove unused functions 2018-10-18 15:40:11 +02:00
Magne Sjaastad
766fea603e #3512 System : Remove unused functions 2018-10-18 15:14:25 +02:00
Magne Sjaastad
ab13e0f0b6 CppCheck : Remove unused variable, increment line as we go 2018-10-12 16:36:32 +02:00
Magne Sjaastad
4290d8d836 #3478 Export Cell Result to File : Move code to RicEclipseCellResultToFileImpl 2018-10-10 15:12:54 +02:00
Magne Sjaastad
9d9771295f System : Replace NULL with nullptr 2018-10-10 10:17:27 +02:00
Bjørn Erik Jensen
c0bf63ea95 Fix a couple of build warnings on Linux 2018-10-09 08:19:16 +02:00
Bjørn Erik Jensen
83b93e1a1e Add addValueTable method. Add flexibility to formatter ragarding end of row and end of table text 2018-10-08 15:52:33 +02:00
Bjørn Erik Jensen
677914a338 #3455 ExportProperty. Display error message for several situations 2018-10-05 10:58:37 +02:00
Bjørn Erik Jensen
116b36bbc8 #3454 ExportProperty. Default result type set to undefined. Search through types when type not specified 2018-10-04 13:51:51 +02:00
Magne Sjaastad
f61b82dd35 System : System : Introduce compiler warning 4456 with fixes 2018-09-25 07:37:40 +02:00
Magne Sjaastad
4009d4d63b System : Introduce compiler warning C4457 with fixes 2018-09-24 21:20:35 +02:00
Bjørn Erik Jensen
43d90aa2e4 Converted enum to enum class to avoid cotire build errors 2018-09-24 09:34:48 +02:00
Magne Sjaastad
4ca3267931 System : Remove unused code 2018-09-21 16:37:47 +02:00
Bjørn Erik Jensen
ce59e8a0d0 #3320 Observed data import. Line based CSV import 2018-09-19 13:03:21 +02:00
sigurdp
43ac06ca98 #3344 HoloLens export: Allow for more human-readable JSON text output 2018-09-18 15:44:59 +02:00
Bjørn Erik Jensen
997a3a6fe0 Fix build warning 2018-09-13 13:03:05 +02:00
Bjørn Erik Jensen
b4dd37337a #3318 Plot editor performance. Several performance fixes 2018-09-13 12:38:50 +02:00
Magne Sjaastad
b604d26e90 #3340 Fix some warnings 2018-09-11 21:56:15 +02:00
Magne Sjaastad
a0a7ff3e7c Merge branch 'use-libecl-hpp' into dev 2018-09-07 10:28:39 +02:00
Joakim Hove
8bf4913957 Use hpp header files when accessing well_info from libecl 2018-09-07 05:17:11 +02:00
Bjørn Erik Jensen
248530ce95 #3301 Ensemble parameters file. Support tab as separator 2018-09-03 10:37:57 +02:00
Bjørn Erik Jensen
698fbb980d FileParseTools. Add new split method 2018-09-03 10:37:19 +02:00
Bjørn Erik Jensen
37961717e3 #3213 Observed data import. Handle custom vector naming. Fix failing unit tests 2018-08-30 13:30:54 +02:00
Bjørn Erik Jensen
2e8bf5aafe #3213 Observed data import. Add categories to vector table. Modify category identification. Update unit test 2018-08-30 11:17:52 +02:00
Bjørn Erik Jensen
c4577084dc RifEclipseDataTableFormatter. Renamed method to clearify its purpose 2018-08-29 08:41:23 +02:00
Magne Sjaastad
2755d2e313 #3253 Export Completions : Move return out of critical section 2018-08-27 13:04:29 +02:00
Magne Sjaastad
9e3a100bcc #3253 OpenMP : Give name to all critical sections 2018-08-27 13:04:29 +02:00
Bjørn Erik Jensen
7cffbfd3ea #3235 Update ResInsight code to new ecllib 2018-08-22 14:16:44 +02:00
Bjørn Erik Jensen
2e78bddaf6 #3119 detect grid unit. Read unit system from one of three available sources 2018-08-15 14:47:56 +02:00