Resolve "Depreciate use of Version 4 and 5.0 Draglibs"

1 files changed, 27 insertions, 26 deletions

diff --git a/Dragon/src/BREDRV.f b/Dragon/src/BREDRV.f
index 3e9a12a..805edd9 100644
--- a/Dragon/src/BREDRV.f
+++ b/Dragon/src/BREDRV.f
@@ -77,8 +77,8 @@
      1 ISTOP
       REAL, ALLOCATABLE, DIMENSION(:) :: XXX,XXXS,XXX1,ENER,ZKEFF,B2
       REAL, ALLOCATABLE, DIMENSION(:,:) :: VOL1
-      REAL, ALLOCATABLE, DIMENSION(:,:,:) :: FLX1,DC1,CHI1,SIGF1,JXM,
-     1 JXP,ADF1
+      REAL, ALLOCATABLE, DIMENSION(:,:,:) :: FLX1,DC1,CHI1,SIGF1,HFACT1,
+     1 JXM,JXP,ADF1
       REAL, ALLOCATABLE, DIMENSION(:,:,:,:) :: TOT1,FHETXM,FHETXP
       REAL, ALLOCATABLE, DIMENSION(:,:,:,:,:) :: SCAT1
       TYPE(C_PTR), ALLOCATABLE, DIMENSION(:) :: IPMAC2
@@ -252,45 +252,46 @@
       NL=NLF
       ALLOCATE(VOL1(NMIX1,NC),FLX1(NMIX1,NG,NC),DC1(NMIX1,NG,NC),
      1 TOT1(NMIX1,NG,NL,NC),CHI1(NMIX1,NG,NC),SIGF1(NMIX1,NG,NC),
-     2 SCAT1(NMIX1,NG,NG,NL,NC),JXM(NMIX1,NG,NC),JXP(NMIX1,NG,NC),
-     3 FHETXM(NMIX1,NG,NL,NC),FHETXP(NMIX1,NG,NL,NC),ADF1(NMIX1,NG,NC),
-     4 ZKEFF(NC),B2(NC))
+     2 SCAT1(NMIX1,NG,NG,NL,NC),HFACT1(NMIX1,NG,NC),JXM(NMIX1,NG,NC),
+     3 JXP(NMIX1,NG,NC),FHETXM(NMIX1,NG,NL,NC),FHETXP(NMIX1,NG,NL,NC),
+     4 ADF1(NMIX1,NG,NC),ZKEFF(NC),B2(NC))
       CALL BREMAC(NC,IPMAC2,NG,NL,LX1,NMIX1,NMIX2,IMIX,IMIX1,IGAP,
-     1 ILEAKS,IDF,IPRINT,ZKEFF,B2,VOL1,FLX1,DC1,TOT1,CHI1,SIGF1,SCAT1,
-     2 JXM,JXP,FHETXM,FHETXP,ADF1)
+     1 ILEAKS,IDF,IPRINT,IH,ZKEFF,B2,VOL1,FLX1,DC1,TOT1,CHI1,SIGF1,
+     2 SCAT1,HFACT1,JXM,JXP,FHETXM,FHETXP,ADF1)
 *----
 *  SELECT A REFLECTOR MODEL
 *----
       IF(HMREFL.EQ."DF-NEM") THEN
         IF(NC.NE.1) CALL XABORT('BREDRV: NC=1 EXPECTED.')
-        CALL BRENEM(IPMAC1,NG,LX1,NMIX1,ITRIAL,IMIX,ICODE,ISPH,ZKEFF,
-     1  B2,ENER,VOL1,FLX1,DC1,TOT1,CHI1,SIGF1,SCAT1,JXM,JXP,FHETXM,
-     2  FHETXP,ADF1,NGET,ADFREF,IPRINT)
+        CALL BRENEM(IPMAC1,NG,LX1,NMIX1,ITRIAL,IMIX,ICODE,ISPH,IH,ZKEFF,
+     1  B2,ENER,VOL1,FLX1,DC1,TOT1,CHI1,SIGF1,SCAT1,HFACT1,JXM,JXP,
+     2  FHETXM,FHETXP,ADF1,NGET,ADFREF,IPRINT)
       ELSE IF(HMREFL.EQ."DF-ANM") THEN
         IF(NC.NE.1) CALL XABORT('BREDRV: NC=1 EXPECTED.')
-        CALL BREANM(IPMAC1,NG,LX1,NMIX1,IMIX,ICODE,ISPH,ZKEFF,B2,ENER,
-     1  XXX1,VOL1,FLX1,DC1,TOT1,CHI1,SIGF1,SCAT1,JXM,JXP,FHETXM,FHETXP,
-     2  ADF1,NGET,ADFREF,IPRINT)
+        CALL BREANM(IPMAC1,NG,LX1,NMIX1,IMIX,ICODE,ISPH,IH,ZKEFF,B2,
+     1  ENER,XXX1,VOL1,FLX1,DC1,TOT1,CHI1,SIGF1,SCAT1,HFACT1,JXM,JXP,
+     2  FHETXM,FHETXP,ADF1,NGET,ADFREF,IPRINT)
       ELSE IF(HMREFL.EQ."DF-RT") THEN
         IF(NC.NE.1) CALL XABORT('BREDRV: NC=1 EXPECTED.')
