OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2024-11-25 18:50:19 -06:00
Code Issues Packages Projects Releases Wiki Activity
797 Commits 24 Branches 101 Tags 97 MiB
de695f3cd5
Commit Graph

797 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Atgeirr Flø Rasmussen
de695f3cd5 Avoid warning by not storing MPIHelper instance reference. 2014-04-15 20:47:37 +02:00
Atgeirr Flø Rasmussen
1e75efd097 Add generation and use of warning-suppressing headers. 2014-04-15 20:46:45 +02:00
Bård Skaflestad
03218f5470 Merge pull request #100 from blattms/master-refactor-for-cpgrid-support 
Adds fully implicite black oil solver working with CpGrid
 2014-04-15 00:03:16 +02:00
Markus Blatt
91a4d59fcc Merge pull request #2 from bska/master-refactor-for-cpgrid-support 
Fix build in !HAVE_DUNE_CORNERPOINT case
 2014-04-14 11:10:01 +02:00
Bård Skaflestad
3ca4a32163 Merge pull request #121 from andlaus/pvdco_to_pvcdo 
fix typo: it's PVCDO, not PVDCO
 2014-04-11 17:41:34 +02:00
Andreas Lauser
e92cac6d0c fix typo: it's PVCDO, not PVDCO 2014-04-11 11:54:56 +02:00
Bård Skaflestad
1cbffa09de Fix memory leak 
Function GridManager::createGrdecl() generally allocates memory
(using std::malloc()) for the MAPAXES keyword data output of the
'grdecl' structure.  Release those resources before leaving the
scope to prevent memory leak introduced in commit fdca540.
 2014-04-10 12:25:28 +02:00
Bård Skaflestad
fdca5404b7 Use new parser for all deck information 
This commit switches to using the convenience method

    GridManager::createGrdecl()

to construct a "struct grdecl" that can be passed directly into
CpGrid::processEclipseFormat().  The practical benefit is that we
get to leverage the opm-parser that's in active development rather
than the calcifying "EclipseGridParser" that will only become less
relevant in the future.  We also don't parse the data twice.

Note: This is mostly compile tested.  In the few actual tests I ran,
I got into trouble with internal assertions in processEclipseFormat.
That problem is not yet analysed.
 2014-04-10 01:01:55 +02:00
Bård Skaflestad
897a33c788 Support older versions of Dune 
Retrieving the "mpihelper.hh" from <dune/common> rather than
<dune/common/parallel> means we can still support (e.g.,) Dune 2.2.1
if needed.
 2014-04-10 00:59:31 +02:00
Bård Skaflestad
433be936e4 Use full path in examples_SOURCES 
That's the convention used elsewhere in the build system and we
should honour that convention.  While here, remove the assignment to
PROGRAM_SOURCE_FILES because that variable is no longer referenced
once we start to run the hooks.
 2014-04-10 00:56:09 +02:00
Bård Skaflestad
c3bb686600 Annotate end of namespace and "#if" 
This commit adds a few annotations to closing braces on namespaces
and one "#ifdef" conditional.  This is an aid to (hopefully) avoid
the problem fixed in commit 688d65e.
 2014-04-09 23:53:20 +02:00
Bård Skaflestad
0f98ce7d6c Restore missing constructor argument 
The 'grav' argument (gravity vector) was apparently lost in a
mis-merge.  This commit restores the missing argument.
 2014-04-09 16:46:51 +02:00
Bård Skaflestad
11e6bc4ad2 Bring a definition of OPM_THROW into scope. 
The template version of outputStateMatlab() uses OPM_THROW so we need
a definition of the macro.
 2014-04-09 16:33:24 +02:00
Bård Skaflestad
688d65e7ef GridHelpers: Fix build when !HAVE_DUNE_CORNERPOINT 
This commit fixes an incorrectly nested "#ifdef..#endif" block that
leads to build failures when opm-autodiff is being used without
dune-cornerpoint.
 2014-04-09 16:07:59 +02:00
