OilfieldToolsNet/opm-core
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge.

Browse Source
This commit is contained in:
Jostein R. Natvig 2011-12-02 13:57:32 +01:00
commit 0a96ddfcd4
4 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.hgignore
View File

@ -31,3 +31,6 @@ ltmain.sh
missing missing
m4/libtool.m4 m4/libtool.m4
m4/lt*.m4 m4/lt*.m4
# Specific executables
grid_io_demo

1
Makefile.am
View File

@ -19,6 +19,7 @@ facetopology.c \
facetopology.h \ facetopology.h \
geometry.c \ geometry.c \
geometry.h \ geometry.h \
grid.h \
preprocess.c \ preprocess.c \
readvector.cpp \ readvector.cpp \
readvector.hpp \ readvector.hpp \

7
cgridinterface.c
View File

@ -1,8 +1,6 @@
#include <assert.h> #include <assert.h>
#include <stdlib.h> #include <stdlib.h>
#include <grid.h>
#include "geometry.h" #include "geometry.h"
#include "cgridinterface.h" #include "cgridinterface.h"
@ -69,9 +67,8 @@ static int
fill_cell_topology(struct processed_grid *pg, fill_cell_topology(struct processed_grid *pg,
struct CornerpointGrid *G ) struct CornerpointGrid *G )
{ {
int f, c1, c2; int f, c1, c2, tag;
size_t c, nc, nhf; size_t c, nc, nhf;
enum face_tag tag;
struct UnstructuredGrid *g; struct UnstructuredGrid *g;
@ -137,6 +134,8 @@ fill_cell_topology(struct processed_grid *pg,
} }
} }
} }
return g->cell_facepos != NULL;
} }
void preprocess (const struct grdecl *in, void preprocess (const struct grdecl *in,

3
cgridinterface.h
View File

@ -19,8 +19,7 @@
#ifndef CGRIDINTERFACE_H #ifndef CGRIDINTERFACE_H
#define CGRIDINTERFACE_H #define CGRIDINTERFACE_H
#include <grid.h> #include "grid.h"
#include "preprocess.h" #include "preprocess.h"
#ifdef __cplusplus #ifdef __cplusplus