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
1,367 Commits 31 Branches 117 Tags
5936c59e22aeb0ecb121542c519b07fbed65e4fe
Commit Graph
57 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Joakim Hove feeaeb1d2e Changed the data files used for testing: 
1) Added RUNSPEC section
2) Replaces DEPTHZ keyword with TOPS keyword.
 2014-04-24 15:26:39 +02:00
Joakim Hove f0126b2501 Removed WellsManager constructor which takes an ole Eclipsegridparser instance. 2014-03-25 18:57:58 +01:00
Joakim Hove 2eab8aeb38 Changed the access to Parser/EclipseState/Schedule to use new well injection and production properties. To be aligned with opm-parser:e75970a28b96374409a55e3e6cea2198b6a0ea23 2014-03-21 00:35:15 +01:00
Joakim Hove ca7de3c7c1 Will check if a well is open before throwing for an invalid control. 2014-03-12 20:27:17 +01:00
Joakim Hove 7413894a67 Removed cpos = ~cpos constructions for closing a well; using well_controls_shut_well explicitly instead. 2014-03-12 17:41:40 +01:00
Joakim Hove 8be1f0e8d3 Changed open / close behaviour of well_controls: 1) well_controls has an explicit open_close flag. 2) Will NOT flip current value to change open|close status 2014-03-04 20:23:19 +01:00
Joakim Hove e5f1e1b0b8 Merge remote-tracking branch 'upstream/master' into opm-parser-integrate 2014-02-26 23:16:10 +01:00
Joakim Hove 4982a913ee Merge pull request #493 from flikka/wellsmanager-group-refactor 
Adding support for creation of groups from "new style" Wells and Groups (new parser)
 2014-02-14 13:54:24 +01:00
Joakim Hove 0393a8f87d Merge pull request #467 from andlaus/parser-integrate_rock_properties 
add variants of all methods which take a deck of the new parser to the rock properties
 2014-02-11 18:13:07 +01:00
Joakim Hove 88c99663c6 Merge pull request #469 from andlaus/parser-integrate_phase_usage_from_deck 
git add variant of phaseUsageFromDeck() which takes a deck of the new parser
 2014-02-10 13:30:39 +01:00
Joakim Hove 5d8c1244db Merge remote-tracking branch 'upstream/opm-parser-integrate' into opm-parser-integrate 2014-02-07 09:23:39 +01:00
Joakim Hove 97bfb0ed82 Merge remote-tracking branch 'upstream/master' into opm-parser-integrate 2014-02-07 09:23:22 +01:00
Joakim Hove 2c05b6a1b4 Merge remote-tracking branch 'upstream/master' into opm-parser-integrate 2014-02-05 23:06:54 +01:00
Joakim Hove ca2def2a02 Merged upstream/master 2014-02-04 21:42:07 +01:00
Joakim Hove 30df3cab37 Using well->hasInjectionControl() to check whether a particular control is available. 2014-01-30 16:37:20 +01:00
Joakim Hove 35d0808fbe Implemented WCONPROD support from Parser::Schedule object. 2014-01-30 15:55:17 +01:00
Joakim Hove 3e2df33a65 Merge remote-tracking branch 'upstream/opm-parser-integrate' into wellsmanager-rates 
Conflicts:
	opm/core/wells/WellsManager.cpp
 2014-01-30 09:50:09 +01:00
Joakim Hove 70e2dd9f12 Implemented well injector properties from opm-parser::Well. 2014-01-30 08:02:13 +01:00
Joakim Hove 0d8b883b8e Added namespace prefix to enum. 2014-01-30 08:00:45 +01:00
Joakim Hove 9f948329c4 Merge remote-tracking branch 'upstream/master' into opm-parser-integrate 2014-01-29 11:02:21 +01:00
Joakim Hove 1548984acd Merge remote-tracking branch 'upstream/master' into wellsmanager-rates 2014-01-29 11:01:14 +01:00
Joakim Hove 7774a11eee WellType is determined from well->isProducer() instead of looking for WCONINJE / WCONPROD keywords. 2014-01-24 12:00:58 +01:00
Joakim Hove 704382ac8c Merge remote-tracking branch 'upstream/master' into opm-parser-integrate 
Conflicts:
	CMakeLists_files.cmake
 2014-01-10 13:04:00 +01:00
