Commit Graph
92 Commits
Author SHA1 Message Date
Jostein R. Natvig 9def4966cc Remove old function "create_cart_grid", please use "create_cart_grid_3d". 2012-02-03 10:56:28 +01:00
Jostein R. Natvig 7439640098 Unify grid destructors: new common function is called free_grid(...). 2012-02-01 15:45:13 +01:00
Jostein R. Natvig 98919ced76 Merge. 2012-02-01 14:57:20 +01:00
Jostein R. Natvig fb99d7bdaf 1) Move extra fields found in struct CornerpointGrid into struct UnstructuredGrid.
2) Remove typedef grid_t
3) Remove struct CornerpointGrid.
4) handle fallout.
2012-02-01 14:56:38 +01:00
Jostein R. Natvig e577b74a48 Add new version of well datastructure. 2012-02-01 12:16:05 +01:00
Jostein R. Natvig a92b7a1b0c Copy modifications to reorder-related codes from MRST repository
branches/mrst-reorg/mex/reorder-C, revision 8955.

The changes are: (1) addition of documentation of input arguments in
tarjan.c and (2) an MIT licence header (codes originated in a PhD
project).
2012-01-25 10:49:49 +01:00
Jostein R. Natvig 80beabc3e9 Remove unnecessary include statement. 2012-01-25 10:44:37 +01:00
Jostein R. Natvig 5d058ca8da Add demonstration for bare-bones reordering implementation. 2012-01-17 14:41:00 +01:00
Jostein R. Natvig 71f6bac21e Add bare-bones implementation of reordering algorithm.
Lightly tested.
2012-01-17 14:39:09 +01:00
Jostein R. Natvig 3ba7623d41 Remove debug output. 2012-01-16 13:36:09 +01:00
Jostein R. Natvig 3b32089890 Whitespace cleanup. 2012-01-16 13:32:32 +01:00
Jostein R. Natvig 5e049918b7 Do not check monotonicity of ZCORN in inactive cells. 2012-01-16 13:31:39 +01:00
Jostein R. Natvig 04f9d46c10 Add tensor grid constructors. 2011-12-14 09:30:25 +01:00
Jostein R. Natvig d25ce5c002 Restructure code to prepare for reuse in future tensor_grid_* constructors. 2011-12-14 09:17:07 +01:00
Jostein R. Natvig 35a1070a5b Merge from upstream. 2011-12-14 07:02:47 +01:00
Jostein R. Natvig 369a438f13 Add function create_cart_grid_2d. Preliminary implementation. 2011-12-14 06:58:02 +01:00
Jostein R. Natvig 0a96ddfcd4 Merge. 2011-12-02 13:57:32 +01:00
Jostein R. Natvig a6bc2c70d1 Hook scaneclipsedeck up to build system. 2011-12-02 13:56:37 +01:00
Jostein R. Natvig 81d2ac3d8f Add simple code to scan an eclipse deck and write keywords to screen. 2011-12-02 13:56:03 +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
Jostein R. Natvig 9e3bf5ebe2 Implement simple Newton iteration. 2010-11-19 13:32:36 +01:00
Jostein R. Natvig 15d598091a Remove Matlab binding. 2010-11-19 10:20:48 +01:00
Jostein R. Natvig ec27ae5707 Remove bindings to mex/matlab/mrst... 2010-11-19 10:13:27 +01:00
Jostein R. Natvig 1c86849ffc Add basic code needed for an implicit upwind mobility-weighted solver
for incompressible twophase flow.
2010-11-18 18:37:00 +01:00
Jostein R. Natvig 3513df0975 Add m4 directory with BLAS and LAPACK checks. 2010-11-10 10:39:48 +01:00
Jostein R. Natvig ac71f1092f * Move source code to src directory.
* Add autotools build system for opmtransport library.
2010-11-10 10:29:41 +01:00
Jostein R. Natvig 43ec21e382 Remove unnecessary argument in mim_ip_simple_all; fix affected code;
as suggested by bska.
2010-11-05 22:05:55 +01:00
Jostein R. Natvig f59e4c437a Add bare-bones explicit mobility-weighted upwind solver for two-phase
incompressible flow.
2010-11-02 09:10:36 +01:00
Jostein R. Natvig 789217900e Remove unused function declarations.
Suggest use of decorated include guards.
2010-10-13 11:35:10 +02:00
Jostein R. Natvig 297b79d4f0 Add simple test of mex_ifsh. 2010-09-22 11:48:08 +00:00
Jostein R. Natvig 0734f8d842 Add copy of (proposed) grid structure. 2010-08-31 14:09:05 +00:00
Jostein R. Natvig 1d991e26e5 Add alternative interface and makefile that builds library. 2010-08-30 08:37:37 +00:00
Jostein R. Natvig ad938d1bcb Whitespace. 2010-08-30 08:36:51 +00:00
Jostein R. Natvig a2e14eb19d Add emacs local variables. 2010-08-27 17:12:16 +00:00
Jostein R. Natvig 87949a432e Fix embarrasing error. 2010-08-20 14:18:22 +00:00
Jostein R. Natvig bea6bcaccb Four-space indentation. 2010-08-19 11:02:50 +00:00
Jostein R. Natvig fe319fbbef Add comment. 2010-08-19 10:52:10 +00:00
Jostein R. Natvig 4519ce2b7c A depth-first graph traversal to find connected components of graph. 2010-08-19 10:46:58 +00:00
Jostein R. Natvig 991851bd9e Add local variables and whitespace changes. 2010-08-17 07:20:12 +00:00
Jostein R. Natvig cd829252ca Additiona and modifications to mimetic assembly routines in C. Add
code to call libmwumfpack from mex code.
2010-08-09 08:02:56 +00:00
Jostein R. Natvig 7e3fe07012 Add system assembly. 2010-08-06 10:53:07 +00:00
Jostein R. Natvig f7e93692f9 free->mxFree. createNumericMatrix->createDoubleMatrix. 2010-08-05 12:16:15 +00:00
Jostein R. Natvig 10582ea32a Convert to using MRST API. 2010-08-05 12:14:39 +00:00
Jostein R. Natvig 97565f3bb7 Return pointers from getXX(...). Transpose centroids and normals.
And coordinates.
2010-08-05 12:13:59 +00:00
Jostein R. Natvig 53de3c03d1 Some cleanup. 'Transpose' getFaceCellNeighbors. 2010-08-05 07:33:59 +00:00
Jostein R. Natvig de74b2565c Add geometry processing in C. 2010-08-04 14:11:37 +00:00
Jostein R. Natvig a118c2f8ef A first attempt at a C API to MRST grids. 2010-08-04 14:10:27 +00:00
Jostein R. Natvig 89128edfac Add hack to reverse sign in ZCORN if ZCORN decrease along pillar.
The sign of z-coordinates in the processed grid is restored to ensure
right-handedness in relation between face geometry and face-cell topology.
2010-03-03 06:49:51 +00:00
Jostein R. Natvig d86ba9ab8d Add sanity chech of input. 2010-01-15 13:20:25 +00:00
Jostein R. Natvig f795a753ed Catch up with change in grid structure. 2010-01-05 15:43:59 +00:00
Jostein R. Natvig d5c900de11 *Change some fields from double to int.
*Add copyright.

