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
3,199 Commits 31 Branches 117 Tags
0e0e92aa714ebb9a4eee18c8359d86022f0783e6
Commit Graph
93 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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 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 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 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
Joakim Hove 59438c624a Merge pull request #87 from andlaus/remove_strict_parsing 
adapt to the removal of the "strict parsing" concept
 2014-12-11 13:20:12 +01:00
Joakim Hove d948777ea0 Merge pull request #255 from andlaus/remove_strict_parsing 
adapt to the removal of the "strict parsing" concept
 2014-12-11 13:20:08 +01:00
Joakim Hove c6445dbe8f FindERT.cmake: Look for libecl_well library 2014-12-08 13:05:26 +01:00
Joakim Hove 29a0c723ef Python class TransGraph to load json from opm_init_check 2014-11-26 14:56:45 +01:00
Joakim Hove ad92edab89 Added opm_init_check to compare OPM and Eclipse. 2014-11-26 14:56:45 +01:00
Joakim Hove e0d39027d0 Added ignore to emacs per directory configuration file. 2014-11-26 14:56:45 +01:00
Joakim Hove 664120880a Merge pull request #221 from andlaus/fix_pr213_fallout 
fix the fallout caused by the slightly too premajure merge of PR #213
 2014-10-10 16:51:13 +02:00
Joakim Hove 68cf022a9d Merge pull request #213 from andlaus/print_parser_log 
sim_fibo_ad*: print the log messages from the parser/EclipseState
 2014-10-10 15:40:56 +02:00
Joakim Hove 42e6020b9e Merge pull request #67 from andlaus/table_improvements 
adapt the the table related API changes of opm-parser
 2014-09-19 15:28:04 +02:00
Joakim Hove 2a9f6e8d35 Merge pull request #203 from andlaus/table_improvements 
dapt the the table related API changes of opm-parser
 2014-09-19 15:27:35 +02:00
Joakim Hove 99f1620963 Merge pull request #167 from andlaus/do_not_pass_shared_ptr_to_EclipseWriter 
pass a reference to the UnstructuredGrid to EclipseWriter instead of a shared_ptr
 2014-07-18 11:51:31 +02:00
Joakim Hove a6ec0bb59c Using the Parser::EclipseGrid to create GridManager 2014-04-24 11:47:01 +02:00
Joakim Hove 2f23e72bea Removed calls to WellsManager() constructor which uses old EclipseGridParser. 2014-03-25 19:36:42 +01:00
Joakim Hove b398ce3b3d Removed Wellsmanager constructor which used old EclipseGridParser instance. 2014-03-25 19:12:19 +01:00
Joakim Hove 0c36af631f Using well_controls_well_is_open() function 2014-03-04 14:49:54 +01:00
Joakim Hove fb3824e0da Raised the opm-core boost dependency to 1.44 to reflect parser requirement 2014-02-28 17:52:14 +01:00
Joakim Hove b834cfb899 Removed explicit cJSON dependency from opm-core 2014-02-28 17:52:13 +01:00
Joakim Hove c3c3817d80 Added required dependencies on opm-parser and CJSON 2014-02-28 17:50:20 +01:00
Joakim Hove 3208c61472 Merge pull request #89 from andlaus/parser-integrate_new_simulatortimer 
Parser integrate new simulatortimer
 2014-02-27 14:43:00 +01:00
Joakim Hove 745c62a551 Merge remote-tracking branch 'upstream/master' into opm-parser-integrate 2014-02-26 23:31:13 +01:00
Joakim Hove 7b7726700e Merge pull request #72 from andlaus/parser-integrate-read_pvt_and_grid 
Parser integrate: read pvt and grid
 2014-02-18 11:33:39 +01:00
Joakim Hove 0a8430690f Merge pull request #82 from flikka/fix-sim_fibo_ad_test 
Trying to get the test back running, by looking at the sim_fib_ad main m...
 2014-02-06 09:07:59 +01:00
Joakim Hove 3318f506b3 Merge remote-tracking branch 'upstream/master' into opm-parser-integrate 2014-02-04 21:35:27 +01:00
Joakim Hove 0138fc43ef Merged upstream/master 2014-01-29 15:25:21 +01:00
Joakim Hove 37314fd284 Merge pull request #75 from flikka/update-parser-dep 
parse function in libParser renamed, fixed in sim_fibo_ad
 2014-01-13 01:38:10 -08:00
Joakim Hove ed23e017f9 Merge remote-tracking branch 'upstream/master' into opm-parser-integrate 2014-01-10 13:05:20 +01:00
Joakim Hove bd1417b164 Changed to use well_controls_get_current_distr(). 2014-01-09 12:09:19 +01:00
Joakim Hove a2fd7307b8 Using the well_controls_get_xxx() functions. 2014-01-09 12:06:26 +01:00
Joakim Hove 427f55940e Changed direct access to struct WellControls to use well_controls_get_xxx() api. NB: Do check the calls to well_control_iget_distr(). 2014-01-09 09:39:16 +01:00
Joakim Hove 37274035bc Changed direct access to struct WellControls to rather use well_controls_get_xxx() api. 2014-01-09 09:39:08 +01:00
Joakim Hove 4e65151271 Merge remote-tracking branch 'upstream/opm-parser-integrate' into opm-parser-integrate 2013-12-17 11:59:47 +01:00
Joakim Hove 691691b280 Merge remote-tracking branch 'upstream/master' into opm-parser-integrate 2013-12-08 18:41:06 +01:00
Joakim Hove accd3e637d Merge pull request #71 from flikka/opm-parser-integrate 
Fixed sim_fibo_ad, by adding EclipseWriter
 2013-12-05 04:40:56 -08:00
Joakim Hove ba138afc2a Merge remote-tracking branch 'upstream/master' into opm-parser-integrate 2013-12-02 15:03:24 +01:00
Joakim Hove 44e02ead25 Merge remote-tracking branch 'upstream/master' into opm-parser-integrate 2013-11-27 14:07:36 +01:00
Joakim Hove 3eca4014a6 Merge pull request #66 from flikka/integration-tests-parser-dep 
Integration tests , with a small usage of the new Schedule class
 2013-11-27 04:55:05 -08:00
Joakim Hove 4ea99a96d9 Merge remote-tracking branch 'upstream/master' into opm-parser-integrate 2013-11-25 16:00:12 +01:00
Joakim Hove 2405462a38 Changed the check_cxx_source_compiles() in Findopm-parser to look for Deck.hpp; Parser.hpp had uneccasary complicated interaction with cJSON 2013-11-25 11:38:12 +01:00
Joakim Hove 1764c1fffa Updated to require opm-parser. Identical to opm-core PR:433 2013-11-18 14:49:38 +01:00
Joakim Hove 40b6aadc98 Updated modules to find Opm-parser 2013-11-05 09:55:43 +01:00
Joakim Hove a99277efdf Updated modules for Findcjson and Findopm-parser 2013-11-05 09:55:42 +01:00
Joakim Hove eab166feea Added opm-parser-prereqs.cmake 2013-11-05 09:55:41 +01:00
Joakim Hove aefaaf6e91 Added CMake find modules opm-parser and cjson 2013-11-05 09:55:41 +01:00