OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-01-21 14:03:18 -06:00
Code Issues Packages Projects Releases Wiki Activity
7,602 Commits 29 Branches 61 Tags 286 MiB
2435e92be1
Commit Graph

182 Commits

Author SHA1 Message Date
Magne Sjaastad
64d41fa109 #1396 Apply patch fix-synthetic-odb-cases 2017-04-25 13:30:09 +02:00
Magne Sjaastad
9dfeef69bf #1396 Add define for updated ERT API used from opm-flowdiag-app 2017-04-24 21:56:04 +02:00
Magne Sjaastad
c701750330 #1396 Update to libert from https://github.com/Statoil/libecl 2017-04-24 21:53:45 +02:00
Jacob Støren
938c8ff69a Update opm-flowdiagnostics-application to include handling of new Ert 2017-04-24 14:42:18 +02:00
Magne Sjaastad
c35e79c3b5 Merge branch 'dev' into pre-proto 2017-04-20 13:40:56 +02:00
Magne Sjaastad
5b5fad46ac #1398 Added file previously hidden by .gitignore 2017-04-05 12:42:20 +02:00
Magne Sjaastad
cd60f80c76 #1398 Include preprocessor part 2017-04-05 12:28:26 +02:00
Magne Sjaastad
2b4efc4b5c #1398 Removed dependency on system boost, added subset of boost to ThirdParty 
Added a subset of boost to ThirdParty folder. Code extracted from version boost version 1.59.0
 2017-04-05 08:38:59 +02:00
Magne Sjaastad
d038ea7581 #1371 Removed opm-common and opm-parser 2017-04-04 13:53:44 +02:00
Magne Sjaastad
8255a3aaa3 Merge branch 'dev' into pre-proto 2017-04-03 07:34:56 +02:00
Jacob Støren
9a11949f67 Updated opm-flowdiagnostics-applications to SHA afd3f6c454f52dcfa0a6aa96be9823176a6daa48 2017-03-31 15:13:50 +02:00
Magne Sjaastad
3d67946976 Merge remote-tracking branch 'origin/dev' into pre-proto 2017-03-15 10:10:43 +01:00
Jacob Støren
ba2e4ca3f2 #1269 Updated opm-flowdiagnostics to a14dc4ba1302bcc1e0aeb35c5de6b4bd39bce98a to fix issue with fraction sums > 1.0 2017-03-03 15:07:26 +01:00
Magne Sjaastad
1753449772 Merge remote-tracking branch 'refs/remotes/origin/dev' 
Conflicts:
	ApplicationCode/ProjectDataModel/CMakeLists_files.cmake
	ApplicationCode/UserInterface/RiuViewerCommands.cpp
 2017-02-22 09:42:51 +01:00
Magne Sjaastad
0b806c7664 Fixed #1238 Pie chart not always complete 2017-02-21 14:44:18 +01:00
Magne Sjaastad
a10b96ba3e Merged branch dev into pre-proto 2017-02-17 11:38:32 +01:00
Jacob Støren
590f9995c8 1212 Turned off shadow, changed to radial edge gradient to make the colors more easy to read. 2017-02-16 11:39:02 +01:00
Magne Sjaastad
f9d8ab8bad Merge remote-tracking branch 'refs/remotes/origin/dev' 
Conflicts:
	ApplicationCode/ProjectDataModel/RimEclipseWellCollection.cpp
	ApplicationCode/Resources/ResInsight.qrc
 2017-02-16 10:18:39 +01:00
