Unverified Commit c1342909 authored by Bevan Cheeseman's avatar Bevan Cheeseman Committed by GitHub
Browse files

Merge pull request #108 from AdaptiveParticles/quick_tree_fix

Minor fix
parents d867657d 5ce2e98d
...@@ -20,7 +20,7 @@ matrix: ...@@ -20,7 +20,7 @@ matrix:
- libhdf5-dev - libhdf5-dev
- libtiff5 - libtiff5
- os: osx - os: osx
osx_image: xcode7.3 osx_image: xcode9.2
install: install:
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update; fi - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update; fi
......
...@@ -91,8 +91,8 @@ int runAPR(cmdLineOptions options) { ...@@ -91,8 +91,8 @@ int runAPR(cmdLineOptions options) {
std::cout << "Writing the APR to hdf5..." << std::endl; std::cout << "Writing the APR to hdf5..." << std::endl;
//feel free to change //feel free to change
unsigned int blosc_comp_type = 6; //Lizard Codec unsigned int blosc_comp_type = BLOSC_ZSTD; //Lizard Codec
unsigned int blosc_comp_level = 9; unsigned int blosc_comp_level = 4;
unsigned int blosc_shuffle = 1; unsigned int blosc_shuffle = 1;
apr.apr_compress.set_compression_type(options.compress_type); apr.apr_compress.set_compression_type(options.compress_type);
......
...@@ -116,6 +116,8 @@ inline uint64_t APRIterator::set_new_lzx(const uint16_t level,const uint16_t z,c ...@@ -116,6 +116,8 @@ inline uint64_t APRIterator::set_new_lzx(const uint16_t level,const uint16_t z,c
return this->current_particle_cell.global_index; return this->current_particle_cell.global_index;
} else { } else {
this->end_index = 0;
current_particle_cell.y = UINT16_MAX;
return UINT64_MAX; return UINT64_MAX;
} }
...@@ -139,6 +141,8 @@ inline uint64_t APRIterator::set_new_lzx(const uint16_t level,const uint16_t z,c ...@@ -139,6 +141,8 @@ inline uint64_t APRIterator::set_new_lzx(const uint16_t level,const uint16_t z,c
return this->current_particle_cell.global_index; return this->current_particle_cell.global_index;
} else { } else {
this->end_index = 0;
current_particle_cell.y = UINT16_MAX;
return UINT64_MAX; return UINT64_MAX;
} }
......
...@@ -235,12 +235,12 @@ public: ...@@ -235,12 +235,12 @@ public:
if (parentIterator.y() == (parentIterator.spatial_index_y_max(level - 1) - 1)) { if (parentIterator.y() == (parentIterator.spatial_index_y_max(level - 1) - 1)) {
tree_data[parentIterator] = tree_data[parentIterator] =
scale_factor_yxz * apr.particles_intensities[apr_iterator] / 8.0f + scale_factor_yxz * particle_data[apr_iterator] / 8.0f +
tree_data[parentIterator]; tree_data[parentIterator];
} else { } else {
tree_data[parentIterator] = tree_data[parentIterator] =
scale_factor_xz * apr.particles_intensities[apr_iterator] / 8.0f + scale_factor_xz * particle_data[apr_iterator] / 8.0f +
tree_data[parentIterator]; tree_data[parentIterator];
} }
......
...@@ -312,6 +312,8 @@ uint64_t APRTreeIterator::set_new_lzx(const uint16_t level,const uint16_t z,cons ...@@ -312,6 +312,8 @@ uint64_t APRTreeIterator::set_new_lzx(const uint16_t level,const uint16_t z,cons
return this->current_particle_cell.global_index; return this->current_particle_cell.global_index;
} else { } else {
this->end_index = 0;
current_particle_cell.y = UINT16_MAX;
return UINT64_MAX; return UINT64_MAX;
} }
...@@ -333,6 +335,8 @@ uint64_t APRTreeIterator::set_new_lzx(const uint16_t level,const uint16_t z,cons ...@@ -333,6 +335,8 @@ uint64_t APRTreeIterator::set_new_lzx(const uint16_t level,const uint16_t z,cons
return this->current_particle_cell.global_index; return this->current_particle_cell.global_index;
} else { } else {
this->end_index = 0;
current_particle_cell.y = UINT16_MAX;
return UINT64_MAX; return UINT64_MAX;
} }
......
Markdown is supported
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