Commit Graph

793 Commits

Author SHA1 Message Date
Bård Skaflestad
dcfd312a37 Turn into autonomous module by referencing local copy of grid.h 2011-12-02 10:36:29 +01:00
Bård Skaflestad
982e339861 Ignore demonstration executable. 2011-11-30 23:49:58 +01:00
Bård Skaflestad
96d9637fc9 The 'enum face_tag' cannot (portably) hold the result of arithmetic.
Make it an 'int'.

Blame: Bard.Skaflestad@sintef.no
2011-11-30 23:48:16 +01:00
Bård Skaflestad
59c8f662a8 Hook demonstration up to build as separate (non-installable) executable.
Circumvent build issue by importing OPMPressure's "grid.h" wholesale.
2011-11-30 14:20:09 +01:00
Bård Skaflestad
3aecf50817 Add example to demonstrate basic workflow for corner-point grids. 2011-11-30 14:01:38 +01:00
Bård Skaflestad
56013a3463 Hook 'readvector' support up to build. 2011-11-30 13:57:54 +01:00
Bård Skaflestad
de2b4df2b2 Add header for 'read_vector_from_file'. 2011-11-30 13:56:21 +01:00
Bård Skaflestad
e6bbd8487b Promote 'readvector.cpp' to top-level feature. 2011-11-30 13:55:02 +01:00
Bård Skaflestad
5d17b10678 Remove unfinished feature that was imported in error. 2011-11-30 13:54:35 +01:00
Bård Skaflestad
070da67034 Slight cleanup.
Remove a build error (too many initialisers for struct ParserState).
Explicit instantiation of read_vector_from_file() for 'int's and
'double's .  Suppress various warnings.
2011-11-30 13:44:27 +01:00
Bård Skaflestad
3f903d67f1 Merge from upstream. 2011-11-30 10:35:54 +01:00
Bård Skaflestad
e2d069836e Name 'grid_t' structure.
Preserve backwards compatibility typedef.
2011-11-30 10:34:41 +01:00
Jostein R. Natvig
a2aaf9c590 Add
* routines to read string records, and interpret as welldate. (unfinished)
 * Routine to read chunks of data from file, with '--' as comment mark,
   '3*3.1415' for repeated values and '/' for termination of read.
2011-11-29 16:24:53 +01:00
Bård Skaflestad
a401f72ca7 Add tag for cardinal directions for all faces per cell. 2011-11-30 13:36:31 +01:00
Bård Skaflestad
dac3142d16 Import geometry calculation from the MATLAB Reservoir Simulation Toolbox.
Author: Jostein R. Natvig

Hook up to build.
2011-11-30 12:41:29 +01:00
Bård Skaflestad
e80ecf1077 Add GRDECL -> UnstructuredGrid transformation. 2011-11-30 11:08:32 +01:00
Bård Skaflestad
b6b455642e Rename newinterface -> cgridinterface 2011-11-30 10:16:23 +01:00
Halvor M. Nilsen
7d654de2f6 changed default instalation dir 2011-11-29 14:43:04 +01:00
Bård Skaflestad
5f0bacf6e4 Merge integer overflow fix from SVN edition. 2011-11-29 11:33:05 +01:00
Bård Skaflestad
80faeb63c7 Don't include an unused header. 2011-11-25 19:19:10 +01:00
Bård Skaflestad
ca041be109 Parametrise vector assignment to support line search on ::std::vector<>'s.
Implement the (_AXPY-like) interface for containers (base-vectors)
that support a begin()/end() iterator pair (e.g., ::std::vector<>).
Finally, update examples accordingly.