Jacob Støren
df35335744 #1172 Well Alloc plot: Sorted the tracers according to contribution. 2017-02-14 08:10:39 +01:00
Jacob Støren
4d1c4031ef #1173 Changed the legend text format in the pie chart 2017-02-13 08:44:29 +01:00
Jacob Støren
8596c3f79c #1206 Updated the opm-flowdiag libraries 2017-02-09 14:14:02 +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
cc095644ce Reapplied fix for synthetic Odb files 2017-02-07 13:53:27 +01:00
Jacob Støren
a6b7bc7c41 Updated Ert to e2a5a9cc20705537d07822958d925e092a323367 to include new accesss to well rates 2017-02-07 13:44:59 +01:00
Magne Sjaastad
405cd382af Reorganized how clipper is included and deleted example files 2017-01-24 15:39:39 +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
Magne Sjaastad
699c2a1103 #1116 Added nightcharts pie plotting library 2017-01-23 12:59:24 +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
astridkbjorke
2c90136a04 pre-proto - Adding clipper library version 6.4.0 to be used for polygon clipping 2017-01-16 09:40:26 +01:00
Jacob Støren
0cec31362b #1117 Temporary patch from @bska. Waiting for an update to the opm-flowdiagnostics library 2017-01-16 09:27:51 +01:00
Jacob Støren
95206315fa opm-flowdiagnostics updated to 80190c28ae0fd4a82cfe88c827559029982db83b 
opm-flowdiagnostics-applications updated to 01ecb8fc22cb70d883edaad398bffc49878859c3
Which fixes error in TOF calculations.
 2017-01-05 14:57:25 +01:00
Jacob Støren
2692abe7fe Renamed catalog to avoid build-server problems due to too long path 2016-12-09 16:25:43 +01:00
Jacob Støren
e25f6cb84d Updated unit test of flow-diag to allign with the example in the flowdiag-app library. 2016-12-08 17:11:47 +01:00
Jacob Støren
147cb5ebe0 Updated opm-flowdiagnostics-applications to sha: 27adc8964f997d0bb508e254b6ff43ad1e1e76bf 2016-12-08 17:11:47 +01:00
Jacob Støren
77180d91cb Opdated opm-flowdiagnostics to sha: d409aedbf96c996c3886e3fd91abd4d8c3b0c601 2016-12-08 17:11:47 +01:00
Jacob Støren
bc493298e2 Flow: Integrated from the FlowDiag branch Step 1. 2016-12-08 17:11:47 +01:00
Magne Sjaastad
f20a8d7dc8 #926 Eclipse Input Data : Do not abort for keywords with more than eight characters 2016-11-25 16:56:26 +01:00
Magne Sjaastad
07e47ce153 #996 Reapplied fix for synthetic Odb files 2016-11-22 21:14:24 +01:00
Magne Sjaastad
9178659449 #996 Updated ERT to 2016.10 2016-11-22 21:14:24 +01:00
Jacob Støren
323f7893cb Made the output from g-test a bit more readable 2016-10-17 15:15:27 +02:00
Magne Sjaastad
ae0da542e2 #804 Reapplied fix for synthetic Odb files 2016-10-13 14:07:17 +02:00
Magne Sjaastad
83e000c91f #804 Updated opm-parser based on 
a3496df501a4369fd827fbf0ff893d03deff425f
 2016-10-13 13:40:44 +02:00
Magne Sjaastad
0306168bb4 #804 Updated opm-common based on 
1216bc052542f24ec6fcfbe1947d52e6300ff754
 2016-10-13 13:40:43 +02:00
