OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2026-09-03 20:53:13 -05:00
Code Issues Packages Projects Releases Wiki Activity
13,193 Commits 53 Branches 83 Tags
7c8fced4fe5a50a5a88a28c8559feac5ad4cfd48
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Kristian Bendiksen 901f0f3a73 Fix early return bug in RigFemPartResultsCollection::initialPermeabilityDependentResults. 2020-06-30 11:47:26 +02:00
Kristian Bendiksen 9790300547 Merge pull request #6137 from OPM/porosity-permeability-calculation-6086 
Porosity permeability calculation 6086
 2020-06-24 18:28:40 +02:00
Kristian Bendiksen 56a08c1bcd #6086 Captialize properties in GeoMechCase. 2020-06-24 15:59:48 +02:00
Kristian Bendiksen f81340b05a #6086 Use mD as unit for permeability. 2020-06-24 15:59:48 +02:00
Kristian Bendiksen 1c86cf4e33 #6086 Add porosity, porosity change and permeability calculation. 2020-06-24 15:59:48 +02:00
Kristian Bendiksen 52815742bb #6031 Initial porosity in pore compressibility calc must use geostatic time step data 2020-06-24 11:18:58 +02:00
Kristian Bendiksen 01c423818d Merge pull request #6133 from OPM/fracture-model-plot-fixes 
Fracture model plot fixes
 2020-06-22 15:51:12 +02:00
Kristian Bendiksen 4eb483a549 Fixes by clang-format 2020-06-22 14:36:35 +02:00
Kristian Bendiksen 6a15958654 #6060 Make permeability plot logarithmic by default. 2020-06-22 14:33:34 +02:00
Kristian Bendiksen 7eefaa9096 #6060 Improve initial look of curves in fracture model plot. 2020-06-22 14:33:34 +02:00
Kristian Bendiksen 94371ce9ac #6060 Hide facies curve by default. 2020-06-22 14:33:34 +02:00
Kristian Bendiksen 6abb8f87ef #6060 Fix spelling of RimPlotCurve::setVisibility. 2020-06-22 14:33:34 +02:00
Kristian Bendiksen 06a954765f #6060 Use better colors for fracture model plot curves. 2020-06-22 14:33:34 +02:00
Kristian Bendiksen aa1fbd83e2 #6091 Show depth and units for fracture model plot. 2020-06-22 14:33:34 +02:00
Kristian Bendiksen 6a54458551 Merge pull request #6095 from OPM/pore-compressibility-fix-6031 
Pore compressibility fix 6031
 2020-06-19 11:16:31 +02:00
Kristian Bendiksen 5276001787 #6031 Extract methods for unit conversion. 2020-06-19 10:27:06 +02:00
Kristian Bendiksen 6844bed32c #6031 Convert values to SI in Pore Compressibility calculation. 
Young's Modulus is expected to be GPa in the element property table,
and the pore pressure is converted from Bar to Pascal.

Output unit is 1/GPa.
 2020-06-19 09:49:13 +02:00
Kristian Bendiksen 7bb04ecd43 #6031 Display reference case info in legend and overlay box. 2020-06-19 09:49:13 +02:00
Kristian Bendiksen d17faca18a #6031 Use reference case for Pore Compressibility calculation. 2020-06-19 09:49:13 +02:00
Kristian Bendiksen 034f75f64e Merge pull request #6079 from OPM/layers-fracture-model-plot-6036 
Layers fracture model plot 6036
 2020-06-19 09:38:12 +02:00
