From 738764c9fd390b162371b04b717c8148216994a9 Mon Sep 17 00:00:00 2001 From: logan-nc Date: Mon, 9 Nov 2026 09:14:42 -0500 Subject: [PATCH 1/3] GPEC - BUG FIX - Label Clebsch displacement netcdf outputs as unitless xigradpsi, xigradpsi_dpsi and xigradalpha are xi.grad(psi_N) and xi.grad(alpha) normalized by chi1, so they are dimensionless, not m. Co-Authored-By: Claude Opus 5.5 Claude-Session: https://claude.ai/code/session_01VMDGyfQKRZQMdk3NJXsKQE --- gpec/gpout.f | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gpec/gpout.f b/gpec/gpout.f index 897b60bd..359569a2 100644 --- a/gpec/gpout.f +++ b/gpec/gpout.f @@ -5860,7 +5860,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) ) From b4518eba73b036fe4d14d69e4b7b2a64b27c8c67 Mon Sep 17 00:00:00 2001 From: logan-nc Date: Mon, 9 Nov 2026 09:15:33 -0500 Subject: [PATCH 2/3] GPEC - BUG FIX - Fill Jbgradpsi_rmatch when jac_out differs from jac_type bwpmns_rmatch was only set in the branch that reuses the working coordinates (jac_out == jac_type and tmag_out /= 0), so other runs wrote uninitialized memory to Jbgradpsi_rmatch. Convert the RMATCH solution to output coordinates the same way as Jbgradpsi. Co-Authored-By: Claude Opus 5.5 Claude-Session: https://claude.ai/code/session_01VMDGyfQKRZQMdk3NJXsKQE --- gpec/gpout.f | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/gpec/gpout.f b/gpec/gpout.f index 359569a2..5d42c2bb 100644 --- a/gpec/gpout.f +++ b/gpec/gpout.f @@ -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 @@ -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 @@ -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) From 0ff7e179d8692a2ff504d55c67149cf995b405c3 Mon Sep 17 00:00:00 2001 From: logan-nc Date: Mon, 9 Nov 2026 09:15:40 -0500 Subject: [PATCH 3/3] ALL - BUMP - Update version to 1.6.1 and document changes in release notes Co-Authored-By: Claude Opus 5.5 Claude-Session: https://claude.ai/code/session_01VMDGyfQKRZQMdk3NJXsKQE --- docs/conf.py | 2 +- docs/releases.rst | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/docs/conf.py b/docs/conf.py index 12c00f0a..cf305423 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -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. diff --git a/docs/releases.rst b/docs/releases.rst index 17d70c57..c1032df3 100644 --- a/docs/releases.rst +++ b/docs/releases.rst @@ -10,6 +10,15 @@ Note, backwards compatibility is defined as the ability to return to a previous The `github release notes `_ 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 ===========