From 8d86d70e915b1d6cd97cca175759742b82fe952a Mon Sep 17 00:00:00 2001 From: Michele Guerini Rocco Date: Fri, 27 Oct 2023 00:58:34 +0200 Subject: [PATCH] =?UTF-8?q?src/equilibrium.f90:=20pol=5Fcurr=20return=20de?= =?UTF-8?q?rivative=20wrt=20=CF=88=5Fn?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/equilibrium.f90 | 4 ++-- src/gray_core.f90 | 12 ++++++------ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/equilibrium.f90 b/src/equilibrium.f90 index fe2bdff..0c9000e 100644 --- a/src/equilibrium.f90 +++ b/src/equilibrium.f90 @@ -864,7 +864,7 @@ contains subroutine pol_curr(psi_n, fpol, dfpol) ! Computes the poloidal current function F(ψ_n) - ! and (optionally) its derivative dF/dψ given ψ_n. + ! and (optionally) its derivative dF/dψ_n given ψ_n. use gray_params, only : iequil implicit none @@ -883,7 +883,7 @@ contains ! Numerical data if(psi_n <= 1 .and. psi_n >= 0) then fpol = fpol_spline%eval(psi_n) - if (present(dfpol)) dfpol = fpol_spline%deriv(psi_n) / psia + if (present(dfpol)) dfpol = fpol_spline%deriv(psi_n) else fpol = fpolas if (present(dfpol)) dfpol = 0 diff --git a/src/gray_core.f90 b/src/gray_core.f90 index 61b1f5c..792dcb5 100644 --- a/src/gray_core.f90 +++ b/src/gray_core.f90 @@ -1355,12 +1355,12 @@ contains bv(3)=bvc(3) ! dbvcdc(iv,jv) = d Bcil(iv) / dxvcil(jv) - dbvcdc(1,1) = -ddpsidrz*psia/rrm - brr/rrm - dbvcdc(2,1) = dfpv*dpsidr*psia/rrm - bphi/rrm - dbvcdc(3,1) = ddpsidrr*psia/rrm - bzz/rrm - dbvcdc(1,3) = -ddpsidzz*psia/rrm - dbvcdc(2,3) = dfpv*dpsidz*psia/rrm - dbvcdc(3,3) = ddpsidrz*psia/rrm + dbvcdc(1,1) = -ddpsidrz*psia/rrm - brr/rrm + dbvcdc(1,3) = -ddpsidzz*psia/rrm + dbvcdc(2,1) = dfpv*dpsidr/rrm - bphi/rrm + dbvcdc(2,3) = dfpv*dpsidz/rrm + dbvcdc(3,1) = +ddpsidrr*psia/rrm - bzz/rrm + dbvcdc(3,3) = +ddpsidrz*psia/rrm ! dbvdc(iv,jv) = d Bcart(iv) / dxvcil(jv) dbvdc(1,1) = dbvcdc(1,1)*csphi - dbvcdc(2,1)*snphi