From 153c2e421290e48f8a3eab0f02d9ae7de5b2cc86 Mon Sep 17 00:00:00 2001
From: Joe Taylor <joe@princeton.edu>
Date: Wed, 17 Jan 2024 07:13:05 -0500
Subject: [PATCH] Diagnostic work in progress on saving and reading QMAP files.
---
qmap/libqmap/q65c.f90 | 5 +++--
qmap/libqmap/read_qm.f90 | 7 +++++--
qmap/libqmap/save_qm.f90 | 2 +-
3 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/qmap/libqmap/q65c.f90 b/qmap/libqmap/q65c.f90
index 50b0b458e..968222cc9 100644
--- a/qmap/libqmap/q65c.f90
+++ b/qmap/libqmap/q65c.f90
@@ -83,8 +83,9 @@ subroutine q65c
n60b=values(7)
nd=n60b-n60
if(nd.lt.0) nd=nd+60
- write(*,3002) nutc,nagain,nhsym,n60,n60b,nd,ntx30a,ntx30b,ndecodes,revision
-3002 format('A',i5.4,8i5,2x,a22)
+ write(*,3002) nutc,nagain,nhsym,n60,n60b,nd,ntx30a,ntx30b,ndecodes, &
+ nsave,revision
+3002 format('A',i5.4,i3,i5,7i4,1x,a22)
if(nhsym.eq.390 .and. (nsave.eq.2 .or. (nsave.eq.1 .and. ndecodes.ge.1))) then
call save_qm(fname,revision,mycall,mygrid,dd,ntx30a,ntx30b,fcenter, &
diff --git a/qmap/libqmap/read_qm.f90 b/qmap/libqmap/read_qm.f90
index f7a097f81..7007f9e2c 100644
--- a/qmap/libqmap/read_qm.f90
+++ b/qmap/libqmap/read_qm.f90
@@ -13,7 +13,10 @@ subroutine read_qm(fname,iret)
ntx30a,ntx30b !...
open(28,file=trim(fname),status='old',access='stream',err=900)
- read(28,end=910) prog_id,mycall,mygrid,fcenter,nutc,ntx30a, &
+ ! read(28,end=910) prog_id,mycall,mygrid,fcenter,nutc,ntx30a, &
+
+!### The following is only for files recorded on 240116:
+ read(28,end=910) prog_id,mycall_12,mygrid_6,fcenter,nutc,ntx30a, &
ntx30b,ndop00,ndop58,ia,ib,fac0,nxtra
fac=1.0
if(fac0.gt.0.0) fac=1.0/fac0
@@ -24,7 +27,7 @@ subroutine read_qm(fname,iret)
iret=3
if(ib.eq.NMAX/2) iret=1
if(ia.eq.NMAX/2+1) iret=2
-! print*,'A',ia,ib,iret
+ print*,'A',ia,ib,iret,prog_id,' ',mycall,' ',mygrid,' ',fcenter,nutc
! write(*,3001) prog_id,mycall(1:6),mygrid,fcenter,nutc,ntx30a,ntx30b, &
! ndop00,ndop58,ia,ib
!3001 format(a24,2x,a6,2x,a6,f10.3,i6.4,2i5/4i9)
diff --git a/qmap/libqmap/save_qm.f90 b/qmap/libqmap/save_qm.f90
index 41948598a..282f29b87 100644
--- a/qmap/libqmap/save_qm.f90
+++ b/qmap/libqmap/save_qm.f90
@@ -52,7 +52,7 @@ subroutine save_qm(fname,revision,mycall,mygrid,dd,ntx30a,ntx30b,fcenter, &
open(29,file=trim(fname),status='unknown',access='stream')
nxtra=0
- write(29) revision//' ',mycall_12,mygrid_6,fcenter,nutc,ntx30a,ntx30b, &
+ write(29) revision//' ',mycall,mygrid,fcenter,nutc,ntx30a,ntx30b, &
ndop00,ndop58,ia,ib,fac0,nxtra !Write header to disk
write(29) id1(1:2,ia:ib) !Write 8-bit data to disk
close(29)