Lacking functionality to split disconnected grid.
2009-12-16 13:49:14 +00:00
Jostein R. Natvig 0e73dd9315 Minor change. 2009-11-26 07:08:44 +00:00
Jostein R. Natvig f4b0ab8c23 Ensure build mechanism changes back to current directory
also when build fails.
2009-11-26 07:06:36 +00:00
Jostein R. Natvig 98ff8ac4f1 Bugfix in mex file. Fixes bug that casued Matlab to crach on
second call to procesgrid.
2009-11-26 06:47:19 +00:00
Jostein R. Natvig 8d81aa467b Add field G.cells.facePos to grid struct. 2009-11-19 17:26:07 +00:00
Jostein R. Natvig 0a895e9432 Remove old Matlab files used for debugging. Use new mex gateway
function and MRST for testing.
2009-11-19 17:19:23 +00:00
Jostein R. Natvig 01fe4d35e0 Add extra error checks. 2009-11-19 17:16:53 +00:00
Jostein R. Natvig 6c4f2e525c Matlab frontend, documentation and build instruction for
processgrid mex script.

This interface allows users of the Matlab Reservoir
Simulation Toolbox (MRST) to use the OPM corner point
grid processing in MRST.  This represent a significant speedup
over the native Matlab grid processing already avaliable in
MRST.
2009-11-19 17:15:09 +00:00
Jostein R. Natvig 5f6544fe73 Use mexopts.sh to control which compiler to use when building Matlab
mex script processgrid.c.
2009-11-19 17:10:47 +00:00
Jostein R. Natvig 23665a99e4 Add nodePos to G.faces field. 2009-11-19 15:25:37 +00:00
Jostein R. Natvig dd1df7ff3f Removed illegal debug code. 2009-09-21 12:24:27 +00:00
Jostein R. Natvig 3e0e7b0c90 Removing uneccessary files. 2009-06-25 11:44:10 +00:00
Jostein R. Natvig 89e23f883f Fix orientation of faces on faults.
Fix problem with indexMap.
2009-06-25 11:41:32 +00:00
Jostein R. Natvig 5186b5795a Remove last known bug. 2009-06-24 09:50:13 +00:00
Jostein R. Natvig bc880431b4 Bugfix. Remove duplicate nodes for partially pinched faces. 2009-06-23 16:12:37 +00:00
Jostein R. Natvig a548d16762 First fix of normal directions. 2009-06-23 10:48:44 +00:00
Jostein R. Natvig 2e9881b746 Refactoring. Moving return struct around instead of a bunch of
auxillary variables.
2009-06-19 13:57:38 +00:00
Jostein R. Natvig 7cc7596fc8 Moved permutation of ACTNUM and ZCORN to process_grdecl. The input is
now unaltered on exit.
2009-06-19 11:31:16 +00:00
Jostein R. Natvig 12c6e7170c 2009-06-19 09:42:02 +00:00
Jostein R. Natvig 2024d80518 Some comments. 2009-06-19 09:17:44 +00:00
Jostein R. Natvig 9bdc8b5a7c Add license header. 2009-06-19 07:54:00 +00:00
Jostein R. Natvig 52bb1d6cae Adding test script for generating grdecl spec with some compelxity. 2009-06-18 16:13:49 +00:00
Jostein R. Natvig bf34f4d1f7 2009-06-18 16:12:59 +00:00
Jostein R. Natvig 286deeaec8 Remove commented out debug code. 2009-06-18 16:12:42 +00:00
Jostein R. Natvig eee76550ef Slowly cleaning up the code. 2009-06-18 16:12:04 +00:00
Jostein R. Natvig 7c0a301382 Some functions have changed names. Allow passing tolerance from Matlab. 2009-06-18 16:11:25 +00:00
Jostein R. Natvig 40addf9f02 Introduce more argument checks. 2009-06-18 16:10:37 +00:00
Jostein R. Natvig e704b2bce9 Allow passinf tolerance to point processing. Write all tolerance checks the same way. 2009-06-18 16:09:49 +00:00
Jostein R. Natvig c6465ec385 No functional change. 2009-06-18 13:31:31 +00:00
Jostein R. Natvig c532cfe7bc Remove bug. faces connecting void space to void space are now skipped. 2009-06-18 13:30:35 +00:00
Jostein R. Natvig 616afb5838 Add check for integer input. No other check is performed. 2009-06-18 13:29:41 +00:00
Jostein R. Natvig a4e75f7013 2009-06-18 13:28:54 +00:00
Jostein R. Natvig c1129c1546 Add some checking + minimum tolerance DBL_EPSILON. 2009-06-18 13:28:24 +00:00
Jostein R. Natvig 45e3b4cede First seemingly working version. Norner is processed. There are some
differences between C and Matlab versions of the processed grid, though.
2009-06-17 13:08:59 +00:00
Jostein R. Natvig a4b48c494b Fix minor problem with constant-k faces.
Compute node coordinates.
2009-06-15 11:05:05 +00:00
Jostein R. Natvig a0c9d4c4ec Forgot to check in these files.
Have added processing of horizontal faces (k constant) that includes
removal of completely pinched or inactive cells.
2009-06-15 07:30:16 +00:00
Jostein R. Natvig ff9c542777 Moved code around.
Fixed bug in sparse_table_realloc.
Add processing of k-constant faces and local cell index.

