Skip to content
Snippets Groups Projects
Commit c210fae8 authored by stamoor's avatar stamoor
Browse files

Fixing Kokkos memory bug

git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13566 f3b2605a-c512-4ea7-a41b-209d697bcdaa
parent 42ef8775
No related branches found
No related tags found
No related merge requests found
......@@ -173,7 +173,10 @@ TYPE create_kokkos(TYPE &data, typename TYPE::value_type **&array,
bigint n = 0;
for (int i = 0; i < n1; i++) {
array[i] = &data.h_view(i,0);
if(n2==0)
array[i] = NULL;
else
array[i] = &data.h_view(i,0);
n += n2;
}
return data;
......@@ -195,7 +198,10 @@ template <typename TYPE, typename HTYPE>
bigint n = 0;
for (int i = 0; i < n1; i++) {
array[i] = &h_data(i,0);
if(n2==0)
array[i] = NULL;
else
array[i] = &h_data(i,0);
n += n2;
}
return data;
......@@ -216,7 +222,10 @@ TYPE grow_kokkos(TYPE &data, typename TYPE::value_type **&array,
array = (typename TYPE::value_type**) srealloc(array,nbytes,name);
for (int i = 0; i < n1; i++)
array[i] = &data.h_view(i,0);
if(n2==0)
array[i] = NULL;
else
array[i] = &data.h_view(i,0);
return data;
}
......@@ -230,7 +239,10 @@ TYPE create_kokkos(TYPE &data, typename TYPE::value_type **&array,
array = (typename TYPE::value_type **) smalloc(nbytes,name);
for (int i = 0; i < n1; i++)
array[i] = &data.h_view(i,0);
if(data.h_view.dimension_1()==0)
array[i] = NULL;
else
array[i] = &data.h_view(i,0);
return data;
}
......@@ -247,7 +259,10 @@ TYPE grow_kokkos(TYPE &data, typename TYPE::value_type **&array,
array = (typename TYPE::value_type **) smalloc(nbytes,name);
for (int i = 0; i < n1; i++)
array[i] = &data.h_view(i,0);
if(data.h_view.dimension_1()==0)
array[i] = NULL;
else
array[i] = &data.h_view(i,0);
return data;
}
......
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