-        CALL BRERT(IPMAC1,IELEM,ICOL,NG,NL,LX1,NMIX1,IMIX,ICODE,ISPH,
+        CALL BRERT(IPMAC1,IELEM,ICOL,NG,NL,LX1,NMIX1,IMIX,ICODE,ISPH,IH,
      1  IDIFF,ZKEFF,B2,ENER,XXX1,VOL1,FLX1,DC1,TOT1,CHI1,SIGF1,SCAT1,
-     2  JXM,JXP,FHETXM,FHETXP,ADF1,NGET,ADFREF,IPRINT)
+     2  HFACT1,JXM,JXP,FHETXM,FHETXP,ADF1,NGET,ADFREF,IPRINT)
       ELSE IF(HMREFL.EQ."ERM-NEM") THEN
-        CALL BREERM(IPMAC1,NC,NG,NL,LX1,NMIX1,ITRIAL,IMIX,ICODE,ISPH,
-     1  ZKEFF,B2,ENER,VOL1,FLX1,DC1,TOT1,CHI1,SIGF1,SCAT1,JXM,JXP,
-     2  FHETXM,FHETXP,ADF1,NGET,ADFREF,IPRINT)
+        CALL BREERM(IPMAC1,NC,NG,NL,LX1,NMIX1,ITRIAL,IMIX,ICODE,ISPH,IH,
+     1  ZKEFF,B2,ENER,VOL1,FLX1,DC1,TOT1,CHI1,SIGF1,SCAT1,HFACT1,JXM,
+     2  JXP,FHETXM,FHETXP,ADF1,NGET,ADFREF,IPRINT)
       ELSE IF(HMREFL.EQ."ERM-ANM") THEN
-        CALL BREERA(IPMAC1,NC,NG,NL,LX1,NMIX1,IMIX,ICODE,ISPH,ZKEFF,B2,
-     1  ENER,XXX1,VOL1,FLX1,DC1,TOT1,CHI1,SIGF1,SCAT1,JXM,JXP,FHETXM,
-     2  FHETXP,ADF1,NGET,ADFREF,IPRINT)
+        CALL BREERA(IPMAC1,NC,NG,NL,LX1,NMIX1,IMIX,ICODE,ISPH,IH,ZKEFF,
+     1  B2,ENER,XXX1,VOL1,FLX1,DC1,TOT1,CHI1,SIGF1,SCAT1,HFACT1,JXM,JXP,
+     2  FHETXM,FHETXP,ADF1,NGET,ADFREF,IPRINT)
       ELSE IF(HMREFL.EQ."LEFEBVRE-LEB") THEN
         IF(NC.NE.2) CALL XABORT('BREDRV: NC=2 EXPECTED.')
-        CALL BRELLB(IPMAC1,NC,NG,NL,NMIX1,ENER,JXM,FHETXM,IPRINT)
+        CALL BRELLB(IPMAC1,NC,NG,NL,NMIX1,IH,ENER,HFACT1,JXM,FHETXM,
+     1  IPRINT)
       ELSE IF(HMREFL.EQ."KOEBKE") THEN
         IF(NC.NE.2) CALL XABORT('BREDRV: NC=2 EXPECTED.')
-        CALL BREKOE(IPMAC1,NC,NG,NL,NMIX1,ISPH,B2,ENER,DC1,TOT1,SCAT1,
-     1  JXM,FHETXM,IPRINT)
+        CALL BREKOE(IPMAC1,NC,NG,NL,NMIX1,ISPH,IH,B2,ENER,DC1,TOT1,
+     1  SCAT1,HFACT1,JXM,FHETXM,IPRINT)
       ELSE
         WRITE(HSMG,'(25H BREDRV: REFLECTOR MODEL ,A,12H IS UNKNOWN.)')
      1  HMREFL
@@ -299,8 +300,8 @@
 *----
 *  SCRATCH STORAGE DEALLOCATION
 *----
-      DEALLOCATE(IMIX,B2,ZKEFF,ADF1,FHETXP,FHETXM,JXP,JXM,SCAT1,SIGF1,
-     1 CHI1,TOT1,DC1,FLX1,VOL1)
+      DEALLOCATE(IMIX,B2,ZKEFF,ADF1,FHETXP,FHETXM,JXP,JXM,HFACT1,SCAT1,
+     1 SIGF1,CHI1,TOT1,DC1,FLX1,VOL1)
       DEALLOCATE(XXX1,XXXS,IMIXS,ENER,IHOM)
       DEALLOCATE(IPMAC2)
       RETURN