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
962 Commits 24 Branches 102 Tags 90 MiB
132657e478
Commit Graph

962 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Atgeirr Flø Rasmussen
3e8bb53730 Moved implementation of class ImpesTPFAAD to separate file. 
Also cleaned up header usage in ImpesTPFAAD.hpp, making some
new inclusions necessary in test program.
 2013-05-22 15:49:55 +02:00
Atgeirr Flø Rasmussen
abc23b8009 ImpesTPFAAD is no longer a template class. 2013-05-22 15:27:16 +02:00
Atgeirr Flø Rasmussen
e86aa3324c Moved DerivedGeology class to GeoProps.hpp. 
Also, it is no longer a template (but its constructor is).
 2013-05-22 15:16:24 +02:00
Bård Skaflestad
04e48cf615 Merge remote-tracking branch 'atgeirr/master' 2013-05-22 13:00:03 +02:00
Atgeirr Flø Rasmussen
511ab37dc4 Fix error in testcase specifying well prod. factors. 
Also switch back to surface volume controls.
 2013-05-22 12:33:40 +02:00
Bård Skaflestad
6d0202d529 collapseJacs(): Don't assume column-major ordering 
The 'InnerIterator' is ordering agnostic, so there is no need to
assume that the Jacobians are stored in a particular ordering.
 2013-05-22 11:26:49 +02:00
Atgeirr Flø Rasmussen
8cc16466a9 Make ImpesTPFAAD use abstract fluid interface instead of template. 
Follow-up changes to test program. Also while there, input correct
number of perforations to add_well() calls.
 2013-05-22 11:13:14 +02:00
Atgeirr Flø Rasmussen
27cd7cf19e Added abstract class BlackoilPropsAdInterface. 
Also made BlackoilPropsAd (the class wrapping opm-core BlackoilPropertiesInterface)
inherit from it.
 2013-05-22 10:56:14 +02:00
Bård Skaflestad
04e51491ee Merge pull request #2 from atgeirr/master 
Multiple changes and advances
 2013-05-22 01:17:51 -07:00
Atgeirr Flø Rasmussen
f2f83fee32 Remove unused experimental AD class. 2013-05-22 08:39:09 +02:00
Atgeirr Flø Rasmussen
476220c84b Refined test to have multi-perforation wells. 2013-05-22 08:34:50 +02:00
Atgeirr Flø Rasmussen
89bd40f81e Removed unused experiment with armadillo replacing Eigen. 2013-05-22 08:34:06 +02:00
Atgeirr Flø Rasmussen
c6b640d3db Change example to use a surface rate constraint for one well. 2013-05-22 00:10:16 +02:00
Atgeirr Flø Rasmussen
edc08c0679 Now accepts both BHP and SURFACE_RATE wells. 2013-05-22 00:09:57 +02:00
Atgeirr Flø Rasmussen
9aea3b4589 Removed extra init that is no longer necessary. 2013-05-21 23:35:28 +02:00
Atgeirr Flø Rasmussen
c8bde19a01 Use all eqns for residual evaluations. 
Use new wellRates() member of WellState.
 2013-05-21 23:26:55 +02:00
Atgeirr Flø Rasmussen
8938459f7b Added well equations. 
Residuals are not yet used for loop control.
 2013-05-21 15:42:35 +02:00
Atgeirr Flø Rasmussen
73ba67ec13 Make the test run a simple bhp-controlled case. 2013-05-21 15:42:10 +02:00
Atgeirr Flø Rasmussen
3929688756 Added utilitied collapseJacs() and vertcat(). 
The utilities are not optimized for speed, but make it easy
to construct a linear system from all the jacobian blocks.
 2013-05-21 15:40:45 +02:00
Atgeirr Flø Rasmussen
bd1af1f53a Make float accuracy fix the main path. Remove alternative path. 2013-05-21 13:54:28 +02:00
Atgeirr Flø Rasmussen
a147ff93d0 Can now solve with bhp-controlled wells. 
Simple initial code. Assumes that well_state.bhp() contains
well bhp targets, does not check control structures.
 2013-05-21 09:33:52 +02:00
Atgeirr Flø Rasmussen
4d794b79dc Added Selector class. 
Used to choose element-by-element between two (potentially AD) vectors,
depending on signs of elements of a third vector. Simple and not optimized.
 2013-05-21 09:29:51 +02:00
