Commit Graph

370 Commits

Author SHA1 Message Date
Joakim Hove
4a22657e76 Added iterator support to GridProperties<T>
- Removed std::vector<> storage of GridProperty<T> objects.
 - Completely removed std::shared_ptr<> from GridProperties<T>.
2016-07-13 23:45:06 +02:00
Jørgen Kvalsvik
d7aae5b75a Fix warnings in GridPropertyTests 2016-07-13 23:40:10 +02:00
Jørgen Kvalsvik
ecb2f0a1ab Fix warnings in SatfuncPropertyInitTests 2016-07-13 23:40:10 +02:00
Jørgen Kvalsvik
de31ac9743 Fix warnings in NNC 2016-07-13 23:40:09 +02:00
Jørgen Kvalsvik
a7e45bf7d4 Fix warnings in GridProperty 2016-07-13 23:40:09 +02:00
Jørgen Kvalsvik
f36851d127 Fix warnings in GridDims 2016-07-13 23:40:09 +02:00
Joakim Hove
84321ba48d Changes to Properties lookup:
1. The normalizing in keyword names has been moved from
   Eclipse3DProperties to GridProperties.

2. The normalizing does both UPPERCASE and removes trailing
   whitespace.
2016-07-13 14:56:15 +02:00
Joakim Hove
f16283e367 Removed the EclipseGrid.fwriteEGRID() method. 2016-07-12 14:28:57 +02:00
Jørgen Kvalsvik
3696b750cd Remove opm-common dependency
Severs the code dependency on opm-commmon. There was no actual
functional dependency here, with the exception of some enable/disable
warning headers. To properly make opm-parser a stand-alone module the
usage of these headers have been removed and the dependency on
opm-common is gone.
2016-07-08 15:53:40 +02:00
Joakim Hove
20bbeeda56 Added EclipseGrid::getActiveMap(). 2016-06-30 08:32:45 +02:00
Anders Matheson
7c6ef1f786 Add missing namespace and include file 2016-06-27 10:20:07 +02:00
Pål Grønås Drange
5b3eaada22 EclipseState demands full deck now, so added D(X|Y|Z) and TOPS to tests 2016-06-21 15:55:04 +02:00
Pål Grønås Drange
49f3356934 Removed getDims() and disable this EclipseGrid
* Removed method getDims since getNXYZ already exists
* Now we throw if EclipseGrid get lean deck
* Removed tests for assertCellInfo and hasCellInfo
* Fixed ResinsightTests to use GridDims
2016-06-21 14:56:34 +02:00
Pål Grønås Drange
1fada954e2 Merge and rebase fixup 2016-06-21 13:13:00 +02:00
Pål Grønås Drange
ff26034445 Added DIMENS/SPECGRID test case, several GridDims changes
* Added a test to ensure DIMENS/SPECGRID are handled consistently
* Added GridDims.cpp source file and moved code from header
* Added GridDims.(c|h)pp to CMakeLists
* Removed use of MessageContainer in GridDims, updated calls
* Made function getDims(keyword) inline readDims
* Reformatted GridDimens
2016-06-21 12:39:16 +02:00
Pål Grønås Drange
ce4bbe8b9f Rewrote EclipseGrid to use std::array when 3D 2016-06-21 12:39:15 +02:00
Pål Grønås Drange
1176c56325 Fixed bug ref assign from value 2016-06-21 12:34:57 +02:00
Pål Grønås Drange
55e950a9a4 Fixed GridDims after rebase, removed ERT knowledge in GridDims 2016-06-21 12:34:57 +02:00
Pål Grønås Drange
12b1815f7b initial griddims 2016-06-21 12:34:11 +02:00
Pål Grønås Drange
96fe8e9968 Merge pull request #853 from pgdr/multregt-faults-ref
Minor refactor. Changed shared_ptr to references in EclipseState and related objects
2016-06-21 12:31:53 +02:00
Pål Grønås Drange
30b03b6aec Fixed value/reference bug, changed init to add...
* Fixed a Section to Section& bug that occurred after removing ptr's
* Renamed initFaults to addFaultFace
* Organized imports in EclipseState and Eclipse3DProperties
* Fixed 2013 to 2016 error in header in E3DP
2016-06-21 11:43:20 +02:00
Pål Grønås Drange
ff9ee958d7 Minor refactor. Changed shared_ptr to references in EclipseState, MULTREGTScanner and FaultCollection 2016-06-20 12:27:56 +02:00
Joakim Hove
a7e3d50e53 Cornerpoint based EclipseGrid constructor. 2016-06-16 22:24:39 +02:00
Joakim Hove
3ab1559a2b Improved error msg. 2016-06-16 16:05:02 +02:00
Joakim Hove
1e8a19f729 Hide unused variable. 2016-06-15 15:41:47 +02:00
Pål Grønås Drange
1c5ce34a96 Using Utility/String.hpp helper function uppercase 2016-06-14 17:43:37 +02:00
Pål Grønås Drange
3f980665e9 Supporting reading and writing mixed case properties/keyword 2016-06-14 12:54:37 +02:00
Joakim Hove
152069351c Added EclipseGrid::activeIndex( ) NB: throws!! 2016-05-27 15:14:40 +02:00
Joakim Hove
0792121bec EclipseGrid copy constructor.
Removed EclipseGrid::EclipseGrid( ecl_grid_type * )
2016-05-27 15:14:39 +02:00
Jørgen Kvalsvik
ae8769ff7c Removed unused EclKW. 2016-05-26 09:22:07 +02:00
Joakim Hove
5cf9932b1d Refactored Eclipse3DProperties
- Moved the handling of keywords from Eclipse3DProperties to
   GridProperties<T>.

 - The GridProperty<T> postprocessor is invoked from
   GridProperties<T>::getKeyword() method. The question of whether the
   postprocessor should be invoked or not is determined by the
   overload:

     public:
       const GridProperty<T>& getKeyword(const std::string) const;

     private:
       GridProperty<T>& getKeyword(const std::string);

   The public const overload will run the postprocessor, whereas the
   non-const private overload should (will) be used in the construction
   phase and should not invoke the post processor.

 - The two pass passing where we first internalize integer keywords and
   then floating point keywords has been removed.

 - Code in GridProperties has mainly been moved to GridProperties.cpp
   with explicit instantiation for int and double.
