OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2025-02-25 18:55:30 -06:00
Code Issues Packages Projects Releases Wiki Activity
1,268 Commits 24 Branches 102 Tags 90 MiB
18fa00b542
Commit Graph

1268 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bård Skaflestad
13d3a42448 Fix phase property references 
Methods 'computeRelperm()' and 'computePressures()' *always* return
a three-element vector of phase properties.  We must therefore
translate to canonical phase indices before indexing into the
results.
 2014-07-03 00:27:17 +02:00
Atgeirr Flø Rasmussen
390bb2b3f1 Merge pull request #162 from andlaus/sync_Findopm-parser.cmake 
Sync findopm parser.cmake
 2014-07-02 11:38:08 +02:00
Andreas Lauser
af60949051 add the boost::regex library as a prerequisite 
this is required for regex-matching keywords. Once GCC 4.9 is the
minimum compiler version to be supported, this can be dropped in favor
of std::regex ...
 2014-07-02 11:25:57 +02:00
Andreas Lauser
5cdece9e3e Findopm-parser.cmake: Fix it up, next try 
thanks to Arne Morten Kvarving, Bård Skaflestad and Roland Kaufmann
for the discussion.
 2014-07-02 11:24:14 +02:00
osae
24506cc637 Include EQUIL-based inititalisation for 3-phase. 2014-06-26 15:11:34 +02:00
Atgeirr Flø Rasmussen
caa49bf3ce Merge pull request #155 from bska/154_cmake 
Synchronise build system with OPM-Core
 2014-06-17 08:37:44 +02:00
Arne Morten Kvarving
132657e478 added: hook for conditionally compiled files 
backport from opm-upscaling PR#100
 2014-06-16 15:53:01 +02:00
Bård Skaflestad
c5bbf19fce Disable search for Boost in parser detection 
This changeset disables the effect of commit 778e87d.  There appears
to be an unforeseen interaction between the calls to

    Find_Package (Boost)

that are implied by module 'opm-parser-prereqs.cmake' and the one
that's directly invoked in 'Findopm-parser.cmake'.  Until the
situation can be fully analysed and a complete solution implemented,
this is a temporary measure to restore the build of opm-core and
downstream OPM modules.
 2014-06-16 15:50:21 +02:00
Andreas Lauser
778e87d710 Findopm-parser.cmake: invoke FindBoost unconditionally 
even if boost was found previously, it might still miss a few
libraries. thanks to @akva2 for catching this.
 2014-06-16 15:50:02 +02:00
Andreas Lauser
d530dcfe17 Findopm-parser.cmake: make sure that the ERT libraries are available 
and some other minor cleanups to the module. For me it still works,
but this being the build system, I can't guarantee more...
 2014-06-16 15:50:01 +02:00
Andreas Lauser
99b4cf5067 allow the opm-parser test to fail 
since the module currently calls the tests for cJSON and boost with
the REQUIRED flag set, cmake aborts completely even if opm-parser is
not REQUIRED. For modules which depend on opm-core that's currently a
non-issue because core has a requirement on parser, but the parser may
be useful for external projects as well, so we play nice.

Also, with this patch the config.h variable HAVE_OPM_PARSER is set...
 2014-06-16 15:50:00 +02:00
Bård Skaflestad
9006824822 Merge pull request #153 from andlaus/fix_sim_fibo_ad_cp 
sim_fibo_ad_cp: make it compile
 2014-06-14 14:13:26 +02:00
Andreas Lauser
7c767e8686 sim_fibo_ad_cp: make it compile 
The constructor for the simulator class changed recently...
 2014-06-13 18:07:51 +02:00
Alf Birger Rustad
2ffaeae466 Merge pull request #144 from totto82/primalvariable 
Refactor primary variable switching
 2014-06-13 16:18:51 +02:00
Tor Harald Sandve
02ce468c01 Support Oil/Water case 
The updatePrimalVariableFromState is now only called when
the gas phase is active.
 2014-06-13 14:44:21 +02:00
Tor Harald Sandve
3e3b39df07 Introduce primaryVariable_ and use it to switch primary variables 2014-06-13 14:31:40 +02:00
Tor Harald Sandve
8a600747fa Read DISGAS and VAPOIL from deck and pass them to the simulator 2014-06-13 14:29:52 +02:00
Bård Skaflestad
aecfa3ed50 Merge pull request #150 from andlaus/enable_property_modifiers 
glue in support for property modifiers
 2014-06-11 22:46:36 +02:00
Alf Birger Rustad
4f777f9f41 Merge pull request #151 from andlaus/include_array 
explicitly include <array>
 2014-06-10 12:23:13 +02:00
Andreas Lauser
776f5e9005 explicitly include <array> 
it _seems_ like this causes the build  failures of the RHEL 5 build at
statoil: http://opm-project.org/CDash/viewBuildError.php?buildid=18933
 2014-06-09 13:22:40 +02:00