Atgeirr Flø Rasmussen
defae7b96d Moved UpwindSelector out of anonymous namespace. 2013-05-21 09:28:54 +02:00
Atgeirr Flø Rasmussen
a301477655 Remove more unused code. 2013-05-20 23:42:12 +02:00
Atgeirr Flø Rasmussen
aea69d328b Clean out dead uncommented code. 2013-05-20 23:09:06 +02:00
Atgeirr Flø Rasmussen
f822cb4739 Test case working again with new fluid. 2013-05-16 16:31:05 +02:00
Atgeirr Flø Rasmussen
cc1f8ed21a Refactored ImpesTPFAAD to use BlackoilPropsAd interface. 
Not yet tested, but compiles and runs. Stops on error message
due to lack of viscosity derivatives.
 2013-05-16 16:05:47 +02:00
Atgeirr Flø Rasmussen
37677fe032 Print face fluxes after solve. 
Also define the HACK_INCOMPRESSIBLE_GRAVITY symbol, since test case
is meaningless without it.
 2013-05-16 14:49:12 +02:00
Atgeirr Flø Rasmussen
f6c6ee0fa0 Fixes in computeFluxes(). 
- Give AD variables the correct block pattern (although as we
   change fluid interface they will not need to be ad types).
 - Make sure 'flux' is only on inner faces.
 - Copy full fluxes to state.faceflux().
 2013-05-16 14:46:54 +02:00
Atgeirr Flø Rasmussen
84d163e9fa Bugfix: convert array to matrix type for matrix multiply. 2013-05-16 14:44:16 +02:00
Atgeirr Flø Rasmussen
6a2b21e04b Refine OpmFind according to Roland Kaufmann's suggestions. 
This enables us to restore FindEigen3.cmake to its original
state (as copied from Eigen sources).
 2013-05-16 14:18:59 +02:00
Atgeirr Flø Rasmussen
f6b46bda8f Merge pull request #1 from bska/master 
Implement total Darcy flux calculation and minor build-system cleanup
 2013-05-16 04:20:45 -07:00
Bård Skaflestad
64b5c83f9d Merge remote-tracking branch 'bska/master' 2013-05-16 11:26:44 +02:00
Bård Skaflestad
409cfb1578 White-space cleanup. 
No functional changes.
 2013-05-16 11:23:59 +02:00
Bård Skaflestad
72dd6a851e Merge remote-tracking branch 'atgeirr/master' 2013-05-16 10:57:44 +02:00
Atgeirr Flø Rasmussen
de743ddce2 Update README.md. 2013-05-16 10:55:40 +02:00
Atgeirr Flø Rasmussen
d59363d681 Now Eigen is found properly. 2013-05-16 10:49:05 +02:00
Bård Skaflestad
0063799e86 Merge remote-tracking branch 'atgeirr/master' 2013-05-16 10:29:19 +02:00
Atgeirr Flø Rasmussen
db95420b98 Add FindEigen3 cmake module. Currently unused. 2013-05-16 10:28:25 +02:00
Bård Skaflestad
c8fb7169aa Move rel-perm and viscosity calculations closer to use 
This is an aesthetic change, only.
 2013-05-16 09:58:34 +02:00
Atgeirr Flø Rasmussen
c20a67aa1b Merge remote-tracking branch 'bska/master' 2013-05-16 09:55:11 +02:00
Atgeirr Flø Rasmussen
1f1e1e8ed2 Reduce tolerance, add alternative code path. 
The alternative code path attempts to deal with floating point cancellation
issues, which may not turn out to be a problem in the end (for real cases).
 2013-05-16 09:53:17 +02:00
Bård Skaflestad
fa2e02a579 The 'pflux' is really the hydraulic head. 
Rename variable accordingly.
 2013-05-16 09:51:34 +02:00
Bård Skaflestad
ef354792cd Implement first cut at Darcy (total) flux calculation. 
This is compile-tested only.
 2013-05-16 09:48:56 +02:00
Bård Skaflestad
b46cef383f Build 'test_impestpfa_ad' along with the 'examples' 2013-05-16 09:48:01 +02:00
Bård Skaflestad
8bc5f66d8d Promote 'test_impestpfa_ad' to an 'example' 
This was the original intention, but the file was misplaced during
the module reorganisation.
 2013-05-16 09:33:58 +02:00
Bård Skaflestad
970f308f59 New sentence -> capital first letter. 2013-05-16 00:10:51 +02:00
Bård Skaflestad
b74d988a7b New sentence -> capital letter. 2013-05-16 00:10:32 +02:00
Bård Skaflestad
24204cf33e Merge remote-tracking branch 'atgeirr/master' 2013-05-15 16:10:54 +02:00
Bård Skaflestad
e0c85a2fdb Adapt to CMake-based build system. 
Specifically,

  - #include <config.h> where appropriate (all .cpp files)
  - Adjust include statements to account for sub-directory locations
    of .hpp files.
 2013-05-15 16:10:20 +02:00