diff options
| author | Guillaume Horel <guillaume.horel@gmail.com> | 2017-04-10 14:18:45 -0400 |
|---|---|---|
| committer | Guillaume Horel <guillaume.horel@gmail.com> | 2017-04-10 14:20:10 -0400 |
| commit | 196f5f731611336721208eff52e980a404c0a701 (patch) | |
| tree | 93c303a94940e80def5f6671ca4a44c80a51b858 /src | |
| parent | a5bac3fe2e22120778b85affbdaeba54079c97fa (diff) | |
| download | lossdistrib-196f5f731611336721208eff52e980a404c0a701.tar.gz | |
revert commit 34a4f01
Diffstat (limited to 'src')
| -rw-r--r-- | src/lossdistrib.c | 5 |
1 files changed, 1 insertions, 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); } |
