diff options
| author | HEBERT Alain <alain.hebert@polymtl.ca> | 2025-12-21 19:50:03 -0500 |
|---|---|---|
| committer | HEBERT Alain <alain.hebert@polymtl.ca> | 2025-12-21 19:50:03 -0500 |
| commit | 64491754efcb832b71915f66cd7301fedcc72df7 (patch) | |
| tree | ed40c4131e0c1b4493183936f34d2233a7ec4cfe /Trivac/src/TRIVAA.f | |
| parent | 5c0d4cce527b0d42dc794a475550783ea846b30a (diff) | |
| parent | 33730217cfd6de8a38c93c2400265e4025ab404a (diff) | |
Merge branch '20-correct-a-ntot1-issue-in-spn-bivac-trivac-solutions' into 'main'
#20: Correct more issues in non-regression tests
See merge request dragon/5.1!36
Diffstat (limited to 'Trivac/src/TRIVAA.f')
| -rwxr-xr-x | Trivac/src/TRIVAA.f | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/Trivac/src/TRIVAA.f b/Trivac/src/TRIVAA.f index b1628c4..5189511 100755 --- a/Trivac/src/TRIVAA.f +++ b/Trivac/src/TRIVAA.f @@ -141,6 +141,7 @@ NBFIS=IPAR(4) NALBP=IPAR(8) NW=IPAR(10) + NW2=0 IF(IGP(4).GT.NBMIX) THEN WRITE(HSMG,'(46HTRIVAA: THE NUMBER OF MIXTURES IN THE TRACKING, 1 2H (,I5,51H) IS GREATER THAN THE NUMBER OF MIXTURES IN THE MAC, @@ -219,6 +220,7 @@ 1 //TEXT11//'. L_MACROLIB EXPECTED.') ENDIF CALL LCMGET(IPMACP,'STATE-VECTOR',IPAR) + NW2=IPAR(10) NSTEP=IPAR(11) IF((IPAR(1).NE.NGRP).OR.(IPAR(2).GT.NBMIX)) THEN WRITE(HSMG,'(43HTRIVAA: INCONSISTENT PERTURBATION MACROLIB , @@ -271,7 +273,7 @@ ELSE * SIMPLIFIED PN THEORY. CALL TRISPS(IPTRK,IPMACR,IPMACP,IPSYS,IMPX,NGRP,NEL,NLF, - 1 NAN,NW,NBFIS,NALBP,LDIFF,IPR,MAT,VOL,NBMIX) + 1 NAN,NW2,NBFIS,NALBP,LDIFF,IPR,MAT,VOL,NBMIX) ENDIF ELSE IF(NSTEP.GT.0) THEN * ASSEMBLY OF PERTURBED SYSTEM MATRICES (WITH STEP DIRECTORIES). @@ -288,7 +290,7 @@ ELSE * SIMPLIFIED PN THEORY. CALL TRISPS(IPTRK,IPMACR,KPMACR,KPSYS,IMPX,NGRP,NEL,NLF, - 1 NAN,NW,NBFIS,NALBP,LDIFF,IPR,MAT,VOL,NBMIX) + 1 NAN,NW2,NBFIS,NALBP,LDIFF,IPR,MAT,VOL,NBMIX) ENDIF 50 CONTINUE ELSE |