From 07877577e79a743abc8062e2438f8e5add9b7e84 Mon Sep 17 00:00:00 2001 From: Francesco Lannutti Date: Sun, 24 Aug 2014 00:58:50 +0200 Subject: [PATCH] Correctly handled .meas statement in Reliability Analysis --- src/frontend/runcoms.c | 2 ++ src/spicelib/analysis/cktdojob.c | 7 +++++++ 2 files changed, 9 insertions(+) diff --git a/src/frontend/runcoms.c b/src/frontend/runcoms.c index 10df7ea06..2f79f76d0 100644 --- a/src/frontend/runcoms.c +++ b/src/frontend/runcoms.c @@ -365,9 +365,11 @@ dosim( tfree(ww); } +#ifndef RELAN /* execute the .measure statements */ if (!err && ft_curckt->ci_last_an && ft_curckt->ci_meas) do_measure(ft_curckt->ci_last_an, FALSE); +#endif return err; } diff --git a/src/spicelib/analysis/cktdojob.c b/src/spicelib/analysis/cktdojob.c index a96656e81..aaa91a3f2 100644 --- a/src/spicelib/analysis/cktdojob.c +++ b/src/spicelib/analysis/cktdojob.c @@ -24,6 +24,10 @@ Modified: 2000 AlansFixes extern SPICEanalysis *analInfo[]; +#ifdef RELAN +extern bool do_measure (char *what, bool chk_only) ; +#endif + int CKTdoJob(CKTcircuit *ckt, int reset, TSKtask *task) { @@ -269,6 +273,9 @@ CKTdoJob(CKTcircuit *ckt, int reset, TSKtask *task) { error2 = error ; } + + /* Execute .meas statement */ + do_measure (spice_analysis_get_name (job->JOBtype), FALSE) ; } #ifdef RELAN