Skip to content
Snippets Groups Projects
Commit 38a8e867 authored by Pierre Augier's avatar Pierre Augier
Browse files

Solve bugs 3d.

parent ad2dae8c
No related branches found
No related tags found
No related merge requests found
......@@ -138,7 +138,7 @@
def plot(self, numfig=None, field=None, key_field=None,
QUIVER=True, vecx='ux', vecy='uy', FIELD_LOC=True,
nb_contours=20, type_plot='contourf'):
nb_contours=20, type_plot='contourf', iz=0):
x_left_axe = 0.08
z_bottom_axe = 0.07
......@@ -178,6 +178,9 @@
else:
field = field_loc
if field.ndim == 3:
field = field[iz]
if mpi.rank == 0:
if numfig is None:
fig, ax = self.output.figure_axe(size_axe=size_axe)
......
......@@ -69,6 +69,10 @@
self.deltay = Ly/ny
self.deltaz = Lz/nz
self.x_seq = self.deltax*np.arange(nx)
self.y_seq = self.deltay*np.arange(ny)
self.z_seq = self.deltaz*np.arange(nz)
self._oper2d = OperatorsPseudoSpectral2D(params)
self.type_fft = self._oper2d.type_fft
self.ifft2 = self.ifft2d = self._oper2d.ifft2
......@@ -145,7 +149,8 @@
' ; Lz = ' + str_Lz + '\n')
def expand_3dfrom2d(self, arr2d):
return arr2d.repeat(self.nz_seq).reshape((self.nz_seq,) + arr2d.shape)
return np.array(list(arr2d)*self.nz_seq).reshape(
(self.nz_seq,) + arr2d.shape)
def project_perpk3d(self, vx_fft, vy_fft, vz_fft):
......
......@@ -197,7 +197,7 @@
sim = Simul(params)
# sim.output.phys_fields.plot()
sim.time_stepping.start()
# sim.time_stepping.start()
# sim.output.phys_fields.plot()
fld.show()
......@@ -28,7 +28,9 @@
'keys_state_fft': [k + '_fft' for k in keys_state_phys],
'keys_state_phys': keys_state_phys,
'keys_phys_needed': keys_state_phys,
'keys_linear_eigenmodes': ['rot_fft']})
'keys_computable': [],
'keys_linear_eigenmodes': ['rot_fft']
})
def compute(self, key, SAVE_IN_DICT=True, RAISE_ERROR=True):
it = self.sim.time_stepping.it
......@@ -72,11 +74,11 @@
vy = self.state_phys.get_var('vy')
vz = self.state_phys.get_var('vz')
self.state_fft.get_var('vx_fft', self.oper.fft3d(vx))
self.state_fft.get_var('vy_fft', self.oper.fft3d(vy))
self.state_fft.get_var('vz_fft', self.oper.fft3d(vz))
self.state_fft.set_var('vx_fft', self.oper.fft3d(vx))
self.state_fft.set_var('vy_fft', self.oper.fft3d(vy))
self.state_fft.set_var('vz_fft', self.oper.fft3d(vz))
def init_from_vxvyfft(self, vx_fft, vy_fft):
self.state_fft.set_var('vx_fft', vx_fft)
self.state_fft.set_var('vy_fft', vy_fft)
self.state_fft.set_var('vz_fft', np.zeros_like(vx_fft))
......@@ -78,5 +80,10 @@
def init_from_vxvyfft(self, vx_fft, vy_fft):
self.state_fft.set_var('vx_fft', vx_fft)
self.state_fft.set_var('vy_fft', vy_fft)
self.state_fft.set_var('vz_fft', np.zeros_like(vx_fft))
self.state_phys.set_var('vx', self.oper.ifft3d(vx_fft))
self.state_phys.set_var('vy', self.oper.ifft3d(vy_fft))
vx = self.state_phys.get_var('vx')
self.state_phys.set_var('vz', np.zeros_like(vx))
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment