OilfieldToolsNet/opm-core
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
6,128 Commits 9 Branches 35 Tags
master
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Joakim Hove f693b757d3 Merge pull request #1210 from stefoss23/test_RelpermDiagnostics_PARSE_EXTRA_RECORDS_compliant 
test_RelpermDiagnostics made to use PARSE_EXTRA_RECORDS.
 2018-01-17 12:27:24 +01:00
Joakim Hove cc20b89e73 Merge pull request #1196 from GitPaean/fixing_history_tests 
fixing history mode tests
 2018-01-09 14:37:10 +01:00
Joakim Hove b190a0531d Merge pull request #1202 from joakim-hove/rm-travis 
Removed travis integration
 2018-01-02 20:29:57 +01:00
Joakim Hove 1f4447df98 Removed travis integration 2017-12-26 12:31:05 +01:00
Joakim Hove c2dd80f6c5 Merge pull request #1182 from joakim-hove/use-wells 
Updated NNC() constructor arguments.
 2017-11-06 17:06:22 +01:00
Joakim Hove 210364ecde Schedule no longer part of EclipseState. 2017-10-24 20:38:15 +02:00
Joakim Hove f696042f26 Merge pull request #1176 from joakim-hove/master 
Updated NNC() constructor.
 2017-09-26 18:43:54 +02:00
Joakim Hove 8a3fe0a3f6 Updated NNC() constructor. 2017-09-26 14:30:50 +02:00
Joakim Hove 02b1e58a77 Merge pull request #1161 from joakim-hove/use-libecl 
Use libecl in jenkins
 2017-05-10 13:36:53 +02:00
Joakim Hove 419aedfcbf Use libecl in jenkins 2017-05-07 12:54:08 +02:00
Joakim Hove 0b1d5745a6 Merge pull request #1149 from joakim-hove/disable-equil-swatinit 
Temporarily disabled EQUIL + SWATINIT test.
 2017-03-21 19:50:55 +01:00
Joakim Hove b55ce6b53e Temporarily disabled EQUIL + SWATINIT test. 2017-03-21 16:49:14 +01:00
Joakim Hove 53eb7e2f1c Merge pull request #1150 from joakim-hove/travis-install-bc 
Travis: apt-get install bc
 2017-03-21 16:48:28 +01:00
Joakim Hove 1caaa5bd35 Travis: apt-get install bc 2017-03-21 16:21:47 +01:00
Joakim Hove e53b0a58fa Merge pull request #1119 from jokva/pvtw-from-eclipsestate 
Read PVTW from EclipseState
 2016-12-06 22:41:39 +01:00
Joakim Hove 647e005297 Merge pull request #1109 from jokva/get-ref-depth-timestep 
Ask for reference depth at timestep.
 2016-11-22 23:12:34 +01:00
Joakim Hove df920e4970 Merge pull request #1101 from jokva/changes-in-grouptree 
GroupTree interface changed upstream
 2016-11-16 13:26:58 +01:00
Joakim Hove 0cf4021698 Merge pull request #1102 from jokva/stack-allocd-items 
Use new DeckItem constructor interface.
 2016-11-11 11:07:34 +01:00
Joakim Hove e348baa6c7 Merge pull request #1098 from jokva/phase-in-runspec 
Read phase information from EclipseState.runspec
 2016-11-02 11:52:24 +01:00
Joakim Hove 99d8ab73f4 Merge pull request #1081 from joakim-hove/celldata-container 
Header file moved in opm-output.
 2016-10-17 11:46:33 +02:00
Joakim Hove 5fdb868526 Header file moved in opm-output. 2016-10-06 14:23:47 +02:00
Joakim Hove 7f1026551a Merge pull request #1072 from atgeirr/fix-warnings 
Fix a few warnings
 2016-09-25 21:06:33 +02:00
Joakim Hove 19f6d540fc Merge pull request #1059 from joakim-hove/create-eclipsegrid 
Create eclipsegrid
 2016-09-07 11:11:10 +02:00
Joakim Hove 8666c8b687 UgGridHelpers::createEclipseGrid( ) 
- A new function createEclipsegrid has been added to the UgGridHelpers
  namespace.

- The UnstructuredGrid C structure has been augmented with a new member:
  double * zcorn which can be used to hold a copy of the zcorn
  value *after* minpv induced modifications.
 2016-09-07 10:56:29 +02:00
