Commit d085f61ff7386d3d0fa8d5990ee29cbf40b0556f

Fix axes ordering in the free surface code.

As everywhere else in Sailfish, the ordering of the dimensions in numpy
arrays is [Z,]Y,X.


6	6
7	7	class LBMGeoFS(geo.LBMGeo2D):
8	8	def init_dist(self, dist):
9		sigma = self.lat_nx / 12.0
	9	sigma = min(self.lat_ny, self.lat_nx) / 12.0
10	10	amp = 0.4
11	11
12	12	vx = vy = numpy.zeros_like(dist[0]).astype(numpy.float32)
13		hx, hy = numpy.mgrid[(-self.lat_nx/2.0):(self.lat_nx/2.0):complex(0, self.lat_nx),
14		(-self.lat_ny/2.0):(self.lat_ny/2.0):complex(0,
15		self.lat_ny)].astype(numpy.float32)
	13	hx, hy = numpy.mgrid[
	14	(-self.lat_ny/2.0):(self.lat_ny/2.0):complex(0, self.lat_ny),
	15	(-self.lat_nx/2.0):(self.lat_nx/2.0):complex(0, self.lat_nx)].astype(numpy.float32)
16	16
17	17	h = 1.0 + amp * numpy.exp(-(numpy.square(hx) + numpy.square(hy)) / sigma**2)
18	18	self.velocity_to_dist(slice(None), (vx, vy), dist, h)


48	48	self.lat_ny = lat_ny
49	49	self.sim = sim
50	50
51		self.mesh_x, self.mesh_y = numpy.mgrid[-1:1:complex(0, self.lat_nx),
52		-1:1:complex(0, self.lat_ny)]
	51	m = min(lat_nx, lat_ny)
	52	mx = lat_nx / m
	53	my = lat_ny / m
53	54
	55	self.mesh_x, self.mesh_y = numpy.mgrid[
	56	-my:my:complex(0, lat_ny),
	57	-mx:mx:complex(0, lat_nx)]
	58
54	59	self.mesh_x = self.mesh_x.astype(numpy.float32)
55	60	self.mesh_y = self.mesh_y.astype(numpy.float32)
56	61	self.mesh_n = (self.lat_nx-1) * (self.lat_ny-1) * 4
…	…
141	141
142	142	glTranslatef(0.0, -0.5, -4.0)
143	143	glRotatef(-60.0, 1.0, 0.0, 0.0)
	144	glRotatef(90.0, 0.0, 0.0, 1.0)
144	145
145	146	glEnableClientState(GL_COLOR_ARRAY)
146	147	glEnableClientState(GL_VERTEX_ARRAY)