OilfieldToolsNet/opm-core
4
0 Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
4,359 Commits 9 Branches 35 Tags
14e93aea75667d4016176696a84564e307aaaeee
Commit Graph
4359 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Atgeirr Flø Rasmussen 14e93aea75 Remove grdecl.h from file list. 2014-04-10 20:51:06 +02:00
Atgeirr Flø Rasmussen 53690a448f Merge pull request #568 from andlaus/remove_grdecl_h 
remove second grdecl.h header file
 2014-04-10 20:47:54 +02:00
Andreas Lauser 07d0196466 remove second grdecl.h header file 
that one was completely unused and the "grdecl" struct defined in
there collided name-wise with the one defined in "GridManager.hpp".
trying to link code which used the version of the grdecl.h header with
code that used the one from GridManager.hpp would have resulted in _a
lot_ hilarity...
 2014-04-10 18:06:05 +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
Markus Blatt 94c9a69bfb Merge pull request #1 from bska/no-mpi 
Fix build issues in !HAVE_MPI case
 2014-04-07 23:26:56 +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
Bård Skaflestad e434000f4e Search for MPI support 
The build system depends on knowing if MPI is available.  Explicitly
search for MPI to honour that requirement.  Don't rely on ISTL's
transitive searching for the same.
 2014-04-07 20:01:18 +02:00
Bård Skaflestad 1fca44fb03 Explicitly group conditions 
For some reason I was unable to produce correct criteria without
inserting explicit parentheses.  I don't know why that is, but
better safe than sorry.
 2014-04-07 20:01:18 +02:00
Bård Skaflestad a154887a2b Exclude "test_parallel_linearsolver" from non-MPI builds 
The "sources_hook" runs after "OpmFiles" in "OpmLibMain".
Therefore, we must search the "tests_SOURCES" to exclude particular
tests from the build.

This fixes a build problem in the non-MPI case.
 2014-04-07 20:01:18 +02:00
Bård Skaflestad 18119e0cb4 Merge pull request #564 from atgeirr/add_compi_producers 
Add Wells::comp_frac for producers
 2014-04-07 18:16:17 +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
Bård Skaflestad 2ffc5a0480 Merge pull request #562 from atgeirr/add-testfiles-to-list 
Add test data files needed for test_equil to the right cmake list.
 2014-04-04 23:08:52 +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 4d5a92e3ff Add test data files needed for test_equil to the right cmake list. 2014-04-04 22:53:34 +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 67fffa0951 Fix matrix size and symmetry for parallel runs. 2014-04-04 21:01:32 +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
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 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
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 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