Joakim Hove b7bb01b77e shared_ptr<EclipseGrid> -> const EclipseGrid& 2016-09-03 17:49:46 +02:00
Joakim Hove 9615f0e9d7 Using { .. } initialization. 2016-08-31 09:55:28 +02:00
Joakim Hove 89a22c30b0 Merge pull request #1057 from akva2/simplify_after_ert_reorg 
simplify jenkins build scripts after ert reorganization
 2016-08-22 17:29:28 +02:00
Joakim Hove a6a95eeac1 Merge pull request #1056 from pgdr/downstream-transmult-and-shared_ptrs 
TransMult and InitConfig are references
 2016-08-09 09:33:06 +02:00
Joakim Hove c686ec69d7 Merge pull request #1041 from jokva/removal-shared_ptr-well 
WellPtr and GroupPtr deprecated
 2016-06-20 14:57:10 +02:00
Joakim Hove 98707b87a8 Using build-all travis script. 2016-06-10 13:38:13 +02:00
Joakim Hove d3aa0926c8 Merge pull request #1016 from jokva/refactor-output-restart 
Breaking opm-core dependency in opm-output; new summary implementation
 2016-06-10 13:15:34 +02:00
Joakim Hove f9b7a5fe66 Merge pull request #1002 from pgdr/eclipsegrid-is-input 
Using getInputGrid API from Parser
 2016-04-20 15:50:13 +02:00
Joakim Hove ce6cdb4a47 Merge pull request #962 from joakim-hove/remove-simulator-state 
Replaced SimulatorState -> SimulationDatacontainer
 2016-03-29 13:16:19 +02:00
Joakim Hove c360079926 Replaced SimulatorState -> SimulationDatacontainer 
Have removed the SimulatorState base class, and instead replaced with
the SimulationDatacontainer class from opm-common. The SimulatorState
objects were typcially created with a default constructor, and then
explicitly initialized with a SimulatorState::init() method. For the
SimulationDataContainer RAII is employed; the init( ) has been removed -
and there is no default constructor.
 2016-03-29 10:44:49 +02:00
Joakim Hove fcd4368da4 Merge pull request #979 from jokva/missing-cassert-include 
Add missing <cassert> include
 2016-03-25 07:36:28 +01:00
Joakim Hove 05c2fb7c5e Merge pull request #978 from chflo/move_log_functionality 
Changed include due to OpmLog changed path
 2016-03-21 22:14:48 +01:00
Joakim Hove 212e3c26a4 Merge pull request #976 from qilicun/rename-ParseMode 
Rename parse mode
 2016-03-17 09:51:50 +01:00
Joakim Hove 2ca569d2e4 Merge pull request #973 from andlaus/fix_PERMXYZ 
Fix PERM[XYZ] output
 2016-03-16 11:28:22 +01:00
Joakim Hove 0c05fc4dc0 Merge pull request #966 from jokva/initconfig-equil 
Remove Equil + EquilWrapper, replace with upstream
 2016-03-04 18:18:57 +01:00
Joakim Hove 85232bb355 Merge pull request #964 from atgeirr/fix-sign-warning 
Silence sign comparison warning.
 2016-02-29 14:48:48 +01:00
Joakim Hove df6e6a2347 Replaced TwoPhaseState -> SimulatorState 2016-02-22 22:03:43 +01:00
Joakim Hove 6ca10ea57d Added SimulatorState::getCellData() 2016-02-22 22:03:42 +01:00
Joakim Hove 6c5fae2f9d Added free function initSaturation(). 
The state argument is of type SimulatorState& - and no longer a template
parameter.
 2016-02-22 22:03:41 +01:00
Joakim Hove a214c10595 Changes in SimulatorState: 
1. Added method setCellDataComponent()
 2. Removed setFirstSat()

Implemented saturation initialisation using setCellDataComponent()
instead of setFirstSat(). This way the template<class Props> has been
removed from the SimulatorState class.
 2016-02-22 08:42:04 +01:00
Joakim Hove 58f355935f Using template for cmp::vector_equal() 2016-02-19 07:57:02 +01:00
Joakim Hove 7909311749 Merge pull request #952 from jokva/unique-auto-deck 
Change Deck access methods/types to references
 2016-02-18 23:17:17 +01:00
Joakim Hove 1661ac8f58 Merge pull request #956 from jokva/remove-unused-wrapper 
Remove unused Wrapper includes from Deck/Utility
 2016-02-17 17:10:43 +01:00
