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
|
f00e3d5763
|
Comparing well names protects againts NULL.
|
2014-01-08 16:10:43 +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
|
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
|
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 |
|
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 |
|
Andreas Lauser
|
40fe2abf04
|
make config.h the first header to be included in any compile unit
this is required for consistency amongst the compile units which are
linked into the same library and seems to be forgotten quite
frequently.
|
2013-04-10 12:56:14 +02:00 |
|
Atgeirr Flø Rasmussen
|
c78b7de680
|
Renamed newwells.h -> wells.h.
Also moved implementation file to subdir.
|
2013-03-18 10:33:34 +01:00 |
|