From 7551ca642aafb3a371ddbfcb5edf271c1382e72a Mon Sep 17 00:00:00 2001 From: Joe Taylor Date: Sat, 15 Nov 2014 18:27:34 +0000 Subject: [PATCH] Remove the line that made deep65 fail with -O2. git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/map65@4602 ab8295b8-cf94-4d9e-aec4-7959e3be5d79 --- libm65/CMakeLists.txt | 2 -- libm65/deep65.f90 | 9 +-------- mainwindow.cpp | 2 +- 3 files changed, 2 insertions(+), 11 deletions(-) diff --git a/libm65/CMakeLists.txt b/libm65/CMakeLists.txt index 9ba5a33ae..b296c99f5 100644 --- a/libm65/CMakeLists.txt +++ b/libm65/CMakeLists.txt @@ -157,8 +157,6 @@ set (CXXSRCS add_definitions (-DBIGSYM=1) set_source_files_properties (sec_midn.f90 PROPERTIES COMPILE_FLAGS -fno-second-underscore) -set_source_files_properties (deep65.f90 PROPERTIES COMPILE_FLAGS -O0) - # # build our targets diff --git a/libm65/deep65.f90 b/libm65/deep65.f90 index 223925eca..6e96f38ca 100644 --- a/libm65/deep65.f90 +++ b/libm65/deep65.f90 @@ -131,16 +131,9 @@ subroutine deep65(s3,mode65,neme,flip,mycall,hiscall,hisgrid,decoded,qual) enddo do i=1,ntot - if(pp(i).gt.p2 .and. pp(i).ne.p1) p2=pp(i) + if(pp(i).gt.p2 .and. i.ne.ip1) p2=pp(i) enddo -! ### DO NOT REMOVE ### - rewind 77 - write(77,*) p1,p2 -! ### Works OK without it (in both Windows and Linux) if compiled -! ### without optimization. However, in Windows this is a colossal -! ### pain because of the way F2PY wants to run the compile step. - if(mode65.eq.1) bias=max(1.12*p2,0.335) if(mode65.eq.2) bias=max(1.08*p2,0.405) if(mode65.ge.4) bias=max(1.04*p2,0.505) diff --git a/mainwindow.cpp b/mainwindow.cpp index 7819eef05..4290faebf 100644 --- a/mainwindow.cpp +++ b/mainwindow.cpp @@ -1,4 +1,4 @@ -//--------------------------------------------------------------- MainWindow +//-------------------------------------------------------------- MainWindow #include "mainwindow.h" #include "ui_mainwindow.h" #include "devsetup.h"