Kristian Bendiksen 78e5b40da9 #6064 Use RiaEclipseUnitTools for unit conversion (and add some new ones). 2020-06-18 19:42:28 +02:00
Kristian Bendiksen 4b56d93582 #6065 Convert Young's Modulus from GPa to MMpsi in frk export. 2020-06-18 19:11:37 +02:00
Kristian Bendiksen ed54cb6c70 #6065 Hide "Detailed Fluid Loss" values for now. 2020-06-18 19:11:37 +02:00
Kristian Bendiksen 19ee0310a9 #6065 Import "Fluid Loss Coefficient" and "Spurt Loss" from csv and export to frk. 2020-06-18 19:11:37 +02:00
Kristian Bendiksen f2696b003d #6064 Compute stress and stress gradients for fracture model plot. 2020-06-18 19:11:37 +02:00
Kristian Bendiksen e23cee8124 Add horizontal permeability. 2020-06-18 19:11:37 +02:00
Kristian Bendiksen 37ffaf3b15 #6065 Export fracture model plot to frk file. 2020-06-18 19:11:37 +02:00
Kristian Bendiksen 4c1333e33d #6036 Add layers track. 2020-06-18 19:11:37 +02:00
Kristian Bendiksen a76ed1f2c9 Merge pull request #6056 from OPM/handle-missing-values-fracture-model-plot-6035 
Handle missing values fracture model plot 6035
 2020-06-10 18:43:21 +02:00
Kristian Bendiksen e99f1fc98a #6305 Handle interpolation of values just outside the boundaries. 2020-06-10 10:38:07 +02:00
Kristian Bendiksen 34e0ae7537 #6035 Improve error logging when extracting elastic properties. 2020-06-10 07:20:39 +02:00
Kristian Bendiksen 89473aa9bd #6035 Handle missing values in fracture model plot. 2020-06-10 07:20:39 +02:00
Kristian Bendiksen 3085fe22e8 #6035 Add method for interpolating missing values (with extrapolation) 2020-06-10 07:20:39 +02:00
Kristian Bendiksen 56753f688d Use inclusive boundaries for interpolation. 2020-06-10 07:20:39 +02:00
Kristian Bendiksen ef579d7933 Merge pull request #6041 from OPM/fix-incorrect-line-endings-5891 
#5891 Fix incorrect line endings (CRLF -> LF)
 2020-06-05 17:13:15 +02:00
Kristian Bendiksen eb3243f679 #5891 Fix incorrect line endings (CRLF -> LF) 2020-06-05 16:04:23 +02:00
Kristian Bendiksen 28708f13fd Merge pull request #6037 from OPM/improve-fem-parts-names-6032 
Improve fem parts names 6032
 2020-06-05 13:01:03 +02:00
Kristian Bendiksen 5ddfd4f9da #6007 Rename Facies Properties to Elastic Properties. 2020-06-05 12:36:30 +02:00
Kristian Bendiksen 466827e7d0 #6007 Reload facies properties when project is reopened. 2020-06-05 12:36:30 +02:00
Kristian Bendiksen 38ec6e5069 #6007 Minor ui tweaks. 2020-06-05 12:36:30 +02:00
Kristian Bendiksen c349047a91 #6007 Add plot track and interpolation for facies properties. 2020-06-05 12:36:30 +02:00
Kristian Bendiksen 2ef822e491 #6007 Add utility for linear interpolation. 2020-06-05 12:36:30 +02:00
Kristian Bendiksen 79af3d7379 #6007 Add user interface for facies properties. 2020-06-05 12:36:30 +02:00
Kristian Bendiksen 46059e7a40 #6032 Merge SE.SEM and ST.STM calculation and rename to S*.SM 2020-06-05 11:09:56 +02:00
Kristian Bendiksen 8ddec683b0 #6032 Rename stress anisotropy results. 
STA12/STA13/STA23 -> SA12/SA13/SA23
SEA12/STA13/STA23 -> SA12/SA13/SA23
 2020-06-05 10:31:29 +02:00
Kristian Bendiksen 0b908370f3 #6032 Rename PORE-COMPRESSIBILITY to COMPRESSIBILITY 2020-06-05 10:25:59 +02:00
Kristian Bendiksen e9e32bfc3a Merge pull request #6023 from OPM/error-as-warnings-flag-6018 
Error as warnings flag 6018
 2020-06-04 13:40:52 +02:00
