Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/convert_grid.f90
Original file line number Diff line number Diff line change
Expand Up @@ -737,7 +737,7 @@ subroutine get_splash2grid_options(ndim,ncolstogrid,icoltogrid,isperiodic,xlab)
integer, intent(in) :: ndim
integer, intent(out) :: ncolstogrid,icoltogrid(:)
logical, intent(out) :: isperiodic(3)
character(len=1), intent(in) :: xlab(3)
character(len=*), intent(in) :: xlab(3)
integer :: nstring,i,icol
logical :: dens_only
character(len=30), dimension(12) :: strings
Expand Down
18 changes: 9 additions & 9 deletions src/labels.f90
Original file line number Diff line number Diff line change
Expand Up @@ -284,9 +284,9 @@ end function get_z_coord
!
!-----------------------------------------------------------------
elemental function strip_units(string,unitslab)
character(len=lenlabel), intent(in) :: string
character(len=*), intent(in) :: unitslab
character(len=lenlabel) :: strip_units
character(len=*), intent(in) :: string
character(len=*), intent(in) :: unitslab
character(len=lenlabel) :: strip_units
integer :: ipos

strip_units = string
Expand All @@ -310,9 +310,9 @@ end function strip_units
!-----------------------------------------------------------------
elemental function shortstring(string,unitslab)
use asciiutils, only:string_delete
character(len=lenlabel), intent(in) :: string
character(len=*), intent(in), optional :: unitslab
character(len=lenlabel) :: shortstring
character(len=*), intent(in) :: string
character(len=*), intent(in), optional :: unitslab
character(len=lenlabel) :: shortstring

shortstring = string
!--strip off the units label
Expand All @@ -337,9 +337,9 @@ end function shortstring
!-----------------------------------------------------------------
elemental function shortlabel(string,unitslab,lc)
use asciiutils, only:string_delete,lcase
character(len=lenlabel), intent(in) :: string
character(len=*), intent(in), optional :: unitslab
character(len=lenlabel) :: shortlabel
character(len=*), intent(in) :: string
character(len=*), intent(in), optional :: unitslab
character(len=lenlabel) :: shortlabel
Comment thread
danieljprice marked this conversation as resolved.
logical, intent(in), optional :: lc

if (present(unitslab)) then
Expand Down
2 changes: 1 addition & 1 deletion src/read_data_dragon.f90
Original file line number Diff line number Diff line change
Expand Up @@ -753,7 +753,7 @@ subroutine find_weights(out_unit_interp,out_unitzintegration,out_labelzintegrati

real(doub_prec), intent(out) :: out_unit_interp
real, intent(out) :: out_unitzintegration
character(len=20), intent(out) :: out_labelzintegration
character(len=*), intent(out) :: out_labelzintegration
real(doub_prec) :: dm_unit, dh_unit, drho_unit, dr_unit
logical :: do_dimweight, do_zintegration
character(len=20) :: rho_length_label
Expand Down
Loading