Markus Blatt
b3ce9bd730 Updated examples/sim_fibo_ad_cp.cpp according to latest changes in examples/sim_fibo_ad.cpp 2014-04-09 14:40:56 +02:00
Markus Blatt
327f1b003d Merge branch 'tester' into master-refactor-for-cpgrid-support 
Resolved conflicts:
	examples/sim_fibo_ad.cpp
	opm/autodiff/FullyImplicitBlackoilSolver_impl.hpp
 2014-04-09 14:39:19 +02:00
Markus Blatt
42fbe3b612 Revert "Activate paralle istl solvers if there is more than one process computing." 
This reverts commit 9598a990df.
The commit slipped in by accident and should be part of a separate branch.
 2014-04-09 13:32:28 +02:00
Markus Blatt
3329e48c57 Adapted sim_fibo_ad_cp with latest changes for sim_fibo_ad 2014-04-09 13:18:28 +02:00
Markus Blatt
bccc7c1350 Updates interface to fix issues not resolved in the latest merge. 
Namely the template parameter was missing for the added methods.
In addition there were still various instances where the grid was
used directly rather than via the functions in GridHelpers.hh.
 2014-04-09 12:16:33 +02:00
Bård Skaflestad
a784d50f1e Merge branch 'master' into blattms-master-refactor-for-cpgrid-support 
Conflicts:
	examples/sim_fibo_ad.cpp
	opm/autodiff/FullyImplicitBlackoilSolver_impl.hpp

This brings the "CpGrid support" branch up to date with respect to
recent changes in opm-autodiff master.
 2014-04-08 16:31:17 +02:00
Bård Skaflestad
79afd9850c Merge pull request #117 from atgeirr/fix_welleq 
Fix NaNs for well equations.
 2014-04-07 15:53:44 +02:00
Atgeirr Flø Rasmussen
e699f9e135 Remove unnecessary argument, and minor formatting corrections. 2014-04-05 00:12:03 +02:00
Atgeirr Flø Rasmussen
303bbac943 Merge remote-tracking branch 'totto82/fix_welleq' into fix_welleq 2014-04-05 00:07:00 +02:00
Atgeirr Flø Rasmussen
b78413a63a Merge pull request #116 from andlaus/adapt_to_EclipseWriter_refactoring 
make everything compile with the newly refactored EclipseWriter
 2014-04-04 23:28:02 +02:00
Tor Harald Sandve
a905eade7a Use preferred phase to compute wellbore mix for dead wells 
The wellmore mix is set to preferred phase for dead wells, where the
total volumetric rates are zero. This sets the phase of the flow out of
perforations in dead wells and thus avoids zero volumerats for injecting
preforations in dead wells.
 2014-04-04 11:36:02 +02:00
Andreas Lauser
8437051416 make everything compile with the newly refactored EclipseWriter 
the states needed to be removed from the call to writeInit()...
 2014-04-02 17:06:20 +02:00
Bård Skaflestad
1f8276b3d4 Merge pull request #115 from atgeirr/expand-selector-options 
Add more options for Selector class.
 2014-04-02 13:14:33 +02:00
Atgeirr Flø Rasmussen
6c4114ea69 Add more options for Selector class. 
You can now choose which comparison to do for the indicator vector
to find when to choose the left argument. Only >= before (still default).
 2014-04-01 15:49:01 +02:00
Atgeirr Flø Rasmussen
c89e9ed53d Merge pull request #114 from andlaus/sim_fibo_ad_remove_old_parser 
sim_fibo_ad: remove compatibility code for old parser
 2014-04-01 08:39:01 +02:00
Andreas Lauser
5e7064b337 sim_fibo_ad: remove compatibility code for old parser 
this makes the simulator quite a bit more maintainable: setting
USE_NEW_PARSER to 0 did not even compile after the the constructor for
the wells manager which took the old deck was removed last
week. Since, according to Atgeirr, SPE-1 is now producing exactly the
same results as before, it also does no longer make too much sense to
keep that code on life support...
 2014-03-31 16:39:17 +02:00
