From faca845d893f20496244511c94e32d8d08f74d56 Mon Sep 17 00:00:00 2001 From: Joe Taylor Date: Fri, 9 Apr 2021 09:50:25 -0400 Subject: [PATCH 1/3] Fix a merge issue in init_rs.c. --- map65/libm65/init_rs.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/map65/libm65/init_rs.c b/map65/libm65/init_rs.c index 3ecd91121..876819f8c 100644 --- a/map65/libm65/init_rs.c +++ b/map65/libm65/init_rs.c @@ -34,12 +34,8 @@ void *INIT_RS(unsigned int symsize,unsigned int gfpoly,unsigned fcr,unsigned pri struct rs *rs; int i, j, sr,root,iprim; -<<<<<<< HEAD:lib/init_rs.c /* Check parameter ranges */ if(symsize < 0 || symsize > (int)(8*sizeof(DTYPE))) -======= - if(symsize > 8*sizeof(DTYPE)) ->>>>>>> 280c8344cd80339491e9bad1dcc4ac9a1e5f684e:map65/libm65/init_rs.c return NULL; /* Need version with ints rather than chars */ if(fcr >= (1< Date: Fri, 9 Apr 2021 13:41:19 -0400 Subject: [PATCH 2/3] Update map65.pro and Makefile for new location of sources in the wsjtx project. --- map65/libm65/Makefile | 3 ++- map65/map65.pro | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/map65/libm65/Makefile b/map65/libm65/Makefile index 0cc9fc36a..810f09e1f 100644 --- a/map65/libm65/Makefile +++ b/map65/libm65/Makefile @@ -74,7 +74,8 @@ 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 ../../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 \ diff --git a/map65/map65.pro b/map65/map65.pro index 6bf3e8a96..83862ada8 100644 --- a/map65/map65.pro +++ b/map65/map65.pro @@ -13,7 +13,7 @@ TARGET = map65 VERSION = 2.5.0 TEMPLATE = app DEFINES = QT5 -DESTDIR = ../map65_install +DESTDIR = /MAP65_2.9 F90 = gfortran gfortran.output = ${QMAKE_FILE_BASE}.o From 7664a634655ed0811f4254ee954934412272c690 Mon Sep 17 00:00:00 2001 From: Joe Taylor Date: Sun, 11 Apr 2021 09:32:21 -0400 Subject: [PATCH 3/3] Send real, not int, to indexx(). Should prevent floating exception message on exit. --- map65/libm65/display.f90 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/map65/libm65/display.f90 b/map65/libm65/display.f90 index 29c76dc4a..9de609074 100644 --- a/map65/libm65/display.f90 +++ b/map65/libm65/display.f90 @@ -81,7 +81,7 @@ subroutine display(nkeep,ftol) endif kz=k if(nstart.eq.1) then - call indexx(utc2,kz,indx2) + call indexx(float(utc2(1:kz)),kz,indx2) k3=0 do k=1,kz k3=min(k3+1,400) @@ -89,7 +89,7 @@ subroutine display(nkeep,ftol) enddo nstart=0 else - call indexx(utc2,kz,indx2) + call indexx(float(utc2(1:kz)),kz,indx2) do k=1,kz k3=min(k3+1,400) line3(k3)=line2(indx2(k)) @@ -108,7 +108,7 @@ subroutine display(nkeep,ftol) j0=j enddo kz=k - call indexx(utc2,kz,indx2) + call indexx(float(utc2(1:kz)),kz,indx2) do k=1,kz k3=min(k3+1,400) line3(k3)=line2(indx2(k))