OilfieldToolsNet/opm-core
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
4,387 Commits 9 Branches 35 Tags
fdd19fd3f69b74afed05f33e9bd0a3b7050c2405
Commit Graph

1872 Commits

Author SHA1 Message Date
Markus Blatt
fdd19fd3f6 Reintroduce lifetime guarantees for UnstructuredGrid used. 
In this pull requested we resorted to storing the data items (e.g. cart_dims, global_cell,
etc.) instead of the UnstructuredGrid. Unfortunately, this is a change of the lifetime
guarantees: Previously, a shared_ptr to the Unstructuredgrid was stored. Thus the data members
were available for the lifetime of the EclipseWriter. With the previous changes the grid could
actually have been destroyed before the writer.

Therefore we no store a shared_ptr to the UnstructuredGrid again (in addition to the datamembers).
Thus at least for UnstructuredGrid the old guarantees still hold.
 2014-04-09 10:31:46 +02:00
Markus Blatt
ebc86bc624 Merge remote-tracking branch 'upstream/master' into master-refactor-for-cpgrid-support 
Manually resolved conflicts in:
	opm/core/io/eclipse/EclipseWriter.cpp
	opm/core/io/eclipse/EclipseWriter.hpp
	opm/core/props/satfunc/SaturationPropsFromDeck_impl.hpp
 2014-04-08 21:50:00 +02:00
Atgeirr Flø Rasmussen
f0c334a901 Merge pull request #563 from osae/testEPS 
New parser; proper handling of ENPTVD/ENKRVD.
 2014-04-08 13:51:43 +02:00
Bård Skaflestad
f3ebd78296 Merge pull request #538 from blattms/parallel-solver-support 
Added support for parallel dune-istl solvers
 2014-04-08 00:17:35 +02:00
Bård Skaflestad
ce687039b2 Don't reference OwnerOverlap* unless MPI is available 
The class OwnerOverlapCopyCommunication is not defined unless MPI is
avilable.  Therefore, we cannot reference the type unless we know
that MPI is available in the current translation unit.
 2014-04-07 20:01:18 +02:00
Atgeirr Flø Rasmussen
59bdd5f31e Changed documentation of Wells::comp_frac to match reality. 2014-04-06 23:45:08 +02:00
Atgeirr Flø Rasmussen
3d98f7a77e Use preferred phase of producer well to set comp_fraction. 
This replaces the previous hack, that set comp_fraction to (0,1,0) always.
 2014-04-06 23:33:43 +02:00
osae
498555fcdd New parser; proper handling of ENPTVD/ENKRVD. 2014-04-05 10:56:30 +02:00
Atgeirr Flø Rasmussen
954924064f Merge remote-tracking branch 'totto82/add_compi_producers' into add_compi_producers 2014-04-05 00:18:38 +02:00
Atgeirr Flø Rasmussen
c0ecf0bc77 Merge pull request #559 from andlaus/EclipseWriter_fix_summary_output 
Eclipse writer fix summary output
 2014-04-04 23:30:31 +02:00
Atgeirr Flø Rasmussen
55fe6b5b69 Merge pull request #558 from andlaus/EclipseWriter_refactor_writeInit_semantics 
Eclipse writer refactor write init semantics
 2014-04-04 23:24:48 +02:00
Atgeirr Flø Rasmussen
4f330ea07b Merge pull request #557 from andlaus/EclipseWriter_remove_old_parser 
Eclipse writer remove old parser
 2014-04-04 23:02:24 +02:00
Atgeirr Flø Rasmussen
b07cd277a7 Merge pull request #561 from totto82/fix_viscosity_table 
Fix undersaturated viscosity table
 2014-04-04 22:41:11 +02:00
Atgeirr Flø Rasmussen
a47c9c7330 Merge pull request #544 from osae/equil-init 
Equil init
 2014-04-04 22:39:37 +02:00
Markus Blatt
ec789bc63a Removes unused parameter warnings in TransTpfa_impl.hpp. 2014-04-04 21:29:19 +02:00
Markus Blatt
d83374e6b7 Merge remote-tracking branch 'upstream/master' into master-refactor-for-cpgrid-support 
Removed conflicts in
	opm/core/wells/WellsManager.cpp
that were due to the change
```diff
-                    pd.well_index = WellsManagerDetail::computeWellIndex(radius, cubical, cell_perm, completion->getDiameter());
+                    pd.well_index = WellsManagerDetail::computeWellIndex(radius, cubical, cell_perm, completion->getSkinFactor());
```
in  WellsManager::createWellsFromSpecs which moved from WellsManager.cpp to WellsManager_impl.hpp file in a previous commit.
 2014-04-04 21:21:22 +02:00
Markus Blatt
3375e313e5 Merge remote-tracking branch 'upstream/master' into parallel-solver-support 
Removed conflicts in:
	opm/core/linalg/LinearSolverIstl.cpp
 2014-04-04 20:38:52 +02:00
Bård Skaflestad
5bb0345698 Merge pull request #535 from blattms/add-scalar-product 
Explicitly construct the ScalarProduct, and SequentialInformation.
 2014-04-04 18:41:56 +02:00
Tor Harald Sandve
4576917061 Fix undersaturatd viscosity table 
Data is now correctly read from ununderdatTable instead of pvtgTable
 2014-04-04 16:06:19 +02:00
Andreas Lauser
e693fa8cf1 EclipseWriter: write the summary file after each call to writeTimeStep() 
this allows to interrupt a simulation and inspect the summary file
which was computed up to that point...
 2014-04-04 14:29:34 +02:00
Tor Harald Sandve
aef6205fb7 Hack to set compi for producer. 
compi is set to [0 1 0] for all producers
 2014-04-04 12:15:49 +02:00
