OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2026-09-05 04:40:19 -05:00
Code Issues Packages Projects Releases Wiki Activity
5,357 Commits 31 Branches 117 Tags
cede806bd5671eeaadeafdf0a76bb01a32ff5f43
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Joakim Hove eafadaa555 Merge pull request #1222 from joakim-hove/time-map-api 
Changed to TimeMap api - using std::time_t
 2017-06-20 10:29:29 +02:00
Joakim Hove 66931cb030 Changed to TimeMap api - using std::time_t 2017-06-19 14:03:14 +02:00
Joakim Hove a61d8ab14a Merge pull request #1187 from joakim-hove/cmake-no-dev 
Added -Wno-dev to Eigen cmake args.
 2017-05-23 15:14:10 +02:00
Joakim Hove deab255468 Added -Wno-dev to Eigen cmake args. 2017-05-21 16:30:27 +02:00
Joakim Hove 71c22d1268 Merge pull request #1184 from joakim-hove/travis-cmake 
Using ppa for cmake in travis.
 2017-05-18 12:05:40 +02:00
Joakim Hove 7b7d451619 Using ppa for cmake in travis. 2017-05-18 10:46:21 +02:00
Joakim Hove 9dda677a28 Merge pull request #1177 from totto82/dummy_pr 
Dummy commit
 2017-05-12 13:39:02 +02:00
Joakim Hove 8b36daa7aa Merge pull request #1173 from joakim-hove/use-libecl 
Use libecl in jenkins build.
 2017-05-10 13:37:05 +02:00
Joakim Hove dc65d43109 Use libecl in jenkins build. 2017-05-08 15:03:12 +02:00
Joakim Hove 527c0a9e75 Using optional restart loading instead of extra. 2017-04-11 22:59:26 +02:00
Joakim Hove 5a29a012e8 Merge pull request #1117 from joakim-hove/travis-install-bc 
Install bc in travis.
 2017-04-03 13:49:44 +02:00
Joakim Hove 45863ac88d Install bc in travis. 2017-03-30 10:59:02 +02:00
Joakim Hove bdc9ffb578 Policy change: warn when missing well/group. 2017-03-15 15:41:25 +01:00
Joakim Hove b4f9e88403 Mark OPMEXTRA as not required restart data. 2017-03-10 09:58:16 +01:00
Joakim Hove dda6f58de0 Merge pull request #1062 from joakim-hove/build-trigger 
White spcae change.
 2017-02-17 10:38:15 +01:00
Joakim Hove 6ed41d282e White spcae change. 2017-02-16 15:03:27 +01:00
Joakim Hove a49aaeb579 Merge pull request #1059 from babrodtk/spellingfix 
Renamed auxillary to auxiliary
 2017-02-16 12:26:09 +01:00
Joakim Hove 5697b4377b Merge pull request #999 from joakim-hove/restart-keys 
Passing keys to the restart load function.
 2017-01-27 08:26:19 +01:00
Joakim Hove 270e5f9c0e Passing keys to the restart load function. 
- Renamed EclipseWriter -> EclipseIO.
 - Loading from restart file is a method on the EclipseIO class.
 2017-01-25 23:16:08 +01:00
Joakim Hove 557e4d7f04 Reversed relaxed tolerances for parellel tests. 2017-01-23 13:35:56 +01:00
Joakim Hove ba4cc12f73 Named tolerances used for parallel testing. 2017-01-23 13:34:48 +01:00
Joakim Hove 2e721eb9e0 Relaxed tolerances for restart testing. 2017-01-23 13:34:48 +01:00
Joakim Hove 5798e3475c Merge pull request #1032 from joakim-hove/increase-abs-dev 
Increased tolerances when running parallel tests.
 2017-01-21 08:45:37 +01:00
Joakim Hove 07d90b5c8d Increased tolerances when running parallel tests. 2017-01-21 08:44:23 +01:00
Joakim Hove 4411712dce Merge pull request #1008 from joakim-hove/correct-rsrv-dim 
Fixed output units RS and RV.
 2017-01-10 21:39:25 +01:00
