Commit Graph
38 Commits
Author SHA1 Message Date
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 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 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 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