From 196f5f731611336721208eff52e980a404c0a701 Mon Sep 17 00:00:00 2001 From: Guillaume Horel Date: Mon, 10 Apr 2017 14:18:45 -0400 Subject: revert commit 34a4f01 --- src/lossdistrib.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/lossdistrib.c b/src/lossdistrib.c index d8257bd..bc39451 100644 --- a/src/lossdistrib.c +++ b/src/lossdistrib.c @@ -462,7 +462,6 @@ void lossdistrib_joint_Z(const double *dp, const double *pp, const int *ndp, #pragma omp parallel for for(int i = 0; i < *nZ; i++){ double* dpshocked = malloc(sizeof(double) * (*ndp)); - double* Sshocked = malloc(sizeof(double) * (*ndp)); double* ppshocked = NULL; if(pp) { ppshocked = malloc(sizeof(double) * (*ndp)); @@ -472,13 +471,11 @@ void lossdistrib_joint_Z(const double *dp, const double *pp, const int *ndp, if(pp) { ppshocked[j] = shockprob(pp[j], rho[j], -Z[i], 0); } - Sshocked[j] = shockseverity(S[j], Z[i], rho[j], dp[j]); } - lossdistrib_joint(dpshocked, ppshocked, ndp, w, Sshocked, + lossdistrib_joint(dpshocked, ppshocked, ndp, w, S + (*ndp) * i, N, defaultflag, qmat + N2 * i); free(dpshocked); - free(Sshocked); if(pp) { free(ppshocked); } -- cgit v1.2.3-70-g09d2