From 6a3e60cfc4747403b87f0bc5ca49f80caf1ac2d8 Mon Sep 17 00:00:00 2001
From: "David A. Bailey" <dbailey@ucar.edu>
Date: Fri, 31 Jul 2020 11:53:01 -0600
Subject: [PATCH] Send swpen by category (#495)

Send broadband fswthrun by categories to coupler.
---
 cicecore/cicedynB/general/ice_flux.F90     | 14 ++++++++++++++
 cicecore/cicedynB/general/ice_step_mod.F90 | 21 +++++++++++++++++++--
 2 files changed, 33 insertions(+), 2 deletions(-)

diff --git a/cicecore/cicedynB/general/ice_flux.F90 b/cicecore/cicedynB/general/ice_flux.F90
index 16abbe162..97b726fdb 100644
--- a/cicecore/cicedynB/general/ice_flux.F90
+++ b/cicecore/cicedynB/general/ice_flux.F90
@@ -311,6 +311,11 @@ module ice_flux
          fresh_da, & ! fresh water flux to ocean due to data assim (kg/m^2/s)
          fsalt_da    ! salt flux to ocean due to data assimilation(kg/m^2/s)
 
+      real (kind=dbl_kind), dimension (:,:,:,:), allocatable, public :: &
+         fswthrun_ai  ! per-category fswthru * ai (W/m^2)
+ 
+      logical (kind=log_kind), public :: send_i2x_per_cat = .false.
+
       !-----------------------------------------------------------------
       ! internal
       !-----------------------------------------------------------------
@@ -713,6 +718,11 @@ subroutine init_coupler_flux
       ffep   (:,:,:,:)= c0
       ffed   (:,:,:,:)= c0
       
+      if (send_i2x_per_cat) then
+         allocate(fswthrun_ai(nx_block,ny_block,ncat,max_blocks))
+         fswthrun_ai(:,:,:,:) = c0
+      endif
+
       !-----------------------------------------------------------------
       ! derived or computed fields
       !-----------------------------------------------------------------
@@ -806,6 +816,10 @@ subroutine init_flux_ocn
       H2_16O_ocn  (:,:,:) = c0
       H2_18O_ocn  (:,:,:) = c0
 
+      if (send_i2x_per_cat) then
+         fswthrun_ai(:,:,:,:) = c0
+      endif
+
       end subroutine init_flux_ocn
 
 !=======================================================================
diff --git a/cicecore/cicedynB/general/ice_step_mod.F90 b/cicecore/cicedynB/general/ice_step_mod.F90
index 333c22cd3..7a2493d58 100644
--- a/cicecore/cicedynB/general/ice_step_mod.F90
+++ b/cicecore/cicedynB/general/ice_step_mod.F90
@@ -177,7 +177,8 @@ subroutine step_therm1 (dt, iblk)
           flat, fswabs, flwout, evap, evaps, evapi, Tref, Qref, Uref, fresh, fsalt, fhocn, &
           fswthru, fswthru_vdr, fswthru_vdf, fswthru_idr, fswthru_idf, &
           meltt, melts, meltb, congel, snoice, &
-          flatn_f, fsensn_f, fsurfn_f, fcondtopn_f
+          flatn_f, fsensn_f, fsurfn_f, fcondtopn_f, &
+          send_i2x_per_cat, fswthrun_ai
       use ice_flux_bgc, only: dsnown, faero_atm, faero_ocn, fiso_atm, fiso_ocn, &
           Qa_iso, Qref_iso, fiso_evap, HDO_ocn, H2_16O_ocn, H2_18O_ocn
       use ice_grid, only: lmask_n, lmask_s, tmask
@@ -310,7 +311,8 @@ subroutine step_therm1 (dt, iblk)
             enddo
          endif ! tr_aero
 
-         if (tmask(i,j,iblk)) &
+         if (tmask(i,j,iblk)) then
+
          call icepack_step_therm1(dt=dt, ncat=ncat,            &
                       nilyr=nilyr, nslyr=nslyr,                &
                       aicen_init   = aicen_init  (i,j,:,iblk), &
@@ -452,6 +454,21 @@ subroutine step_therm1 (dt, iblk)
                       frz_onset    = frz_onset   (i,j,  iblk), &
                       yday=yday, prescribed_ice=prescribed_ice)
 
+      !-----------------------------------------------------------------
+      ! handle per-category i2x fields, no merging
+      !-----------------------------------------------------------------
+
+         if (send_i2x_per_cat) then
+            do n = 1, ncat
+               ! TODO (mvertens, 2018-12-22): do we need to add the band separated quantities
+               ! for MOM6 here also?
+
+               fswthrun_ai(i,j,n,iblk) = fswthrun(i,j,n,iblk)*aicen_init(i,j,n,iblk)
+            enddo                  ! ncat
+         endif
+
+         endif
+
          if (tr_iso) then
             do n = 1, ncat
                if (vicen(i,j,n,iblk) > puny) &