Remove old function "create_cart_grid", please use "create_cart_grid_3d".
This commit is contained in:
Jostein R. Natvig
parent
bdd7bcb50f
commit
9def4966cc
@ -437,227 +437,6 @@ fill_cart_geometry_3d(struct UnstructuredGrid *G, int nx, int ny, int nz)
|
||||
|
||||
/* --------------------------------------------------------------------- */
|
||||
|
||||
struct UnstructuredGrid*
|
||||
create_cart_grid(int nx, int ny, int nz)
|
||||
{
|
||||
int i,j,k;
|
||||
int nxf, nyf, nzf;
|
||||
int Nx, Ny, Nz;
|
||||
|
||||
struct UnstructuredGrid *G;
|
||||
double *coord, *ccentroids, *cvolumes;
|
||||
double *fnormals, *fcentroids, *fareas;
|
||||
|
||||
int *fnodes, *fnodepos, *fcells, *cfaces, *cfacepos;
|
||||
|
||||
G = malloc(1 * sizeof *G);
|
||||
if (G == NULL)
|
||||
{
|
||||
fprintf(stderr, "Cannot allocate space for grid.\n");
|
||||
exit(EXIT_FAILURE);
|
||||
}
|
||||
|
||||
G->dimensions = 3;
|
||||
|
||||
Nx = nx+1;
|
||||
Ny = ny+1;
|
||||
Nz = nz+1;
|
||||
|
||||
nxf = Nx*ny*nz;
|
||||
nyf = nx*Ny*nz;
|
||||
nzf = nx*ny*Nz;
|
||||
|
||||
G->number_of_cells = nx*ny*nz;
|
||||
G->number_of_faces = nxf+nyf+nzf;
|
||||
G->number_of_nodes = Nx*Ny*Nz;
|
||||
|
||||
G->node_coordinates = malloc(G->number_of_nodes * 3 * sizeof *(G->node_coordinates));
|
||||
|
||||
G->face_nodes = malloc(G->number_of_faces * 4 * sizeof *(G->face_nodes));
|
||||
G->face_nodepos = malloc((G->number_of_faces+1) * sizeof *(G->face_nodepos));
|
||||
G->face_cells = malloc(G->number_of_faces * 2 * sizeof *(G->face_cells));
|
||||
G->face_centroids = malloc(G->number_of_faces * 3 * sizeof *(G->face_centroids));
|
||||
G->face_normals = malloc(G->number_of_faces * 3 * sizeof *(G->face_normals));
|
||||
G->face_areas = malloc(G->number_of_faces * 1 * sizeof *(G->face_areas));
|
||||
|
||||
G->cell_faces = malloc(G->number_of_cells * 6 * sizeof *(G->cell_faces));
|
||||
G->cell_facepos = malloc((G->number_of_cells+1) * sizeof *(G->cell_facepos));
|
||||
G->cell_centroids = malloc(G->number_of_cells * 3 * sizeof *(G->cell_centroids));
|
||||
G->cell_volumes = malloc(G->number_of_cells * 1 * sizeof *(G->cell_volumes));
|
||||
|
||||
if ((G->face_nodes == NULL ) ||
|
||||
(G->face_nodepos == NULL ) ||
|
||||
(G->face_cells == NULL ) ||
|
||||
(G->face_centroids == NULL ) ||
|
||||
(G->face_normals == NULL ) ||
|
||||
(G->face_areas == NULL ) ||
|
||||
(G->cell_faces == NULL ) ||
|
||||
(G->cell_facepos == NULL ) ||
|
||||
(G->cell_centroids == NULL ) ||
|
||||
(G->cell_volumes == NULL ) )
|
||||
{
|
||||
fprintf(stderr, "Cannot allocate space for grid.\n");
|
||||
exit(EXIT_FAILURE);
|
||||
}
|
||||
|
||||
cfaces = G->cell_faces;
|
||||
cfacepos = G->cell_facepos;
|
||||
ccentroids = G->cell_centroids;
|
||||
cvolumes = G->cell_volumes;
|
||||
cfacepos[0] = 0;
|
||||
for (k=0; k<nz; ++k) {
|
||||
for (j=0; j<ny; ++j) {
|
||||
for (i=0; i<nx; ++i) {
|
||||
*cfaces++ = i+ Nx*(j+ ny* k );
|
||||
*cfaces++ = i+1+Nx*(j+ ny* k );
|
||||
*cfaces++ = i+ nx*(j+ Ny* k ) +nxf;
|
||||
*cfaces++ = i+ nx*(j+1+Ny* k ) +nxf;
|
||||
*cfaces++ = i+ nx*(j+ ny* k ) +nxf+nyf;
|
||||
*cfaces++ = i+ nx*(j+ ny*(k+1)) +nxf+nyf;
|
||||
|
||||
cfacepos[1] = cfacepos[0]+6;
|
||||
++cfacepos;
|
||||
|
||||
*ccentroids++ = i+0.5;
|
||||
*ccentroids++ = j+0.5;
|
||||
*ccentroids++ = k+0.5;
|
||||
|
||||
*cvolumes++ = 1;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
fnodes = G->face_nodes;
|
||||
fnodepos = G->face_nodepos;
|
||||
fcells = G->face_cells;
|
||||
fnormals = G->face_normals;
|
||||
fcentroids = G->face_centroids;
|
||||
fareas = G->face_areas;
|
||||
fnodepos[0] = 0;
|
||||
|
||||
/* Faces with x-normal */
|
||||
for (k=0; k<nz; ++k) {
|
||||
for (j=0; j<ny; ++j) {
|
||||
for (i=0; i<nx+1; ++i) {
|
||||
*fnodes++ = i+Nx*(j + Ny * k );
|
||||
*fnodes++ = i+Nx*(j+1 + Ny * k );
|
||||
*fnodes++ = i+Nx*(j+1 + Ny *(k+1));
|
||||
*fnodes++ = i+Nx*(j + Ny *(k+1));
|
||||
fnodepos[1] = fnodepos[0] + 4;
|
||||
++fnodepos;
|
||||
if (i==0) {
|
||||
*fcells++ = -1;
|
||||
*fcells++ = i+nx*(j+ny*k);
|
||||
}
|
||||
else if (i == nx) {
|
||||
*fcells++ = i-1+nx*(j+ny*k);
|
||||
*fcells++ = -1;
|
||||
}
|
||||
else {
|
||||
*fcells++ = i-1 + nx*(j+ny*k);
|
||||
*fcells++ = i + nx*(j+ny*k);
|
||||
}
|
||||
|
||||
*fnormals++ = 1;
|
||||
*fnormals++ = 0;
|
||||
*fnormals++ = 0;
|
||||
|
||||
*fcentroids++ = i;
|
||||
*fcentroids++ = j+0.5;
|
||||
*fcentroids++ = k+0.5;
|
||||
|
||||
*fareas++ = 1;
|
||||
}
|
||||
}
|
||||
}
|
||||
/* Faces with y-normal */
|
||||
for (k=0; k<nz; ++k) {
|
||||
for (j=0; j<ny+1; ++j) {
|
||||
for (i=0; i<nx; ++i) {
|
||||
*fnodes++ = i+ Nx*(j + Ny * k );
|
||||
*fnodes++ = i + Nx*(j + Ny *(k+1));
|
||||
*fnodes++ = i+1 + Nx*(j + Ny *(k+1));
|
||||
*fnodes++ = i+1 + Nx*(j + Ny * k );
|
||||
fnodepos[1] = fnodepos[0] + 4;
|
||||
++fnodepos;
|
||||
if (j==0) {
|
||||
*fcells++ = -1;
|
||||
*fcells++ = i+nx*(j+ny*k);
|
||||
}
|
||||
else if (j == ny) {
|
||||
*fcells++ = i+nx*(j-1+ny*k);
|
||||
*fcells++ = -1;
|
||||
}
|
||||
else {
|
||||
*fcells++ = i+nx*(j-1+ny*k);
|
||||
*fcells++ = i+nx*(j+ny*k);
|
||||
}
|
||||
|
||||
*fnormals++ = 0;
|
||||
*fnormals++ = 1;
|
||||
*fnormals++ = 0;
|
||||
|
||||
*fcentroids++ = i+0.5;
|
||||
*fcentroids++ = j;
|
||||
*fcentroids++ = k+0.5;
|
||||
|
||||
*fareas++ = 1;
|
||||
}
|
||||
}
|
||||
}
|
||||
/* Faces with z-normal */
|
||||
for (k=0; k<nz+1; ++k) {
|
||||
for (j=0; j<ny; ++j) {
|
||||
for (i=0; i<nx; ++i) {
|
||||
*fnodes++ = i+ Nx*(j + Ny * k);
|
||||
*fnodes++ = i+1 + Nx*(j + Ny * k);
|
||||
*fnodes++ = i+1 + Nx*(j+1 + Ny * k);
|
||||
*fnodes++ = i+ Nx*(j+1 + Ny * k);
|
||||
fnodepos[1] = fnodepos[0] + 4;
|
||||
++fnodepos;
|
||||
if (k==0) {
|
||||
*fcells++ = -1;
|
||||
*fcells++ = i+nx*(j+ny*k);
|
||||
}
|
||||
else if (k == nz) {
|
||||
*fcells++ = i+nx*(j+ny*(k-1));
|
||||
*fcells++ = -1;
|
||||
}
|
||||
else {
|
||||
*fcells++ = i+nx*(j+ny*(k-1));
|
||||
*fcells++ = i+nx*(j+ny*k);
|
||||
}
|
||||
|
||||
*fnormals++ = 0;
|
||||
*fnormals++ = 0;
|
||||
*fnormals++ = 1;
|
||||
|
||||
*fcentroids++ = i+0.5;
|
||||
*fcentroids++ = j+0.5;
|
||||
*fcentroids++ = k;
|
||||
|
||||
*fareas++ = 1;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
coord = G->node_coordinates;
|
||||
for (k=0; k<nz+1; ++k) {
|
||||
for (j=0; j<ny+1; ++j) {
|
||||
for (i=0; i<nx+1; ++i) {
|
||||
*coord++ = i;
|
||||
*coord++ = j;
|
||||
*coord++ = k;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return G;
|
||||
}
|
||||
|
||||
/* --------------------------------------------------------------------- */
|
||||
|
||||
static struct UnstructuredGrid*
|
||||
allocate_cart_grid_2d(int nx, int ny)
|
||||
{
|
||||
|
||||
@ -36,10 +36,6 @@ extern "C" {
|
||||
|
||||
struct UnstructuredGrid;
|
||||
|
||||
/* void destroy_cart_grid(struct UnstructuredGrid *G); */
|
||||
|
||||
struct UnstructuredGrid *create_cart_grid(int nx, int ny, int nz);
|
||||
|
||||
struct UnstructuredGrid *create_cart_grid_2d(int nx, int ny);
|
||||
struct UnstructuredGrid *create_cart_grid_3d(int nx, int ny, int nz);
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user