diff options
| author | HEBERT Alain <alain.hebert@polymtl.ca> | 2025-12-28 15:55:41 -0500 |
|---|---|---|
| committer | HEBERT Alain <alain.hebert@polymtl.ca> | 2025-12-28 15:55:41 -0500 |
| commit | 754ef58dfd2880f95dd9765d035389f391917492 (patch) | |
| tree | d7056a5fcb559893c91df8d7533fa5fdb03d8480 /Dragon/src/EVODRV.f | |
| parent | ec64ba52445d2d06deba1216471ccf3d289c78a3 (diff) | |
| parent | 744b40856a035580b786378cae13d453edd26689 (diff) | |
Merge branch '19-depreciate-use-of-version-4-and-5-0-draglibs' into 'main'
Resolve "Depreciate use of Version 4 and 5.0 Draglibs"
See merge request dragon/5.1!40
Diffstat (limited to 'Dragon/src/EVODRV.f')
| -rw-r--r-- | Dragon/src/EVODRV.f | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/Dragon/src/EVODRV.f b/Dragon/src/EVODRV.f index cb9b40c..cd8b69f 100644 --- a/Dragon/src/EVODRV.f +++ b/Dragon/src/EVODRV.f @@ -113,8 +113,7 @@ INTEGER INDREC,IMPX,NBISO,NGROUP,NBMIX,ISONAM(3,NBISO), 1 ISONRF(3,NBISO),MIX(NBISO),IEVOL(NBISO),ISTYP(NBISO),NDEPL, 2 NSUPS,NREAC,NCOMB,ITYPE,INR,IEXTR,IGLOB,ISAT,IDIRAC,ITIXS, - 3 IFLMAC,IYLMIX,ISAVE,ISET,IDEPL,IPICK,MIXBRN(NBMIX), - 4 MIXPWR(NBMIX) + 3 IFLMAC,IYLMIX,ISAVE,ISET,IDEPL,IPICK,MIXBRN(NBMIX),MIXPWR(NBMIX) REAL DEN(NBISO),VX(NBMIX),EPS1,EPS2,EXPMAX,H1,FIT,XTI,XTF, 1 XT(2),FLUMIX(NGROUP,NBMIX) LOGICAL LMACRO @@ -136,7 +135,7 @@ 1 NDFP2,HREAC,IPIFI,IZAE INTEGER, ALLOCATABLE, DIMENSION(:,:) :: JM,INADPL,IEVOLB,KFISS, 1 KPAR,IDR,KPF - REAL, ALLOCATABLE, DIMENSION(:) :: ENERG,RRD,AWR,PYIELD,TIMES + REAL, ALLOCATABLE, DIMENSION(:) :: ENERG,RERD,RRD,AWR,PYIELD,TIMES REAL, ALLOCATABLE, DIMENSION(:,:) :: BPAR,RER,VPHV REAL, ALLOCATABLE, DIMENSION(:,:,:) :: YDPL,YIELD,YIELD2 REAL, ALLOCATABLE, DIMENSION(:,:,:,:) :: SIG @@ -191,7 +190,7 @@ NBESP=MAX(1,IDIM(10)) ALLOCATE(KPAR(NDEPL,NPAR),HREAC(2*NREAC),IDR(NREAC,NDEPL)) ALLOCATE(BPAR(NDEPL,NPAR),YIELD2(NBESP,NFISS,NDFP), - 1 RER(NREAC,NDEPL),RRD(NDEPL)) + 1 RER(NREAC,NDEPL),RERD(NDEPL),RRD(NDEPL)) CALL LCMGET(IPLIB,'ISOTOPESDEPL',INADPL) IF(IMPX.GT.1) THEN WRITE(IUNOUT,'(/38HEVODRV: DEPLETING ISOTOPES FROM CHAIN:)') @@ -207,6 +206,8 @@ CALL LCMGET(IPLIB,'CHARGEWEIGHT',IZAE) IF(NFISS*NDFP.GT.0) CALL LCMGET(IPLIB,'FISSIONYIELD',YIELD2) CALL LCMSIX(IPLIB,' ',2) + RERD(:NDEPL)=RER(1,:NDEPL) + DEALLOCATE(RER) *---- * SET THE LCM MICROLIB ISOTOPEWISE DIRECTORIES. *---- @@ -572,7 +573,7 @@ *---- CALL EVOSIG(IMPX,INR,IGLOB,NGROUP,NBMIX,NBISO,NCOMB,ISONAM, 1 IPISO,DEN,FLUMIX,VX,MILVO,JM,NVAR,NSUPS,NREAC,HREAC,IDR, - 2 RER,RRD,FIT,AWR,IZAE,FUELDN,NXSPER,DELTAT(1,IP),MIXPWR,PFACT, + 2 RERD,RRD,FIT,AWR,IZAE,FUELDN,NXSPER,DELTAT(1,IP),MIXPWR,PFACT, 3 SIG(1,1,1,IP),VPHV(1,IP)) NLENGT=(NVAR+1)*(NREAC+1)*NBMIX CALL LCMPUT(IPDEPL,'MICRO-RATES',NLENGT,2,SIG(1,1,1,IP)) @@ -627,7 +628,7 @@ *---- CALL EVOSIG(IMPX,INR,IGLOB,NGROUP,NBMIX,NBISO,NCOMB,ISONAM, 1 IPISO,DEN,FLUMIX,VX,MILVO,JM,NVAR,NSUPS,NREAC,HREAC,IDR, - 2 RER,RRD,FIT,AWR,IZAE,FUELDN,NXSPER,DELTAT(1,IP),MIXPWR,PFACT, + 2 RERD,RRD,FIT,AWR,IZAE,FUELDN,NXSPER,DELTAT(1,IP),MIXPWR,PFACT, 3 SIG(1,1,1,IP),VPHV(1,IP)) NLENGT=(NVAR+1)*(NREAC+1)*NBMIX CALL LCMPUT(IPDEPL,'MICRO-RATES',NLENGT,2,SIG(1,1,1,IP)) @@ -801,7 +802,7 @@ *---- CALL EVOBLD(IMPX,INR2,IGLOB,NBMIX,NBISO,NCOMB,ISONAM,IPISO, 1 YDPL,VX,MILVO,JM,NVAR,NDFP,NSUPS,NREAC,NPAR,NFISS,XT,EPS1,EPS2, - 2 EXPMAX,H1,ITYPE,IDIRAC,FIT,DELTA,ENERG,KPAR,BPAR,YIELD,IDR,RER, + 2 EXPMAX,H1,ITYPE,IDIRAC,FIT,DELTA,ENERG,KPAR,BPAR,YIELD,IDR, 3 RRD,AWR,FUELDN,SIG(1,1,1,1),VPH,VPHV(1,1),MIXPWR,VTOTD,IEVOLB, 4 KFISS,KPF) *---- @@ -868,7 +869,7 @@ * RELEASE THE ALLOCATED MEMORY *---- DEALLOCATE(IDR,HREAC,KPAR) - DEALLOCATE(RRD,RER,YIELD,BPAR) + DEALLOCATE(RRD,RERD,YIELD,BPAR) DEALLOCATE(KPF,KFISS) *---- * USE THE RESULT OF A DEPLETION CALCULATION IN THE FOLLOWING RUN |