This restores independent build of OPMTransport (when used outside Dune).
2011-11-25 19:17:17 +01:00
Bård Skaflestad
17f48c62c8 Introduce macro to control whether or not to initialise NR with prev. soln.
On by default.
2011-11-25 18:15:46 +01:00
Bård Skaflestad
93916418fc Don't import a type that's not actually used. 2011-11-25 17:05:23 +01:00
Bård Skaflestad
aacf2bddd1 Use template parameter names in closer proximity to intended use. 2011-11-25 17:04:12 +01:00
Bård Skaflestad
905076c242 Implement extended interface required by ImplictTransport.
Specifically, implement (trivial) versions of pc(), s_min(), and s_max().
2011-11-25 17:02:34 +01:00
Bård Skaflestad
4235f64e07 Don't reference nonexistent header. 2011-11-25 17:01:13 +01:00
Bård Skaflestad
2709a2d514 Merge from upstream. 2011-11-25 16:05:26 +01:00
Bård Skaflestad
5fc17a2ead Expand flux calculation interface to account for presence of wells. 2011-11-25 15:27:08 +01:00
Ingeborg Ligaarden
8595ea52b0 Merged changes 2011-11-25 14:47:01 +01:00
Ingeborg Ligaarden
9dbd4d7773 Merged changes. 2011-11-25 14:43:03 +01:00
Bård Skaflestad
ded39c358e Really remove all purported boundary condition handling. 2011-11-25 14:19:12 +01:00
Bård Skaflestad
4a50653106 Don't pretend to support boundary conditions.
We don't.
2011-11-25 14:17:07 +01:00
Bård Skaflestad
432a1d4230 Assemble well equation form contributions per completion.
We assemble one equation for each well, with the equation being
trivial for wells controlled by bottom-hole targets.  Moreover, at
present we only support BHP and RESV controls.  The infrastructure is
in place to support more general controls (i.e., surface rate
targets), but such wells are currently not part of the 'well.h'
module.
2011-11-25 14:02:15 +01:00
Ingeborg Ligaarden
844c5b2b29 No functional changes. 2011-11-25 11:22:09 +01:00
Bård Skaflestad
feaa79d74b Prepare to assemble RESV control target. 2011-11-24 23:21:41 +01:00
Bård Skaflestad
2d8a73776f Assemble completion-to-cell contributions. Reestablish build. 2011-11-24 22:39:17 +01:00
Bård Skaflestad
581420d845 Check-point commit to mark half-way support for well assembly.
Does not build.
2011-11-24 18:57:38 +01:00
Bård Skaflestad
3085a4d12b Implement csrmatrix_zero() in terms of vector_zero(). 2011-11-23 23:06:16 +01:00
Bård Skaflestad
8677bc3827 Compute component fluxes across completions if the model includes wells.
This necessitates a public interface change whereby the caller is
required to pass the current well (bottom-hole) pressure values into
the assembler.
2011-11-23 19:25:47 +01:00
Bård Skaflestad
9d40dcd131 Remove an instance of EOL whitespace. 2011-11-23 19:16:22 +01:00
Bård Skaflestad
79e501a5ff Name the constant 20 according to local use.
Also, replace manual modulus calculation by built-in operator.
2011-11-23 19:14:55 +01:00
Bård Skaflestad
974d665ce3 Fix small inconsistency in field output subscripts.
While here, don't assert that the number of elements is divisible by 20.

Okay'ed by: Kari B. Skjerve
2011-11-23 19:09:53 +01:00
Ingeborg Ligaarden
d999a8c259 Now works for periodic on geocell after changing f2hf-mapping on periodic boundary. 2011-11-23 18:04:57 +01:00
Kari B. Skjerve
fc992da21f Output all field values for subsamples 2011-11-23 15:28:07 +01:00
Bård Skaflestad
8937b6b283 Allocate backing store for well completion data.
Also, include well connections in system matrix.
2011-11-23 15:25:48 +01:00
Bård Skaflestad
aff142bd54 Take initial steps towards including wells in assembly.
Specifically, accept (and currently ignore), a WellCompletions
structure into the constructor, and aggregate all driving forces
(source terms, boundary conditions and all well-related structures)
into an assembler-specific "force" structure.  Accept a pointer to
such a structure into the assemble() function.  Currently ignored
except for source terms.
2011-11-23 13:20:37 +01:00
Bård Skaflestad
099fa2b612 Name the well_t and well_control_t structures. 2011-11-23 11:23:30 +01:00
Ingeborg Ligaarden
c69f82368b Go to next step in linesearch if s< s_min or s > s_max. 2011-11-18 17:50:17 +01:00
Ingeborg Ligaarden
9dc4d190b6 Initialize increment to 0, it was 'nan' and therefore made linear solver return 'nan'. 2011-11-11 14:57:39 +01:00
Ingeborg Ligaarden
298280129c Gives the same jacobi and residual for geocell for fixed as r 8522 in MATLAB modulo different transmissiblity calculations for pcflux. 2011-11-11 10:21:24 +01:00