Kristian Bendiksen cfb54a428c #6018 Fix std::string/QByteArray ambiguous overload for assignment operator. 
Broke build on Ubuntu 20.04, gcc 9.3.
 2020-06-03 22:20:38 +02:00
Kristian Bendiksen 23202c9f15 #6018 Remove unnecessary caf::FilePath assignement operator 
In C++11 implicit generation of the copy constructor is deprecated if the
class has a user-declared copy assignment operator or a user-declared destructor.
 2020-06-03 22:06:30 +02:00
Kristian Bendiksen 8f5edbf5b0 #6029 Fix unsigned/signed comparison in Fwk tests. 2020-06-03 22:06:30 +02:00
Kristian Bendiksen 16c3ce1ca2 #6029 Update test helper to new gtest version. 2020-06-03 22:06:30 +02:00
Kristian Bendiksen 2eb18d8151 #6029 Upgrade gtest to v1.10 for Fwk/. 2020-06-03 22:06:30 +02:00
Kristian Bendiksen 817ae0290c #6029 Upgrade gtest to v1.10 for ApplicationCode/. 2020-06-03 22:06:29 +02:00
Kristian Bendiksen 7fdb920b3b #6018 Fix "catch polymorphic type by value" error on Ubuntu 20.04. 2020-06-03 22:06:29 +02:00
Kristian Bendiksen 1e920863d9 #6018 Enable RESINSIGHT_TREAT_WARNINGS_AS_ERRORS in github actions. 2020-06-03 22:06:29 +02:00
Kristian Bendiksen 988dea1629 #6018 Add RESINSIGHT_TREAT_WARNINGS_AS_ERRORS build flag. 
The flag controls "-Werror" on linux. Default is off.
 2020-06-03 22:06:28 +02:00
Kristian Bendiksen d443f97a1a #5989 Add parser for facies properties csv file 2020-06-02 15:26:37 +02:00
Kristian Bendiksen ee20ec4107 #6004 Pore Compressibility: incorrect sign first term in computation. 2020-06-02 15:19:37 +02:00
Kristian Bendiksen 3e882a65df #5979 Fix color legend crash when opening regression test project 
Projects containing Rim2dIntersectionViews copy legend config from the view using
PdmXmlObjectHandle::writeObjectToXmlString/readObjectFromXmlString. The
resulting xml contains references to RimColorLegendCollection which are unresolved,
and this would lead to a crash (m_colorLegend == nullptr). Fixed by resolving
the references explicitly after copy the config.
 2020-05-26 07:44:57 +02:00
Kristian Bendiksen f9598cfe7c #5960 Roff import: pick colors from best matching items in Rock Type color legend. 2020-05-24 18:31:07 +02:00
Kristian Bendiksen 8a0f911856 #5960 Add utility for computing "edit distance" between two strings. 2020-05-24 18:31:00 +02:00
Kristian Bendiksen 30ee125749 Improve method name to reflect implementation. 
RimColorLegendCollection::allColorLegeds is better than
RimColorLegendCollection::customColorLegends since method returns both kinds
of color legends.
 2020-05-24 17:26:51 +02:00
Kristian Bendiksen 0b9577df71 #5874 Remove direct accessor to obsoleted RimRegularLegendConfig::colorRange field. 2020-05-24 17:26:51 +02:00
Kristian Bendiksen f578f1f954 #5959 Add rock type color legend with colors from Equinor GeoStandard. 
Colors extracted from "Equinor GeoStandard - May 2020" document.
 2020-05-24 17:26:51 +02:00
