From cdac0ca3612d2c3ad23c6757d6249ef406e3396b Mon Sep 17 00:00:00 2001 From: Michele Guerini Rocco Date: Sat, 5 Oct 2024 15:06:22 +0200 Subject: [PATCH] fixup 15fc891 --- src/gray_core.f90 | 4 ++-- src/gray_tables.f90 | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/gray_core.f90 b/src/gray_core.f90 index b0ac49e..abb3edb 100644 --- a/src/gray_core.f90 +++ b/src/gray_core.f90 @@ -143,7 +143,7 @@ contains results%tables%inputs_maps = inputs_maps(params, equil, plasma, bres, xgcn) ! print ψ surface for q=3/2 and q=2/1 - call find_flux_surfaces(qvals=[1.5_wp_, 2.0_wp_], & + call find_flux_surfaces(qvals=[1.0_wp_, 1.5_wp_, 2.0_wp_], & params=params, equil=equil, & tbl=results%tables%flux_surfaces) @@ -614,7 +614,7 @@ contains if (params%equilibrium%iequil /= EQ_VACUUM) then call store_ec_profiles( & results%tables%ec_profiles, rhop_tab, rhot_tab, jphi_beam, & - jcd_beam, dpdv_beam, currins_beam, pins_beam, ip) + jcd_beam, dpdv_beam, currins_beam, pins_beam, index_rt) call postproc_profiles(equil, pabs_beam, icd_beam, rhot_tab, dpdv_beam, & jphi_beam, rhotpav, drhotpav, rhotjava, drhotjava, dpdvp, jphip, & diff --git a/src/gray_tables.f90 b/src/gray_tables.f90 index 11310ff..b84878c 100644 --- a/src/gray_tables.f90 +++ b/src/gray_tables.f90 @@ -131,7 +131,7 @@ contains real(wp_) :: psi_n, rho_p, drho_p call tbl%init(title='kinetic-profiles', id=55, active=is_active(params, 25), & - labels=[character(64) :: 'psi_n', 'rho_t', 'n_e', 'T_e', 'q', 'J_φ']) + labels=[character(64) :: 'ψ_n', 'ρ_t', 'n_e', 'T_e', 'q', 'J_φ']) if (.not. tbl%active) return if (params%equilibrium%iequil == EQ_VACUUM) return @@ -178,7 +178,7 @@ contains type(table) :: tbl call tbl%init(title='ec-resonance', id=70, active=is_active(params, 70), & - labels=[character(64) :: 'i', 'B_tot', 'R', 'z']) + labels=[character(64) :: 'n', 'B', 'R', 'z']) if (.not. tbl%active) return if (params%equilibrium%iequil == EQ_VACUUM) return @@ -220,8 +220,8 @@ contains n_tot = size(R_cont) call cniteq_f(R, z, B_tot, size(R), size(z), B, & n_conts, n_points, n_tot, R_cont, z_cont) - do j = 1, size(R_cont) - call tbl%append([wrap(j), wrap(B), wrap(R_cont(j)), wrap(z_cont(j))]) + do j = 1, n_tot + call tbl%append([wrap(n), wrap(B), wrap(R_cont(j)), wrap(z_cont(j))]) end do end if end do