Browse Source

go.sh calling scattnaly with params coasing buggy execution

Konstantin Ladutenko 10 years ago
parent
commit
a01bb3910c
2 changed files with 24 additions and 16 deletions
  1. 11 11
      compare.cc
  2. 13 5
      go.sh

+ 11 - 11
compare.cc

@@ -243,19 +243,19 @@ int main(int argc, char *argv[]) {
 
     //printf("--best C/C++ time ratio: %Lg\n", static_cast<long double>(best_c)/static_cast<long double>(best_cpp));
 
-    clock_gettime(CLOCK_PROCESS_CPUTIME_ID, &time1);
-    nMie(L, x, m, nt, Theta, &Qext, &Qsca, &Qabs, &Qbk, &Qpr, &g, &Albedo, S1, S2);
-    clock_gettime(CLOCK_PROCESS_CPUTIME_ID, &time2);
-     ctime_nsec = diff(time1,time2).tv_nsec;
-    printf("-- C time consumed %ld sec : %ld nsec\n",diff(time1,time2).tv_sec, ctime_nsec);
+    // clock_gettime(CLOCK_PROCESS_CPUTIME_ID, &time1);
+       nMie(L, x, m, nt, Theta, &Qext, &Qsca, &Qabs, &Qbk, &Qpr, &g, &Albedo, S1, S2);
+    // clock_gettime(CLOCK_PROCESS_CPUTIME_ID, &time2);
+    //  ctime_nsec = diff(time1,time2).tv_nsec;
+    // printf("-- C time consumed %ld sec : %ld nsec\n",diff(time1,time2).tv_sec, ctime_nsec);
 
-    clock_gettime(CLOCK_PROCESS_CPUTIME_ID, &time1);
-          nmie::nMie_wrapper(L, x, m, nt, Theta, &Qextw, &Qscaw, &Qabsw, &Qbkw, &Qprw, &gw, &Albedow, S1w, S2w);
-    clock_gettime(CLOCK_PROCESS_CPUTIME_ID, &time2);
-    cpptime_nsec = diff(time1,time2).tv_nsec;
-    printf("-- C++ time consumed %ld sec : %ld nsec\n",diff(time1,time2).tv_sec,cpptime_nsec);
+    // clock_gettime(CLOCK_PROCESS_CPUTIME_ID, &time1);
+       nmie::nMie_wrapper(L, x, m, nt, Theta, &Qextw, &Qscaw, &Qabsw, &Qbkw, &Qprw, &gw, &Albedow, S1w, S2w);
+    // clock_gettime(CLOCK_PROCESS_CPUTIME_ID, &time2);
+    // cpptime_nsec = diff(time1,time2).tv_nsec;
+    // printf("-- C++ time consumed %ld sec : %ld nsec\n",diff(time1,time2).tv_sec,cpptime_nsec);
 
-    printf("-- C/C++ time ratio: %Lg\n", static_cast<long double>(ctime_nsec)/static_cast<long double>(cpptime_nsec));
+    // printf("-- C/C++ time ratio: %Lg\n", static_cast<long double>(ctime_nsec)/static_cast<long double>(cpptime_nsec));
     
     if (has_comment) {
       printf("%6s, %+.5e, %+.5e, %+.5e, %+.5e, %+.5e, %+.5e, %+.5e\n", comment.c_str(), Qext, Qsca, Qabs, Qbk, Qpr, g, Albedo);

+ 13 - 5
go.sh

@@ -22,12 +22,20 @@ cd tests/shell
 # 	echo $file
 #     fi
 # done
- PROGRAM='../../../scattnlay'
-# time ASAN_SYMBOLIZER_PATH=/usr/bin/llvm-symbolizer-3.4 
-#time 
-time $PROGRAM -l 5 0.4642 1.8000 1.7000 0.7114 0.8000 0.7000 0.7393 1.2000 0.0900 0.9168 2.8000 0.2000 1.0000 1.5000 0.4000  -t 0.0 90.0 5 -c test01
-
+PROGRAM='../../../scattnlay'
+# ASAN_SYMBOLIZER_PATH=/usr/bin/llvm-symbolizer-3.4  $PROGRAM -l 5 0.4642 1.8000 1.7000 0.7114 0.8000 0.7000 0.7393 1.2000 0.0900 0.9168 2.8000 0.2000 1.0000 1.5000 0.4000  -t 0.0 90.0 5 -c test01
 
+echo BUG -- All 3 designs shoul give almost the same answer
+echo
+echo $PROGRAM -l 1 4.71238898038469 2 0.0001
+$PROGRAM -l 1 4.71238898038469 2 0.0001
+echo
+echo $PROGRAM -l 2 4.71238898038469 2 0.0001 9.42477796076937 1 0
+$PROGRAM -l 2 4.71238898038469 2 0.0001 9.42477796076937 1 0
+echo
+echo $PROGRAM -l 2 4.71238898038469 2 0.0001 9.42477796076938 1 0
+$PROGRAM -l 2 4.71238898038469 2 0.0001 9.42477796076938 1 0
+echo
 #  #apt-get install oprofile
 # echo oprofile
 # PROGRAM='../../../scattnlay-g'