Merge branch 'master' into mmcx

fangq · Jul 15, 2019 · c8c1cb9 · c8c1cb9
2 parents afcfda1 + 61bdd10
commit c8c1cb9
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/src/tettracing.c b/src/tettracing.c
@@ -1038,11 +1038,11 @@ float branchless_badouel_raytet(ray *r, raytracer *tracer, mcconfig *cfg, visito
 			if(newidx!=r->oldidx){
                             if(cfg->isatomic)
 #pragma omp atomic
-			        tracer->mesh->weight[r->oldidx]+=ww;
+			        tracer->mesh->weight[r->oldidx]+=r->oldweight;
                             else
-                                tracer->mesh->weight[eid+tshift]+=ww;
+                                tracer->mesh->weight[r->oldidx]+=r->oldweight;
 			    r->oldidx=newidx;
-			    r->oldweight=0.0;
+			    r->oldweight=ww;
                         }else
 			    r->oldweight+=ww;
                      }else{