Magne Sjaastad
3b4f1620a5 #804 Updated ERT based on 6287acdb0d039ce13eb9956b67035280a3de9539 2016-10-13 13:40:43 +02:00
Magne Sjaastad
88e40aa2d9 #886 LAS Export: Set the STEP if the data is resampled 2016-09-23 10:20:05 +02:00
Jacob Støren
cdfec7a04f #876 Avoid empty lines in LAS export file 2016-09-13 11:47:42 +02:00
Jacob Støren
382bf84036 #875 Fixed wrong number of digits after punctation for numbers < 1000 2016-09-12 15:57:55 +02:00
Magne Sjaastad
5420960b22 #826 Added opm-flowdiagnostics libary with a basic test 2016-09-05 15:23:24 +02:00
Magne Sjaastad
830db2c6ec (#743) Added import of Input Case using opm-parser 2016-06-23 14:36:33 +02:00
Magne Sjaastad
eb6d3e0e8f (#743) Updated opm-parser with support for missing include files 2016-06-23 13:49:44 +02:00
Magne Sjaastad
2f83194a5e #769 Fixed compile issues on Linux 2016-06-19 12:41:13 +02:00
Magne Sjaastad
ee156794b6 Added standalone unit test for opm-parser 2016-06-16 18:10:08 +02:00
Magne Sjaastad
98683944b7 Reapplied fix for synthetic Odb files 2016-06-13 14:57:27 +02:00
Magne Sjaastad
da76b01611 Updated ERT, opm-common and opm-parser 
ERT 80650d05d49b419ec74ba316312313dfc6ba0875
opm-common e7db252f3e310a04718f315e6cdb9d6c428c5762
opm-parser 817722b99baa62cc63a5f859cc90b951f0b0636e
 2016-06-13 14:18:50 +02:00
Magne Sjaastad
7adaa4b45c Integrated opmjson directly in opm-parser, removed dependency to opm-common 2016-06-13 12:27:28 +02:00
Magne Sjaastad
718e724760 Include JSON files directly in opm-parser, opm-parser has now no dependencies 2016-06-13 10:39:57 +02:00
Magne Sjaastad
1c044da54a Always use static libraries for opm libs and NRlib 2016-06-05 18:45:53 +02:00
Magne Sjaastad
a08a4eb5ef Added custom wrapper for json files to control install features of json 2016-06-02 11:31:41 +02:00
Magne Sjaastad
9b6e422d0c #742 Integrated opm-parser and added basic unit test 2016-06-01 15:53:21 +02:00
Magne Sjaastad
2892653298 #742 Added custom-opm-parser, compiles on Windows 2016-06-01 15:53:21 +02:00
Magne Sjaastad
758b4a452b #742 Added custom-opm-common to ThirdParty 2016-06-01 15:53:21 +02:00
Magne Sjaastad
54c98ca9f8 #742 NRLib now uses Boost from CMake 2016-06-01 15:53:21 +02:00
Magne Sjaastad
362dd50e9b Updated internal ERT 
Copied ERT from

614a4295ad
 2016-04-19 14:48:14 +02:00
Magne Sjaastad
7b24b3a96b (#713) Removed temporary workaround for NNC data import in ECLIPSE 2015 2016-01-08 09:25:38 +01:00
Jacob Støren
38be5baca1 NRLib: Fixed missing precision in LAS file export 2015-11-06 15:07:09 +01:00
Magne Sjaastad
56ad3a448e Reapplied fix for synthetic Odb files 
See commit bfdc00edaf
 2015-10-30 14:42:05 +01:00
Magne Sjaastad
aabd5c6cf7 (#613) Updated ERT 
Updated ERT to 9eb4c76cb930450c35e6d44d479da1141e296c7a of the
release/2015.10 branch
 2015-10-30 09:47:37 +01:00
Magne Sjaastad
9aff75c128 (#594) Fixed invalid formatting of well info during export of LAS files 2015-10-27 11:42:37 +01:00
Pål Hagen
c2f0163eef (#541) Using two parameters when adding well info (parameter name and value) 2015-10-16 13:35:09 +02:00
Pål Hagen
7bcbb80691 (#541) Added interface for adding well info for export 2015-10-16 11:02:12 +02:00
Pål Hagen
33a32c9c1a (#541) Added some access methods to NRLib::LasWell to be used when exporting 2015-10-15 16:11:03 +02:00
Pål Hagen
958357b563 (#541) Fixed obvious bug in NRLib (LasWell::WriteToFile()) 2015-10-15 14:55:16 +02:00
Pål Hagen
972d8fe5e0 (#541) Fixed a couple of bugs in NRLib/LasWell. Made export possible. 
Had to add a default constructor to be able to export to a LAS file from
scratch (not based on an existing LAS file). Also corrected a bug in
LasWell::WriteToFile() and LasWell::ParseInformation(). Reading a LAS
file exported from LasWell was not possible before the bug fixes.
 2015-10-15 08:18:14 +02:00
Jacob Storen
10046eed4a Linux fixes 2015-10-14 07:13:45 -07:00
Pål Hagen
5e8a6d90cd (#498) Picking and displaying well log channel unit from LAS files 2015-09-21 10:10:25 +02:00
Pål Hagen
39193396ae (#489) Added interface to get access to depth unit 2015-09-18 13:43:56 +02:00
Pål Hagen
f4df58006c (#434) Added unit tests for NRLib/well 2015-09-14 09:02:27 +02:00
Pål Hagen
a9027ecefa (#434) Added NRLib for LAS support. Created CMake file to build it. 
Readme.txt describes how to update the source code contained in NRLib.
 2015-09-11 16:32:38 +02:00
Pål Hagen
2b87c8c7d6 Added Qwt library and basic classes for well log viewer 2015-08-26 12:27:29 +02:00
Pål Hagen
bfdc00edaf Hack to be able to read synthetic ODB related Eclipse cases 
Similar hack as commit 24fb7ac
 2015-07-01 15:36:23 +02:00
Pål Hagen
c06dabddcb Upgraded ERT from GitHub master commit e71b881 2015-07-01 15:36:22 +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
Jacob Støren
09744af4b8 Upgraded ERT from github master commit d9955e849 
Startup on new project
 2015-04-14 15:47:22 +02:00
Magne Sjaastad
f2c75c7f59 Updated ERT to bbab02e02630924471760a7e9357825ad414e2e9 
Integrated fix for MSW reading of large wells
 2014-11-05 17:23:07 +01: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
b93053b089 Updated ERT to 946e512ac17c1e2469892072a925428c0a012fa1 2014-10-09 20:13:04 +02:00
Jacob Støren
76d32d1a73 Ert: Updated to 9a2492633ab037b83952c5b643a7ba06851481b1 that fixes MSVC10 compile issues 2013-12-12 22:17:54 +01:00
Jacob Støren
a0404333ab ERT: Updated to nnc-export branch from Joakim b933117d4e 2013-12-12 22:17:51 +01:00
Magne Sjaastad
d1f8f383c4 ERT: Use 1-based ids for well branches and segments. Removed adding of 1 
in picking text info in RimReservoirView.

Integraded ERT from
0f9e820554
 2013-10-08 12:31:15 +02:00
Magne Sjaastad
c07875701a ERT: Integrated ERT/master from 
13c3c25fe1
 2013-10-07 14:50:14 +02:00
Magne Sjaastad
d3ef53285a Updated to ERT version fix for amalgamated-nnc-bug 
e47dfe0ee4
p4#: 22363
 2013-09-09 12:13:33 +02:00
Jacob Støren
81aaf707de Ert: Fixed build settings to build static libs on linux 
p4#: 22243
 2013-08-29 11:50:03 +02:00
Jacob Støren
14dc3def92 MswRollUp: Ert : Fix of missing MSW branches 
This is an intermediate commit and does not compile
p4#: 22228
 2013-08-26 15:17:20 +02:00
Jacob Støren
3151f99129 MswRollUp: Ert: Fix of wrongly named define: WINDOWS_LSF 
This is an intermediate commit and does not compile
p4#: 22223
 2013-08-26 14:50:27 +02:00
Jacob Støren
d7d5d2942b MswRollUp: Updated Ert to commit 1fea6b00f3 master Fixed an Api change 
This is an intermediate commit and does not compile
p4#: 22222
 2013-08-26 14:44:03 +02:00
Jacob Støren
b63f51921d MswRollUp: Updated Ert to experimental MSW branch. Updated ResInsight code to handle API changes 
067fa99faa
This is an intermediate commit and does not compile
p4#: 22212
 2013-08-26 13:56:42 +02:00
Jacob Støren
4be58edf78 MSW code reverted. Regrettfully the work has to be reconsidered. 
Both ERT and the resinsight code is rolled back to before MSW was introduced as refined.
p4#: 21999
 2013-06-25 15:53:19 +02:00
Magne Sjaastad
7a24b2664e Updated ERT to handle multi segment wells 
Updated input code in ResInsight accordingly

ERT version on GitHub
067fa99faa
p4#: 21920
 2013-06-13 22:12:02 +02:00
Magne Sjaastad
80c5224c65 Updated ERT to e361fe404e 
p4#: 21590
 2013-05-10 10:25:46 +02:00
Magne Sjaastad
5cc4c9a231 Moved Linux directives into ifdef 
Use INSTALL_ERT to control shared/static library type on non-MSVC
p4#: 21478
 2013-04-29 13:21:36 +02:00