Joakim Hove 6515b57632 Merge pull request #950 from joakim-hove/simulatorstate-refactor 
Removed opm_memcmp_double() - use cmp from common.
 2016-02-15 12:55:53 +01:00
Joakim Hove 5172652e73 Removed opm_memcmp_double() - use cmp from common. 2016-02-14 21:41:51 +01:00
Joakim Hove 88aad94f54 Merge pull request #951 from jepebe/travis 
Travis support
 2016-02-08 12:07:26 +01:00
Joakim Hove 9b1efd7810 Revert: Removed unused SimulatorState comparison. 
This reverts commit 5ce1d84ac1.
 2016-02-04 18:39:40 +01:00
Joakim Hove b241fde63c Revert: Removed unused SimulatorState::setFirstSat 2016-02-04 18:39:39 +01:00
Joakim Hove 4e46bb3fa4 Merge pull request #948 from joakim-hove/simulatorstate-remove-unused 
Simulatorstate remove unused
 2016-02-04 15:57:59 +01:00
Joakim Hove 5ce1d84ac1 Removed unused SimulatorState comparison. 2016-02-03 05:54:24 +01:00
Joakim Hove df0d11b8de Removed unused SimulatorState::setFirstSat() 2016-02-03 05:51:05 +01:00
Joakim Hove 282cac57ea Merge pull request #945 from joakim-hove/simulator-state-no-grid 
Removed SimulatorState::init( UnstructureGrid& )
 2016-01-25 17:49:05 +01:00
Joakim Hove ba1c06d415 Removed SimulatorState::init( UnstructureGrid& ) 2016-01-25 07:30:03 +01:00
Joakim Hove bbcc39805d Merge pull request #942 from qilicun/debug_relperm 
fix relperm diagnostics tests issue.
 2016-01-11 09:21:10 +01:00
Joakim Hove a35520a65d Merge pull request #939 from joakim-hove/table-column 
Table column
 2016-01-08 15:29:10 +01:00
Joakim Hove a6deb02d04 Changed to use new table api from opm-parser. 2016-01-08 14:47:09 +01:00
Joakim Hove a566ac608d Added TableColumn based overloads. 2016-01-06 09:19:47 +01:00
Joakim Hove 65ff9bb75b Removed erroneous test data. 2016-01-05 11:47:20 +01:00
Joakim Hove 1de19dd47d Added out-of-range tests. 2015-12-03 16:19:43 +01:00
Joakim Hove 130f222cb0 Added regression test for norne PvtLiveOil PVT. 2015-12-03 14:16:04 +01:00
Joakim Hove 68e12e9250 Renamed memcmp_double -> opm_memcmp_double 2015-10-12 09:25:37 +02:00
Joakim Hove c8649896f8 Relocated warning headers. 2015-10-06 11:39:14 +02:00
Joakim Hove 01258e7412 Merge pull request #895 from joakim-hove/table-container-fixup 
Fxied bug in table-container use.
 2015-10-05 15:59:52 +02:00
Joakim Hove 545aeeeb23 Fxied bug in table-container use. 2015-10-05 15:59:08 +02:00
Joakim Hove 61d5e291d6 Merge pull request #886 from joakim-hove/table-container 
Changed Table code to use TableContainer
 2015-10-05 14:46:49 +02:00
Joakim Hove 5b15bbdde2 Changed Table code to use TableContainer 2015-10-05 09:59:29 +02:00
Joakim Hove 43d1890190 Merge pull request #889 from totto82/fixTotalRates 
Use correct units for the accumulated output
 2015-09-23 10:35:23 +02:00
Joakim Hove 34e90a0a30 Merge pull request #865 from joakim-hove/table-refactor 
Using TableManager to get tables.
 2015-09-02 11:57:53 +02:00
Joakim Hove f3151a9abe Using TableManager to get tables. 2015-09-01 12:58:09 +02:00
Joakim Hove 6579a150f3 Merge pull request #860 from joakim-hove/THPRES 
Using map base ThresholdPressure implementation.
 2015-08-25 16:23:56 +02:00
Joakim Hove c03d6f0b4b Ensure that thresholdPressure.hpp is compiled. 
Added a test to ensure that thresholdPressure is compiled; however the
test is deactivated because it requires the GridHelpers from opm-autodiff.
 2015-08-25 16:22:38 +02:00
Joakim Hove f8fb0ab7ab Using map base ThresholdPressure implementation. 2015-08-25 16:22:37 +02:00
Joakim Hove 9ad6e59ee7 Merge pull request #857 from iLoop2/ThresholdPressure 
Threshold pressure
 2015-08-24 16:54:07 +02:00
Joakim Hove 352f6bc26e Merge pull request #854 from chflo/OPM-215 
Opm 215 EclipseReader restart file read of solution data
 2015-08-23 23:09:32 +02:00
Joakim Hove a5f8921fff Merge pull request #850 from atgeirr/fix-groupcontrol-resv 
Use the correct (new) method from the Group class for group RESV.
 2015-08-14 13:47:38 +02:00
Joakim Hove 20968d9c0a Added small utility memcmp_double() 2015-08-12 14:31:07 +02:00
Joakim Hove 8820e80f4a Merge pull request #843 from chflo/opm-218-reverse 
Reverse changes that should not have been merged into master
 2015-08-10 15:26:28 +02:00
Joakim Hove 2b49064b01 Merge pull request #842 from atgeirr/move-warningutility-upstream 
Remove warning-suppression utility headers.
 2015-08-10 11:30:35 +02:00
Joakim Hove e1cf94dea1 Merge pull request #832 from joakim-hove/parsemode 
Updated tests to use ParseMode.
 2015-08-06 17:44:52 +02:00
Joakim Hove 7b6172a1f8 Updated to use ParseMode. 2015-08-06 15:56:51 +02:00
Joakim Hove 6ea7677a59 Merge pull request #837 from joakim-hove/OPM-218 
Opm 218
 2015-08-05 15:11:21 +02:00
Joakim Hove bc25ec87b7 Added RPTRST information to test deck. 2015-08-05 13:38:53 +02:00
Joakim Hove a6124d9a77 Merge pull request #831 from joakim-hove/TOPS-unittest 
Unittest creating UnstructuredGrid with TOPS.
 2015-07-24 14:20:41 +02:00
Joakim Hove 398724a053 Unittest creating UnstructuredGrid with TOPS. 2015-07-24 09:15:56 +02:00
Joakim Hove a127db5638 Merge pull request #821 from atgeirr/add-missing-include 
Add missing include statement.
 2015-06-22 13:24:03 +02:00
Joakim Hove b29ea2ae1c Merge pull request #812 from chflo/OPM-206 
Opm 206 Use IOConfig from EclipseState to decide which Eclipse output files to write (and when)
 2015-06-15 17:30:03 +02:00
Joakim Hove c52ac33dfa Added missing free( ) to malloc() memory. 2015-06-10 22:53:51 +02:00
Joakim Hove 6af549dce0 Merge pull request #804 from iLoop2/OPM-203 
Added suport for converting of Metric grid values
 2015-05-29 09:21:43 +02:00
Joakim Hove 356f50bc50 Merge pull request #770 from joakim-hove/external-cmake 
External cmake
 2015-05-15 14:37:54 +02:00
Joakim Hove 73b6422001 Merge pull request #3 from andlaus/fix_opm-cmake_build 
fix the opm-cmake duncontrol support
 2015-05-15 09:07:05 +02:00
Joakim Hove e42124afd4 Removed common build files from cmake directory 2015-05-08 10:51:17 +02:00
Joakim Hove 9cb13141ba Changed logic for finding cmake modules. 
The loading of opm related cmake modules now follows the following
logic:

 1. Try include( OpmInit )
 2. Update the cmake load path with OPM_CMAKE_ROOT and try again.
 3. Bail out.
 2015-05-08 10:49:54 +02:00
Joakim Hove f9dbdb000e Merge pull request #797 from andlaus/istl_depend_on_umfpack 
Finddune-istl.cmake: Add UMFPACK as an optional dependency
 2015-04-29 05:56:50 +02:00
Joakim Hove e1ab9d1d74 Merge pull request #791 from joakim-hove/summary-time-fixup 
Ert function ecl_sum_add_tstep() expects seconds.
 2015-04-22 09:35:06 +02:00
Joakim Hove e2c5dba11e Ert function ecl_sum_add_tstep() expects seconds. 2015-04-22 09:30:32 +02:00
Joakim Hove 640647c9ba Merge pull request #788 from joakim-hove/master 
Added bool time_in_days to ecl_sum constructor.
 2015-04-16 18:37:00 +02:00