diff --git a/tglf/src/tglf_geometry.f90 b/tglf/src/tglf_geometry.f90 index 3f831d912..4c40fc3d0 100644 --- a/tglf/src/tglf_geometry.f90 +++ b/tglf/src/tglf_geometry.f90 @@ -1324,7 +1324,7 @@ END SUBROUTINE mercier_write ! squarness shear s_zeta_loc = rmin*d(zeta)/dx. Included elevation Zmaj_loc. ! Also changed definition of s_delta = rmin*d(delta)/dx from Waltz-Miller convention to GYRO's. ! July 26, 2021 set elevation Zmaj_loc =0.0 and DZMAJDX_LOC=0.0 since these break the up/down symmetry of Miller by contributing to Grad_r -! August 1, 2024 revised with MXH parameterization +! August 1, 2024 Sophia Guizzo(s.guizzo@columbia.edu) revised with MXH parameterization (Arbon et al PPCF 2020) !--------------------------------------------------------------- SUBROUTINE miller_geo diff --git a/tglf/tools/input/tglf02/out.tglf.prec b/tglf/tools/input/tglf02/out.tglf.prec index 727db957a..85deb3f69 100644 --- a/tglf/tools/input/tglf02/out.tglf.prec +++ b/tglf/tools/input/tglf02/out.tglf.prec @@ -1 +1 @@ - 71.623670671890324 + 70.851711653595530 diff --git a/tglf/tools/input/tglf02/out.tglf.run b/tglf/tools/input/tglf02/out.tglf.run index 3f8d1e37d..fb5f5b143 100644 --- a/tglf/tools/input/tglf02/out.tglf.run +++ b/tglf/tools/input/tglf02/out.tglf.run @@ -1,6 +1,7 @@ [Parsing data in input.tglf] no mpi D(R) = -0.0000E+00 D(I) = 0.0000E+00 + kinetic species = 2 non-kinetic species = 0 Gam/Gam_GB Q/Q_GB Q_low/Q_GB Pi/Pi_GB S/S_GB -elec -1.7988E+00 1.1609E+01 9.7591E+00 2.9572E-06 3.0467E+00 -ion1 -1.7988E+00 2.3297E+01 2.3361E+01 -1.3682E-04 -3.0467E+00 +elec -1.8002E+00 1.1546E+01 9.6965E+00 3.5870E-06 2.9850E+00 +ion1 -1.8002E+00 2.2973E+01 2.3036E+01 2.7380E-04 -2.9850E+00 diff --git a/tglf/tools/input/tglf02/out.tglf.version b/tglf/tools/input/tglf02/out.tglf.version index 8b16a48d8..954eb52b1 100644 --- a/tglf/tools/input/tglf02/out.tglf.version +++ b/tglf/tools/input/tglf02/out.tglf.version @@ -1,3 +1,3 @@ -53e1f02 -GFORTRAN_OSX_MACPORTS -Thu Jun 1 13:18:05 PDT 2017 +19387296 [2024-09-04] +OSX_MONTEREY +Mon Sep 16 16:37:05 EDT 2024