Merge E3SM Icepack cice-consortium/E3SM-icepack-initial-integration to Consortium

columnphysics/icepack_brine.F90

@@ -65,13 +65,13 @@ subroutine preflushing_changes (aicen,    vicen,    vsnon,      &
                                       hbr_old,  hin,hsn,  firstice    )
 
       real (kind=dbl_kind), intent(in) :: &
-         aicen       , & ! concentration of ice
-         vicen       , & ! volume per unit area of ice          (m)
-         vsnon       , & ! volume per unit area of snow         (m)
-         meltb       , & ! bottom ice melt                      (m)
-         meltt       , & ! top ice melt                         (m)
-         congel      , & ! bottom ice growth                    (m)
-         snoice          ! top ice growth from flooding         (m)
+         aicen        , & ! concentration of ice
+         vicen        , & ! volume per unit area of ice          (m)
+         vsnon        , & ! volume per unit area of snow         (m)
+         meltb        , & ! bottom ice melt                      (m)
+         meltt        , & ! top ice melt                         (m)
+         congel       , & ! bottom ice growth                    (m)
+         snoice           ! top ice growth from flooding         (m)
 
       real (kind=dbl_kind), intent(out) :: &
          hbr_old          ! old brine height (m)
@@ -150,13 +150,13 @@ subroutine compute_microS_mushy (nilyr,      nblyr,      &
          nblyr           ! number of bio layers
 
       real (kind=dbl_kind), dimension (nblyr+2), intent(in) :: &
-         bgrid              ! biology nondimensional vertical grid points
+         bgrid           ! biology nondimensional vertical grid points
 
       real (kind=dbl_kind), dimension (nblyr+1), intent(in) :: &
-         igrid              ! biology vertical interface points
+         igrid           ! biology vertical interface points
 
       real (kind=dbl_kind), dimension (nilyr+1), intent(in) :: &
-         cgrid              ! CICE vertical coordinate
+         cgrid           ! CICE vertical coordinate
 
       real (kind=dbl_kind), intent(in) :: &
          hice_old    , & ! previous timestep ice height (m)
@@ -171,10 +171,10 @@ subroutine compute_microS_mushy (nilyr,      nblyr,      &
          bphi_min        ! surface porosity
 
       real (kind=dbl_kind), intent(inout) :: &
-         hbr_old           ! previous timestep brine height (m)
+         hbr_old         ! previous timestep brine height (m)
 
       real (kind=dbl_kind), dimension (nblyr+1), intent(inout)  :: &
-         iDin           ! tracer diffusivity/h^2 (1/s) includes gravity drainage/molecular
+         iDin            ! tracer diffusivity/h^2 (1/s) includes gravity drainage/molecular
 
       real (kind=dbl_kind), dimension (nblyr+1), intent(inout)  :: &
          iphin       , & ! porosity on the igrid
@@ -183,7 +183,7 @@ subroutine compute_microS_mushy (nilyr,      nblyr,      &
          iTin            ! Temperature on the igrid (oC)
 
       real (kind=dbl_kind), dimension (nblyr+2), intent(inout)  :: &
-         bSin        , &    ! bulk salinity (ppt) on bgrid
+         bSin        , & ! bulk salinity (ppt) on bgrid
          brine_sal   , & ! equilibrium brine salinity (ppt)
          brine_rho       ! internal brine density (kg/m^3)
 
@@ -285,7 +285,7 @@ subroutine compute_microS_mushy (nilyr,      nblyr,      &
 
       do k= 2, nblyr+1
          ikin(k) = k_o*iphin(k)**exp_h
-         iDin(k) = iphin(k)*Dm/hbr_old**2
+         if (hbr_old .GT. puny) iDin(k) = iphin(k)*Dm/hbr_old**2
          if (hbr_old .GE. Ra_c) &
             iDin(k) = iDin(k) &
                     + l_sk*ikin(k)*gravit/viscos_dynamic*drho(k)/hbr_old**2
@@ -304,12 +304,12 @@ subroutine prepare_hbrine (nblyr, &
                                  i_grid,     sss)
 
       integer (kind=int_kind), intent(in) :: &
-         nblyr           ! number of bio layers
+         nblyr          ! number of bio layers
 
       real (kind=dbl_kind), dimension (:), intent(in) :: &
-         bSin      , & ! salinity of ice layers on bio grid (ppt)
-         bTin      , & ! temperature of ice layers on bio grid for history (C)
-         i_grid        ! biology grid interface points
+         bSin       , & ! salinity of ice layers on bio grid (ppt)
+         bTin       , & ! temperature of ice layers on bio grid for history (C)
+         i_grid         ! biology grid interface points
 
       real (kind=dbl_kind), dimension (:), intent(inout) :: &
          brine_sal  , & ! equilibrium brine salinity (ppt)
@@ -333,14 +333,14 @@ subroutine prepare_hbrine (nblyr, &
       ! local variables
 
       real (kind=dbl_kind), dimension(nblyr+1) :: &
-          kin       !  permeability
+          kin           !  permeability
 
       real (kind=dbl_kind) :: &
           k_min, ktemp, &
           igrp, igrm, rigr  ! grid finite differences
 
       integer (kind=int_kind) :: &
-           k   ! layer index
+           k            ! layer index
 
       character(len=*),parameter :: subname='(prepare_hbrine)'
 
@@ -470,7 +470,7 @@ subroutine update_hbrine (meltt,       &
       ! local variables
 
       real (kind=dbl_kind) :: &
-         hbrmin    , & ! thinS or hin
+         hbrmin     , & ! thinS or hin
          dhbr_hin   , & ! hbr-hin
          hbrocn     , & ! brine height above sea level (m) hbr-h_ocn
          dhbr       , & ! change in brine surface
@@ -565,22 +565,22 @@ subroutine calculate_drho (nblyr,     i_grid,     b_grid, &
                                  brine_rho, ibrine_rho, drho)
 
       integer (kind=int_kind), intent(in) :: &
-         nblyr          ! number of bio layers
+         nblyr        ! number of bio layers
 
       real (kind=dbl_kind), dimension (nblyr+2), intent(in) :: &
-         b_grid         ! biology nondimensional grid layer points
+         b_grid       ! biology nondimensional grid layer points
 
       real (kind=dbl_kind), dimension (nblyr+1), intent(in) :: &
-         i_grid         ! biology grid interface points
+         i_grid       ! biology grid interface points
 
       real (kind=dbl_kind), dimension (nblyr+2), intent(in) :: &
-         brine_rho     ! Internal brine density (kg/m^3)
+         brine_rho    ! Internal brine density (kg/m^3)
 
       real (kind=dbl_kind), dimension (nblyr + 1), intent(in) :: &
-         ibrine_rho    ! Internal brine density (kg/m^3)
+         ibrine_rho   ! Internal brine density (kg/m^3)
 
       real (kind=dbl_kind), dimension (nblyr+1), intent(out) :: &
-         drho          ! brine difference about grid point (kg/m^3)
+         drho         ! brine difference about grid point (kg/m^3)
 
       ! local variables
 
@@ -679,7 +679,7 @@ subroutine icepack_init_hbrine(bgrid, igrid, cgrid, &
          nblyr    ! number of bio layers
 
       real (kind=dbl_kind), intent(inout) :: &
-         phi_snow           !porosity at the ice-snow interface
+         phi_snow           ! porosity at the ice-snow interface
 
       real (kind=dbl_kind), dimension (nblyr+2), intent(out) :: &
          bgrid              ! biology nondimensional vertical grid points
@@ -688,9 +688,9 @@ subroutine icepack_init_hbrine(bgrid, igrid, cgrid, &
          igrid              ! biology vertical interface points
 
       real (kind=dbl_kind), dimension (nilyr+1), intent(out) :: &
-         cgrid            , &  ! CICE vertical coordinate
-         icgrid           , &  ! interface grid for CICE (shortwave variable)
-         swgrid                ! grid for ice tracers used in dEdd scheme
+         cgrid         , &  ! CICE vertical coordinate
+         icgrid        , &  ! interface grid for CICE (shortwave variable)
+         swgrid             ! grid for ice tracers used in dEdd scheme
 
 !autodocument_end
 
@@ -772,10 +772,10 @@ subroutine icepack_init_zsalinity(nblyr,ntrcr_o,  Rayleigh_criteria, &
                Rayleigh_real, trcrn_bgc, nt_bgc_S, ncat, sss)
 
       integer (kind=int_kind), intent(in) :: &
-       nblyr, & ! number of biolayers
+       nblyr  , & ! number of biolayers
        ntrcr_o, & ! number of non bio tracers
-       ncat , & ! number of categories
-       nt_bgc_S ! zsalinity index
+       ncat   , & ! number of categories
+       nt_bgc_S   ! zsalinity index
 
       logical (kind=log_kind), intent(inout) :: &
        Rayleigh_criteria
@@ -787,7 +787,7 @@ subroutine icepack_init_zsalinity(nblyr,ntrcr_o,  Rayleigh_criteria, &
        sss
 
       real (kind=dbl_kind), dimension(:,:), intent(inout):: &
-       trcrn_bgc ! bgc subset of trcrn
+       trcrn_bgc  ! bgc subset of trcrn
 
 !autodocument_end
 

columnphysics/icepack_intfc.F90

@@ -45,13 +45,15 @@ module icepack_intfc
       use icepack_tracers,    only: icepack_max_iso    => max_iso
       use icepack_tracers,    only: icepack_nmodal1    => nmodal1
       use icepack_tracers,    only: icepack_nmodal2    => nmodal2
-      use icepack_parameters, only: icepack_nspint     => nspint
+
+      use icepack_shortwave_data, only: icepack_nspint_3bd => nspint_3bd
+      use icepack_shortwave_data, only: icepack_nspint_5bd => nspint_5bd
 
       use icepack_parameters, only: icepack_init_parameters
       use icepack_parameters, only: icepack_query_parameters
       use icepack_parameters, only: icepack_write_parameters
       use icepack_parameters, only: icepack_recompute_constants
-      use icepack_parameters, only: nspint, secday, spval_const
+      use icepack_parameters, only: secday, spval_const
       use icepack_parameters, only: c0, c1, c1p5, c2, c3, c4, c5, c6, c8
       use icepack_parameters, only: c10, c15, c16, c20, c25, c100, c1000
       use icepack_parameters, only: p001, p01, p1, p2, p4, p5, p6, p05
@@ -85,6 +87,7 @@ module icepack_intfc
       use icepack_snow, only: icepack_init_snow
       use icepack_snow, only: icepack_step_snow
 
+      use icepack_shortwave, only: icepack_init_radiation
       use icepack_shortwave, only: icepack_prep_radiation
       use icepack_shortwave, only: icepack_step_radiation
 
@@ -109,10 +112,12 @@ module icepack_intfc
       use icepack_therm_shared  , only: icepack_snow_temperature
       use icepack_therm_shared  , only: icepack_liquidus_temperature
       use icepack_therm_shared  , only: icepack_sea_freezing_temperature
-      use icepack_therm_shared  , only: icepack_enthalpy_snow
       use icepack_therm_shared  , only: icepack_init_thermo
+      use icepack_therm_shared  , only: icepack_salinity_profile
       use icepack_therm_shared  , only: icepack_init_trcr
 
+      use icepack_mushy_physics , only: icepack_enthalpy_snow
+      use icepack_mushy_physics , only: icepack_enthalpy_mush
       use icepack_mushy_physics , only: icepack_mushy_density_brine
       use icepack_mushy_physics , only: icepack_mushy_liquid_fraction
       use icepack_mushy_physics , only: icepack_mushy_temperature_mush
@@ -121,6 +126,7 @@ module icepack_intfc
       use icepack_warnings, only: icepack_warnings_print
       use icepack_warnings, only: icepack_warnings_flush
       use icepack_warnings, only: icepack_warnings_aborted
+      use icepack_warnings, only: icepack_warnings_getall
 
 !autodocument_end icepack_intfc.F90