Skip to content

hotfix v1.6.1 #367

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
matt-pharr merged 5 commits into from
Nov 13, 2026
Merged

hotfix v1.6.1 #367

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
68f4e3d
Merge branch 'release-1.6.0'
logan-nc Oct 24, 2026
738764c
GPEC - BUG FIX - Label Clebsch displacement netcdf outputs as unitless
logan-nc Nov 9, 2026
b4518eb
GPEC - BUG FIX - Fill Jbgradpsi_rmatch when jac_out differs from jac_…
logan-nc Nov 9, 2026
0ff7e17
ALL - BUMP - Update version to 1.6.1 and document changes in release …
logan-nc Nov 9, 2026
775e263
Merge pull request #366 from PrincetonUniversity/hotfix-1.6.1
matt-pharr Nov 13, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion docs/conf.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@
# The short X.Y version.
version = '1.6'
# The full version, including alpha/beta/rc tags.
release = '1.6.0'
release = '1.6.1'

# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
Expand Down
9 changes: 9 additions & 0 deletions docs/releases.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.6.1
===========

Fixes
-----
- GPEC - The Clebsch displacements ``xigradpsi``, ``xigradpsi_dpsi`` and ``xigradalpha`` in the netCDF output are labeled unitless instead of m.
- GPEC - ``Jbgradpsi_rmatch`` is now filled when ``jac_out`` differs from ``jac_type`` or ``tmag_out=0``; it previously held uninitialized values in those runs.


GPEC v1.6.0
===========

Expand Down
13 changes: 10 additions & 3 deletions gpec/gpout.f
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3418,7 +3418,7 @@ SUBROUTINE gpout_xbnormal(egnum,xspmn,spots,interpspot,nspot)
REAL(r8) :: ximax,rmax,area

REAL(r8), DIMENSION(0:mthsurf) :: delpsi,jacs,dphi
COMPLEX(r8), DIMENSION(0:mthsurf) :: xwp_fun,bwp_fun
COMPLEX(r8), DIMENSION(0:mthsurf) :: xwp_fun,bwp_fun,bwpr_fun

COMPLEX(r8), DIMENSION(:,:), ALLOCATABLE :: xmns,ymns,
$ xnomns,bnomns,bwpmns,bwpmns_rmatch
Expand All @@ -3431,7 +3431,7 @@ SUBROUTINE gpout_xbnormal(egnum,xspmn,spots,interpspot,nspot)
COMPLEX(r8), DIMENSION(:,:), ALLOCATABLE :: rss,zss,
$ xnofuns,bnofuns,intbwpmns

COMPLEX(r8), DIMENSION(mpert) :: interpbwn
COMPLEX(r8), DIMENSION(mpert) :: interpbwn,bwpr_mn
TYPE(cspline_type) :: fsp_sol
c-----------------------------------------------------------------------
c allocation puts memory in heap, avoiding stack overfill
Expand Down Expand Up @@ -3532,6 +3532,13 @@ SUBROUTINE gpout_xbnormal(egnum,xspmn,spots,interpspot,nspot)
IF ((jac_out /= jac_type).OR.(tout==0)) THEN
CALL gpeq_bcoordsout(bwpmns(istep,:),bno_mn,
$ psifac(istep),ji=1)
IF(galsol%gal_flag) THEN
CALL iscdftb(mfac,mpert,bwpr_fun,mthsurf,bwp_mn_rmatch)
bwpr_fun=bwpr_fun/(jacs*delpsi)
CALL iscdftf(mfac,mpert,bwpr_fun,mthsurf,bwpr_mn)
CALL gpeq_bcoordsout(bwpmns_rmatch(istep,:),bwpr_mn,
$ psifac(istep),ji=1)
ENDIF
IF (msing>0) THEN
CALL gpeq_bcoordsout(intbwpmns(istep,:),interpbwn,
$ psifac(istep),ji=0)
Expand Down Expand Up @@ -5860,7 +5867,7 @@ SUBROUTINE gpout_xclebsch(egnum,xspmn)
$ "Contravariant Clebsch angle displacement") )
ids = (/xp_id,dp_id,xa_id/)
DO i=1,3
CALL check( nf90_put_att(fncid,ids(i),"units","m") )
CALL check( nf90_put_att(fncid,ids(i),"units","unitless") )
CALL check( nf90_put_att(fncid,ids(i),"jacobian",jac_out) )
ENDDO
CALL check( nf90_enddef(fncid) )
Expand Down
Loading