Kristian Bendiksen 0ed99c09fa Avoid saving standard color legends. 2020-05-24 17:26:51 +02:00
Kristian Bendiksen d768ec88a9 #5874 Fix order of colors in legend. 2020-05-24 17:26:51 +02:00
Kristian Bendiksen 044ab55eea #5874 Use color legend in WellLogTrack result coloring. 2020-05-24 17:26:51 +02:00
Kristian Bendiksen 5295dbe299 #5874 Allow user defined color legends in result objects. 2020-05-24 17:26:51 +02:00
Kristian Bendiksen 8da32eddc1 Remove unused RiaColorTables includes. 2020-05-24 17:26:51 +02:00
Kristian Bendiksen 96f9a8813f Remove unused file. 2020-05-24 17:26:51 +02:00
Kristian Bendiksen 403a5502da Remove unused RimScaleLegendConfig. 2020-05-24 17:26:51 +02:00
Kristian Bendiksen c366e85682 Refactor delete operations for pdm objects. 2020-05-22 07:02:53 +02:00
Kristian Bendiksen b20747efbe Merge pull request #5966 from OPM/fix-gcc8-warning-5964 
#5964 Fix "type qualifiers ignored on cast result type" warning on gc…
 2020-05-20 20:56:20 +02:00
Kristian Bendiksen c03f6e43ca #5964 Fix "type qualifiers ignored on cast result type" warning on gcc 8. 2020-05-20 18:58:34 +02:00
Kristian Bendiksen 2ff699c079 Merge pull request #5754 from OPM/stricter-warnings-linux 
Stricter warnings linux
 2020-05-20 15:19:38 +02:00
Kristian Bendiksen d5a950d67c Treat warnings as errors on new gcc versions 2020-05-20 14:23:23 +02:00
Kristian Bendiksen 9c8fe15d28 Use unsigned int for bitfiddling (fixes unused variables warnings on gcc). 2020-05-20 14:23:22 +02:00
Kristian Bendiksen 30cec3e280 Fix comparison between signed and unsigned integer expressions. 2020-05-20 14:23:22 +02:00
Kristian Bendiksen 2f4ee076de Remove "set-but-unused" variables (generates warnings on gcc 7). 2020-05-20 13:45:59 +02:00
Kristian Bendiksen 59621e38f7 Remove undefined behavior (sequence point ordering). 2020-05-20 13:45:10 +02:00
Kristian Bendiksen 03b1a31ff3 Enable all warnings ("-Wall") for ApplicationCode directory on linux. 
Allowing initializiation reordering and unused parameters for now since there
are a lots of them, and the code is harmless.
 2020-05-20 13:45:10 +02:00
Kristian Bendiksen e80b3c2ff2 #5927 Add pore compressibility calculation. 2020-05-20 08:53:15 +02:00
Kristian Bendiksen 34dcd3c737 Merge pull request #5912 from OPM/calculate-stress-anisotropy-5910 
#5910 Add calculator for stress anisotropy.
 2020-05-14 13:17:48 +02:00
