From 4e76fabff0d41a748a3d41ca2aa4c6954951c268 Mon Sep 17 00:00:00 2001
From: Giovanni La Mura <giovanni.lamura@inaf.it>
Date: Wed, 29 Nov 2023 13:45:59 +0100
Subject: [PATCH] Enable debug logging in CLU
---
src/cluster/clu.f | 96 ++++++++++++++++++++++++++++++++++++++---------
1 file changed, 79 insertions(+), 17 deletions(-)
diff --git a/src/cluster/clu.f b/src/cluster/clu.f
index 1aecb479..9c902231 100644
--- a/src/cluster/clu.f
+++ b/src/cluster/clu.f
@@ -58,7 +58,7 @@ CCC DIMENSION TQSE(2,NSPH),TQSPE(2,NSPH),TQSS(2,NSPH),TQSPS(2,NSPH)
CCC DIMENSION DC0M(NSPH,NSHL-NTL),XIV(NXI)
DIMENSION DC0M(6,4),XIV(200)
COMPLEX*16 DC0M
- COMPLEX*16 ARG,S0,S0M
+ COMPLEX*16 ARG,S0,S0M,CCSAM
8010 FORMAT(1H ,16I5)
8015 FORMAT(1H ,
1'READ(IR,*)NSPH,LI,LE,MXNDM,INPOL,NPNT,NPNTTS,IAVM,ISAM')
@@ -140,9 +140,9 @@ CCC DIMENSION DC0M(NSPH,NSHL-NTL),XIV(NXI)
6991 FORMAT('========== JXI =',I3,' ====================')
6992 FORMAT('********** JTH =',I3,', JPH =',I3,
1', JTHS =',I3,', JPHS =',I3,' ********************')
- IR=5
- IW=6
- IT=7
+ IR=25
+ IW=26
+ IT=27
ITIN=17
CCC
CCC OTHER COMMENTS IN FILE GLOBALCOMS
@@ -293,7 +293,13 @@ C
119 VKARG=XI*VK
SQSFI=1.0D0/(XI*XI)
WRITE(IW,6716)XI
- 120 CALL HJV(EXRI,VKARG,JER,LCALC,ARG)
+ 120 CALL HJV(EXRI,VKARG,JER,LCALC,ARG)
+C DEBUG CODE
+C IF(JXI.NE.1)GOTO 199
+C PRINT *,"DEBUG: witing VJ0"
+C CALL LOGMAT(VJ0)
+C 199 PRINT *,"DEBUG: already wrote VJ0"
+C END DEBUG
IF(JER.EQ.0)GO TO 122
WRITE(IW,6650)
GO TO 490
@@ -314,13 +320,22 @@ C
128 DC0(IC)=DC0M(I,IC)
130 IF(MOD(NSH,2).EQ.0)DC0(ICI+1)=EXDC
CALL DME(LI,I,NPNT,NPNTTS,VKARG,EXDC,EXRI,JER,LCALC,ARG)
+C DO 199 IDL=1,8
+C PRINT *,"DEBUG: RMI(",IDL,",",I,") =",RMI(IDL,I)
+C 199 PRINT *,"DEBUG: REI(",IDL,",",I,") =",REI(IDL,I)
+C PRINT *,"DEBUG: DME - jer =",JER,", lcalc =",LCALC,
+C 1", arg =",ARG
IF(JER.EQ.0)GO TO 132
WRITE(IW,6750)
GO TO 490
- 132 CONTINUE
+ 132 CONTINUE
CALL CMS(AM)
+ CALL SUMMAT(AM,CCSAM)
+ PRINT *,"DEBUG: after CMS CCSAM =",CCSAM
NDIT=2*NSPH*NLIM
CALL LUCIN(AM,MXNDM,NDIT,JER)
+ CALL SUMMAT(AM,CCSAM)
+ PRINT *,"DEBUG: after LUCIN CCSAM =",CCSAM
IF(JER.EQ.1)GO TO 495
CALL ZTM(AM)
@@ -343,6 +358,7 @@ C
158 WRITE(IW,6061)
160 CS0=0.25D0*VK*VK*VK/DACOS(C0)
CALL SCR0(VK,EXRI)
+ PRINT *,"DEBUG: after SCR0 TFSAS =",TFSAS
SQK=VK*VK*EXDC
CALL APS(ZPV,LI,NSPH,IOG,RMI,REI,SQK,GAPS)
CALL RABAS(INPOL,LI,NSPH,IOG,RMI,REI,TQSE,TQSPE,TQSS,TQSPS)
@@ -1605,6 +1621,7 @@ CCC DIMENSION SVW(LE,3,2,2),SVS(LE,3,2,2)
CCC DIMENSION ZPV(LM,3,2,2)
DIMENSION ZPV(8,3,2,2)
C0=0.0D0
+C SZPV=C0
DO 10 L=1,LM
DO 10 ILMP=1,3
ZPV(L,ILMP,1,1)=C0
@@ -1617,6 +1634,7 @@ CCC DIMENSION ZPV(LM,3,2,2)
ZP=-1.0D0/DSQRT(XD)
ZPV(L,2,1,2)=ZP
ZPV(L,2,2,1)=ZP
+C SZPV=SZPV+2.0D0*ZP
15 CONTINUE
IF(LM.EQ.1)GO TO 30
DO 20 L=2,LM
@@ -1625,6 +1643,7 @@ CCC DIMENSION ZPV(LM,3,2,2)
ZP=DSQRT(XN/XD)
ZPV(L,1,1,1)=ZP
ZPV(L,1,2,2)=ZP
+C SZPV=SZPV+2.0D0*ZP
20 CONTINUE
LMMO=LM-1
DO 25 L=1,LMMO
@@ -1633,8 +1652,10 @@ CCC DIMENSION ZPV(LM,3,2,2)
ZP=-DSQRT(XN/XD)
ZPV(L,3,1,1)=ZP
ZPV(L,3,2,2)=ZP
+C SZPV=SZPV+2.0D0*ZP
25 CONTINUE
- 30 CONTINUE
+ 30 CONTINUE
+C PRINT *,"DEBUG: szpv =",SZPV
RETURN
END
REAL*8 FUNCTION CG1(LMPML,MU,L,M)
@@ -1853,7 +1874,7 @@ CCC NSPEF=1 CALLING WITH IDOT=0, NSPEF=NSPH OTHERWISE
IMPLICIT REAL*8(A-H,O-Z)
CCC DIMENSION RCF(NSPH,NSHL),YLM(MAX0(LITPOS,LMTPOS))
DIMENSION RCF(6,8),YLM(289)
- COMPLEX*16 YLM
+ COMPLEX*16 YLM,SVYHJ
COMMON/C1/VH(255),VJ0(102),VYHJ(4335),VYJ0(1734),VJ(1),
1RMI(8,6),REI(8,6),W(160,4),AM0M(160,160),
2FSAS(6),SAS(6,2,2),VINTS(6,16),VINTT(16),
@@ -1902,7 +1923,7 @@ CCC DIMENSION RCF(NSPH,NSHL),YLM(MAX0(LITPOS,LMTPOS))
DO 28 LPO=LMNPO,LMXPO,2
I=I+1
IL=IL+1
- 28 V3J0(I)=RAC3J(IL)
+ 28 V3J0(I)=RAC3J(IL)
NSPHMO=NSPH-1
LIT=LI+LI
IVY=0
@@ -1916,6 +1937,10 @@ CCC DIMENSION RCF(NSPH,NSHL),YLM(MAX0(LITPOS,LMTPOS))
CALL SPHAR(CRTH,SRTH,CRPH,SRPH,LIT,YLM)
DO 38 IV=1,LITPOS
38 VYHJ(IV+IVY)=DCONJG(YLM(IV))
+C SVYHJ=(0.0D0,0.0D0)
+C DO 995 IDI=1,4335
+C 995 SVYHJ=SVYHJ+VYHJ(IDI)
+C PRINT *,"DEBUG: in STR svyhj =",SVYHJ
40 IVY=IVY+LITPOS
LMT=LI+LE
IVY=0
@@ -1928,7 +1953,7 @@ CCC DIMENSION RCF(NSPH,NSHL),YLM(MAX0(LITPOS,LMTPOS))
CALL SPHAR(CRTH,SRTH,CRPH,SRPH,LMT,YLM)
DO 48 IV=1,LMTPOS
48 VYJ0(IV+IVY)=DCONJG(YLM(IV))
- 50 IVY=IVY+LMTPOS
+ 50 IVY=IVY+LMTPOS
RETURN
END
SUBROUTINE HJV(EXRI,VK,JER,LCALC,ARG)
@@ -1990,7 +2015,7 @@ CCC DIMENSION RFJ(MAX0(LIT,LMT)),RFN(LITPO)
RETURN
45 DO 47 LPO=1,LMTPO
47 VJ0(LPO+IVHB)=RFJ(LPO)
- 50 IVHB=IVHB+LMTPO
+ 50 IVHB=IVHB+LMTPO
RETURN
END
SUBROUTINE PWMA(UP,UN,YLM,INPOL,LW,ISQ)
@@ -2078,7 +2103,7 @@ CCC DIMENSION YLM(NLWM+2)
U3(2)=U1(3)*U2(1)-U1(1)*U2(3)
U3(3)=U1(1)*U2(2)-U1(2)*U2(1)
RETURN
- END
+ END
SUBROUTINE CMS(AM)
IMPLICIT REAL*8(A-H,O-Z)
COMMON/C1/VH(255),VJ0(102),VYHJ(4335),VYJ0(1734),VJ(1),
@@ -2098,6 +2123,7 @@ CCC NDIT.LE.MXNDM
DIMENSION AM(960,960)
COMPLEX*16 AM
COMPLEX*16 DM,DE,CGH,CGK,GHIT,CC0
+ COMMON/C6/RAC3J(17)
CC0=(0.0D0,0.0D0)
NDI=NSPH*NLIM
NBL=0
@@ -2185,7 +2211,7 @@ CCC NDIT.LE.MXNDM
1VINTS,VINTT,FSAC,SAC,FSACM,VINT,VINTM,SCSCP,ECSCP,SCSCPM,ECSCPM
COMMON/C4/LITPO,LITPOS,LMTPO,LMTPOS,LI,NLIM,LE,NLEM,NSPH
COMMON/C9/GIS(480,80),GLS(480,80),SAM(960,160)
- COMPLEX*16 GIS,GLS,SAM
+ COMPLEX*16 GIS,GLS,SAM,DBGTST
CCC DIMENSION AM(MXNDM,MXNDM)
CCC NDIT.LE.MXNDM
DIMENSION AM(960,960)
@@ -2210,7 +2236,19 @@ CCC NDIT.LE.MXNDM
M3=M3+1
I3=I3+1
GIS(I2,I3)=GHIT(2,0,N2,L2,M2,L3,M3)
- 15 GLS(I2,I3)=GHIT(2,1,N2,L2,M2,L3,M3)
+ 15 GLS(I2,I3)=GHIT(2,1,N2,L2,M2,L3,M3)
+C DEBUG CODE
+C DBGTST=CC0
+C DO 990 DI=1,NDI
+C DO 990 DJ=1,NLEM
+C 990 DBGTST=DBGTST+GIS(DI,DJ)
+C PRINT *,"DEBUG: in ZTM init sgis =",DBGTST
+C DBGTST=CC0
+C DO 991 DI=1,NDI
+C DO 991 DJ=1,NLEM
+C 991 DBGTST=DBGTST+GLS(DI,DJ)
+C PRINT *,"DEBUG: in ZTM init sgls =",DBGTST
+C END DEBUG
DO 25 I1=1,NDI
I1E=I1+NDI
DO 25 I3=1,NLEM
@@ -2553,7 +2591,7 @@ CCC 3j(J,J2,J3;0,0,0)
80 RAC3J(IRR)=RAC3J(IRR)*CNR
CNL=CNR*RATRAC
DO 85 IRL=1,NMATMO
- 85 RAC3J(IRL)=RAC3J(IRL)*CNL
+ 85 RAC3J(IRL)=RAC3J(IRL)*CNL
RETURN
END
SUBROUTINE R3JJR(J2,J3,M2,M3)
@@ -2663,7 +2701,7 @@ CCC 3j(J,J2,J3;-M2-M3,M2,M3)
80 RAC3J(IRR)=RAC3J(IRR)*CNR
CNL=CNR*RATRAC
DO 85 IRL=1,NMATMO
- 85 RAC3J(IRL)=RAC3J(IRL)*CNL
+ 85 RAC3J(IRL)=RAC3J(IRL)*CNL
RETURN
END
SUBROUTINE R3JMR(J1,J2,J3,M1)
@@ -2888,7 +2926,7 @@ cccccccccccccccccccccc
CCNB=DREF(L)*FN(LPO)*SZ*LTPO
CCNC=REF(L)*DFB
CCND=DREF(L)*FB(LPO)*SZ*LTPO
- 90 REI(L,I)=1.0D0+UIM*(CRI*CCNA-CCNB)/(CRI*CCNC-CCND)
+ 90 REI(L,I)=1.0D0+UIM*(CRI*CCNA-CCNB)/(CRI*CCNC-CCND)
RETURN
END
SUBROUTINE RKT(NPNTMO,STEP,X,LPO,Y1,Y2,DY1,DY2)
@@ -3466,4 +3504,28 @@ CCC DIMENSION AV(NDDMST*NDDMST)
3 CDTP=CDTP+AV((J-1)*ISTEP+I)*AV(J+IR)
RETURN
END
+ SUBROUTINE SUMMAT(AM,RSLT)
+ DIMENSION AM(921600)
+ COMPLEX*16 AM,CC0,RSLT
+ CC0=(0.0D0,0.0D0)
+ RSLT=CC0
+ DO 4 I=1,921600
+ 4 RSLT=RSLT+AM(I)
+ RETURN
+ END
+ SUBROUTINE LOGMAT(AM)
+ DIMENSION AM(960,960)
+ COMPLEX*16 AM
+ IL=36
+ OPEN(IL,FILE="matrix.log",STATUS="UNKNOWN")
+ DO 5 I=1,960
+ DO 6 J=1,960
+ WRITE(IL,9901)I,J,DREAL(AM(I,J))
+ 6 WRITE(IL,9902)I,J,DIMAG(AM(I,J))
+ 5 CONTINUE
+ CLOSE(IL)
+ 9901 FORMAT("R:",1I3,",",1I3,",",1D15.7)
+ 9902 FORMAT("I:",1I3,",",1I3,",",1D15.7)
+ RETURN
+ END
CCC
--
GitLab