Andreas Lauser
b4b03ffee3 EclipseWriter: remove unused method activeToGlobalCellData_() 2014-04-02 16:47:59 +02:00
Andreas Lauser
c8683b39d0 EclipseWriter: fold the writeSolution_() method back into writeTimeStep() 
because this was the only caller...
 2014-04-02 16:47:27 +02:00
Andreas Lauser
3ce9d6b3b1 output writers: remove the state parameters from writeInit() 
because as discussed with Atgeirr, this function should no longer
write the initial solution, it also does no longer need to know the
initial simulator state...
 2014-04-02 16:42:04 +02:00
Andreas Lauser
a02f315ace EclipseWriter: remove old parser 
this patch gets rid of the old-parser-taking methods of
EclipseWriter. this avoids quite a few consistency issues and also
reduces the amount of duplicate work required.
 2014-04-02 14:25:03 +02:00
Roland Kaufmann
acf9f96e46 Use TimeMap directly instead of copying times 
The simulator object will probably have created a time map anyway to
control the timestepping so this can be reused directly by the output
writer. (If not, it is easy to create one and pass it).
 2014-04-01 20:27:53 +02:00
Roland Kaufmann
a4c168e58e Use new parser for reading time map and generating output 2014-04-01 14:34:02 +02:00
Roland Kaufmann
5371e19d19 Use new parser in common output interface 
Since EclipseWriter can now take a Deck instead of an EclipseGridParser
the interface can be changed to take this type instead.
 2014-04-01 14:33:55 +02:00
osae
7d8996acbb Equil regions now internally indexed 0..(NTEQUL-1) 2014-03-31 16:16:45 +02:00
Atgeirr Flø Rasmussen
f6e8fbbbfa Bugfix: skin factor, not diameter. 2014-03-31 14:47:16 +02:00
Markus Blatt
e4ba9a0fe8 Removed last artefact of checkCellExistence (in constructor taking wells) 
Somehow this slipped one of the merges. With the last
patch this module failed to compile as we use the new
definition without the bool parameters.
 2014-03-29 10:35:12 +01:00
Markus Blatt
8df032ea44 Readd definition of WellsManager constructor from wells. 
As @bska pointed in my issue #518 this definition was
accidentally removed in commit 20468d1 during a merge of
upstream changes. Therefore I readd it with this patch.
 2014-03-29 10:12:40 +01:00
osae
d6a2696cbd New parser included. 2014-03-28 17:35:43 +01:00
osae
34f1209b45 Default equil region should be one not zero ... 
Otherwise problems when kw EQLNUM is used.
 2014-03-28 17:18:50 +01:00
osae
782a5934c9 Fixed Bg versus 1/Bg issue. 2014-03-28 17:14:16 +01:00
Atgeirr Flø Rasmussen
2a5dc33bb8 Merge pull request #551 from atgeirr/re-add-bhp-eclipsewriter 
Re-add the bhp reports to the summary output.
 2014-03-28 14:11:03 +01:00
Atgeirr Flø Rasmussen
3adcadff42 Remove debug output. 2014-03-28 13:04:32 +01:00
Atgeirr Flø Rasmussen
27a396b439 This re-adds the bhp reports to the summary output. 
It was lost in the shuffling bewteen branches when working on the new parser.
 2014-03-28 13:01:10 +01:00
Markus Blatt
1fb15b0d2d Added missing file TransTpfa.hpp 2014-03-27 15:27:41 +01:00
Markus Blatt
8668ce7b71 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
Markus Blatt
3fceb968ea [bugfix] Use the size of the vector for the copying. 
The last patch did not compile as there was no size member
in scope. Therefore this patch resorts to using the size of
the vector.
 2014-03-27 11:53:13 +01:00
Markus Blatt
58a7589d7d Throw an error when using a sequential solver in parallel 2014-03-27 11:49:41 +01:00
Kai Bao
c1d4f928b4 A new SimulatorTimer Class 2014-03-26 15:53:54 +01:00
osae
14e271f049 Some adjustments to equil initialisation. 
- Saturations, phase pressures, and standard initialsation of RS and RV
   now agree to baseline.
 - Tables of RS and RV versus vertical depth (kw RSVD RVVD) have been
   hardcoded for testing (need new parser) and the calculations agree to
   baseline in the gas and oil zones.  In the water zone there is some
   differences: Our code computes saturated RS and RV using the final
   phase pressures (these are modified to be consistent with saturations
   and capillary pressures) while the baseline uses unmodified phase pressures.
 2014-03-26 14:53:47 +01:00
osae
5df819d509 Merge branch 'master' of git://github.com/OPM/opm-core 
Conflicts:
	CMakeLists_files.cmake
 2014-03-26 14:51:06 +01:00
Markus Blatt
d1ccbf8446 [bugfix] Use the size of the vector for the copying. 
The last patch did not compile as there was no size member
in scope. Therefore this patch resorts to using the size of
the vector.
 2014-03-26 10:23:11 +01:00
Joakim Hove
20468d1987 Removed WellsManager constructor which takes an ole Eclipsegridparser instance. 2014-03-25 18:57:58 +01:00
Markus Blatt
c1a7a03987 Moved ISTL right and left hand side construction for ISTL to solveSystem 
cherry-picked from add-scalarproduct and ported.
 2014-03-25 09:58:07 +01:00
Markus Blatt
0cb3f861e7 Moved ISTL right and left hand side construction for ISTL to solveSystem 2014-03-25 09:37:41 +01:00
Kai Bao
dbd351dd4d Output correct information for temporary use. 
Change the SimulatorTimer class a little bit to output the totaltime and
current time correctly.
 2014-03-24 16:41:02 +01:00