Kristian Bendiksen 20ca3354b9 Stimplan preprocessor refact (#5895) 
* #5633 Add Fracture Model data object.
* #5633 Add visualization for Fracture Model.
* Use thickness direction well path.
* #5834 WIP Fracture Model: Extract facies names along thickness direction vector
* Update to class enums.
* Remove RimFractureModel dip, tilt and azimuth (no longer used).
* #5824: Fix fracture model direction relative to formation dip
* Workaround problem in generated python code which breaks tests on linux. See #5862.
* Update name of thickness direction well path.
* #5834 Add import command for facies roff file.
* #5834 Show color legend data in facies track.
Also make it possible to change the data source for the curve data in plot.
* Fracture Model: replace "Thickness Type" with "Extraction Type".
* Use shorter curve legends in fracture model plot.
* Use class enum for RimFractureModel::ExtractionType.
* Use RimProject::current() instead of RiaApplication::instance()->project().
* Simplify RimFractureModel by not implementing Rim3dPropertiesInterface.
* Use scoped enums in RiaPlotAnnotationTool.
* Remove unused RimFractureModelPlot fields.
* Hide fracture model plots field, and add accessor methods.
 2020-05-14 06:39:55 +02:00
Kristian Bendiksen f628730618 #5910 Add calculator for stress anisotropy. 2020-05-14 06:19:26 +02:00
Kristian Bendiksen c016c02e40 Replace RiaApplication::instance()->project() with RimProject::current(). 
Also remove uneccessary includes of RiaApplication.h.
 2020-05-12 12:01:44 +02:00
Kristian Bendiksen 7972ff8c02 #5409 Remove deprecated QFontMetrics::width() call. 
Replaced with `QFontMetrics( font ).boundingRect( QString ).width() as suggested
in Qt5 docs. The replacement should work for all Qt5 versions as it was
available in Qt4 too.
 2020-05-12 12:01:44 +02:00
Kristian Bendiksen d86de5e8ff #5409 Remove deprecated QPlainTextEdit::setTabStopWidth call on Qt >= 5.10 
Need to still use it for 5.9 and older.
 2020-05-12 12:01:44 +02:00
Kristian Bendiksen 8211727b79 Remove ifdefs for Qt4 support. 2020-05-12 12:01:44 +02:00
Kristian Bendiksen 2bc677b8c8 #5785 Add timelapse calculator one time. 2020-05-12 12:01:44 +02:00
Kristian BendiksenandMagne Sjaastad b84e868564 Split fem part results collection 5785 (#5871) 
* #5785 Extract RigFemClosestResultIndexCalculator class to separate file.

* #5785 Move method implementation of RigFemClosestResutIndexCalculator to cpp file.

Also improve const correctness.

* #5785 Extract method for calculating normal SE, ie. SE:11/22/33.

* #5785 Extract method for calculating shear SE, ie. SE:12/13/23.

* #5785 Create a list of result calculators.

* #5785 Extract method for calculating timelapse, normalized, and gamma results.

* #5785 Extract method for calculating normal ST, ie. ST:11/22/33.

* #5785 Extract method for calculating shear ST, ie. ST:12/13/23.

* #5785 Extract method for calculating surface angles and aligned stress.

* #5785 Extract method for calculating principal strain and stress.

* #5785 Extract method for calculating FOS, SFI and DSM for SE.

* #5785 Extract method for calculating NE.EV, NE.ED, ST.Q and ST.STM.

* #5785 Extract method for calculating compaction.

* #5785 Extract method for calculating stress gradients.

* #5785 Extract method for calculating SE.SEM.

* #5785 Extract method for calculating NE.

* #5785 Extract method for calculating formation indices.

* #5785 Extract method for calculating nodal graidents, bar conversions, and EnIpPorBar.

* #5785 Use std::unique_ptr to calculators.

* Use std::vector<unique_ptr>

Co-authored-by: Magne Sjaastad <magne.sjaastad@ceetronsolutions.com>
 2020-05-09 08:57:07 +02:00
Kristian Bendiksen 368de8491e Add color icon to RimColorLegendItem in project tree. 2020-05-08 11:19:31 +02:00
Kristian Bendiksen db384ea754 Add getters for RimColorLegend++. 2020-05-08 11:19:31 +02:00
Kristian Bendiksen 78c33683eb Merge pull request #5879 from OPM/color-legend-second-branch 
Color legends
 2020-05-06 11:47:29 +02:00
Kristian Bendiksen 20eff6f5d3 #5875 Remove duplicated code: import formation names using RifColorLegendData. 2020-05-06 11:04:33 +02:00
Kristian Bendiksen e66f937c29 Fix assignment instead of comparison bug in RimPlotDataFilterItem::fieldChangedByUi 2020-04-30 12:46:50 +02:00
Kristian Bendiksen 4dfa975836 Fix warnings about "statement without effect" on gcc 7 on linux. 2020-04-30 12:46:50 +02:00
Kristian Bendiksen 92f4e6278c Fix signed/unsigned comparison. 2020-04-30 12:46:50 +02:00
Kristian Bendiksen b93b92cae2 Add parentheses in unclear expressions when suggested by gcc 7.3.1 on linux 2020-04-30 12:46:50 +02:00
Kristian Bendiksen 656010ffb9 Fix incorrect comparison for majorTickMarkCount in RimMultiPlot::fieldChangedByUi. 2020-04-30 12:46:50 +02:00