Andreas Lauser
0219f83563 glue in support for property modifiers 
i.e. reading the grid properties from EclipseState instead of from the
raw deck. This requires that all deck files exhibit a GRID and a
SCHEDULE section or else EclipseState will throw in the constructor.
 2014-06-09 12:36:46 +02:00
Bård Skaflestad
c834177897 Merge pull request #131 from andlaus/implement_multi-region_pvt_tables 
implement multi-region PVT
 2014-06-06 14:38:35 +02:00
Atgeirr Flø Rasmussen
2d8bf078ed Merge pull request #142 from GitPaean/oscillation_treatment_withlimitedupdate 
Oscillation treatment withlimitedupdate
 2014-05-28 13:30:03 +02:00
Kai Bao
51fae6ca70 Removing some comments. 2014-05-23 14:55:54 +02:00
Kai Bao
f516bd6ce3 Removing some comments and debugging output. 2014-05-23 14:53:54 +02:00
Kai Bao
c96637ab96 Changing detectNewtonOscillations() a little bit. 
Changing detectNewtonOscillations() a little bit for ease in reading.
 2014-05-23 14:50:49 +02:00
Kai Bao
508a0c11ef Adding some comments before calling stablizeNewton. 2014-05-23 14:25:58 +02:00
Kai Bao
bb22f3572d Adding size function in LinearisedBlackoilResidual. 
int sizeNonLinear() const;
To compute the size of the non-linear system.
 2014-05-23 13:40:44 +02:00
Kai Bao
9fe98514c0 Changing the location of & when defining reference. 2014-05-23 11:39:26 +02:00
Kai Bao
1da24f3c3c Changing the way of string comparison to ==. 2014-05-23 10:07:02 +02:00
Kai Bao
cb48d185b9 The reference is used for residual_histroy. 
In the detectNewtonOscillations().
 2014-05-23 09:55:29 +02:00
Kai Bao
f2518b6647 Removing the output of the size of system. 2014-05-22 22:15:55 +02:00
Kai Bao
cd174c5ba4 Merge branch 'specifying_maximum_iterations' into oscillation_treatment_withlimitedupdate 
Conflicts:
	opm/autodiff/FullyImplicitBlackoilSolver.hpp
	opm/autodiff/FullyImplicitBlackoilSolver_impl.hpp
 2014-05-22 22:13:14 +02:00
Kai Bao
6e6339d8c3 Adding user-specifying max iteration. 2014-05-22 22:09:54 +02:00
Kai Bao
fdb201d365 Restoring maxit to be 15. 2014-05-22 21:59:27 +02:00
Kai Bao
8a905535ce Removing some spaces. 2014-05-22 21:58:44 +02:00
Kai Bao
6ac95ac7a8 Removing some debugging output. 2014-05-22 21:56:00 +02:00
Kai Bao
5c409173b4 Removing some debugging output. 2014-05-22 20:56:22 +02:00
Kai Bao
95cd33185b Correcting the determination of stagnate. 2014-05-22 20:25:58 +02:00
Kai Bao
f597e2117d Rewriting the detection function with for loop. 
It is more automatic while it remains to change to some more flexible
form.
 2014-05-22 16:07:17 +02:00
Kai Bao
d7aa21dc03 Merge branch 'master' into oscillation_treatment_withlimitedupdate 
Conflicts:
	opm/autodiff/FullyImplicitBlackoilSolver.hpp
 2014-05-22 09:59:50 +02:00
Bård Skaflestad
3678464d51 Merge pull request #141 from atgeirr/master 
Fix warnings
 2014-05-21 20:02:49 +02:00
Atgeirr Flø Rasmussen
cb327ce63a Warning removal: const on return types not needed. 2014-05-21 19:49:29 +02:00
Atgeirr Flø Rasmussen
4734052d86 Bugfix: local variable shadowed proper variable. 2014-05-21 19:48:48 +02:00
Bård Skaflestad
f0d908d104 Merge pull request #140 from atgeirr/cpr-preconditioning 
Cpr preconditioner
 2014-05-21 15:36:12 +02:00
Atgeirr Flø Rasmussen
3b80724581 Update Eigen requirements. 2014-05-21 13:57:16 +02:00
Atgeirr Flø Rasmussen
f48ee55c0d Change error message. 2014-05-21 13:15:42 +02:00
Atgeirr Flø Rasmussen
e9ab64fd18 Remove usage of DUNE_UNUSED_PARAMETER. 2014-05-21 13:14:02 +02:00
Kai Bao
2733b5459e Removing the space before (). 2014-05-21 11:02:04 +02:00
Kai Bao
252048b30a Removing one blank line. 2014-05-21 11:00:24 +02:00