From e7b5db7b8eca9811474f4fd63dfd646ffd00ce32 Mon Sep 17 00:00:00 2001 From: Joe Taylor Date: Mon, 12 Dec 2022 09:34:13 -0500 Subject: [PATCH] No need for polfit.f90. --- q65w/libm65/CMakeLists.txt | 2 - q65w/libm65/Makefile | 130 ------------------------------------- q65w/libm65/Makefile.0 | 114 -------------------------------- q65w/libm65/Makefile.MinGW | 105 ------------------------------ q65w/libm65/Makefile.jtsdk | 129 ------------------------------------ q65w/libm65/Makefile.linux | 96 --------------------------- q65w/libm65/polfit.f90 | 87 ------------------------- 7 files changed, 663 deletions(-) delete mode 100644 q65w/libm65/Makefile delete mode 100644 q65w/libm65/Makefile.0 delete mode 100644 q65w/libm65/Makefile.MinGW delete mode 100644 q65w/libm65/Makefile.jtsdk delete mode 100644 q65w/libm65/Makefile.linux delete mode 100644 q65w/libm65/polfit.f90 diff --git a/q65w/libm65/CMakeLists.txt b/q65w/libm65/CMakeLists.txt index 0275fb5c5..b37f596e4 100644 --- a/q65w/libm65/CMakeLists.txt +++ b/q65w/libm65/CMakeLists.txt @@ -62,7 +62,6 @@ set (libm65_FSRCS noisegen.f90 packjt.f90 pfxdump.f90 - polfit.f90 recvpkt.f90 rfile3a.f90 s3avg.f90 @@ -74,7 +73,6 @@ set (libm65_FSRCS smo.f90 sun.f90 symspec.f90 -# timer.f90 timf2.f90 tm2.f90 toxyz.f90 diff --git a/q65w/libm65/Makefile b/q65w/libm65/Makefile deleted file mode 100644 index 810f09e1f..000000000 --- a/q65w/libm65/Makefile +++ /dev/null @@ -1,130 +0,0 @@ -# Makefile for MinGW on Windows -CC = c:/JTSDK/Qt55/Tools/mingw492_32/bin/gcc -FC = c:/JTSDK/Qt55/Tools/mingw492_32/bin/gfortran -CXX = c:/JTSDK/Qt55/Tools/mingw492_32/bin/g++ - -FFLAGS = -O2 -fbounds-check -Wall -Wno-conversion -Wno-precision-loss \ - -fno-second-underscore -fbacktrace \ - -ffpe-summary=none -# -ffpe-trap=invalid,zero,overflow,underflow,denormal -CFLAGS = -I. -fbounds-check - -# Default rules -%.o: %.c - ${CC} ${CFLAGS} -c $< -%.o: %.f - ${FC} ${FFLAGS} -c $< -%.o: %.F - ${FC} ${FFLAGS} -c $< -%.o: %.f90 - ${FC} ${FFLAGS} -c $< -%.o: %.F90 - ${FC} ${FFLAGS} -c $< - -all: packjt.o wavhdr.o libm65.a m65.exe mapsim.exe libastro.a - -OBJS1 = trimlist.o display.o getdphi.o pctile.o ccf65.o \ - decode1a.o sort.o filbig.o fil6521.o afc65b.o \ - twkfreq.o decode65b.o indexx.o ssort.o fchisq.o setup65.o \ - extract.o deep65.o ccf2.o demod64a.o chkhist.o graycode.o \ - interleave63.o encode65.o igray.o set.o shell.o qra64_subs.o \ - grid2k.o getpfx2.o q65b.o qra64c.o twkfreq_xy.o qra64zap.o \ - deg2grid.o getpfx1.o k2grid.o ftrsd2.o graycode65.o \ - wrapkarn.o nchar.o init_rs.o encode_rs.o decode_rs.o \ - four2a.o rfile3a.o grid2deg.o pfxdump.o dpol.o sync64.o spec64.o \ - astro.o tm2.o sun.o moondop.o coord.o tmoonsub.o \ - geocentric.o moon2.o toxyz.o dot.o dcoord.o f77_wisdom.o \ - gen65.o chkmsg.o ptt.o astrosub.o astro0.o recvpkt.o symspec.o \ - iqcal.o iqfix.o timf2.o s3avg.o packjt.o badmsg.o fmtmsg.o \ - qracodes.o qra64.o smo.o averms.o lorentzian.o npfwht.o pdmath.o \ - qra13_64_64_irr_e.o fchisq0.o gen_q65_wave.o wavhdr.o - -packjt.o: packjt.f90 - $(FC) -c packjt.f90 - -libm65.a: $(OBJS1) - ar cr libm65.a $(OBJS1) - ranlib libm65.a - -qra64_subs.o: ./qra64/qra64_subs.c - gcc -c -O2 -o qra64_subs.o ./qra64/qra64_subs.c - -qracodes.o: qracodes/qracodes.c - gcc -c -O2 -o qracodes.o qracodes/qracodes.c - -qra64.o: qra64/qra64.c - gcc -c -O2 -o qra64.o qra64/qra64.c - -qra13_64_64_irr_e.o: qracodes/qra13_64_64_irr_e.c - gcc -c -O2 -o qra13_64_64_irr_e.o \ - qracodes/qra13_64_64_irr_e.c - -npfwht.o: qracodes/npfwht.c - gcc -c -O2 -o npfwht.o qracodes/npfwht.c - -pdmath.o: qracodes/pdmath.c - gcc -c -O2 -o pdmath.o qracodes/pdmath.c - -OBJS3 = m65.o m65a.o map65a.o symspec.o decode0.o ftninit.o ftnquit.o \ - timer.o ipcomm.o sec_midn.o usleep.o -# cutil.o - -LIBS3 = -L'C:/JTSDK/Qt55/5.5/mingw492_32/lib' -lQt5Core - -m65.exe: $(OBJS3) libm65.a - $(CXX) -o m65.exe $(OBJS3) $(LIBS3) libm65.a ../libfftw3f_win.a \ - -lgfortran -# cp m65.exe ../../map65_install - cp m65.exe /c/MAP65_2.9 - -OBJS7 = astrosub.o astro0.o astro.o tm2.o grid2deg.o sun.o moondop.o \ - coord.o dot.o moon2.o tmoonsub.o toxyz.o geocentric.o \ - dcoord.o - -libastro.a: $(OBJS7) - ar cr libastro.a $(OBJS7) - ranlib libastro.a - -OBJS6 = mapsim.o cgen65.o noisegen.o gran.o -mapsim.exe: $(OBJS6) libm65.a - $(FC) -o mapsim.exe $(OBJS6) libm65.a - -INCPATH = -I'C:/JTSDK/Qt55/5.5/mingw492_32/include/QtCore' \ - -I'C:/JTSDK/Qt55/5.5/mingw492_32/include' - -ipcomm.o: ipcomm.cpp - $(CXX) -c $(INCPATH) ipcomm.cpp - -#m65a.o: m65a.f90 -# $(FC) -c -fno-second-underscore -cpp m65a.f90 - -sec_midn.o: sec_midn.f90 - $(FC) -c -fno-second-underscore sec_midn.f90 - -#symspec.o: ../symspec.f90 -# $(FC) -c $(FFLAGS) -o symspec.o ../symspec.f90 - -OBJS4 = tastro.o astro0.o libm65.a -tastro.exe: $(OBJS4) - $(FC) $(FFLAGS) -o tastro.exe $(OBJS4) libm65.a - -OBJS5 = t1.o timer.o libm65.a -t1.exe: $(OBJS5) - $(FC) $(FFLAGS) -o t1.exe $(OBJS5) libm65.a - -#astro0.o: ../astro0.f90 -# $(FC) -c $(FFLAGS) -o astro0.o ../astro0.f90 - -init_rs.o: init_rs.c - $(CC) -c -DBIGSYM=1 -o init_rs.o init_rs.c - -encode_rs.o: encode_rs.c - $(CC) -c -DBIGSYM=1 -o encode_rs.o encode_rs.c - -decode_rs.o: decode_rs.c - $(CC) -c -DBIGSYM=1 -o decode_rs.o decode_rs.c - -.PHONY : clean - -clean: - rm -f *.o *.mod libm65.a m65.exe diff --git a/q65w/libm65/Makefile.0 b/q65w/libm65/Makefile.0 deleted file mode 100644 index 7ff2357ff..000000000 --- a/q65w/libm65/Makefile.0 +++ /dev/null @@ -1,114 +0,0 @@ -# Makefile for Linux -CC = gcc -FC = gfortran -CXX = g++ - -FFLAGS = -O2 -fbounds-check -Wall -Wno-precision-loss -fno-second-underscore -# For ptt_unix: -CFLAGS = -I. -fbounds-check -DHAVE_STDLIB_H=1 -DHAVE_STDIO_H=1 \ - -DHAVE_FCNTL_H=1 -DHAVE_SYS_IOCTL_H=1 - -# Default rules -%.o: %.c - ${CC} ${CFLAGS} -c $< -%.o: %.f - ${FC} ${FFLAGS} -c $< -%.o: %.F - ${FC} ${FFLAGS} -c $< -%.o: %.f90 - ${FC} ${FFLAGS} -c $< -%.o: %.F90 - ${FC} ${FFLAGS} -c $< - -all: packjt.o libm65.a m65 mapsim libastro.a - -OBJS1 = trimlist.o display.o getdphi.o pctile.o ccf65.o \ - decode1a.o sort.o filbig.o fil6521.o afc65b.o \ - twkfreq.o decode65b.o indexx.o ssort.o fchisq.o setup65.o \ - extract.o deep65.o ccf2.o demod64a.o chkhist.o graycode.o \ - interleave63.o encode65.o igray.o set.o shell.o qra64_subs.o \ - grid2k.o getpfx2.o qra64b.o qra64c.o twkfreq_xy.o qra64zap.o \ - deg2grid.o getpfx1.o k2grid.o ftrsd2.o graycode65.o \ - wrapkarn.o nchar.o init_rs.o encode_rs.o decode_rs.o \ - four2a.o rfile3a.o grid2deg.o pfxdump.o dpol.o sync64.o spec64.o \ - astro.o tm2.o sun.o moondop.o coord.o tmoonsub.o \ - geocentric.o moon2.o toxyz.o dot.o dcoord.o f77_wisdom.o \ - gen65.o chkmsg.o astrosub.o astro0.o recvpkt.o symspec.o \ - iqcal.o iqfix.o timf2.o s3avg.o packjt.o badmsg.o fmtmsg.o \ - qracodes.o qra64.o smo.o averms.o lorentzian.o npfwht.o pdmath.o \ - qra13_64_64_irr_e.o fchisq0.o genqra64a.o ptt_unix.o - -packjt.o: packjt.f90 - $(FC) -c packjt.f90 - -libm65.a: $(OBJS1) - ar cr libm65.a $(OBJS1) - ranlib libm65.a - -qra64_subs.o: ./qra64/qra64_subs.c - gcc -c -O2 -o qra64_subs.o ./qra64/qra64_subs.c - -qracodes.o: ./qracodes/qracodes.c - gcc -c -O2 -o qracodes.o ./qracodes/qracodes.c - -qra64.o: ./qra64/qra64.c - gcc -c -O2 -o qra64.o ./qra64/qra64.c - -qra13_64_64_irr_e.o: ./qracodes/qra13_64_64_irr_e.c - gcc -c -O2 -o qra13_64_64_irr_e.o ./qracodes/qra13_64_64_irr_e.c - -npfwht.o: ./qracodes/npfwht.c - gcc -c -O2 -o npfwht.o ./qracodes/npfwht.c - -pdmath.o: ./qracodes/pdmath.c - gcc -c -O2 -o pdmath.o ./qracodes/pdmath.c - -OBJS3 = m65.o m65a.o map65a.o symspec.o decode0.o ftninit.o ftnquit.o \ - timer.o ipcomm.o sec_midn.o usleep.o - -m65: $(OBJS3) libm65.a - $(CXX) -o m65 $(OBJS3) libm65.a -lfftw3f -lQt5Core -lfftw3f -lgfortran - cp m65 ../../map65_install - -OBJS7 = astrosub.o astro0.o astro.o tm2.o grid2deg.o sun.o moondop.o \ - coord.o dot.o moon2.o tmoonsub.o toxyz.o geocentric.o \ - dcoord.o - -libastro.a: $(OBJS7) - ar cr libastro.a $(OBJS7) - ranlib libastro.a - -OBJS6 = mapsim.o cgen65.o noisegen.o gran.o -mapsim: $(OBJS6) libm65.a - $(FC) -o mapsim $(OBJS6) libm65.a - -INCPATH = -I. -I'/usr/include/x86_64-linux-gnu/qt5' \ - -I'/usr/include/x86_64-linux-gnu/qt5/QtCore' - -ipcomm.o: ipcomm.cpp - $(CXX) -c $(INCPATH) -fPIC ipcomm.cpp - -sec_midn.o: sec_midn.f90 - $(FC) -c -fno-second-underscore sec_midn.f90 - -OBJS4 = tastro.o astro0.o libm65.a -tastro: $(OBJS4) - $(FC) $(FFLAGS) -o tastro $(OBJS4) libm65.a - -OBJS5 = t1.o timer.o libm65.a -t1: $(OBJS5) - $(FC) $(FFLAGS) -o t1 $(OBJS5) libm65.a - -init_rs.o: init_rs.c - $(CC) -c -DBIGSYM=1 -o init_rs.o init_rs.c - -encode_rs.o: encode_rs.c - $(CC) -c -DBIGSYM=1 -o encode_rs.o encode_rs.c - -decode_rs.o: decode_rs.c - $(CC) -c -DBIGSYM=1 -o decode_rs.o decode_rs.c - -.PHONY : clean - -clean: - rm -f *.o *.mod libm65.a m65 diff --git a/q65w/libm65/Makefile.MinGW b/q65w/libm65/Makefile.MinGW deleted file mode 100644 index 52b0ace03..000000000 --- a/q65w/libm65/Makefile.MinGW +++ /dev/null @@ -1,105 +0,0 @@ -# Makefile for MinGW on Windows -CC = gcc -FC = g95 -CXX = c:/wsjt-env/Qt5/Tools/mingw48_32/bin/g++ - -FFLAGS = -O2 -fbounds-check -Wall -Wno-precision-loss -fno-second-underscore -CFLAGS = -I. -fbounds-check - -# Default rules -%.o: %.c - ${CC} ${CFLAGS} -c $< -%.o: %.f - ${FC} ${FFLAGS} -c $< -%.o: %.F - ${FC} ${FFLAGS} -c $< -%.o: %.f90 - ${FC} ${FFLAGS} -c $< -%.o: %.F90 - ${FC} ${FFLAGS} -c $< - -all: libm65.a m65.exe JT65code.exe mapsim.exe libastro.a - -OBJS1 = trimlist.o display.o getdphi.o pctile.o ccf65.o \ - decode1a.o sort.o filbig.o fil6521.o afc65b.o \ - twkfreq.o decode65b.o indexx.o ssort.o fchisq.o setup65.o \ - extract.o deep65.o ccf2.o demod64a.o chkhist.o graycode.o \ - interleave63.o unpackmsg.o encode65.o igray.o set.o unpackcall.o \ - unpackgrid.o grid2k.o unpacktext.o getpfx2.o packmsg.o \ - deg2grid.o packtext.o getpfx1.o packcall.o k2grid.o packgrid.o \ - wrapkarn.o nchar.o init_rs.o encode_rs.o decode_rs.o \ - four2a.o rfile3a.o grid2deg.o pfxdump.o dpol.o \ - astro.o tm2.o sun.o moondop.o coord.o tmoonsub.o \ - geocentric.o moon2.o toxyz.o dot.o dcoord.o f77_wisdom.o \ - gen65.o chkmsg.o ptt.o astrosub.o astro0.o recvpkt.o symspec.o \ - iqcal.o iqfix.o timf2.o s3avg.o - -libm65.a: $(OBJS1) - ar cr libm65.a $(OBJS1) - ranlib libm65.a - -OBJS3 = m65.o m65a.o map65a.o symspec.o decode0.o ftninit.o ftnquit.o \ - timer.o ipcomm.o sec_midn.o cutil.o - -LIBS3 = -L'C:/wsjt-env/Qt5/5.2.1/mingw48_32/lib' -lQt5Core - -m65.exe: $(OBJS3) libm65.a - $(CXX) -o m65.exe $(OBJS3) $(LIBS3) libm65.a ../libfftw3f_win.a \ - c:/MinGW/lib/libf95.a - cp m65.exe ../../map65_install - -OBJS2 = JT65code.o -JT65code.exe: $(OBJS2) libm65.a - $(FC) -o JT65code.exe $(OBJS2) libm65.a - -OBJS7 = astrosub.o astro0.o astro.o tm2.o grid2deg.o sun.o moondop.o \ - coord.o dot.o moon2.o tmoonsub.o toxyz.o geocentric.o \ - dcoord.o - -libastro.a: $(OBJS7) - ar cr libastro.a $(OBJS7) - ranlib libastro.a - -OBJS6 = mapsim.o cgen65.o noisegen.o gran.o -mapsim.exe: $(OBJS6) libm65.a - $(FC) -o mapsim.exe $(OBJS6) libm65.a - -INCPATH = -I'C:/wsjt-env/Qt5/5.2.1/mingw48_32/include/QtCore' \ - -I'C:/wsjt-env/Qt5/5.2.1/mingw48_32/include' - -ipcomm.o: ipcomm.cpp - $(CXX) -c $(INCPATH) ipcomm.cpp - -#m65a.o: m65a.f90 -# $(FC) -c -fno-second-underscore -cpp m65a.f90 - -sec_midn.o: sec_midn.f90 - $(FC) -c -fno-second-underscore sec_midn.f90 - -#symspec.o: ../symspec.f90 -# $(FC) -c $(FFLAGS) -o symspec.o ../symspec.f90 - -OBJS4 = tastro.o astro0.o libm65.a -tastro.exe: $(OBJS4) - $(FC) $(FFLAGS) -o tastro.exe $(OBJS4) libm65.a - -OBJS5 = t1.o timer.o libm65.a -t1.exe: $(OBJS5) - $(FC) $(FFLAGS) -o t1.exe $(OBJS5) libm65.a - -#astro0.o: ../astro0.f90 -# $(FC) -c $(FFLAGS) -o astro0.o ../astro0.f90 - -init_rs.o: init_rs.c - $(CC) -c -DBIGSYM=1 -o init_rs.o init_rs.c - -encode_rs.o: encode_rs.c - $(CC) -c -DBIGSYM=1 -o encode_rs.o encode_rs.c - -decode_rs.o: decode_rs.c - $(CC) -c -DBIGSYM=1 -o decode_rs.o decode_rs.c - -.PHONY : clean - -clean: - rm -f *.o libm65.a m65.exe jt65code.exe diff --git a/q65w/libm65/Makefile.jtsdk b/q65w/libm65/Makefile.jtsdk deleted file mode 100644 index 77d97f597..000000000 --- a/q65w/libm65/Makefile.jtsdk +++ /dev/null @@ -1,129 +0,0 @@ -# Makefile for MinGW on Windows -CC = c:/JTSDK/Qt55/Tools/mingw492_32/bin/gcc -FC = c:/JTSDK/Qt55/Tools/mingw492_32/bin/gfortran -CXX = c:/JTSDK/Qt55/Tools/mingw492_32/bin/g++ - -FFLAGS = -O2 -fbounds-check -Wall -Wno-conversion -Wno-precision-loss \ - -fno-second-underscore -fbacktrace \ - -ffpe-summary=none -# -ffpe-trap=invalid,zero,overflow,underflow,denormal -CFLAGS = -I. -fbounds-check - -# Default rules -%.o: %.c - ${CC} ${CFLAGS} -c $< -%.o: %.f - ${FC} ${FFLAGS} -c $< -%.o: %.F - ${FC} ${FFLAGS} -c $< -%.o: %.f90 - ${FC} ${FFLAGS} -c $< -%.o: %.F90 - ${FC} ${FFLAGS} -c $< - -all: packjt.o wavhdr.o libm65.a m65.exe mapsim.exe libastro.a - -OBJS1 = trimlist.o display.o getdphi.o pctile.o ccf65.o \ - decode1a.o sort.o filbig.o fil6521.o afc65b.o \ - twkfreq.o decode65b.o indexx.o ssort.o fchisq.o setup65.o \ - extract.o deep65.o ccf2.o demod64a.o chkhist.o graycode.o \ - interleave63.o encode65.o igray.o set.o shell.o qra64_subs.o \ - grid2k.o getpfx2.o q65b.o qra64c.o twkfreq_xy.o qra64zap.o \ - deg2grid.o getpfx1.o k2grid.o ftrsd2.o graycode65.o \ - wrapkarn.o nchar.o init_rs.o encode_rs.o decode_rs.o \ - four2a.o rfile3a.o grid2deg.o pfxdump.o dpol.o sync64.o spec64.o \ - astro.o tm2.o sun.o moondop.o coord.o tmoonsub.o \ - geocentric.o moon2.o toxyz.o dot.o dcoord.o f77_wisdom.o \ - gen65.o chkmsg.o ptt.o astrosub.o astro0.o recvpkt.o symspec.o \ - iqcal.o iqfix.o timf2.o s3avg.o packjt.o badmsg.o fmtmsg.o \ - qracodes.o qra64.o smo.o averms.o lorentzian.o npfwht.o pdmath.o \ - qra13_64_64_irr_e.o fchisq0.o genqra64a.o wavhdr.o - -packjt.o: packjt.f90 - $(FC) -c packjt.f90 - -libm65.a: $(OBJS1) - ar cr libm65.a $(OBJS1) - ranlib libm65.a - -qra64_subs.o: ./qra64/qra64_subs.c - gcc -c -O2 -o qra64_subs.o ./qra64/qra64_subs.c - -qracodes.o: qracodes/qracodes.c - gcc -c -O2 -o qracodes.o qracodes/qracodes.c - -qra64.o: qra64/qra64.c - gcc -c -O2 -o qra64.o qra64/qra64.c - -qra13_64_64_irr_e.o: qracodes/qra13_64_64_irr_e.c - gcc -c -O2 -o qra13_64_64_irr_e.o \ - qracodes/qra13_64_64_irr_e.c - -npfwht.o: qracodes/npfwht.c - gcc -c -O2 -o npfwht.o qracodes/npfwht.c - -pdmath.o: qracodes/pdmath.c - gcc -c -O2 -o pdmath.o qracodes/pdmath.c - -OBJS3 = m65.o m65a.o map65a.o symspec.o decode0.o ftninit.o ftnquit.o \ - timer.o ipcomm.o sec_midn.o usleep.o -# cutil.o - -LIBS3 = -L'C:/JTSDK/Qt55/5.5/mingw492_32/lib' -lQt5Core - -m65.exe: $(OBJS3) libm65.a - $(CXX) -o m65.exe $(OBJS3) $(LIBS3) libm65.a ../libfftw3f_win.a \ - -lgfortran - cp m65.exe ../../map65_install - -OBJS7 = astrosub.o astro0.o astro.o tm2.o grid2deg.o sun.o moondop.o \ - coord.o dot.o moon2.o tmoonsub.o toxyz.o geocentric.o \ - dcoord.o - -libastro.a: $(OBJS7) - ar cr libastro.a $(OBJS7) - ranlib libastro.a - -OBJS6 = mapsim.o cgen65.o noisegen.o gran.o -mapsim.exe: $(OBJS6) libm65.a - $(FC) -o mapsim.exe $(OBJS6) libm65.a - -INCPATH = -I'C:/JTSDK/Qt55/5.5/mingw492_32/include/QtCore' \ - -I'C:/JTSDK/Qt55/5.5/mingw492_32/include' - -ipcomm.o: ipcomm.cpp - $(CXX) -c $(INCPATH) ipcomm.cpp - -#m65a.o: m65a.f90 -# $(FC) -c -fno-second-underscore -cpp m65a.f90 - -sec_midn.o: sec_midn.f90 - $(FC) -c -fno-second-underscore sec_midn.f90 - -#symspec.o: ../symspec.f90 -# $(FC) -c $(FFLAGS) -o symspec.o ../symspec.f90 - -OBJS4 = tastro.o astro0.o libm65.a -tastro.exe: $(OBJS4) - $(FC) $(FFLAGS) -o tastro.exe $(OBJS4) libm65.a - -OBJS5 = t1.o timer.o libm65.a -t1.exe: $(OBJS5) - $(FC) $(FFLAGS) -o t1.exe $(OBJS5) libm65.a - -#astro0.o: ../astro0.f90 -# $(FC) -c $(FFLAGS) -o astro0.o ../astro0.f90 - -init_rs.o: init_rs.c - $(CC) -c -DBIGSYM=1 -o init_rs.o init_rs.c - -encode_rs.o: encode_rs.c - $(CC) -c -DBIGSYM=1 -o encode_rs.o encode_rs.c - -decode_rs.o: decode_rs.c - $(CC) -c -DBIGSYM=1 -o decode_rs.o decode_rs.c - -.PHONY : clean - -clean: - rm -f *.o *.mod libm65.a m65.exe diff --git a/q65w/libm65/Makefile.linux b/q65w/libm65/Makefile.linux deleted file mode 100644 index 4b96f215b..000000000 --- a/q65w/libm65/Makefile.linux +++ /dev/null @@ -1,96 +0,0 @@ -CC = gcc -FC = gfortran - -FFLAGS = -O2 -fbounds-check -Wall -# For ptt_unix: -CFLAGS = -I. -fbounds-check -DHAVE_STDLIB_H=1 -DHAVE_STDIO_H=1 \ - -DHAVE_FCNTL_H=1 -DHAVE_SYS_IOCTL_H=1 - -# Default rules -%.o: %.c - ${CC} ${CFLAGS} -c $< -%.o: %.f - ${FC} ${FFLAGS} -c $< -%.o: %.F - ${FC} ${FFLAGS} -c $< -%.o: %.f90 - ${FC} ${FFLAGS} -c $< -%.o: %.F90 - ${FC} ${FFLAGS} -c $< - -all: libm65.a m65 - -OBJS1 = trimlist.o display.o getdphi.o pctile.o ccf65.o \ - decode1a.o sort.o filbig.o fil6521.o afc65b.o \ - twkfreq.o decode65b.o indexx.o ssort.o fchisq.o setup65.o \ - extract.o deep65.o ccf2.o demod64a.o chkhist.o graycode.o \ - interleave63.o unpackmsg.o encode65.o igray.o set.o unpackcall.o \ - unpackgrid.o grid2k.o unpacktext.o getpfx2.o packmsg.o \ - deg2grid.o packtext.o getpfx1.o packcall.o k2grid.o packgrid.o \ - wrapkarn.o nchar.o init_rs.o encode_rs.o decode_rs.o \ - four2a.o rfile3a.o grid2deg.o pfxdump.o dpol.o \ - astro.o tm2.o sun.o moondop.o coord.o tmoonsub.o \ - geocentric.o moon2.o toxyz.o dot.o dcoord.o f77_wisdom.o \ - gen65.o chkmsg.o ptt_unix.o astrosub.o astro0.o recvpkt.o \ - symspec.o iqcal.o iqfix.o timf2.o s3avg.o - -libm65.a: $(OBJS1) - ar cr libm65.a $(OBJS1) - ranlib libm65.a - -OBJS3 = m65.o m65a.o map65a.o symspec.o decode0.o ftninit.o ftnquit.o \ - timer.o ipcomm.o sec_midn.o cutil.o - -m65: $(OBJS3) libm65.a - g++ -o m65 $(OBJS3) libm65.a -lfftw3f -lQtCore -lfftw3f -lgfortran - -OBJS2 = m65a.o ipcomm.o sec_midn.o cutil.o decode0.o map65a.o \ - timer.o ftninit.o ftnquit.o -LIBS2 = -lQtCore -lfftw3f -lgfortran - -m65a: $(OBJS2) libm65.a - g++ -o m65a $(OBJS2) libm65.a -lQtCore -lfftw3f -lgfortran - -OBJS6 = t3.o ipcomm.o -LIBS2 = -lQtCore -lgfortran - -t3: $(OBJS6) - g++ -o t3 $(OBJS6) $(LIBS2) - -t3: - -INCPATH = -I. -I'/usr/include/qt4' -I'/usr/include/qt4/QtCore' - -ipcomm.o: ipcomm.cpp - g++ -c $(INCPATH) ipcomm.cpp - -m65a.o: m65a.F90 - $(FC) -c -fno-second-underscore -DUNIX m65a.F90 - -extract.o: extract.F - $(FC) -c -fno-second-underscore -DUNIX extract.F - -sec_midn.o: sec_midn.f90 - $(FC) -c -fno-second-underscore sec_midn.f90 - -OBJS4 = tastro.o astro0.o libm65.a -tastro: $(OBJS4) - $(FC) $(FFLAGS) -o tastro $(OBJS4) libm65.a - -OBJS5 = t1.o timer.o libm65.a -t1: $(OBJS5) - $(FC) $(FFLAGS) -o t1 $(OBJS5) libm65.a - -init_rs.o: init_rs.c - $(CC) -c -DBIGSYM=1 -o init_rs.o init_rs.c - -encode_rs.o: encode_rs.c - $(CC) -c -DBIGSYM=1 -o encode_rs.o encode_rs.c - -decode_rs.o: decode_rs.c - $(CC) -c -DBIGSYM=1 -o decode_rs.o decode_rs.c - -.PHONY : clean - -clean: - rm -f *.o libm65.a m65 m65a diff --git a/q65w/libm65/polfit.f90 b/q65w/libm65/polfit.f90 deleted file mode 100644 index 33e8d44ed..000000000 --- a/q65w/libm65/polfit.f90 +++ /dev/null @@ -1,87 +0,0 @@ -subroutine polfit(y,npts,a) - -! Input: y(npts) !Expect npts=4 -! Output: a(1) = baseline -! a(2) = amplitude -! a(3) = theta (deg) - - real y(npts) - real a(3) - real deltaa(3) - integer ipk(1) - save - -! Set starting values: - a(1)=minval(y) - a(2)=maxval(y)-a(1) - ipk=maxloc(y) - a(3)=(ipk(1)-1)*45.0 - - deltaa(1:2)=0.1*a(2) - deltaa(3)=10.0 - nterms=3 - -! Start the iteration - chisqr=0. - chisqr0=1.e6 - iters=10 - - do iter=1,iters - do j=1,nterms - chisq1=fchisq_pol(y,npts,a) - fn=0. - delta=deltaa(j) -10 a(j)=a(j)+delta - chisq2=fchisq_pol(y,npts,a) - if(chisq2.eq.chisq1) go to 10 - if(chisq2.gt.chisq1) then - delta=-delta !Reverse direction - a(j)=a(j)+delta - tmp=chisq1 - chisq1=chisq2 - chisq2=tmp - endif -20 fn=fn+1.0 - a(j)=a(j)+delta - chisq3=fchisq_pol(y,npts,a) - if(chisq3.lt.chisq2) then - chisq1=chisq2 - chisq2=chisq3 - go to 20 - endif - -! Find minimum of parabola defined by last three points - delta=delta*(1./(1.+(chisq1-chisq2)/(chisq3-chisq2))+0.5) - a(j)=a(j)-delta - deltaa(j)=deltaa(j)*fn/3. -! write(*,4000) iter,j,a,deltaa,chisq2 -!4000 format(2i2,2(2x,3f8.2),f12.5) - enddo ! j=1,nterms - chisqr=fchisq_pol(y,npts,a) -! write(*,4000) 0,0,a,chisqr - if(chisqr.lt.1.0) exit - if(deltaa(1).lt.0.01*(a(2)-a(1)) .and. deltaa(2).lt.0.01*(a(2)-a(1)) & - .and. deltaa(3).lt.1.0) exit - if(chisqr/chisqr0.gt.0.99) exit - chisqr0=chisqr - enddo ! iter - a(3)=mod(a(3)+360.0,180.0) - - return -end subroutine polfit - -real function fchisq_pol(y,npts,a) - - real y(npts),a(3) - data rad/57.2957795/ - - chisq = 0. - do i=1,npts - theta=(i-1)*45.0 - yfit=a(1) + a(2)*cos((theta-a(3))/rad)**2 - chisq=chisq + (y(i) - yfit)**2 - enddo - fchisq_pol=chisq - - return -end function fchisq_pol