GopherProxy

	tSwapped row-col read/write order - ns2dfd - 2D finite difference Navier Stokes…
	git clone git://src.adamsgaard.dk/ns2dfd
	Log
	Files
	Refs
	LICENSE
	---
	commit d0adbc625218b6a15d9a4e01da69a7196fe5284f
	parent 11ed07ed184958fe2c18d696a2ecca8b01695fd2
	Author: Anders Damsgaard <[email protected]>
	Date: Mon, 3 Mar 2014 09:25:08 +0100

	Swapped row-col read/write order

	Diffstat:
	M ns2dfd.py \| 24 ++++++++++++------------
	M src/file_io.c \| 24 ++++++++++++------------

	2 files changed, 24 insertions(+), 24 deletions(-)
	---
	diff --git a/ns2dfd.py b/ns2dfd.py
	t@@ -186,18 +186,18 @@ class fluid:
	self.init_grid(dx = self.dx, dy = self.dy,\
	nx = self.nx, ny = self.ny)

	- for j in range(self.ny+1):
	- for i in range(self.nx+1):
	+ for i in range(self.nx+1):
	+ for j in range(self.ny+1):
	self.P[i,j] = \
	numpy.fromfile(fh, dtype=numpy.float64, count=1)

	- for j in range(self.ny+2):
	- for i in range(self.nx+2):
	+ for i in range(self.nx+2):
	+ for j in range(self.ny+2):
	self.U[i,j] = \
	numpy.fromfile(fh, dtype=numpy.float64, count=1)

	- for j in range(self.ny+2):
	- for i in range(self.nx+2):
	+ for i in range(self.nx+2):
	+ for j in range(self.ny+2):
	self.V[i,j] = \
	numpy.fromfile(fh, dtype=numpy.float64, count=1)

	t@@ -241,16 +241,16 @@ class fluid:
	fh.write(self.nx.astype(numpy.int32))
	fh.write(self.ny.astype(numpy.int32))

	- for j in range(self.ny+1):
	- for i in range(self.nx+1):
	+ for i in range(self.nx+1):
	+ for j in range(self.ny+1):
	fh.write(self.P[i,j].astype(numpy.float64))

	- for j in range(self.ny+2):
	- for i in range(self.nx+2):
	+ for i in range(self.nx+2):
	+ for j in range(self.ny+2):
	fh.write(self.U[i,j].astype(numpy.float64))

	- for j in range(self.ny+2):
	- for i in range(self.nx+2):
	+ for i in range(self.nx+2):
	+ for j in range(self.ny+2):
	fh.write(self.V[i,j].astype(numpy.float64))

	finally:
	diff --git a/src/file_io.c b/src/file_io.c
	t@@ -45,22 +45,22 @@ int read_file(char *path,

	allocate_memory(P, U, V, nx, ny);

	- for (j=0; j<*ny+1; j++) {
	- for (i=0; i<*nx+1; i++) {
	+ for (i=0; i<*nx+1; i++) {
	+ for (j=0; j<*ny+1; j++) {
	fread(&tmp, sizeof(double), 1, fp);
	(*P)[i][j] = tmp;
	}
	}

	- for (j=0; j<*ny+2; j++) {
	- for (i=0; i<*nx+2; i++) {
	+ for (i=0; i<*nx+2; i++) {
	+ for (j=0; j<*ny+2; j++) {
	fread(&tmp, sizeof(double), 1, fp);
	(*U)[i][j] = tmp;
	}
	}

	- for (j=0; j<*ny+2; j++) {
	- for (i=0; i<*nx+2; i++) {
	+ for (i=0; i<*nx+2; i++) {
	+ for (j=0; j<*ny+2; j++) {
	fread(&tmp, sizeof(double), 1, fp);
	(*V)[i][j] = tmp;
	}
	t@@ -113,22 +113,22 @@ int write_file(char *path,
	fwrite(nx, sizeof(int), 1, fp);
	fwrite(ny, sizeof(int), 1, fp);

	- for (j=0; j<*ny+1; j++) {
	- for (i=0; i<*nx+1; i++) {
	+ for (i=0; i<*nx+1; i++) {
	+ for (j=0; j<*ny+1; j++) {
	tmp = (*P)[i][j];
	fwrite(&tmp, sizeof(double), 1, fp);
	}
	}

	- for (j=0; j<*ny+2; j++) {
	- for (i=0; i<*nx+2; i++) {
	+ for (i=0; i<*nx+2; i++) {
	+ for (j=0; j<*ny+2; j++) {
	tmp = (*U)[i][j];
	fwrite(&tmp, sizeof(double), 1, fp);
	}
	}

	- for (j=0; j<*ny+2; j++) {
	- for (i=0; i<*nx+2; i++) {
	+ for (i=0; i<*nx+2; i++) {
	+ for (j=0; j<*ny+2; j++) {
	tmp = (*V)[i][j];
	fwrite(&tmp, sizeof(double), 1, fp);
	}