update optional arguments in lower level routines for fsd step_therm2

columnphysics/icepack_therm_itd.F90

@@ -897,15 +897,13 @@ subroutine lateral_melt (dt,         ncat,       &
 
       integer (kind=int_kind), intent(in) :: &
          ncat    , & ! number of thickness categories
+         nfsd    , & ! number of floe size categories
          nilyr   , & ! number of ice layers
          nblyr   , & ! number of bio layers
          nslyr   , & ! number of snow layers
          n_aero  , & ! number of aerosol tracers
          nbtrcr      ! number of bio tracers
 
-      integer (kind=int_kind), intent(in), optional :: &
-         nfsd        ! number of floe size categories
-
       real (kind=dbl_kind), dimension (:), intent(inout) :: &
          aicen   , & ! concentration of ice
          vicen   , & ! volume per unit area of ice          (m)
@@ -915,9 +913,7 @@ subroutine lateral_melt (dt,         ncat,       &
          trcrn       ! tracer array
 
       real (kind=dbl_kind), intent(in) :: &
-         rside       ! fraction of ice that melts laterally
-
-      real (kind=dbl_kind), intent(in), optional :: &
+         rside   , & ! fraction of ice that melts laterally
          wlat        ! lateral melt rate (m/s)
 
       real (kind=dbl_kind), intent(inout) :: &
@@ -940,11 +936,11 @@ subroutine lateral_melt (dt,         ncat,       &
       real (kind=dbl_kind), dimension(:), intent(inout) :: &
          fiso_ocn     ! isotope flux to ocean (kg/m^2/s)
 
-      real (kind=dbl_kind), dimension (:), intent(in), optional :: &
+      real (kind=dbl_kind), dimension (:), intent(in) :: &
          floe_rad_c     , & ! fsd size bin centre in m (radius)
          floe_binwidth      ! fsd size bin width in m (radius)
 
-      real (kind=dbl_kind), dimension (:), intent(out), optional :: &
+      real (kind=dbl_kind), dimension (:), intent(out) :: &
          d_afsd_latm        ! change in fsd due to lateral melt (m)
 
       ! local variables
@@ -1331,16 +1327,14 @@ subroutine add_new_ice (ncat,      nilyr,      &
 
       integer (kind=int_kind), intent(in) :: &
          ncat  , & ! number of thickness categories
+         nfsd  , & ! number of floe size categories
          nilyr , & ! number of ice layers
          nblyr , & ! number of bio layers
          ntrcr , & ! number of tracers
          nltrcr, & ! number of zbgc tracers
          n_aero, & ! number of aerosol tracers
          ktherm    ! type of thermodynamics (-1 none, 1 BL99, 2 mushy)
 
-      integer (kind=int_kind), intent(in), optional :: &
-         nfsd      ! number of floe size categories
-
       real (kind=dbl_kind), dimension(0:ncat), intent(in) :: &
          hin_max      ! category boundaries (m)
 
@@ -1417,21 +1411,21 @@ subroutine add_new_ice (ncat,      nilyr,      &
          H2_18O_ocn     ! ocean concentration of H2_18O (kg/kg)
 
       ! floe size distribution
-      real (kind=dbl_kind), intent(in), optional :: &
+      real (kind=dbl_kind), intent(in) :: &
          wave_sig_ht    ! significant height of waves globally (m)
 
-      real (kind=dbl_kind), dimension(:), intent(in), optional  :: &
+      real (kind=dbl_kind), dimension(:), intent(in) :: &
          wave_spectrum  ! ocean surface wave spectrum, E(f) (m^2 s)
 
-      real(kind=dbl_kind), dimension(:), intent(in), optional :: &
+      real(kind=dbl_kind), dimension(:), intent(in) :: &
          wavefreq,              & ! wave frequencies (s^-1)
          dwavefreq                ! wave frequency bin widths (s^-1)
 
-      real (kind=dbl_kind), dimension (:), intent(in), optional :: &
+      real (kind=dbl_kind), dimension (:), intent(in) :: &
          floe_rad_c     , & ! fsd size bin centre in m (radius)
          floe_binwidth      ! fsd size bin width in m (radius)
 
-      real (kind=dbl_kind), dimension(:), intent(out), optional :: &
+      real (kind=dbl_kind), dimension(:), intent(out) :: &
                             ! change in thickness distribution (area)
          d_afsd_latg    , & ! due to fsd lateral growth
          d_afsd_newi        ! new ice formation