OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2026-08-02 09:39:37 -05:00
Code Issues Packages Projects Releases Wiki Activity
1,680 Commits 51 Branches 82 Tags
0bd0d6d7a7e2b82e05464fc97abc5f610cdc1952
Commit Graph
46 Commits
Author SHA1 Message Date
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
https://github.com/Ensembles/ert/tree/0f9e82055442f13a6388c34687d59f1acfdb37f7
 2013-10-08 12:31:15 +02:00
Magne Sjaastad c07875701a ERT: Integrated ERT/master from 
https://github.com/Ensembles/ert/tree/13c3c25fe10057f44544cf8f6c0684b669aa0280
 2013-10-07 14:50:14 +02:00
Magne Sjaastad d3ef53285a Updated to ERT version fix for amalgamated-nnc-bug 
https://github.com/joakim-hove/ert/commit/e47dfe0ee4e1485f5b70e9b24f33a9d6d1c41902
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 
https://github.com/joakim-hove/ert/commit/067fa99faa300815950d7c0147649754a578b71a
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
https://github.com/joakim-hove/ert/commit/067fa99faa300815950d7c0147649754a578b71a
p4#: 21920
 2013-06-13 22:12:02 +02:00
Magne Sjaastad 80c5224c65 Updated ERT to https://github.com/Ensembles/ert/commit/e361fe404e6f709b986cbb46af5a947028a2d56e 
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
Magne Sjaastad ca856f7603 Updated ERT to 315ceeee250808ea6a6530233dd5125f9f76f06c 
Support of reading LGR dimensions
Close file handles between access to files, keep ERT file-related cache to speed up reading of many files multiple times
p4#: 21477
 2013-04-29 13:13:42 +02:00
Magne Sjaastad 01490c480f Merge pull request #23 from OPM/master 
RHEL/debian packaging and octave fixes
 2013-04-12 05:22:11 -07:00
Magne Sjaastad 1b07630239 Fix for reading wells, verified to be working on case TestCase_LGR_Amalg 
https://github.com/Ensembles/ert/commit/806a18a1373e34a4a9bff649fcafc4e3ad1c46f9
p4#: 21153
 2013-04-07 16:22:39 +02:00
Magne Sjaastad b0c3bc5fba Added code for reading out grid dimensions from 
https://github.com/Ensembles/ert/commit/5c8ab75e76a58bfa3b17b1d8bca8fee4e99cca13
p4#: 21150
 2013-04-05 15:08:50 +02:00
Jacob Støren db62f01e0a Differenced the compiler options on Windows and Linux, making a ton of stupid MSVC compiler warnings go away. 
p4#: 21138
 2013-04-05 10:42:53 +02:00
CeetronResInsight 2d5ed03b9b When ERT is configured to be not installed, do static linking of the Ert modules 
p4#: 21135
 2013-04-05 08:15:03 +02:00
Magne Sjaastad 32d67d9978 Updated ERT from https://github.com/Ensembles/ert/commits/master to version 
4a78d88f1dc7bbc86f173c5adb825bbca29fa116
p4#: 21120
 2013-04-04 08:24:40 +02:00
Torstein Hegge 7b0b923d80 gitignore: Ignore more build system products 
Ignore static libraries, cmake products, generated code and unit test
binaries.

Some extra care must be taken not to ignore more than intended when ignoring
the *_UnitTests. There is no way to directly express a path-neutral "only
ignore files with this pattern, not directories" in a single gitignore
pattern, but it can be expressed as "ignore everything containing this pattern
except directories".
 2013-04-02 19:01:09 +02:00
Jacob Støren e8bf853231 ERT: Temporary hack fix of crash on well reading with inordered timesteps. 
p4#: 20408
 2013-02-07 11:10:26 +01:00
Jacob Støren 602c9f5535 Fixing the crash on retreiving the fractureActive index on none dual porosity again. 
p4#: 20326
 2013-02-01 09:50:17 +01:00
