Merge pull request #1 from eclare108213/fluff2

make fluff an optional argument
dabail10 · May 23, 2024 · 0384859 · 0384859
2 parents 338fc72 + 3f8a746
commit 0384859
Showing 1 changed file with 7 additions and 2 deletions.
diff --git 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, &