implemented all other type tests

Author: HazelCullom

test/MeshField.cpp

@@ -14,12 +14,13 @@ void single_type(int num_tuples) {
   Controller c(num_tuples);
   MeshField::MeshField<Controller> cabMeshField(c);
 
-  auto field = cabMeshField.makeField<0>();
+  auto field0 = cabMeshField.makeField<0>();
 
   auto vector_kernel = KOKKOS_LAMBDA(const int s, const int a)
   {
-   field.access(s,a);
-   printf("test %d %d\n", s,a);
+   double d0 = 10;
+   field0.access(s,a) = d0;
+   assert(field0.access(s,a) == d0);
   };
 
   cabMeshField.parallel_for(0,num_tuples,vector_kernel,"single_type_pfor");
@@ -39,7 +40,28 @@ void multi_type(int num_tuples) {
   auto field2 = cabMeshField.makeField<2>();
   auto field3 = cabMeshField.makeField<3>();
   auto field4 = cabMeshField.makeField<4>();
- 
+
+  auto vector_kernel = KOKKOS_LAMBDA(const int s, const int a)
+  {
+   double d0 = 10.456;
+   field0.access(s,a) = d0;
+   double d1 = 43.973234567;
+   field1.access(s,a) = d1;
+   float f0 = 123.45;
+   field2.access(s,a) = f0;
+   int i0 = 22;
+   field3.access(s,a) = i0;
+   char c0 = 'a';
+   field4.access(s,a) = c0;
+   
+   assert(field0.access(s,a) == d0);
+   assert(field1.access(s,a) == d1);
+   assert(field2.access(s,a) == f0);
+   assert(field3.access(s,a) == i0);
+   assert(field4.access(s,a) == c0);
+  };
+  
+  cabMeshField.parallel_for(0,num_tuples,vector_kernel,"multi_type_pfor");
 }
 
 void many_type(int num_tuples) {
@@ -59,6 +81,34 @@ void many_type(int num_tuples) {
   auto field4 = cabMeshField.makeField<4>();
   auto field5 = cabMeshField.makeField<5>();
   auto field6 = cabMeshField.makeField<6>();
+
+  auto vector_kernel = KOKKOS_LAMBDA(const int s, const int a)
+  {
+   double d0 = 10.456;
+   field0.access(s,a) = d0;
+   double d1 = 43.973234567;
+   field1.access(s,a) = d1;
+   float f0 = 123.45;
+   field2.access(s,a) = f0;
+   float f1 = 543.21;
+   field3.access(s,a) = f1;
+   int i0 = 222;
+   field4.access(s,a) = i0;
+   short int i1 = 50;
+   field5.access(s,a) = i1;
+   char c0 = 'h';
+   field6.access(s,a) = c0;
+   
+   assert(field0.access(s,a) == d0);
+   assert(field1.access(s,a) == d1);
+   assert(field2.access(s,a) == f0);
+   assert(field3.access(s,a) == f1);
+   assert(field4.access(s,a) == i0);
+   assert(field5.access(s,a) == i1);
+   assert(field6.access(s,a) == c0);
+  };
+  
+  cabMeshField.parallel_for(0,num_tuples,vector_kernel,"many_type_pfor");
 }
 
 void rank1_arr(int num_tuples) {
@@ -70,6 +120,19 @@ void rank1_arr(int num_tuples) {
   MeshField::MeshField<Controller> cabMeshField(c);
 
   auto field0 = cabMeshField.makeField<0>();
+
+  
+  auto vector_kernel = KOKKOS_LAMBDA(const int s, const int a)
+  {
+   for (int i = 0; i < width; i++)
+   {
+    double d0 = 10+i;
+    field0.access(s,a,i) = d0;
+    assert(field0.access(s,a,i) == d0);
+   }
+  };
+  
+  cabMeshField.parallel_for(0,num_tuples,vector_kernel,"rank1_arr_pfor");
 }
 
 void rank2_arr(int num_tuples) {
@@ -83,6 +146,21 @@ void rank2_arr(int num_tuples) {
   MeshField::MeshField<Controller> cabMeshField(c);
 
   auto field0 = cabMeshField.makeField<0>();
+
+  auto vector_kernel = KOKKOS_LAMBDA(const int s, const int a)
+  {
+   for (int i = 0; i < width; i++)
+   {
+    for (int j = 0; j < height; j++)
+    {
+     double d0 = (10+i)/(j+1);
+     field0.access(s,a,i,j) = d0;
+     assert(field0.access(s,a,i,j) == d0);
+    }
+   }
+  };
+  
+  cabMeshField.parallel_for(0,num_tuples,vector_kernel,"rank2_arr_pfor");
 }
 
 void rank3_arr(int num_tuples) {
@@ -97,6 +175,25 @@ void rank3_arr(int num_tuples) {
   MeshField::MeshField<Controller> cabMeshField(c);
 
   auto field0 = cabMeshField.makeField<0>();
+
+  auto vector_kernel = KOKKOS_LAMBDA(const int s, const int a)
+  {
+   for (int i = 0; i < width; i++)
+   {
+    for (int j = 0; j < height; j++)
+    {
+     for (int k = 0; k < depth; k++)
+     {
+      double d0 = ((10+i)*(k+1))/(j+1);
+      field0.access(s,a,i,j,k) = d0;
+      assert(field0.access(s,a,i,j,k) == d0);
+     }
+    }
+   }
+  };
+  
+  cabMeshField.parallel_for(0,num_tuples,vector_kernel,"rank3_arr_pfor");
+
 }
 
 void mix_arr(int num_tuples) {
@@ -116,19 +213,50 @@ void mix_arr(int num_tuples) {
   auto field1 = cabMeshField.makeField<1>();
   auto field2 = cabMeshField.makeField<2>();
   auto field3 = cabMeshField.makeField<3>();
+
+  auto vector_kernel = KOKKOS_LAMBDA(const int s, const int a)
+  {
+   float f0;
+   int i0;
+   char c0 = 's';
+   field3.access(s,a) = c0;
+   
+   for (int i = 0; i < width; i++)
+   {
+    i0 = i+s+a;
+    field2.access(s,a,i) = i0;
+    for (int j = 0; j < height; j++)
+    {
+     f0 = i0 / (i+j+1.123);
+     field1.access(s,a,i,j) = f0;
+     for (int k = 0; k < depth; k++)
+     {
+      double d0 = ((10+i)*(k+1))/(j+1);
+      field0.access(s,a,i,j,k) = d0;
+      assert(field0.access(s,a,i,j,k) == d0);
+     }
+     assert(field1.access(s,a,i,j) == f0);
+    }
+    assert(field2.access(s,a,i) == i0);
+   }
+   assert(field3.access(s,a) == c0);
+  };
+  
+  cabMeshField.parallel_for(0,num_tuples,vector_kernel,"mix_arr_pfor");
+
 }
 
 int main(int argc, char* argv[]) {
   int num_tuples = (argc < 2) ? (1000) : (atoi(argv[1]));
   Kokkos::ScopeGuard scope_guard(argc, argv);
-  printf("num_tuples: %d\n", num_tuples);
+  
   single_type(num_tuples);
-  //multi_type(num_tuples);
-  //many_type(num_tuples);
-  //rank1_arr(num_tuples);
-  //rank2_arr(num_tuples);
-  //rank3_arr(num_tuples);
-  //mix_arr(num_tuples);
+  multi_type(num_tuples);
+  many_type(num_tuples);
+  rank1_arr(num_tuples);
+  rank2_arr(num_tuples);
+  rank3_arr(num_tuples);
+  mix_arr(num_tuples);
 
   return 0;
 }