Joakim Hove f00e3d5763 Comparing well names protects againts NULL. 2014-01-08 16:10:43 +01:00
Joakim Hove d96b88742e Removed commented out code. 2014-01-08 15:58:11 +01:00
Joakim Hove ddf6a3c084 Removed access to internal variabel cpty. 2014-01-08 11:32:00 +01:00
Joakim Hove 370f9f0458 Using && instead of &= in the functions comparing wells and well_controls. 2014-01-06 19:22:39 +01:00
Joakim Hove 9fa7362992 Removed explicit (struct WellControls *) cast to align with the rest of the code. 2014-01-06 19:09:36 +01:00
Joakim Hove b22b3f9fe2 Moved struct WellControls to the implementation file well_controls.c. 2014-01-06 15:13:32 +01:00
Joakim Hove c970363f5e Implemented well_controls based on well_controls_get_xxx() functions. 2014-01-06 14:59:11 +01:00
Joakim Hove 8ef5b2b695 Implemented well_controls based on well_controls_get_xxx() functions. 2014-01-06 14:51:11 +01:00
Joakim Hove 027ffb3c5a Implemented well_controls based on well_controls_get_xxx() functions. 2014-01-06 14:40:55 +01:00
Joakim Hove 8132954b85 Added functions to get type, target and distr of *current* control. 2014-01-06 14:40:03 +01:00
Joakim Hove 4db3a70e05 Implemented well_controls based on well_controls_iset_xxx() functions. 2014-01-06 14:19:09 +01:00
Joakim Hove 965c12a689 Implemented well_control based on well_controls_iset_xxx() functions. 2014-01-06 12:40:03 +01:00
Joakim Hove 2ee6331ac1 Implemented well_controls_add_new() with well_controls_iset_xxx() functions. 2014-01-06 12:24:32 +01:00
Joakim Hove 6098368d08 Added new function well_controls_iset_distr(). 2014-01-06 12:22:15 +01:00
Joakim Hove 3d171bd961 Using new function well_controls_invert_current(). 2014-01-06 12:08:29 +01:00
Joakim Hove bf95c9f768 Added new functions to set target and type and invert value of current control. 2014-01-06 12:06:36 +01:00
Joakim Hove 8819f7f42c Changes test_wells to use well_controls_get_xxx() functions. 2014-01-06 10:34:25 +01:00
Joakim Hove efcb1103d1 Changed test_wellsmanager to use well_controls_get_xxx() functions. 2014-01-06 10:26:46 +01:00
Joakim Hove d783028bcb Using well_controls_get_num() and well_controls_get|set_current() in WellsManager 2014-01-06 10:12:11 +01:00
Joakim Hove 17b800796f Temporarily added symbol HAVE_WELLCONTROLS before including well_controls.h - to get acces to the internal elements in struct WellControls. 2014-01-05 16:25:31 +01:00
Joakim Hove 3653404c41 Reimplemnted struct WellControls access to use the set/get functions in well_controls.c 2014-01-05 16:23:22 +01:00
Joakim Hove aea54d073a Added well_controls_get_xxx() and well_controls_set_xxx() functions. The well_controls_reserved() function is called from well_controls_add() and not explicitly. 2014-01-05 16:22:30 +01:00
Joakim Hove fb8413960c Removed #include <opm/core/well_controls.h> from wells.h and inserted explicit #include <opm/core/well_controls.h> where needed. 2014-01-05 15:03:30 +01:00
Joakim Hove 157d0870f2 Removed struct WellControlManagement and replaced with simple integer field cpty in the WellControls structure. 2014-01-05 14:54:56 +01:00
Joakim Hove 8acdf34653 Moved well_controls implementation to separate file well_controls.c. 2014-01-05 14:47:15 +01:00
Joakim Hove 0450e1bb77 Extracted everything related to well controls to separate header well_controls.h - to simplify introducing new parser. 2014-01-03 16:04:12 +01:00
Joakim Hove ec71334d74 Added test calls to wells_equal() and well_controls_equal(). 2014-01-03 16:01:15 +01:00
Joakim Hove 487ff810fd Added test_wellmanager which loads wellmanager from deck and tests many values. 2014-01-03 16:00:57 +01:00
Joakim Hove 42a4fa704e Merge remote-tracking branch 'upstream/master' into opm-parser-integrate 2013-12-08 18:38:38 +01:00
Joakim Hove 0c620fb72a Merge remote-tracking branch 'upstream/master' into opm-parser-integrate 2013-11-25 15:54:01 +01:00
Joakim Hove 1829acd201 Added very simple parser test to check a parser can be instantiated and a simple file parsed 2013-11-14 12:52:12 +01:00
Joakim Hove 5798b5f9f1 Added test with accompanying data for Blackoilstate::equals() 2013-10-28 17:43:29 +01:00
Joakim Hove 877829f43a Added method equals in BlackoilState.hpp 2013-10-28 17:42:32 +01:00
Joakim Hove 368e1813a1 Using Datamapper.h in writeVtkData 2012-06-28 13:20:18 +02:00