From 278292ff89dfd80dc430d1f83ca65bedacb17ab2 Mon Sep 17 00:00:00 2001 From: David A Minton Date: Wed, 14 Dec 2022 11:47:15 -0500 Subject: [PATCH] Made sure energy and momentum units are correct after fraggle. Also fixed typo that saved ke orbit to spin by accident. --- src/fraggle/fraggle_io.f90 | 4 ++-- src/fraggle/fraggle_set.f90 | 16 ++++++++++++++++ 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/src/fraggle/fraggle_io.f90 b/src/fraggle/fraggle_io.f90 index c2b60f98d..e37adf13d 100644 --- a/src/fraggle/fraggle_io.f90 +++ b/src/fraggle/fraggle_io.f90 @@ -204,8 +204,8 @@ module subroutine fraggle_io_write_frame(self, nc, param) end do call check( nf90_put_var(nc%id, nc%ke_orb_varid, fragments%ke_orbit_before, start=[ 1, eslot]), "fraggle_io_write_frame nf90_put_var ke_orb_varid before" ) call check( nf90_put_var(nc%id, nc%ke_orb_varid, fragments%ke_orbit_after, start=[ 2, eslot]), "fraggle_io_write_frame nf90_put_var ke_orb_varid after" ) - call check( nf90_put_var(nc%id, nc%ke_spin_varid, fragments%ke_orbit_before, start=[ 1, eslot]), "fraggle_io_write_frame nf90_put_var ke_spin_varid before" ) - call check( nf90_put_var(nc%id, nc%ke_spin_varid, fragments%ke_orbit_after, start=[ 2, eslot]), "fraggle_io_write_frame nf90_put_var ke_spin_varid after" ) + call check( nf90_put_var(nc%id, nc%ke_spin_varid, fragments%ke_spin_before, start=[ 1, eslot]), "fraggle_io_write_frame nf90_put_var ke_spin_varid before" ) + call check( nf90_put_var(nc%id, nc%ke_spin_varid, fragments%ke_spin_after, start=[ 2, eslot]), "fraggle_io_write_frame nf90_put_var ke_spin_varid after" ) call check( nf90_put_var(nc%id, nc%pe_varid, fragments%pe_before, start=[ 1, eslot]), "fraggle_io_write_frame nf90_put_var pe_varid before" ) call check( nf90_put_var(nc%id, nc%pe_varid, fragments%pe_after, start=[ 2, eslot]), "fraggle_io_write_frame nf90_put_var pe_varid after" ) call check( nf90_put_var(nc%id, nc%L_orb_varid, fragments%Lorbit_before(:), start=[1, 1, eslot], count=[NDIM, 1, 1]), "fraggle_io_write_frame nf90_put_var L_orb_varid before" ) diff --git a/src/fraggle/fraggle_set.f90 b/src/fraggle/fraggle_set.f90 index 4a70130b6..dfa0f64e6 100644 --- a/src/fraggle/fraggle_set.f90 +++ b/src/fraggle/fraggle_set.f90 @@ -300,6 +300,22 @@ module subroutine fraggle_set_original_scale_factors(self, colliders) frag%rb(:, i) = frag%x_coll(:, i) + frag%rbcom(:) frag%vb(:, i) = frag%v_coll(:, i) + frag%vbcom(:) end do + + frag%Lorbit_before(:) = frag%Lorbit_before * frag%Lscale + frag%Lspin_before(:) = frag%Lspin_before * frag%Lscale + frag%Ltot_before(:) = frag%Ltot_before * frag%Lscale + frag%ke_orbit_before = frag%ke_orbit_before * frag%Escale + frag%ke_spin_before = frag%ke_spin_before * frag%Escale + frag%pe_before = frag%pe_before * frag%Escale + frag%Etot_before = frag%Etot_before * frag%Escale + + frag%Lorbit_after(:) = frag%Lorbit_after * frag%Lscale + frag%Lspin_after(:) = frag%Lspin_after * frag%Lscale + frag%Ltot_after(:) = frag%Ltot_after * frag%Lscale + frag%ke_orbit_after = frag%ke_orbit_after * frag%Escale + frag%ke_spin_after = frag%ke_spin_after * frag%Escale + frag%pe_after = frag%pe_after * frag%Escale + frag%Etot_after = frag%Etot_after * frag%Escale frag%mscale = 1.0_DP frag%dscale = 1.0_DP