Move subroutine h1() to its own file, h1.f90.

git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@8310 ab8295b8-cf94-4d9e-aec4-7959e3be5d79

CMakeLists.txt

@@ -471,6 +471,7 @@ set (wsjt_FSRCS
   lib/graycode65.f90
   lib/grayline.f90
   lib/grid2deg.f90
+  lib/ft8/h1.f90
   lib/hash.f90
   lib/hint65.f90
   lib/hspec.f90

Versions.cmake

@@ -1,6 +1,6 @@
 # Version number components
 set (WSJTX_VERSION_MAJOR 1)
-set (WSJTX_VERSION_MINOR 7)
+set (WSJTX_VERSION_MINOR 8)
 set (WSJTX_VERSION_PATCH 1)
 set (WSJTX_RC 0)		 # release candidate number, comment out or zero for development versions
 set (WSJTX_VERSION_IS_RELEASE 0) # set to 1 for final release build

lib/ft8/compress.f90

@@ -23,24 +23,6 @@ subroutine compress(c)
   return
 end subroutine compress
 
-real function h1(x)
-
-!  sigma=1.0/sqrt(2.0)
-  sigma=1.0
-  xlim=sigma/sqrt(6.0)
-  ax=abs(x)
-  sgnx=1.0
-  if(x.lt.0) sgnx=-1.0
-  if(ax.le.xlim) then
-     h1=x
-  else
-     z=exp(1.0/6.0 - (ax/sigma)**2)
-     h1=sgnx*sqrt(6.0)*sigma*(2.0/3.0 - 0.5*z)
-  endif
-
-  return
-end function h1
-
 subroutine wavestats(x,kz,rms,pk,pwr_pk,pwr_ave)
 
   real x(kz)

lib/ft8/foxgen.f90

@@ -22,7 +22,7 @@ subroutine foxgen()
   character*6 mygrid
   character*87 cbits
   character*88 cb88
-  logical bcontest,checksumok
+  logical bcontest
   integer itone(NN)
   integer icos7(0:6)
   integer*1 msgbits(KK),codeword(3*ND),msgbits2
@@ -153,21 +153,3 @@ subroutine foxgen()
 
   return
 end subroutine foxgen
-
-real function h1(x)
-
-!  sigma=1.0/sqrt(2.0)
-  sigma=1.0
-  xlim=sigma/sqrt(6.0)
-  ax=abs(x)
-  sgnx=1.0
-  if(x.lt.0) sgnx=-1.0
-  if(ax.le.xlim) then
-     h1=x
-  else
-     z=exp(1.0/6.0 - (ax/sigma)**2)
-     h1=sgnx*sqrt(6.0)*sigma*(2.0/3.0 - 0.5*z)
-  endif
-
-  return
-end function h1

lib/ft8/h1.f90

@@ -0,0 +1,17 @@
+real function h1(x)
+
+!  sigma=1.0/sqrt(2.0)
+  sigma=1.0
+  xlim=sigma/sqrt(6.0)
+  ax=abs(x)
+  sgnx=1.0
+  if(x.lt.0) sgnx=-1.0
+  if(ax.le.xlim) then
+     h1=x
+  else
+     z=exp(1.0/6.0 - (ax/sigma)**2)
+     h1=sgnx*sqrt(6.0)*sigma*(2.0/3.0 - 0.5*z)
+  endif
+
+  return
+end function h1