w4kek
/
WSJT-X
mirror of https://github.com/saitohirga/WSJT-X.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove redundant Fortran function 

lib/hopping.f90 has been superceded by  C/C++ code except for the call
to grayline() which is now called directly.

git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@5545 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
This commit is contained in:
Bill Somerville 2015-06-06 13:05:04 +00:00
parent 8250901942
commit 5a8fa2f379
3 changed files with 7 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CMakeLists.txt
View File

@ -317,7 +317,6 @@ set (wsjt_FSRCS
lib/grayline.f90 lib/grayline.f90
lib/grid2deg.f90 lib/grid2deg.f90
lib/hash.f90 lib/hash.f90
lib/hopping.f90
lib/image.f90 lib/image.f90
lib/indexx.f90 lib/indexx.f90
lib/interleave4.f90 lib/interleave4.f90
@ -629,7 +628,7 @@ include (FortranCInterface)
FortranCInterface_VERIFY (CXX QUIET) FortranCInterface_VERIFY (CXX QUIET)
FortranCInterface_HEADER (FC.h MACRO_NAMESPACE "FC_" SYMBOL_NAMESPACE "FC_" FortranCInterface_HEADER (FC.h MACRO_NAMESPACE "FC_" SYMBOL_NAMESPACE "FC_"
SYMBOLS SYMBOLS
hopping grayline
) )

12
WSPRBandHopping.cpp
View File

@ -17,10 +17,10 @@
extern "C" extern "C"
{ {
#ifndef CMAKE_BUILD #ifndef CMAKE_BUILD
#define FC_hopping hopping_ #define FC_grayline grayline_
#else #else
#include "FC.h" #include "FC.h"
void FC_hopping (int const * year, int const * month, int const * nday, float const * uth, char const * my_grid void FC_grayline (int const * year, int const * month, int const * nday, float const * uth, char const * my_grid
, int const * nduration, int * isun , int const * nduration, int * isun
, int my_grid_len); , int my_grid_len);
#endif #endif
@ -312,10 +312,10 @@ auto WSPRBandHopping::next_hop () -> Hop
my_grid = (my_grid + " ").left (6); // hopping doesn't like my_grid = (my_grid + " ").left (6); // hopping doesn't like
// short grids // short grids
// look up band for this period // look up the period for this time
FC_hopping (&year, &month, &day, &uth, my_grid.toLatin1 ().constData () FC_grayline (&year, &month, &day, &uth, my_grid.toLatin1 ().constData ()
, &m_->gray_line_duration_, &period_index , &m_->gray_line_duration_, &period_index
, my_grid.size ()); , my_grid.size ());
band_index = next_hopping_band(); band_index = next_hopping_band();

8
lib/hopping.f90
View File

@ -1,8 +0,0 @@
subroutine hopping(nyear,month,nday,uth,mygrid,nduration,isun)
character*6 mygrid
call grayline(nyear,month,nday,uth,mygrid,nduration,isun)
return
end subroutine hopping