Skip to content
This repository was archived by the owner on Aug 28, 2024. It is now read-only.

Commit

Permalink
Made sure energy and momentum units are correct after fraggle. Also f…
Browse files Browse the repository at this point in the history
…ixed typo that saved ke orbit to spin by accident.
  • Loading branch information
daminton committed Dec 14, 2022
1 parent 86872fc commit 278292f
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 2 deletions.
4 changes: 2 additions & 2 deletions src/fraggle/fraggle_io.f90
Original file line number Diff line number Diff line change
Expand Up @@ -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" )
Expand Down
16 changes: 16 additions & 0 deletions src/fraggle/fraggle_set.f90
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 278292f

Please sign in to comment.