From 3f8a746addfca22a8e075c9b93b08303cc6e22c4 Mon Sep 17 00:00:00 2001 From: Elizabeth Hunke Date: Thu, 23 May 2024 00:18:10 -0600 Subject: [PATCH] make fluff an optional argument --- columnphysics/icepack_therm_vertical.F90 | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/columnphysics/icepack_therm_vertical.F90 b/columnphysics/icepack_therm_vertical.F90 index f3743a21..232d1d16 100644 --- a/columnphysics/icepack_therm_vertical.F90 +++ b/columnphysics/icepack_therm_vertical.F90 @@ -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) @@ -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) @@ -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, &