Update version, interface documentation, trailing blanks (#473)

columnphysics/icepack_itd.F90

@@ -135,7 +135,7 @@ subroutine rebin (ntrcr,    trcr_depend,     &
 
       real (kind=dbl_kind), dimension(0:ncat), intent(in) :: &
          hin_max   ! category limits (m)
- 
+
       real (kind=dbl_kind), intent(in) :: &
          Tf                ! freezing temperature
 
@@ -785,11 +785,11 @@ subroutine cleanup_itd (dt,          ntrcr,      &
          ntrcr , & ! number of tracers in use
          nbtrcr, & ! number of bio tracers in use
          n_aero    ! number of aerosol tracers
- 
-      real (kind=dbl_kind), intent(in) :: & 
-         dt        ! time step 
- 
-      real (kind=dbl_kind), intent(in) :: & 
+
+      real (kind=dbl_kind), intent(in) :: &
+         dt        ! time step
+
+      real (kind=dbl_kind), intent(in) :: &
          Tf        ! Freezing temperature
 
       real (kind=dbl_kind), dimension(0:ncat), intent(in) :: &
@@ -1923,7 +1923,7 @@ subroutine icepack_aggregate (ncat,               &
                                    atrcr,     aice,          &
                                    vice ,     vsno,          &
                                    trcr_base, n_trcr_strata, &
-                                   nt_strata, trcr, Tf)   
+                                   nt_strata, trcr, Tf)
       if (icepack_warnings_aborted(subname)) return
 
       deallocate (atrcr)

columnphysics/icepack_mechred.F90

@@ -401,7 +401,7 @@ subroutine ridge_ice (dt,          ndtd,       &
                            msnow_mlt,   esnow_mlt,   &
                            maero,       miso,        &
                            mpond,       Tf,          &
-                           aredistn,    vredistn)    
+                           aredistn,    vredistn)
          if (icepack_warnings_aborted(subname)) return
 
       !-----------------------------------------------------------------

columnphysics/icepack_shortwave.F90

@@ -4508,7 +4508,7 @@ subroutine compute_dEdd_5bd(                          &
       ! copy/point to table data for local names
       asm_prm_ice_drc => ssp_sasymmdr
       asm_prm_ice_dfs => ssp_sasymmdf
-      ss_alb_ice_drc => ssp_snwalbdr 
+      ss_alb_ice_drc => ssp_snwalbdr
       ss_alb_ice_dfs => ssp_snwalbdf
       ext_cff_mss_ice_drc => ssp_snwextdr
       ext_cff_mss_ice_dfs => ssp_snwextdf

columnphysics/icepack_therm_itd.F90

@@ -92,10 +92,10 @@ subroutine linear_itd (ncat,        hin_max,     &
                              ntrcr,       trcr_depend, &
                              trcr_base,   n_trcr_strata,&
                              nt_strata,                &
-                             aicen_init,  vicen_init,  & 
-                             aicen,       trcrn,       & 
-                             vicen,       vsnon,       & 
-                             aice,        aice0,       & 
+                             aicen_init,  vicen_init,  &
+                             aicen,       trcrn,       &
+                             vicen,       vsnon,       &
+                             aice,        aice0,       &
                              fpond,       Tf           )
 
       integer (kind=int_kind), intent(in) :: &
@@ -1627,8 +1627,8 @@ subroutine add_new_ice (ncat,      nilyr,      &
             vi0tmp = fnew*dt / (rhoi*Lfresh) ! ocn/cpl assumes frazil volume is pure, fresh ice
             dfresh = -rhoi*(vi0new - vi0tmp)/dt
             frazil_diag = frazil - vi0tmp
-!        else 
-!           do nothing - other correction options could be implemented in the future             
+!        else
+!           do nothing - other correction options could be implemented in the future
          endif
 
          if (saltflux_option == 'prognostic') then
@@ -1637,7 +1637,7 @@ subroutine add_new_ice (ncat,      nilyr,      &
             dfsalt = ice_ref_salinity*p001*dfresh
          endif
          fresh  = fresh + dfresh
-         fsalt  = fsalt + dfsalt      
+         fsalt  = fsalt + dfsalt
       endif
 
       !-----------------------------------------------------------------

columnphysics/icepack_therm_vertical.F90

@@ -2495,7 +2495,7 @@ subroutine icepack_step_therm1(dt, ncat, nilyr, nslyr,    &
          fsnow    =           fsnow*(c1-worka)
       endif ! snwredist
 
-!echmod - remove all of this code - non-BFB because of values carried in tracer arrays when the snow physics options are not active 
+!echmod - remove all of this code - non-BFB because of values carried in tracer arrays when the snow physics options are not active
       !-----------------------------------------------------------------
       ! solid and liquid components of snow mass
       !-----------------------------------------------------------------

columnphysics/version.txt

@@ -1 +1 @@
-ICEPACK 1.3.4
+ICEPACK 1.4.0

configuration/driver/icedrv_forcing.F90

@@ -97,7 +97,7 @@ module icedrv_forcing
          oceanmixed_ice , & ! if true, use internal ocean mixed layer
          restore_ocn        ! restore sst if true
 
-      real (kind=dbl_kind), public :: & 
+      real (kind=dbl_kind), public :: &
          trest, &           ! restoring time scale (sec)
          trestore           ! restoring time scale (days)
 
@@ -1077,7 +1077,7 @@ end subroutine ocn_ISPOL
       subroutine finish_ocn_forcing(sst_temp)
 
 ! Compute ocean freezing temperature Tf based on tfrz_option
-! 'minus1p8'         Tf = -1.8 C 
+! 'minus1p8'         Tf = -1.8 C
 ! 'constant'         Tf = Tocnfrz
 ! 'linear_salt'      Tf = -depressT * sss
 ! 'mushy'            Tf conforms with mushy layer thermo (ktherm=2)

configuration/driver/icedrv_init_column.F90

@@ -1066,7 +1066,7 @@ subroutine init_zbgc
       if (modal_aero .AND. (.NOT. tr_zaero) .AND. (.NOT. tr_aero)) then
          modal_aero = .false.
       endif
-         
+
       if (modal_aero .AND. trim(shortwave(1:4)) /= 'dEdd') then
          write(nu_diag,*) 'WARNING: modal_aero = T but shortwave /= dEdd'
          write(nu_diag,*) 'WARNING: setting modal_aero = F'

doc/source/conf.py

@@ -62,9 +62,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = u'1.3.4' 
+version = u'1.4.0' 
 # The full version, including alpha/beta/rc tags.
-version = u'1.3.4' 
+version = u'1.4.0' 
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

doc/source/user_guide/interfaces.include

@@ -844,7 +844,7 @@ icepack_init_parameters
            rhos_in, rhoi_in, rhow_in, cp_air_in, emissivity_in, &
            cp_ice_in, cp_ocn_in, hfrazilmin_in, floediam_in, &
            depressT_in, dragio_in, thickness_ocn_layer1_in, iceruf_ocn_in, &
-           albocn_in, gravit_in, viscosity_dyn_in, &
+           albocn_in, gravit_in, viscosity_dyn_in, tscale_pnd_drain_in, &
            Tocnfrz_in, rhofresh_in, zvir_in, vonkar_in, cp_wv_in, &
            stefan_boltzmann_in, ice_ref_salinity_in, &
            Tffresh_in, Lsub_in, Lvap_in, Timelt_in, Tsmelt_in, &
@@ -927,6 +927,7 @@ icepack_init_parameters
            cp_ocn_in,     & ! specific heat of ocn    (J/kg/K)
            depressT_in,   & ! Tf:brine salinity ratio (C/ppt)
            viscosity_dyn_in, & ! dynamic viscosity of brine (kg/m/s)
+           tscale_pnd_drain_in,&! mushy macroscopic drainage timescale (days)
            Tocnfrz_in,    & ! freezing temp of seawater (C)
            Tffresh_in,    & ! freezing temp of fresh ice (K)
            Lsub_in,       & ! latent heat, sublimation freshwater (J/kg)
@@ -1258,7 +1259,8 @@ icepack_query_parameters
            p333_out, p666_out, spval_const_out, pih_out, piq_out, pi2_out, &
            rhos_out, rhoi_out, rhow_out, cp_air_out, emissivity_out, &
            cp_ice_out, cp_ocn_out, hfrazilmin_out, floediam_out, &
-           depressT_out, dragio_out, thickness_ocn_layer1_out, iceruf_ocn_out, albocn_out, gravit_out, viscosity_dyn_out, &
+           depressT_out, dragio_out, thickness_ocn_layer1_out, iceruf_ocn_out, &
+           albocn_out, gravit_out, viscosity_dyn_out, tscale_pnd_drain_out, &
            Tocnfrz_out, rhofresh_out, zvir_out, vonkar_out, cp_wv_out, &
            stefan_boltzmann_out, ice_ref_salinity_out, &
            Tffresh_out, Lsub_out, Lvap_out, Timelt_out, Tsmelt_out, &
@@ -1349,6 +1351,7 @@ icepack_query_parameters
            cp_ocn_out,     & ! specific heat of ocn    (J/kg/K)
            depressT_out,   & ! Tf:brine salinity ratio (C/ppt)
            viscosity_dyn_out, & ! dynamic viscosity of brine (kg/m/s)
+           tscale_pnd_drain_out, & ! mushy macroscopic drainage timescale (days)
            Tocnfrz_out,    & ! freezing temp of seawater (C)
            Tffresh_out,    & ! freezing temp of fresh ice (K)
            Lsub_out,       & ! latent heat, sublimation freshwater (J/kg)