Joakim Hove 6b0626272d Fixed output units RS and RV. 2017-01-09 16:20:19 +01:00
Joakim Hove 15108f3499 Merge pull request #968 from atgeirr/add-vtk-writing 
Re-add vtk writing functionality
 2016-12-06 11:09:48 +01:00
Joakim Hove 7ef40b3512 Removed all calls to writeECLData. 2016-12-06 08:34:17 +01:00
Joakim Hove 21b1b2318d Merge pull request #943 from jokva/write-init-and-egrid-rename 
Rename to EclipseWriter.writeInitial
 2016-11-22 12:59:51 +01:00
Joakim Hove e999ad7a98 Remove python tests. 2016-11-21 18:02:21 +01:00
Joakim Hove f90e608bfc Merge pull request #851 from joakim-hove/use-celldata-container 
data::Solution for opm-output communication.
 2016-10-17 11:46:45 +02:00
Joakim Hove 39be053aef Using data::Solution for transfer of 3D data. 2016-10-10 10:52:51 +02:00
Joakim Hove 67db2a5e5b Merge pull request #814 from joakim-hove/create-eclipse-grid 
Updated OutputWriter signature.
 2016-09-08 16:26:20 +02:00
Joakim Hove ff333b4112 Updated OutputWriter signature. 2016-09-08 10:18:52 +02:00
Joakim Hove d7e054cbfa Merge pull request #804 from joakim-hove/remove-shared-ptr 
shared_ptr<EclipseGrid> -> const EclipseGrid&
 2016-09-07 11:12:29 +02:00
Joakim Hove 5aa2b97c31 shared_ptr<EclipseGrid> -> const EclipseGrid& 2016-09-03 17:49:46 +02:00
Joakim Hove 10d76d5bb1 shared_ptr<EclipseGrid> -> const EclipseGrid& 2016-08-31 19:39:39 +02:00
Joakim Hove 5602e654c3 Merge pull request #795 from joakim-hove/arg-reorder 
Illustrate support of properties like KRW and FLUX in restart file.
 2016-08-23 11:30:36 +02:00
Joakim Hove 71491cac6c Merge pull request #796 from akva2/simplify_after_ert_reorg 
simplify jenkins build scripts after ert reorganization
 2016-08-22 17:29:40 +02:00
Joakim Hove 0f7c9f4b97 Added optional simProps argument to restart. 2016-08-20 20:10:50 +02:00
Joakim Hove 56a7775fee Changed order of arguments to match opm-output. 2016-08-20 20:09:56 +02:00
Joakim Hove f03fd5feee Merge pull request #794 from jokva/parser-restart-config 
Match RestartConfig interface in opm-parser
 2016-08-12 15:46:31 +02:00
Joakim Hove 0a4dfb6d69 Merge pull request #783 from pgdr/downstream-transmult-and-shared_ptrs 
TransMult, Init, and SimConfig are references, applyModifierDeck take…
 2016-08-09 09:33:18 +02:00
Joakim Hove c5b7827cbd Check more INIT keywords 
- Floating point: DX,DY,DZ and DEPTH
 - Integer: PVTNUM, SATNUM, FIPNUM, EQLNUM
 2016-07-28 07:57:00 +02:00
Joakim Hove e02db6b4e2 Minor output fixup. 2016-07-28 07:57:00 +02:00
Joakim Hove 91051a687b Refactor restart test. 
- Using Python to run flow repeatedly and compare results.
 - Cleaned up and removed unnecessary SPE1 runs from testing.
 2016-07-28 07:54:20 +02:00
Joakim Hove e7213411de Merge pull request #763 from joakim-hove/master 
Fixup from bug in ert comparison code.
 2016-07-19 07:54:24 +02:00
Joakim Hove 27535d8c8e Using ony relative differences when comparing. 2016-07-16 11:48:38 +02:00
Joakim Hove bd63d37af3 Using only relative differences when comparing. 2016-07-16 11:48:03 +02:00
Joakim Hove 48c8d15ecd Merge pull request #738 from joakim-hove/write-tran 
Write TRAN? to the INIT file.
 2016-07-01 13:56:54 +02:00