Markus Blatt
46f3607641 Merge remote-tracking branch 'upstream/master' into master-refactor-for-cpgrid-support 
Resolved conflicts:
	opm/autodiff/FullyImplicitBlackoilSolver_impl.hpp
 2014-03-31 11:39:37 +02:00
Atgeirr Flø Rasmussen
b8a8242159 Merge pull request #113 from atgeirr/fix-timer-usage 
Fix timer usage.
 2014-03-28 15:52:43 +01:00
Atgeirr Flø Rasmussen
4b53f88685 Fix timer usage. 
This makes the simulator produce proper summary output again.
 2014-03-28 14:31:30 +01:00
Atgeirr Flø Rasmussen
faba01f917 Merge pull request #112 from GitPaean/fix_using_new_timer 
A small fix to make sim_fibo_ad use the new SimulatorTimer.
 2014-03-28 13:51:22 +01:00
Atgeirr Flø Rasmussen
9d9576c955 Merge pull request #110 from atgeirr/new_well_formulation 
New well formulation
 2014-03-28 12:47:29 +01:00
Markus Blatt
b279a174db Merge remote-tracking branch 'upstream/master' into master-refactor-for-cpgrid-support 
Conflicts:
	examples/sim_fibo_ad.cpp
	opm/autodiff/FullyImplicitBlackoilSolver_impl.hpp
 2014-03-27 16:17:44 +01:00
Markus Blatt
9598a990df Activate paralle istl solvers if there is more than one process computing. 2014-03-27 11:31:17 +01:00
Kai Bao
0914841823 A small fixing to make the sim_fibo_ad using the new timer. 2014-03-27 11:15:55 +01:00
Atgeirr Flø Rasmussen
d4f1a89370 Merge pull request #111 from andlaus/FullyImplicitBlackoilSolver_throw_exception_uppon_non-finite_residual 
FullyImplicitBlackoilSolver: Throw an exception uppon encountering a non-finite residual
 2014-03-26 15:29:34 +01:00
Andreas Lauser
8cd93bf70a FullyImplicitBlackoilSolver: cleanup the residualNorm() method 2014-03-26 15:16:43 +01:00
Atgeirr Flø Rasmussen
2db726268b Merge pull request #108 from andlaus/FullyImplicitBlackoilSolver_unify_state_conversion 
FullyImplicitBlackoilSolver: unify the state conversion routines
 2014-03-26 14:29:08 +01:00
Atgeirr Flø Rasmussen
8663c5b604 Merge branch 'FullyImplicitBlackoilSolver_unify_state_conversion' of https://github.com/andlaus/opm-autodiff into test_andlaus 
Conflicts:
	opm/autodiff/FullyImplicitBlackoilSolver.cpp

Resolved by using the new, reduced version of constantState().
 2014-03-26 14:21:23 +01:00
Andreas Lauser
2f84156b91 FullyImplicitBlackoilSolver: Throw an exception uppon encountering a non-finite residual 2014-03-26 12:54:46 +01:00
Atgeirr Flø Rasmussen
347016a066 Add more checks to cover bug that was in operator -=. 2014-03-26 12:25:11 +01:00
Atgeirr Flø Rasmussen
60ff38adc6 Added test for += and -= operators. 2014-03-26 12:03:44 +01:00
Atgeirr Flø Rasmussen
37a23825c4 Removed dead code in test_block.cpp. 2014-03-26 11:48:13 +01:00
Atgeirr Flø Rasmussen
3bc57780aa Fix bug in -= operator. 2014-03-26 11:44:49 +01:00
Atgeirr Flø Rasmussen
5e4dff401c Merge branch 'master' into new_well_formulation 
Needed to avoid compile errors with updated opm-core.
 2014-03-26 11:02:52 +01:00
Atgeirr Flø Rasmussen
4845fc3073 Merge pull request #109 from joakim-hove/remove-old-WellsManager 
Removed calls to deprecated WellsManager() constructor
 2014-03-25 23:28:26 +01:00
Joakim Hove
2f23e72bea Removed calls to WellsManager() constructor which uses old EclipseGridParser. 2014-03-25 19:36:42 +01:00