2016-05-24 09:50:15 +02:00
Joakim Hove
1a0a822cbb Renamed member variable. 2016-05-24 08:50:56 +02:00
Joakim Hove
8f70ee7d0b Removed GridProperties::getKeyword( size_t ) 2016-05-24 08:50:56 +02:00
Joakim Hove
c7d4c7fff2 Added ACTNUM postprocessor.
Added a post processor to the ACTNUM property which will set ACTNUM to
zero for all cells with PORV == 0.
2016-05-24 08:50:56 +02:00
Joakim Hove
4c610eb040 GridProperty::runPostProcessor() is public. 2016-05-24 08:50:56 +02:00
Joakim Hove
3035a89b71 Add test of PORO == 0 -> ACTNUM = 0 behavior. 2016-05-24 08:50:56 +02:00
Pål Grønås Drange
607e4e2b9a Renamed getNNC() to getInputNNC() avoids confusion
* The NNC in the eclipse state is and will always be the nnc from deck
* updated tests
2016-05-13 14:09:29 +02:00
Joakim Hove
afc76ccd7e Merge pull request #797 from jokva/summary-config-from-eclipsestate
Summary config from eclipsestate
2016-05-10 09:55:11 +02:00
Jørgen Kvalsvik
1d5ae5ea55 EclipseGrid::getNXYZ which returns xyz as array 2016-05-09 14:55:24 +02:00
Joakim Hove
3289b046c3 Check deck for ACTNUM keyword. 2016-05-09 09:44:31 +02:00
Pål Grønås Drange
5a7dcc5427 Made FaultCollection reference in State thereby fixing compiler warn 2016-05-03 13:22:57 +02:00
Pål Grønås Drange
63e452167c Introduce deckptr-less EclipseState and EclipseGrid 2016-05-03 13:22:56 +02:00
Jørgen Kvalsvik
1622a5bd49 Use explicit loop invariant in loadFromDeckKeyword
gcc doesn't seem to do this for us.
2016-05-03 09:16:28 +02:00
Atgeirr Flø Rasmussen
28d6237749 Silence warning in brace-init of std::array. 2016-04-29 13:45:26 +02:00
Joakim Hove
54579155a1 Merge pull request #782 from jokva/grid-properties-std-function
Refactor GridPropertyInitializers to use std::function
2016-04-28 09:02:25 +02:00
Pål Grønås Drange
e1ab313cb7 Added method getIJK in EclipseGrid 2016-04-27 12:55:14 +02:00
Jørgen Kvalsvik
e7bdb796da Replace boost::lexical_cast with std::to_string 2016-04-27 11:51:45 +02:00
Jørgen Kvalsvik
eb1182da27 Moved temp init into GridProperty
The GridPropertyInitializers files now really only held the temperature
initialisation function, and has been merged into GridProperty.
2016-04-27 11:51:45 +02:00
Jørgen Kvalsvik
0889c8c286 Bind parameters individually to init/post hooks
With the inflexible GridProperty*Function replaced with std::function,
bind parameters individually to each property, indicating exactly what
dependencies any function has.
2016-04-27 11:51:45 +02:00
Jørgen Kvalsvik
5f22a99a96 Replace Grid*Function with std::function
Replaces the home-grown capturing function object with std::function.
Using the library provided std::function enables creating the objects
via std::bind, enabling non-uniform signatures and relieves us of a
maintenance burden.
2016-04-27 11:51:45 +02:00