Joakim Hove b60f1ac5e7 Added Python based integration test to check TRAN? 2016-07-01 13:18:34 +02:00
Joakim Hove be71a2f8b2 Removed NNC argument from EclipseWriter ctor. 2016-07-01 12:26:25 +02:00
Joakim Hove e262d0da68 Renamed writeInit -> writeInitAndEgrid( ) 2016-07-01 12:26:25 +02:00
Joakim Hove 5a89598788 Write TRAN? to the INIT file. 2016-07-01 12:26:25 +02:00
Joakim Hove 6fffc45e5a Merge pull request #748 from atgeirr/fix-minor-bug-and-warning 
Fix minor bug and warning
 2016-06-30 22:04:03 +02:00
Joakim Hove 8d9090b8f9 Merge pull request #747 from joakim-hove/nosim-param 
Will look for param: 'nosim' and override deck.
 2016-06-29 16:41:36 +02:00
Joakim Hove 09f22f370a Will look for param: 'nosim' and override deck. 2016-06-29 08:03:38 +02:00
Joakim Hove 7649e43145 Merge pull request #736 from pgdr/add-tops-to-test-deck 
Added TOPS keyword to test deck
 2016-06-22 08:24:51 +02:00
Joakim Hove efa9a604a8 Merge pull request #723 from jokva/deprecate-wellptr 
Well shared_ptr alias deprecated
 2016-06-20 14:57:02 +02:00
Joakim Hove d6b3650160 Merge pull request #724 from jokva/eclipse-writer-nnc-constructor 
Pass NNC to OutputWriter constructor
 2016-06-16 15:56:14 +02:00
Joakim Hove 9c146eb611 Merge pull request #719 from joakim-hove/travis-reorg 
Using build-all travis configuration.
 2016-06-13 10:29:09 +02:00
Joakim Hove 56574d529a Using build-all travis configuration. 2016-06-10 13:52:16 +02:00
Joakim Hove dd5d9b34a2 Merge pull request #688 from jokva/refactor-output-restart 
Breaking opm-core dependency in opm-output; new summary implementation
 2016-06-10 13:15:46 +02:00
Joakim Hove 02da9a60f3 Merge pull request #691 from joakim-hove/solidify-restart-test 
Some checks for file open and file has keyword.
 2016-05-19 21:14:24 +02:00
Joakim Hove cb4c25ca3d Merge pull request #680 from pgdr/introducing-nnc 
Introducing NNC output
 2016-05-19 13:44:31 +02:00
Joakim Hove 3729f91b6d Some checks for file open and file has keyword. 
Using type 'const char*' instead of auto to guarantee C
interoperability.
 2016-05-19 10:02:28 +02:00
Joakim Hove 58851e8c02 Merge pull request #666 from kjellkongsvik/clean_EclipseWriter 
Remove parameters from EclipseWriter constructor
 2016-05-03 15:37:30 +02:00
Joakim Hove ef05a64a88 Merge pull request #664 from joakim-hove/remove-python 
Removed stale test code
 2016-04-29 08:01:42 +02:00
Joakim Hove 240e08733e Merge pull request #663 from joakim-hove/restart-refactor 
Change method name -> IOConfig::restart()
 2016-04-28 22:20:31 +02:00
Joakim Hove ead88e9ee4 Change method name -> IOConfig::restartRequested() 2016-04-28 15:58:17 +02:00
Joakim Hove db3bbbe65e Removed stale test code 2016-04-26 17:51:11 +02:00
Joakim Hove 1f64f79f6d Merge pull request #657 from pgdr/eclipsegrid-is-input 
Using getInputGrid API from Parser
 2016-04-20 15:50:33 +02:00
Joakim Hove 6f6f1afb8f 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-04-14 11:32:08 +02:00
Joakim Hove d23c4e5518 Updated to use ParseMode. 2016-04-14 11:32:08 +02:00
Joakim Hove 9f6d658486 Removed WellsManager constructor which takes an ole Eclipsegridparser instance. 2016-04-14 11:32:07 +02:00
Joakim Hove 2defd015ad Merge pull request #641 from atgeirr/rename-autodiff 
Rename opm-autodiff -> opm-simulators.
 2016-04-10 22:15:12 +02:00