The calculation of point coordinates still remains.
2009-06-12 15:42:32 +00:00
Jostein R. Natvig ff37ae8160 Modifying grdecl and processed_grid. Introducing const here and there. 2009-06-12 13:10:31 +00:00
Jostein R. Natvig 201a31a9bc Many changes. I cannot remember them all. 2009-06-12 12:40:38 +00:00
Jostein R. Natvig f02fbe0b9d Refactoring code, adding correct handling of faces on boundary.
Packing unstructured data in csr-like strucuture.
2009-06-11 23:35:19 +00:00
Jostein R. Natvig 82ff742b37 Moved processing of face topology to separate file. 2009-06-11 07:56:45 +00:00
Jostein R. Natvig e04eb2f728 Initial checkin of cornerpoint processing code.
Current status
--------------
Given vectors ZCORN, COORD and ACTNUM as well as the Cartesian
dimensions these vectors implicitly refer to, the code is
currently capable of

 * Identify unique points along each pillar
 * Assign point numbers for each point specified in ZCORN
 * Compute face topology, i.e., the corners that define the geometry
   of the faces as well as the cells that are connected through the face.
 * Identify and compute intesections that occur in the processing of
   face topology.

What remains is

 * Handle the face geometry of boundary faces. (simple)
 * Compute point coordinates of the final point list.
 * Put all pieces together in a tidy manner.
2009-06-11 07:33:50 +00:00