diff options
| author | HEBERT Alain <alain.hebert@polymtl.ca> | 2026-01-04 11:33:53 -0500 |
|---|---|---|
| committer | HEBERT Alain <alain.hebert@polymtl.ca> | 2026-01-04 11:33:53 -0500 |
| commit | 37a0700f07547af849a605ec91b62d43c569a286 (patch) | |
| tree | 45b764d8e487a461f5c6e24479030840d0bd39b4 /Dragon/src/MPOCA2.f | |
| parent | 0e2eaa1f4619b6a38dc325d6d41def103c92caa5 (diff) | |
| parent | 98b807649ee1f0f813c8d0b2316e5d6ad37d3507 (diff) | |
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
Diffstat (limited to 'Dragon/src/MPOCA2.f')
| -rw-r--r-- | Dragon/src/MPOCA2.f | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/Dragon/src/MPOCA2.f b/Dragon/src/MPOCA2.f index 70a24a8..49ac76d 100644 --- a/Dragon/src/MPOCA2.f +++ b/Dragon/src/MPOCA2.f @@ -75,8 +75,8 @@ *---- * ALLOCATABLE ARRAYS *---- - INTEGER, ALLOCATABLE, DIMENSION(:) :: IDATAP,IFD1,IAD1,IFD2, - 1 IAD2,IJJ1,NJJ1,IPOS,IJJ2,NJJ2,MIX,ITYPE,IDATAP_MIL,VINTE1D + INTEGER, ALLOCATABLE, DIMENSION(:) :: IDATAP,IFD1,IAD1,IFD2,IAD2, + 1 IJJ1,NJJ1,IPOS,IJJ2,NJJ2,MIX,ITYPE,IDEPL,IDATAP_MIL,VINTE1D INTEGER, ALLOCATABLE, DIMENSION(:) :: REACTION,ISOTOPE INTEGER, ALLOCATABLE, DIMENSION(:,:) :: ISONAM,OUPUTID INTEGER, ALLOCATABLE, DIMENSION(:,:,:) :: ADRX,VINTE3D @@ -94,7 +94,7 @@ ALLOCATE(ADRX(NREA+3,NISO,NADRX+NMIL),IDATAP(MAXIDA),IFD1(NG), 1 IAD1(NG+1),IFD2(NG),IAD2(NG+1),IJJ1(NMIL),NJJ1(NMIL), 2 IPOS(NMIL),IJJ2(NG),NJJ2(NG),ISONAM(3,NBISO),MIX(NBISO), - 3 ITYPE(NBISO),IDATAP_MIL((2*NG+1)*NISO)) + 3 ITYPE(NBISO),IDEPL(NBISO),IDATAP_MIL((2*NG+1)*NISO)) ALLOCATE(RDATAX(MAXRDA),OVERV(NG),DNUSIG(NG,NPRC+1), 1 DCHI(NG,NPRC),WORKD(NPRC),WORK1(NG*NMIL+1),WORK2(NG), 2 DATA1(NG,NREA),DATA2(NG,NL),DATA3(NG,NG,NL),DATA4(NG,NG), @@ -227,6 +227,7 @@ CALL LCMGET(IPEDIT,'ISOTOPESMIX',MIX) CALL LCMGET(IPEDIT,'ISOTOPESDENS',DEN) CALL LCMGET(IPEDIT,'ISOTOPESTYPE',ITYPE) + CALL LCMGET(IPEDIT,'ISOTOPESTODO',IDEPL) ENDIF NISOTS=0 DO 90 IBISO=1,NBISO @@ -287,6 +288,7 @@ ALLOCATE(DECAYC(NISOTS)) DECAYC(:NISOTS)=0.0 DO 150 IBISO=1,NBISO + IF(IDEPL(IBISO).EQ.1) GO TO 150 IF(MIX(IBISO).EQ.0) GO TO 150 WRITE(TEXT12,'(3A4)') (ISONAM(I0,IBISO),I0=1,3) IISOTS=0 @@ -1007,7 +1009,7 @@ DEALLOCATE(NOMISO,NOMREA) DEALLOCATE(CONCES,DENISO,DEN,DATA4,DATA3,DATA2,DATA1,WORK2,WORK1, 1 WORKD,DCHI,DNUSIG,OVERV,RDATAX) - DEALLOCATE(IDATAP_MIL,ITYPE,MIX,ISONAM,NJJ2,IJJ2,IPOS,NJJ1,IJJ1, - 1 IAD2,IFD2,IAD1,IFD1,IDATAP,ADRX) + DEALLOCATE(IDATAP_MIL,IDEPL,ITYPE,MIX,ISONAM,NJJ2,IJJ2,IPOS,NJJ1, + 1 IJJ1,IAD2,IFD2,IAD1,IFD1,IDATAP,ADRX) RETURN END |