OilfieldToolsNet/opm-simulators
4
0 Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2026-10-12 17:02:02 -05:00
Code Issues Packages Projects Releases Wiki Activity
3,977 Commits 31 Branches 117 Tags
09a86747b5c9cfe09d0b812b42381f0302e01838
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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 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 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 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
Joakim Hove a9a42e82be Changed Table code to use TableContainer 2015-10-04 07:45:58 +02:00
Joakim Hove 009ae54523 Merge pull request #449 from joakim-hove/table-refactor 
Using TableManager to get tables.
 2015-09-02 11:58:17 +02:00
Joakim Hove d2cd65fe34 Merge pull request #140 from joakim-hove/table-refactor 
Using TableManager to get tables.
 2015-09-02 11:58:01 +02:00
Joakim Hove 9bd8d73a26 Using TableManager to get tables. 2015-09-01 13:14:51 +02:00
Joakim Hove 86dfd557a0 Using TableManager to get tables. 2015-09-01 13:02:15 +02:00
Joakim Hove 8c6f06147e 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 f3dd2451d2 Using map base ThresholdPressure implementation. 2015-08-25 16:22:37 +02:00
Joakim Hove 13262f6d28 Merge pull request #443 from iLoop2/ThresholdPressure 
Added suport for new Threshold Pressure behavior
 2015-08-24 16:54:12 +02:00
Joakim Hove cd02c3fb83 Merge pull request #429 from joakim-hove/parsemode2 
Using new string based ParseMode api.
 2015-08-10 14:36:27 +02:00
Joakim Hove 6680279815 Using new string based ParseMode api. 2015-08-09 22:18:36 +02:00
Joakim Hove b58aafe896 Merge pull request #427 from joakim-hove/parsemode-fixup 
Removed extre trailing '/'
 2015-08-06 18:40:15 +02:00
Joakim Hove 83c14a4dd7 Removed extre trailing '/' 2015-08-06 18:39:36 +02:00
Joakim Hove fc2223605e Merge pull request #136 from joakim-hove/parsemode 
Added ParseMode argument
 2015-08-06 17:45:43 +02:00
Joakim Hove 578fb09310 Merge pull request #421 from joakim-hove/parsemode 
Added ParseMode argument to parse and EclipseState
 2015-08-06 17:45:01 +02:00
Joakim Hove 796a34bebe Updated to use ParseMode. 2015-08-06 15:56:51 +02:00
Joakim Hove 5ed11e4af9 Merge pull request #426 from joakim-hove/OPM-218 
Opm 218
 2015-08-05 15:11:28 +02:00
Joakim Hove 7bd36a6b65 Addde ParseMode argument to parse and EclipseState 2015-08-05 14:18:05 +02:00
Joakim Hove 6a841cfa83 Added new 'false' argument to writeTimeStep() 2015-08-05 13:46:17 +02:00
Joakim Hove 71f3cc9c64 Added ParseMode argument 2015-07-27 13:53:11 +02:00
Joakim Hove 304cf22a5b Merge pull request #395 from chflo/OPM-212 
OPM-212: Added parameter override of IOConfig Restart write setting
 2015-06-15 17:30:13 +02:00
Joakim Hove 55d05b1038 Merge pull request #380 from joakim-hove/cmake-fixup 
Removed .cmake extension from include()
 2015-05-15 15:44:23 +02:00
Joakim Hove 78437a29e3 Removed .cmake extension from include() 2015-05-15 15:44:02 +02:00
Joakim Hove 01c7e66419 Merge pull request #95 from joakim-hove/external-cmake 
External cmake
 2015-05-15 14:38:34 +02:00
Joakim Hove 0f9a19b5af Merge pull request #336 from joakim-hove/external-cmake 
External cmake
 2015-05-15 14:38:20 +02:00
Joakim Hove d3741ab9af Added support for building with duncontrol 2015-05-15 14:34:17 +02:00
Joakim Hove 605397beae Removed cmake/ directory 2015-05-15 14:30:52 +02:00
Joakim Hove 8150bd3075 Changed logic for finding cmake modules 2015-05-15 14:30:51 +02:00
Joakim Hove ec7d0f9472 Merge pull request #350 from edbru/OPM-186 
Implemented NOSIM keyword.
 2015-04-28 11:55:18 +02:00
Joakim Hove 8e9cc4728e Merge pull request #275 from joakim-hove/use-OpmLog 
Using OpmLog instead of explicit logger
 2015-03-09 08:08:07 +01:00
Joakim Hove 9b7d84bd9f ERT-830: Using OpmLog instead of explicit logger 2015-03-09 08:00:13 +01:00
Joakim Hove c021b66c18 The stream::open() functions require c_str() 2015-02-12 17:25:40 +01:00
Joakim Hove 02b682ea52 Merge pull request #297 from qilicun/support_minpvf 
support MINPVF.
 2015-02-12 09:34:35 +01:00
Joakim Hove a2ae3baea3 Protecting against use of unassigned deck values. 2015-01-14 11:41:41 +01:00
Joakim Hove f1e64a3b9b Merge pull request #257 from joakim-hove/move-log 
Renamed ParserLog -> OpmLog
 2014-12-16 13:23:17 +01:00
Joakim Hove 78ba6760da ERT-747: Renamed ParserLog -> Logger 2014-12-15 12:23:09 +01:00