Fix test for SammyGridAccess

sammy/src/salmon/tests/SammyGridAccessTest.cpp

@@ -87,7 +87,7 @@ void testFirstGrid(sammy::SammyGridAccess & access, sammy::GridDataList & list,
     }
 }
 
-void testSecondGrid(sammy::SammyGridAccess & access, sammy::GridDataList & list, int ktzero){
+void testSecondGrid(sammy::SammyGridAccess & access, sammy::GridDataList & list){
     ASSERT_EQ(20, access.getNumEnergies(list));   
     for (int i = 0; i < 20; i++){
         double e = i + 10;
@@ -111,7 +111,7 @@ void testFirstGridOff(sammy::SammyGridAccess & access, sammy::GridDataList & lis
     }
 }
 
-void testSecondGridOff(sammy::SammyGridAccess & access, sammy::GridDataList & list, int ktzero){
+void testSecondGridOff(sammy::SammyGridAccess & access, sammy::GridDataList & list){
     ASSERT_EQ(10, access.getNumEnergies(list));
     for (int i = 0; i < 10; i++){
         double e = i + 20;
@@ -142,17 +142,17 @@ TEST(GridAcccesTest, twoGridsNoOffsetLimits){
 
           list.setExpGridIndex(1);
           access.setToExpGrid(list);
-          testSecondGrid(access, list, ktzero);
+          testSecondGrid(access, list);
 
           list.setExpGridIndex(0);
           list.setAuxGridIndex(1);
           access.setToAuxGrid(list);
-          testSecondGrid(access, list, 0);
+          testSecondGrid(access, list);
 
           list.setExpGridIndex(1);
           list.setAuxGridIndex(0);
           access.setToAuxGrid(list);
-          testFirstGrid(access, list, 0);
+          testFirstGrid(access, list, ktzero);
        }
     }
 }
@@ -173,18 +173,18 @@ TEST(GridAcccesTest, twoGridsNoOffset){
 
           list.setExpGridIndex(1);
           access.setToExpGrid(list);
-          testSecondGrid(access, list, ktzero);
+          testSecondGrid(access, list);
 
 
           list.setExpGridIndex(0);
           list.setAuxGridIndex(1);
           access.setToAuxGrid(list);
-          testSecondGrid(access, list, 0);
+          testSecondGrid(access, list);
 
           list.setExpGridIndex(1);
           list.setAuxGridIndex(0);
           access.setToAuxGrid(list);
-          testFirstGrid(access, list, 0);
+          testFirstGrid(access, list, ktzero);
        }
     }
 }
@@ -213,7 +213,7 @@ TEST(GridAcccesTest, twoGridsOffset){
 
           list.setExpGridIndex(1);
           access.setToExpGrid(list);
-          testSecondGridOff(access, list, ktzero);
+          testSecondGridOff(access, list);
 
           list.getGrid(1)->setRowMax(15);
           ASSERT_EQ(6, access.getNumEnergies(list));
@@ -225,7 +225,7 @@ TEST(GridAcccesTest, twoGridsOffset){
           list.setExpGridIndex(0);
           list.setAuxGridIndex(1);
           access.setToAuxGrid(list);
-          testSecondGridOff(access, list, ktzero);
+          testSecondGridOff(access, list);
 
           list.setExpGridIndex(1);
           list.setAuxGridIndex(0);
@@ -280,13 +280,6 @@ TEST(GridAcccesTest, oneGridsNoOffsetLimits){
 
           sammy::SammyGridAccess access;
           access.setUseOffset(false);
-          int nn = numcro;
-          if (nn <= 0) nn = 1;
-          list.getGrid(0)->setNumPerEnergy(nn);          
-          nn = 1;
-          if (ktzero > 0) nn = 2;
-          if (numcro > 1) nn = 3;
-          list.getGrid(0)->setDataIndex(nn);         
           access.setToExpGrid(list);
           testFirstGrid(access, list, ktzero);