Jacob Støren df40d89fe9 Fixing the crash on retreiving the fractureActive index on none dual porosity again. 
p4#: 20326
 2013-02-01 09:26:43 +01:00
Jacob Støren 66f0bc03bd Undo an unintended checkin 
p4#: 20323
 2013-01-31 17:21:30 +01:00
Jacob Støren 4a52c5f7c1 Final rename to cmake with no capitals 2013-01-31 17:18:33 +01:00
Jacob Støren d48d7d50ff Starting to rename the CMake directory. Case change problem 2013-01-31 17:15:19 +01:00
Jacob Støren b33dd15372 Ert: Updated to 3f8166c4739fdfe654d3992920a36bf0a6981b4d 
Had to remove a kræsj.txt file that caused trouble (again)
p4#: 20320
 2013-01-31 15:55:49 +01:00
Jacob Støren 85238529ef Build system fixes to handle new Ert version 
p4#: 20319
 2013-01-31 15:39:40 +01:00
Magne Sjaastad f57ed233a1 ERT: Added NULL pointer check 
p4#: 20292
 2013-01-30 07:27:54 +01:00
Jacob Støren 24ac7b819e Version number put into a separate file 
p4#: 20214
 2013-01-22 11:28:35 +01:00
Jacob Støren e88f62abcf Intermediate fix of bool size inconsistency between C and C++ 
p4#: 20200
 2013-01-21 08:29:50 +01:00
Magne Sjaastad 6f257f7dba Updated to ERT version 67a38b6899f6935cb13b092105c90274f2b632f5 
p4#: 20199
 2013-01-18 15:27:32 +01:00
Magne Sjaastad 825be4e8d0 Removed file with norwegian characters 
p4#: 20196
 2013-01-18 09:15:46 +01:00
Magne Sjaastad bdfd9c543e Added missing files for ERT revision a39d4b4a9e597532b2dbf845751a70ffe1de3805 
p4#: 20195
 2013-01-18 09:00:23 +01:00
Magne Sjaastad 2cf0e32d4b Updated ERT to GIT version a39d4b4a9e597532b2dbf845751a70ffe1de3805 
p4#: 20194
 2013-01-18 08:53:37 +01:00
Jacob Støren c74619e79a Fixed cmakelist for Reservoirdatamodel test project 
p4#: 20190
 2013-01-17 21:26:12 +01:00
Magne Sjaastad 04006370ac Added ERT as source code based on https://github.com/Ensembles/ert/ and commit 7b53b5f61f5b47e8169b72098b562071df394bc3 
This is SVN commit 4117
Updated ResInsight cmakelists to build ERT and link directly
Removed precompiled ERT binaries
p4#: 20183
 2013-01-17 13:33:59 +01:00
Magne Sjaastad a8b5d9cee2 Updated ERT to SVN 4117 for Linux 64 
p4#: 19185
 2012-10-16 09:12:03 +02:00
Magne Sjaastad 427a7cb8c5 Updated ERT to SVN 4117 for Windows 32/64 
p4#: 19184
 2012-10-16 08:40:44 +02:00
Magne Sjaastad bf8a006c0e Updated ERT to SVN revision 4077 for Windows 32/x64 2012-09-13 11:41:48 +02:00
Magne Sjaastad 5b136d9822 Updated ERT to SVN revision 4077. Use new folder structure for ThirdParty/Ert, one folder for libs and one folder for includes. Minor application changes to be compatible with API changes in ERT. 2012-09-13 11:12:11 +02:00
Magne Sjaastad 748f061a55 Updated ERT to SVN revision 4077. Use new folder structure for ThirdParty/Ert, one folder for libs and one folder for includes. Minor application changes to be compatible with API changes in ERT. 2012-09-13 10:56:39 +02:00
unknown 2c9695e594 Updated to version 0.8.0 2012-06-26 16:10:41 +02:00
Alf B. Rustad dfe97efb1b Initial commit of ResInsight version 0.4.8 2012-05-18 09:45:23 +02:00