diff options
| author | Alain Hebert <alainhebert@Alains-MacBook-Pro.local> | 2025-12-21 19:25:34 -0500 |
|---|---|---|
| committer | Alain Hebert <alainhebert@Alains-MacBook-Pro.local> | 2025-12-21 19:25:34 -0500 |
| commit | 33730217cfd6de8a38c93c2400265e4025ab404a (patch) | |
| tree | ed40c4131e0c1b4493183936f34d2233a7ec4cfe /Trivac/src/MACXSI.f | |
| parent | 5c0d4cce527b0d42dc794a475550783ea846b30a (diff) | |
#20: Correct more issues in non-regression tests
Diffstat (limited to 'Trivac/src/MACXSI.f')
| -rwxr-xr-x | Trivac/src/MACXSI.f | 19 |
1 files changed, 15 insertions, 4 deletions
diff --git a/Trivac/src/MACXSI.f b/Trivac/src/MACXSI.f index 6cfac6a..406cecb 100755 --- a/Trivac/src/MACXSI.f +++ b/Trivac/src/MACXSI.f @@ -1,5 +1,6 @@ *DECK MACXSI - SUBROUTINE MACXSI (IPLIST,IND,NMIXT,NGRP,NDG,NL,IMPX,NBMIX,JND) + SUBROUTINE MACXSI (IPLIST,IND,NMIXT,NGRP,NDG,NL,IMPX,NBMIX,ILEAK, + 1 NW,JND) * *----------------------------------------------------------------------- * @@ -27,6 +28,8 @@ * *Parameters: output * NBMIX number of mixtures. +* ILEAK type of diffusion coefficient. +* NW weighting flag (=0/1: P1-weighted information absent/present). * JND REDGET flag (=1 ';' encountered; =2 'STEP' encountered). * *----------------------------------------------------------------------- @@ -36,7 +39,7 @@ * SUBROUTINE ARGUMENTS *---- TYPE(C_PTR) IPLIST - INTEGER IND,NMIXT,NGRP,NDG,NL,IMPX,NBMIX,JND + INTEGER IND,NMIXT,NGRP,NDG,NL,IMPX,NBMIX,ILEAK,NW,JND *---- * LOCAL VARIABLES *---- @@ -138,7 +141,7 @@ CALL LCMLEN(KPLIST,'FIXE',ILENGT,ITYLCM) IF(ILENGT.EQ.NMIXT) CALL LCMGET(KPLIST,'FIXE',S(1,JGR)) DO 30 IL=1,NL - WRITE (CM,'(I2.2)') IL-1 + WRITE(CM,'(I2.2)') IL-1 CALL LCMLEN(KPLIST,'SCAT'//CM,ILENGT,ITYLCM) IF(ILENGT.GT.NMIXT*NL*NGRP*NGRP) THEN CALL XABORT('MACXSI: INVALID INPUT MACROLIB(2).') @@ -316,7 +319,7 @@ ENDIF IF(LSC) THEN DO 200 IL=1,NL - WRITE (CM,'(I2.2)') IL-1 + WRITE(CM,'(I2.2)') IL-1 IPOSDE=0 DO 195 IBM=1,NMIXT J2=JGR @@ -345,6 +348,14 @@ IF(IMPX.GT.1) CALL LCMLIB(KPLIST) 210 CONTINUE *---- +* SET STATE-VECTOR FLAGS +*---- + NW=0 + IF(LT1) NW=1 + ILEAK=0 + IF(LD) ILEAK=1 + IF(LDX.OR.LDY.OR.LDZ) ILEAK=2 +*---- * SCRATCH STORAGE DEALLOCATION *---- DEALLOCATE(TOTAL,TOTA1,ZNUG,CHI,NUSDL,CHDL,OVERV,DIFFX,DIFFY, |