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

4461 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
osae
04d8322fa0 Some additional tests: live gas, RSVD and RVVD 2014-04-03 09:07:00 +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
b7d571efe2 add support for the UG grid library 
recently UG has become free software (yay!), so we can now support it
with a good conscience. The CMake module is based on the "UseUG.cmake"
module of dune-grid but it is quite a bit simpler and actually
works. (I cannot see how UseUG.cmake can work without ever including
the ug-config*.cmake files...)

the UG source code is available here:

https://github.com/ugfem/ug
 2014-04-02 16:01:55 +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
osae
d0da7a9437 Update tests and provide some eclipse output. 2014-03-31 15:32:06 +02:00
Bård Skaflestad
f07fac6b83 Merge pull request #552 from atgeirr/fix-well-index-call 
Bugfix: skin factor, not diameter.
 2014-03-31 15:01:23 +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
0303a9afab Merge pull request #546 from GitPaean/test_data_for_new_SimulatorTimer 
A new SimulatorTimer and the test code and test data
 2014-03-28 13:51:00 +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
Markus Blatt
aa5ac90fa6 Removed superfluous export of HAVE_DUNE_ISTL. 
With the last patch HAVE_DUNE_ISTL will already be
defined in config.h
 2014-03-27 11:47:35 +01:00
Markus Blatt
66a4889771 [cmake] Export HAVE_DUNE_ISTL for other modules. 
This is e.g. needed in the parallel version of autodiff to
test whether ISTL is there.
 2014-03-27 11:45:34 +01:00
Kai Bao
e5761412ba Added the test code and test data. 
Added TESTTIMER.DATA and test_timer.cpp
 2014-03-26 17:53:06 +01:00
Kai Bao
2a359b6457 Added the test and test data for the new SimulatorTimer 
Added test_timer.cpp, TESTTIMER.DATA
 2014-03-26 17:45:39 +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
Atgeirr Flø Rasmussen
62a0cf16c5 Merge pull request #542 from joakim-hove/remove-old-WellsManager 
Removed deprecated WellsManager constructor
 2014-03-25 23:28:22 +01:00
Joakim Hove
20468d1987 Removed WellsManager constructor which takes an ole Eclipsegridparser instance. 2014-03-25 18:57:58 +01:00
Atgeirr Flø Rasmussen
84ffe95fc1 Merge pull request #541 from GitPaean/fix_timer_bug_temp 
Output correct information for temporary use.
 2014-03-25 10:16:43 +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
Atgeirr Flø Rasmussen
417c08e890 Merge pull request #536 from andlaus/EclipseWriter_dont_restrict_pressure 
EclipseWriter: don't convert the pressure field to active cells
 2014-03-21 08:59:41 +01:00
Atgeirr Flø Rasmussen
86ed298439 Merge pull request #540 from joakim-hove/wellsmanager-well-properties 
Changed the access method to well rates/properties
 2014-03-21 08:58:07 +01:00
Atgeirr Flø Rasmussen
0c877459e4 Merge pull request #537 from andlaus/EclipseWriter_workaround_for_gcc_4_4 
EclipseWriter: work around a GCC 4.4 smart_ptr bug
 2014-03-21 08:55:49 +01:00
Atgeirr Flø Rasmussen
ef5ee72c8e Merge pull request #539 from blattms/fix-pr-532 
Fixes issues in pull request #532
 2014-03-21 08:53:58 +01:00
Joakim Hove
5eaed335b9 Changed the access to Parser/EclipseState/Schedule to use new well injection and production properties. To be aligned with opm-parser:e75970a28b96374409a55e3e6cea2198b6a0ea23 2014-03-21 00:35:15 +01:00
Markus Blatt
23332dcf8f Increase verbosity such that we see the actual solve 2014-03-20 22:24:33 +01:00
Markus Blatt
621afe3273 Fixes the laplacian. 
As we do not represent dofs on the boundary, we need to make sure that all diagonal
values are 4.
 2014-03-20 22:21:03 +01:00
Markus Blatt
34d246600e Fixed test_linearsolver for the official 2.2 release. 
This release does neither support KAMG nor FastAMG. Therfore
this patch deactivates test these preconditioners.
 2014-03-20 22:18:27 +01:00
Markus Blatt
1e205adcf1 Added support for the parallel solvers of dune-istl. 
To support this the solveSystem methods of the LinearSolverInterface gets
an optional additional template parameter of type boost::any. It can hold any
copy constructable object. In our case it is used to pass the information about
the parallelization into the solvers of dune-istl without the compiler needing to know
their type. Inside of LinearSolverIstl::solveSystem we check whether the type stored inside of
boost::any is the new ParallelIstlInformation. If this is the case we extract the information
and use the parallel solvers if available, otherwise we solve serial/sequential.

The new ParallelIstlInformation is needed as the OwnerOverlapCopyCommunication is not copy
constructable. This is indeed a design flaw that should and will fixed upstream, but for the
time being we need ParallelIstlInformation to transfer the ParallelIndexSet and RemoteIndices
objects.
 2014-03-20 21:59:29 +01:00