Some more fixes resulting from the BGC merge

CICE-Consortium · Sep 24, 2024 · 44f71bb · 44f71bb
1 parent 7cde537
commit 44f71bb
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 14 deletions.
diff --git a/columnphysics/icepack_therm_vertical.F90 b/columnphysics/icepack_therm_vertical.F90
@@ -30,7 +30,7 @@ module icepack_therm_vertical
       use icepack_parameters, only: saltflux_option, congel_freeze
       use icepack_parameters, only: icepack_chkoptargflag
 
-      use icepack_tracers, only: ncat, nilyr, nslyr
+      use icepack_tracers, only: ncat, nilyr, nslyr, nfsd
       use icepack_tracers, only: tr_iage, tr_FY, tr_aero, tr_pond, tr_fsd, tr_iso
       use icepack_tracers, only: tr_pond_lvl, tr_pond_topo
       use icepack_tracers, only: n_aero, n_iso
@@ -486,7 +486,7 @@ subroutine frzmlt_bottom_lateral (dt,                 &
                                         Tbot,     fbot,     &
                                         rsiden,    Cdn_ocn,  &
                                         wlat,      aicen, &
-                                        afsdn,     nfsd,     &
+                                        afsdn,            &
                                         floe_rad_c, floe_binwidth)
 
       real (kind=dbl_kind), intent(in) :: &
@@ -533,9 +533,6 @@ subroutine frzmlt_bottom_lateral (dt,                 &
       real (kind=dbl_kind), dimension (:,:), intent(in), optional :: &
          afsdn     ! area floe size distribution
 
-      integer (kind=int_kind), intent(in), optional :: &
-         nfsd        ! number of floe size categories
-
       ! local variables
       real (kind=dbl_kind), dimension (ncat) :: &
          delta_an  , & ! change in the ITD
@@ -2208,8 +2205,7 @@ subroutine icepack_step_therm1(dt,                        &
                                     lmask_n     , lmask_s     , &
                                     mlt_onset   , frz_onset   , &
                                     yday        , prescribed_ice, &
-                                    zlvs        , &
-                                    afsdn       , nfsd        , &
+                                    zlvs        , afsdn       , &
                                     floe_rad_c,   floe_binwidth)
 
       real (kind=dbl_kind), intent(in) :: &
@@ -2339,9 +2335,6 @@ subroutine icepack_step_therm1(dt,                        &
       real (kind=dbl_kind), dimension(:,:), intent(in), optional :: &
          afsdn        ! afsd tracer
 
-      integer (kind=int_kind), intent(in), optional :: &
-         nfsd         ! number of fsd categories
-
       real (kind=dbl_kind), dimension(:), intent(inout) :: &
          aicen_init  , & ! fractional area of ice
          vicen_init  , & ! volume per unit area of ice            (m)
@@ -2583,7 +2576,7 @@ subroutine icepack_step_therm1(dt,                        &
                                   Tbot,       fbot,     &
                                   rsiden,     Cdn_ocn,   &
                                   wlat,       aicen,  &
-                                  afsdn,      nfsd,      &
+                                  afsdn,              &
                                   floe_rad_c, floe_binwidth)
 
       if (icepack_warnings_aborted(subname)) return

diff --git a/configuration/driver/icedrv_InitMod.F90 b/configuration/driver/icedrv_InitMod.F90
@@ -39,7 +39,7 @@ subroutine icedrv_initialize
       use icepack_intfc, only: icepack_init_fsd_bounds
       use icepack_intfc, only: icepack_init_snow
       use icepack_intfc, only: icepack_warnings_flush
-      use icedrv_domain_size, only: ncat, nfsd
+      use icedrv_domain_size, only: ncat
 !     use icedrv_diagnostics, only: icedrv_diagnostics_debug
       use icedrv_flux, only: init_coupler_flux, init_history_therm, &
           init_flux_atm_ocn

diff --git a/configuration/driver/icedrv_step.F90 b/configuration/driver/icedrv_step.F90
@@ -438,7 +438,7 @@ subroutine step_therm2 (dt)
       use icedrv_arrays_column, only: first_ice
       use icedrv_calendar, only: yday
       use icedrv_domain_size, only: ncat, nilyr, nslyr, n_aero, nblyr, &
-                                    nx, nfsd
+                                    nx
       use icedrv_flux, only: fresh, frain, fpond, frzmlt, frazil, frz_onset
       use icedrv_flux, only: fsalt, Tf, sss, salinz, fhocn, rsiden, wlat
       use icedrv_flux, only: meltl, frazil_diag, flux_bio, faero_ocn, fiso_ocn
@@ -657,7 +657,7 @@ subroutine step_dyn_wave (dt)
 
       use icedrv_arrays_column, only: wave_spectrum, wave_sig_ht, &
           d_afsd_wave, floe_rad_l, floe_rad_c, wavefreq, dwavefreq
-      use icedrv_domain_size, only: ncat, nfsd, nfreq, nx
+      use icedrv_domain_size, only: ncat, nfreq, nx
       use icedrv_state, only: trcrn, aicen, aice, vice
       use icepack_intfc, only: icepack_step_wavefracture