Merge branch 'final-heat-diffusion-integration-squash' of https://gitlab.kitware.com/peltier.val/vtk-m into final-heat-diffusion-integration-squash

# Conflicts:
#	examples/heat_diffusion/InitalCondition.cpp
#	examples/heat_diffusion/main.cxx
This commit is contained in:
Valentine Peltier 2020-08-02 14:35:17 +02:00
commit 362f8b7644

@ -18,8 +18,8 @@ VTKM_EXEC void FillInitialCondition::operator()(const CoordType &coord,
diffusion = parameters.diffuse_coeff;
} else {
float dx = (float)coord[0] - 0.0f;
float dy = (float)coord[1] - 0.0f;
float dx = coord[0] - 0.0f;
float dy = coord[1] - 0.0f;
float distance = dx * dx + dy * dy;
float rayon = (1.25f * 1.25f);