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
|
b22b3f9fe2
|
Moved struct WellControls to the implementation file well_controls.c.
|
2014-01-06 15:13:32 +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
|
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 |
|
Kristian Flikka
|
e4a7a33598
|
Implementation (not finished) of wells_equal, well_controls_equal, and tests. To build a WellsManager test for old and new parser
Conflicts:
CMakeLists_files.cmake
|
2014-01-03 16:00:10 +01:00 |
|
Atgeirr Flø Rasmussen
|
71057d69db
|
Clean up well docs.
Needed to rename structs in legacy_well.h to avoid clash in docs.
|
2013-03-20 14:14:53 +01:00 |
|
Atgeirr Flø Rasmussen
|
c78b7de680
|
Renamed newwells.h -> wells.h.
Also moved implementation file to subdir.
|
2013-03-18 10:33:34 +01:00 |
|