Merge branch '22-issue-with-the-partial-homogenization-of-a-colorset' into 'main'

#22: Issue with the partial homogenization of a colorset

See merge request dragon/5.1!43

1 files changed, 9 insertions, 30 deletions

diff --git a/Dragon/src/EDIMIC.f b/Dragon/src/EDIMIC.f
index e284110..90e1dfb 100644
--- a/Dragon/src/EDIMIC.f
+++ b/Dragon/src/EDIMIC.f
@@ -172,7 +172,6 @@
       MAXH=9+NBESP+2*NDEL+NED+NL+3*NW
       CALL EDIMAX(NBISO,ISONAM,MIX,IPRINT,NREGIO,NMERGE,MATCOD,IMERGE,
      1 LSISO,LISO,MAXISO)
-      
       ALLOCATE(IGAR(NGROUP,3,NL),IHNISO(3,MAXISO),ISMIX(MAXISO),
      1 ISTYP(MAXISO),ISTOD(MAXISO),ITYPRO(NL),MILVO(NMERGE),
      2 ITYPS(NBISO),IMERGL(NBMIX))
@@ -200,11 +199,9 @@
         IF(MAXISO.GT.0) JPEDIT=LCMLID(IPEDIT,'ISOTOPESLIST',MAXISO)
       ENDIF
 *
-      DO 10 ISO=1,MAXISO
-      SDEN(ISO)=0.0
-      VOLISO(ISO)=0.0
-      JPIFI(ISO)=0
-   10 CONTINUE
+      SDEN(:MAXISO)=0.0
+      VOLISO(:MAXISO)=0.0
+      JPIFI(:MAXISO)=0
       IOF0H=8+NED+NL+3*NW
       IOF1H=8+NED+NL+3*NW+NDEL
       IOF2H=8+NED+NL+3*NW+2*NDEL
@@ -349,24 +346,10 @@
 *  MERGE/CONDENSE REACTIONS 'NWT0','NWT1','NWAT0','NWAT1','SIGS'//CM,
 *   'SCAT'//CM, 'NTOT0', 'NUSIGF', 'CHI', 'CHIxx', 'STRD' AND HVECT
 *----
-      DO 110 J=1,MAXH+NL
-      HMAKE(J)=' '
-  110 CONTINUE
-      DO 121 J=1,MAXH
-      DO 120 I=1,NGCOND
-      GAS(I,J)=0.0D0
-  120 CONTINUE
-  121 CONTINUE
-      DO 132 K=1,NL
-      DO 131 J=1,NGCOND
-      DO 130 I=1,NGCOND
-      WSCAT(I,J,K)=0.0D0
-  130 CONTINUE
-  131 CONTINUE
-  132 CONTINUE
-      DO 140 I=1,NDEL
-      WDLA(I)=0.0
-  140 CONTINUE
+      HMAKE(:MAXH+NL)=' '
+      GAS(:NGCOND,:MAXH)=0.0D0
+      WSCAT(:NGCOND,:NGCOND,:NL)=0.0D0
+      WDLA(:NDEL)=0.0
 *----
 *  RECOVER THE RADIOACTIVE DECAY CONSTANTS OF DELAYED NEUTRON
 *  GROUPS FROM THE MACROLIB IF THEY EXIST
@@ -508,9 +491,7 @@
                CALL LCMGET(KPLIB,'TRANC',GAR(1,7+NED+NL+3*NW))
                HMAKE(7+NED+NL+3*NW)='TRANC'
             ENDIF
-            DO 186 IGR=1,NGROUP
-            GAR(IGR,5+NED+NL+3*NW)=0.0
-  186       CONTINUE
+            GAR(:NGROUP,5+NED+NL+3*NW)=0.0
             CALL LCMLEN(KPLIB,'H-FACTOR',LENGTH,ITYLCM)
             IF(LENGTH.GT.0) THEN
                CALL LCMGET(KPLIB,'H-FACTOR',GAR(1,5+NED+NL+3*NW))
@@ -549,9 +530,7 @@
             PARM4=0.0D0
             PARM12(:NW+1)=0.0D0
             IF(IADJ.EQ.0) THEN
-              DO 206 IW=1,NW+1
-                PARM12(IW)=FLUXES(IREGIO,IGR,IW)*DENVOL
-  206         CONTINUE
+              PARM12(:NW+1)=FLUXES(IREGIO,IGR,:NW+1)*DENVOL
               PARM3=0.0D0
               DO 210 JREGIO=1,NREGIO
               IF(IMERGE(JREGIO).EQ.INM) THEN