Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

make fluff an optional argument #1

Merged
merged 1 commit into from
May 23, 2024
Merged
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
9 changes: 7 additions & 2 deletions columnphysics/icepack_therm_vertical.F90
Original file line number Diff line number Diff line change
Expand Up @@ -2302,7 +2302,6 @@ subroutine icepack_step_therm1(dt, ncat, nilyr, nslyr, &
hpnd , & ! melt pond depth (m)
ipnd , & ! melt pond refrozen lid thickness (m)
iage , & ! volume-weighted ice age
fluff , & ! area-weighted ice fluffballs
FY , & ! area-weighted first-year ice area
fsurfn , & ! net flux to top surface, excluding fcondtop
fcondtopn , & ! downward cond flux at top surface (W m-2)
Expand Down Expand Up @@ -2346,6 +2345,9 @@ subroutine icepack_step_therm1(dt, ncat, nilyr, nslyr, &
aerosno , & ! snow aerosol tracer (kg/m^2)
aeroice ! ice aerosol tracer (kg/m^2)

real (kind=dbl_kind), dimension(:), intent(inout), optional :: &
fluff ! area-weighted ice fluffballs

real (kind=dbl_kind), dimension(:,:), intent(inout), optional :: &
isosno , & ! snow isotope tracer (kg/m^2)
isoice ! ice isotope tracer (kg/m^2)
Expand Down Expand Up @@ -2612,7 +2614,10 @@ subroutine icepack_step_therm1(dt, ncat, nilyr, nslyr, &
!-----------------------------------------------------------------

if (tr_iage) call increment_age (dt, iage(n))
if (tr_fluff) call increment_fluff (dt, fluff(n))
if (icepack_warnings_aborted(subname)) return
if (present(fluff)) then
if (tr_fluff) call increment_fluff (dt, fluff(n))
endif
if (icepack_warnings_aborted(subname)) return
if (tr_FY) call update_FYarea (dt, &
lmask_n, lmask_s, &
Expand Down
Loading