Merge branch 'hotfix-1.5.1'

Author: logan-nc

docs/conf.py

@@ -62,7 +62,7 @@
 # The short X.Y version.
 version = '1.5'
 # The full version, including alpha/beta/rc tags.
-release = '1.5.0'
+release = '1.5.1'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

docs/releases.rst

@@ -10,6 +10,15 @@ Note, backwards compatibility is defined as the ability to return to a previous
 
 The `github release notes <https://github.com/PrincetonUniversity/GPEC/releases>`_ are reproduced below.
 
+GPEC v1.5.1
+===========
+
+Fixes
+------
+- GPEC - Fixes bug in jacfac diagnostic, now benchmarked with MEPHIT
+- GPEC - Fixes bug in terminal output of q during vsingfld
+
+
 GPEC v1.5.0
 ===========
 

gpec/gpdiag.f

@@ -2425,9 +2425,12 @@ SUBROUTINE gpdiag_jacfac()
 
       CHARACTER(2) :: si
 
-      boutmn(:) = 1
-
       DO i=-2,2
+         boutmns(:, :) = 0
+         boutfuns(:, :) = 0
+         boutmn(:) = 1
+         boutfun(:) = 1
+         CALL iscdftf(mfac,mpert,boutfun,mthsurf,boutmn)
          IF (i>=0) THEN
             WRITE(UNIT=si,FMT='(I1)')i
             si=ADJUSTL(si)

gpec/gpout.f

@@ -2141,7 +2141,7 @@ SUBROUTINE gpout_vsingfld()
             IF(ising == 1) WRITE(*,'(1x,a12,a12,a12,a12)') "psi", "q",
      $         "singflx", "chirikov"
             WRITE(*,'(1x,es12.3,f12.3,es12.3,f12.3)')
-     $         respsi, sq%f(4), ABS(vflxmn(ising)),
+     $         respsi, singtype(ising)%q, ABS(vflxmn(ising)),
      $         vchirikov(ising)
          ENDIF
       ENDDO