Skip to content

Commit

Permalink
Merge pull request #1812 from ngoldbaum/2d-cg-fix
Browse files Browse the repository at this point in the history
 fix small issue missed in #1809
  • Loading branch information
Nathan Goldbaum committed Jun 4, 2018
2 parents 0ce549f + cb2d4ba commit 77a1d89
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 3 deletions.
2 changes: 2 additions & 0 deletions .gitignore
Expand Up @@ -12,6 +12,7 @@ yt/analysis_modules/halo_finding/rockstar/rockstar_interface.c
yt/analysis_modules/ppv_cube/ppv_utils.c
yt/analysis_modules/photon_simulator/utils.c
yt/frontends/ramses/_ramses_reader.cpp
yt/frontends/ramses/io_utils.c
yt/frontends/sph/smoothing_kernel.c
yt/geometry/fake_octree.c
yt/geometry/grid_container.c
Expand All @@ -23,6 +24,7 @@ yt/geometry/particle_oct_container.c
yt/geometry/particle_smooth.c
yt/geometry/selection_routines.c
yt/utilities/amr_utils.c
yt/utilities/cython_fortran_utils.c
yt/utilities/lib/autogenerated_element_samplers.c
yt/utilities/kdtree/forthonf2c.h
yt/utilities/libconfig_wrapper.c
Expand Down
6 changes: 3 additions & 3 deletions yt/data_objects/tests/test_covering_grid.py
Expand Up @@ -137,10 +137,10 @@ def test_octree_cg():
assert_equal((density_field == 0.0).sum(), 0)

def test_smoothed_covering_grid_2d_dataset():
ds = fake_random_ds(64, nprocs=4)
ds = fake_random_ds([32, 32, 1], nprocs=4)
ds.periodicity = (True, True, True)
scg = ds.smoothed_covering_grid(1, [0.0, 0.0, 0.0], ds.domain_dimensions)
assert_equal(scg['density'].shape, ds.domain_dimensions)
scg = ds.smoothed_covering_grid(1, [0.0, 0.0, 0.0], [32, 32, 1])
assert_equal(scg['density'].shape, [32, 32, 1])

def test_arbitrary_grid_derived_field():
def custom_metal_density(field, data):
Expand Down

0 comments on commit 77a1d89

Please sign in to comment.