Joakim Hove f3f8ce82c4 Merge pull request #602 from joakim-hove/remove-sim-state 
Replaced SimulatorState -> SimulationDataContainer
 2016-03-29 13:16:38 +02:00
Joakim Hove e843461b37 Merge pull request #962 from joakim-hove/remove-simulator-state 
Replaced SimulatorState -> SimulationDatacontainer
 2016-03-29 13:16:19 +02:00
Joakim Hove 18c07d5d66 Replaced SimulatorState -> SimulationDataContainer 2016-03-29 10:48:36 +02:00
Joakim Hove 38628de09e 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 b42700c6a8 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 0e0e92aa71 Merge pull request #620 from chflo/move_log_functionality 
Changed includes due to OpmLog moved from parser to common
 2016-03-21 22:15:14 +01:00
Joakim Hove c1b1b9296f Merge pull request #617 from qilicun/rename-ParseMode 
Rename parse mode
 2016-03-17 09:52:45 +01:00
Joakim Hove c17ffbb111 Merge pull request #614 from qilicun/use-prtlog 
use EclipsePRTLog.
 2016-03-15 08:29:35 +01:00
Joakim Hove 7ddd1c1c80 PolymerState changes 
- The PolymerState class will derive from SimulatorState, instead of
   containing a TwoPhaseState instance.

 - The Polymer calculation methods take PolymerState& input argument
   instead of TwoPhaseState&
 2016-02-22 18:42:13 +01:00
Joakim Hove dff635e7b9 Merge pull request #579 from jokva/unique-auto-deck 
Change Deck access methods/types to references
 2016-02-19 13:36:06 +01:00
Joakim Hove a9262e4574 Set abs_diff limit for restart_test to 1e-2 2016-02-19 13:00:27 +01:00
Joakim Hove f5694ffe57 Merge pull request #594 from joakim-hove/fix-restart-test 
Fix restart test
 2016-02-19 08:06:55 +01:00
Joakim Hove 95752bcd97 Added absolute eps for comparison. 2016-02-19 07:42:38 +01:00
Joakim Hove d1b30f4f48 Changed wording: relative -> absolute 2016-02-19 07:41:53 +01:00
Joakim Hove b41f70cad0 Merge pull request #567 from joakim-hove/table-column 
Table column
 2016-01-08 15:29:21 +01:00
Joakim Hove 24601480e3 Using new Table api. 2016-01-08 13:57:38 +01:00
Joakim Hove 833f5d053f Avoid using Deck. 
Removed incorrect use of Deck for polymer and solvent properties.
 2016-01-08 13:57:37 +01:00
Joakim Hove 8302db443b Try to find opm-data and run flow on SPE1 case. 2015-10-21 18:43:08 +02:00
Joakim Hove a879e9cd41 Removed cmake setting : NON_PUBLIC_TEST 2015-10-21 16:56:10 +02:00
Joakim Hove 0a7c778c36 Changes to solver approach configuration: 
1. Added new parameter group string: "solver_approach" which can take
    the values {direct, cpr, interleaved}.

 2. Hierarchy:

    i   If a value is set in the parameter group that takes absolute
        presedence.

    ii  If the Eclipse input deck asks for CPR - you get CPR.

    iii You get the flow default - currently interleaved.
 2015-10-21 13:01:44 +02:00
Joakim Hove 0149732abc Merge pull request #493 from joakim-hove/relocate-warning-headers 
Updated path to warning suppression header.
 2015-10-06 16:06:05 +02:00
Joakim Hove 76f674b16b Updated path to warning suppression header. 2015-10-06 12:11:49 +02:00
Joakim Hove f3437a67f7 Merge pull request #488 from joakim-hove/table-container 
Changed Table code to use TableContainer
 2015-10-05 14:47:13 +02:00
Joakim Hove 1a0358d85a Using TableContainer. 2015-10-04 09:00:01 +02:00