Markus Blatt
c282949400
Merge remote-tracking branch 'upstream/master' into master-refactor-for-cpgrid-support
...
Manually resolved conflicts:
opm/core/io/eclipse/EclipseWriter.cpp
opm/core/io/eclipse/EclipseWriter.hpp
opm/core/props/BlackoilPropertiesFromDeck.cpp
opm/core/simulator/initState_impl.hpp
opm/core/wells/WellsManager.cpp
opm/core/wells/WellsManager.hpp
2014-03-27 15:27:11 +01:00
Joakim Hove
f0126b2501
Removed WellsManager constructor which takes an ole Eclipsegridparser instance.
2014-03-25 18:57:58 +01:00
Atgeirr Flø Rasmussen
5fc6cbc16f
Made single-argument constructors explicit.
...
Avoids unintended implicit conversions.
2014-03-17 13:27:50 +01:00
Markus Blatt
c6daebc35d
Merge branch 'refactor-for-cpgrid-support' into master-refactor-for-cpgrid-support
...
Manually resolved conflicts in:
opm/core/props/BlackoilPropertiesFromDeck.cpp
opm/core/wells/WellsManager.cpp
2014-03-13 13:41:45 +01:00
Markus Blatt
2d54a7398b
Refactored WellsManager to partial use without UnstructuredGrid.
2014-02-25 17:52:51 +01:00
Kristian Flikka
a055b529ec
Add handling of WGRUPCON to new-parser friendly WellsManager constructor
2014-02-24 15:24:33 +01:00
Markus Blatt
21864388bd
Merge remote-tracking branch 'origin/opm-parser-integrate' into refactor-for-cpgrid-support
...
Resolved Conflicts:
opm/core/props/BlackoilPropertiesFromDeck.cpp
opm/core/props/rock/RockFromDeck.hpp
opm/core/props/satfunc/SaturationPropsFromDeck.hpp
opm/core/props/satfunc/SaturationPropsFromDeck_impl.hpp
2014-02-19 15:22:18 +01:00
Markus Blatt
d5f470cb68
Refactored parts needed for Blackoil in autodiff to get rid of UG dependency.
...
This patch refactors (hopefully) all parts of opm-core that are needed
by the fully implicite black oil solver in opm-autodiff and that inherently
relied on UnstructuredGrid.
We added a new simple grid interface consisting out of free functions
that will allow us to use CpGrid without copying it to an UnstructuredGrid
by the means of the GridAdapter. Using this interface we have add methods that
allow specifying the grid information (global_cell, cartdims, etc.) wherever
possible to prevent introducing grid parameters for the type of the grid.
Unfortunately this was not possible everywhere.
2014-02-17 13:23:01 +01:00
Kristian Flikka
ab42682399
Removed old EclipseGridParser from WellsManager constructor, WGROUPCON still missing
2014-02-14 15:36:32 +01:00
Kristian Flikka
3c93c7a781
Added building of WellsCollection group structure from new opm-parser objects
2014-02-14 13:43:25 +01:00
Kristian Flikka
3d215691da
Removed WELTARG commented code, moved wellperf_data into createWellsFromSpecs function
2014-02-03 09:22:28 +01:00
Kristian Flikka
76dff2e326
Extracted well controls setup to separate function
2014-02-03 09:07:58 +01:00
Kristian Flikka
e12ec1b25d
Extracted well specification and completion data setup to a function
2014-02-03 08:58:54 +01:00
Kristian Flikka
7ce9cb9055
Compdat extraction from new CompletionXXX classes
2014-01-29 11:58:13 +01:00
Kristian Flikka
731fe7d3f4
Changed new WellsManager constructor to take in EclipseStateConstPtr instead of SchedulePtr
2014-01-08 16:10:55 +01:00
Kristian Flikka
1f1c0ebcf3
New constructor for WellsManager that also takes the new parser as argument. New test comparing old and new
2014-01-07 16:10:45 +01:00
Júlio Hoffimann
c077912466
Remove trailing whitespaces
2013-07-28 08:34:13 -03:00
Bård Skaflestad
d6154d8961
Clone wells object when constructing from existing.
...
This installs a measure of safety on the part of the interface in that
the caller is free to dispose of the wells object upon returning from
the WellsManager constructor.
2012-10-05 10:15:06 +02:00
Halvor Møll Nilsen
044c13e9fb
Added constuctor to WellManager which used Wells struct.
2012-10-05 10:14:55 +02:00
Atgeirr Flø Rasmussen
611cd53380
Reorganized, added opm/core/wells/ and opm/core/simulator/.
2012-06-05 15:42:49 +02:00
