Skip to content
Snippets Groups Projects
Commit 37eecfaf authored by Jean-Matthieu Etancelin's avatar Jean-Matthieu Etancelin
Browse files

Update to single precision patch. Fix gpu advection test

parent 819320f2
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
HySoP/hysop/gpu/tests/test_advection_randomVelocity.py
+ 32
− 48
View file @ 37eecfaf
...@@ -40,12 +40,10 @@ def assertion_2D_withPython(scal, velo, advec, advec_py): ...@@ -40,12 +40,10 @@ def assertion_2D_withPython(scal, velo, advec, advec_py):
velo_d = velo.discreteFields.values()[0] velo_d = velo.discreteFields.values()[0]
scal_d.data[0][...] = npw.asrealarray( scal_d.data[0][...] = npw.asrealarray(
np.random.random(scal_d.data[0].shape)) np.random.random(scal_d.data[0].shape))
velo_d.data[0][...] = npw.ones(scal_d.data[0].shape) velo_d.data[0][...] = np.asarray(
#velo_d.data[0][...] = np.asarray( np.random.random(scal_d.data[0].shape)) / (2. * scal_d.resolution[0])
# np.random.random(scal_d.data[0].shape)) / (2. * scal_d.resolution[0]) velo_d.data[1][...] = np.asarray(
velo_d.data[1][...] = npw.ones(scal_d.data[0].shape) np.random.random(scal_d.data[0].shape)) / (2. * scal_d.resolution[1])
#velo_d.data[1][...] = np.asarray(
# np.random.random(scal_d.data[0].shape)) / (2. * scal_d.resolution[1])
scal_d.toDevice() scal_d.toDevice()
velo_d.toDevice() velo_d.toDevice()
...@@ -69,15 +67,12 @@ def assertion_3D_withPython(scal, velo, advec, advec_py): ...@@ -69,15 +67,12 @@ def assertion_3D_withPython(scal, velo, advec, advec_py):
velo_d = velo.discreteFields.values()[0] velo_d = velo.discreteFields.values()[0]
scal_d.data[0][...] = npw.asrealarray( scal_d.data[0][...] = npw.asrealarray(
np.random.random(scal_d.data[0].shape)) np.random.random(scal_d.data[0].shape))
velo_d.data[0][...] = npw.ones(scal_d.data[0].shape) velo_d.data[0][...] = npw.zeros_like(
#npw.zeros_like( scal_d.data[0]) / (2. * scal_d.resolution[0])
# scal_d.data[0]) / (2. * scal_d.resolution[0]) velo_d.data[1][...] = npw.zeros_like(
velo_d.data[1][...] = npw.ones(scal_d.data[0].shape) scal_d.data[0]) / (2. * scal_d.resolution[1])
#npw.zeros_like( velo_d.data[2][...] = npw.zeros_like(
# scal_d.data[0]) / (2. * scal_d.resolution[1]) scal_d.data[0]) / (2. * scal_d.resolution[2])
velo_d.data[2][...] = npw.ones(scal_d.data[0].shape)
#npw.zeros_like(
# scal_d.data[0]) / (2. * scal_d.resolution[2])
scal_d.toDevice() scal_d.toDevice()
velo_d.toDevice() velo_d.toDevice()
...@@ -103,14 +98,14 @@ def test_2D_m6_1k(): ...@@ -103,14 +98,14 @@ def test_2D_m6_1k():
advec = Advection(velo, scal, discretization=d2d, advec = Advection(velo, scal, discretization=d2d,
method={TimeIntegrator: RK2, method={TimeIntegrator: RK2,
Interpolation: Linear, Interpolation: Linear,
Remesh: L2_1, Remesh: L4_2,
Support: 'gpu_2k', Support: 'gpu_2k',
Splitting: 'o2'} Splitting: 'o2'}
) )
advec_py = Advection(velo, scal, discretization=d2d, advec_py = Advection(velo, scal, discretization=d2d,
method={TimeIntegrator: RK2, method={TimeIntegrator: RK2,
Interpolation: Linear, Interpolation: Linear,
Remesh: L2_1, Remesh: L4_2,
Support: '', Support: '',
Splitting: 'o2'}, Splitting: 'o2'},
) )
...@@ -699,13 +694,10 @@ def test_rectangular_domain2D(): ...@@ -699,13 +694,10 @@ def test_rectangular_domain2D():
scal_d = scal.discreteFields.values()[0] scal_d = scal.discreteFields.values()[0]
velo_d = velo.discreteFields.values()[0] velo_d = velo.discreteFields.values()[0]
scal_d.data[0][...] = npw.asrealarray(np.random.random(scal_d.data[0].shape)) scal_d.data[0][...] = npw.asrealarray(np.random.random(scal_d.data[0].shape))
velo_d.data[0][...] = npw.ones(scal_d.data[0].shape) velo_d.data[0][...] = np.asarray(
#np.asarray( np.random.random(velo_d.data[0].shape)) / (2. * scal_d.resolution[0])
# np.random.random(velo_d.data[0].shape)) / (2. * scal_d.resolution[0]) velo_d.data[1][...] = np.asarray(
velo_d.data[1][...] = npw.ones(scal_d.data[0].shape) np.random.random(velo_d.data[1].shape)) / (2. * scal_d.resolution[1])
#np.asarray(
# np.random.random(velo_d.data[1].shape)) / (2. * scal_d.resolution[1])
scal_d.toDevice() scal_d.toDevice()
velo_d.toDevice() velo_d.toDevice()
...@@ -746,15 +738,12 @@ def test_rectangular_domain3D(): ...@@ -746,15 +738,12 @@ def test_rectangular_domain3D():
scal_d = scal.discreteFields.values()[0] scal_d = scal.discreteFields.values()[0]
velo_d = velo.discreteFields.values()[0] velo_d = velo.discreteFields.values()[0]
scal_d.data[0][...] = npw.asrealarray(np.random.random(scal_d.data[0].shape)) scal_d.data[0][...] = npw.asrealarray(np.random.random(scal_d.data[0].shape))
velo_d.data[0][...] = npw.ones(scal_d.data[0].shape) velo_d.data[0][...] = npw.asrealarray(
#npw.asrealarray( np.random.random(velo_d.data[0].shape)) / (2. * scal_d.resolution[0])
# np.random.random(velo_d.data[0].shape)) / (2. * scal_d.resolution[0]) velo_d.data[1][...] = npw.asrealarray(
velo_d.data[1][...] = npw.ones(scal_d.data[0].shape) np.random.random(velo_d.data[1].shape)) / (2. * scal_d.resolution[1])
#npw.asrealarray( velo_d.data[2][...] = npw.asrealarray(
# np.random.random(velo_d.data[1].shape)) / (2. * scal_d.resolution[1]) np.random.random(velo_d.data[2].shape)) / (2. * scal_d.resolution[2])
velo_d.data[2][...] = npw.ones(scal_d.data[0].shape)
#npw.asrealarray(
# np.random.random(velo_d.data[2].shape)) / (2. * scal_d.resolution[2])
scal_d.toDevice() scal_d.toDevice()
velo_d.toDevice() velo_d.toDevice()
...@@ -796,12 +785,10 @@ def test_vector_2D(): ...@@ -796,12 +785,10 @@ def test_vector_2D():
velo_d = velo.discreteFields.values()[0] velo_d = velo.discreteFields.values()[0]
scal_d.data[0][...] = npw.asrealarray(np.random.random(scal_d.data[0].shape)) scal_d.data[0][...] = npw.asrealarray(np.random.random(scal_d.data[0].shape))
scal_d.data[1][...] = npw.asrealarray(np.random.random(scal_d.data[1].shape)) scal_d.data[1][...] = npw.asrealarray(np.random.random(scal_d.data[1].shape))
velo_d.data[0][...] = npw.ones(scal_d.data[0].shape) velo_d.data[0][...] = npw.asarray(
#npw.asarray( np.random.random(velo_d.data[0].shape)) / (2. * scal_d.resolution[0])
# np.random.random(velo_d.data[0].shape)) / (2. * scal_d.resolution[0]) velo_d.data[1][...] = npw.asarray(
velo_d.data[1][...] = npw.ones(scal_d.data[0].shape) np.random.random(velo_d.data[1].shape)) / (2. * scal_d.resolution[1])
#npw.asarray(
# np.random.random(velo_d.data[1].shape)) / (2. * scal_d.resolution[1])
scal_d.toDevice() scal_d.toDevice()
velo_d.toDevice() velo_d.toDevice()
...@@ -850,15 +837,12 @@ def test_vector_3D(): ...@@ -850,15 +837,12 @@ def test_vector_3D():
np.random.random(scal_d.data[0].shape)) np.random.random(scal_d.data[0].shape))
scal_d.data[2][...] = npw.asrealarray( scal_d.data[2][...] = npw.asrealarray(
np.random.random(scal_d.data[0].shape)) np.random.random(scal_d.data[0].shape))
velo_d.data[0][...] = npw.ones(scal_d.data[0].shape) velo_d.data[0][...] = npw.asrealarray(
#npw.asrealarray( np.random.random(velo_d.data[0].shape)) / (2. * scal_d.resolution[0])
# np.random.random(velo_d.data[0].shape)) / (2. * scal_d.resolution[0]) velo_d.data[1][...] = npw.asrealarray(
velo_d.data[1][...] = npw.ones(scal_d.data[0].shape) np.random.random(velo_d.data[1].shape)) / (2. * scal_d.resolution[1])
#npw.asrealarray( velo_d.data[2][...] = npw.asrealarray(
# np.random.random(velo_d.data[1].shape)) / (2. * scal_d.resolution[1]) np.random.random(velo_d.data[2].shape)) / (2. * scal_d.resolution[2])
velo_d.data[2][...] = npw.ones(scal_d.data[0].shape)
#npw.asrealarray(
# np.random.random(velo_d.data[2].shape)) / (2. * scal_d.resolution[2])
scal_d.toDevice() scal_d.toDevice()
velo_d.toDevice() velo_d.toDevice()
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment