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/EDIDRV.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/EDIDRV.f')
| -rw-r--r-- | Dragon/src/EDIDRV.f | 29 |
1 files changed, 11 insertions, 18 deletions
diff --git a/Dragon/src/EDIDRV.f b/Dragon/src/EDIDRV.f index bc48d6f..1f39079 100644 --- a/Dragon/src/EDIDRV.f +++ b/Dragon/src/EDIDRV.f @@ -136,7 +136,7 @@ INTEGER, ALLOCATABLE, DIMENSION(:,:) :: FIPI,FIFP INTEGER, ALLOCATABLE, DIMENSION(:,:,:) :: KEYANI REAL, ALLOCATABLE, DIMENSION(:) :: WORKF,WORKA,VOLME,WLETY,WE, - > COURI,TAUXT,SIGT,SIGS,SCATS,FLINT,SCATD,DEN,TN,EMEVF,EMEVG,RER, + > COURI,TAUXT,SIGT,SIGS,SCATS,FLINT,SCATD,DEN,TN,EMEVF,RER, > DECAY,RRD,FIYI,ENERG,NAWR,NDEN,NTMP,NVOL,SNEJ,WORK1,WORK2 REAL, ALLOCATABLE, DIMENSION(:,:) :: ADF REAL, ALLOCATABLE, DIMENSION(:,:,:) :: FLUXC,FADJC,FLUXES,AFLUXE, @@ -517,9 +517,8 @@ *---- * EVALUATE H-FACTOR IF REQUIRED FOR THE EDITION MACROLIB *---- - ALLOCATE(EMEVF(NBISO),EMEVG(NBISO)) + ALLOCATE(EMEVF(NBISO)) EMEVF(:NBISO)=0.0 - EMEVG(:NBISO)=0.0 IF((NSAVES.GE.2).AND.(IHF.NE.0)) THEN CALL LCMLEN(IPLIB,'DEPL-CHAIN',ILLCM,ITLCM) IF(ILLCM.NE.0) THEN @@ -534,10 +533,9 @@ CALL LCMGET(IPLIB,'DEPLETE-ENER',RER) CALL LCMSIX(IPLIB,' ',2) * - CALL EDIHFC(IPEDIT,NGROUP,NGCOND,NREGIO,NMERGE,NBISO,NDEPL, - > NREAC,MATCOD,VOLUME,INADPL,ISONA,ISONR,IPISO, - > MIX,FLUXES(1,1,1),DEN,IGCOND,IMERGE,RER,EMEVF, - > EMEVG,VOLME,IPRINT) + CALL EDIHFC(IPEDIT,NGROUP,NGCOND,NREGIO,NMERGE,NBISO, + > MATCOD,VOLUME,ISONA,IPISO,MIX,FLUXES(1,1,1), + > DEN,IGCOND,IMERGE,VOLME,IPRINT,EMEVF) * DEALLOCATE(RER,INADPL) CALL LCMSIX(IPEDIT,' ',2) @@ -605,8 +603,8 @@ > IPRINT,NGROUP,NGCOND,NBMIX,NREGIO,NMERGE,NDFI, > NDFP,ILEAKS,ILUPS,NW,MATCOD,VOLUME,KEYFLX,CURNAM, > IGCOND,IMERGE,FLUXES,AFLUXE,EIGENK,EIGINF,B2,DEN, - > ITYPE,IDEPL,LSISO,EMEVF,EMEVG,DECAY,YIELD,FIPI, - > FIFP,PYIELD,ITRANC,LISO,NMLEAK) + > ITYPE,IDEPL,LSISO,EMEVF,DECAY,YIELD,FIPI,FIFP, + > PYIELD,ITRANC,LISO,NMLEAK) *---- * ISOTX FILE PROCESSING *---- @@ -631,13 +629,10 @@ KPEDIT=JPISO(ISO) CALL LCMGET(KPEDIT,'AWR',AWR) EMEVF2=0.0 - EMEVG2=0.0 CALL LCMLEN(KPEDIT,'MEVF',ILENF,ITYLCM) - CALL LCMLEN(KPEDIT,'MEVG',ILENG,ITYLCM) IF(ILENF.EQ.1) CALL LCMGET(KPEDIT,'MEVF',EMEVF2) - IF(ILENG.EQ.1) CALL LCMGET(KPEDIT,'MEVG',EMEVG2) NAWR(ISO)=AWR - SNEJ(ISO)=EMEVF2+EMEVG2 + SNEJ(ISO)=EMEVF2 ENDDO * NBIXS=IXEDI @@ -681,8 +676,7 @@ > NGROUP,NGCOND,NBMIX,NREGIO,NMERGE,NDFI,NDFP,ILEAKS, > ILUPS,NW,MATCOD,VOLUME,KEYFLX,CURNAM,IGCOND,IMERGE, > FLUXES,AFLUXE,EIGENK,EIGINF,B2,DEN,ITYPE,LSISO,EMEVF, - > EMEVG,DECAY,YIELD,FIPI,FIFP,PYIELD,ITRANC,LISO, - > NMLEAK) + > DECAY,YIELD,FIPI,FIFP,PYIELD,ITRANC,LISO,NMLEAK) ENDIF *---- * EDIT MICROSCOPIC ACTIVATION XS @@ -690,7 +684,7 @@ IF(NACTI.GT.0) THEN CALL EDIACT(IPEDIT,IPRINT,NGROUP,NGCOND,NREGIO,NMERGE,NL,NBISO, > NED,VOLUME,MIX,IGCOND,IMERGE,FLUXES(1,1,1),ITRANC, - > ISONA,IPISO,HVECT,CURNAM,NACTI,IACTI,EMEVF,EMEVG) + > ISONA,IPISO,HVECT,CURNAM,NACTI,IACTI,EMEVF) ENDIF *---- * STATISTICS AND DELTA SIGMAS @@ -709,8 +703,7 @@ ENDIF * IF(ALLOCATED(PYIELD)) DEALLOCATE(PYIELD,YIELD,FIFP,FIPI) - DEALLOCATE(DECAY) - DEALLOCATE(EMEVG,EMEVF) + DEALLOCATE(DECAY,EMEVF) DEALLOCATE(SCATS,SIGS,FADJC,FLUXC,TAUXT) DEALLOCATE(WE,WLETY,VOLME) IF(HSIGN.EQ.'L_LIBRARY') THEN |