Merge branch 'master' into box2001

cicecore/cicedynB/general/ice_init.F90

@@ -55,8 +55,13 @@ subroutine input_data
 
       use ice_broadcast, only: broadcast_scalar, broadcast_array
       use ice_diagnostics, only: diag_file, print_global, print_points, latpnt, lonpnt
-      use ice_domain_size, only: max_nstrm, nilyr, nslyr, max_ntrcr, ncat, n_aero
       use ice_domain, only: land_override
+      use ice_domain_size, only: ncat, nilyr, nslyr, nblyr, &
+                                 n_aero, n_zaero, n_algae, &
+                                 n_doc, n_dic, n_don, n_fed, n_fep, &
+                                 n_trbgcz, n_trzs, n_trbri, n_trzaero, &
+                                 n_trage, n_trfy, n_trlvl, n_trpnd, n_trbgcs, &
+                                 n_bgc, nltrcr, max_nsw, max_ntrcr, max_nstrm
       use ice_calendar, only: year_init, istep0, histfreq, histfreq_n, &
                               dumpfreq, dumpfreq_n, diagfreq, &
                               npt, dt, ndtd, days_per_year, use_leap_years, &
@@ -144,6 +149,7 @@ subroutine input_data
 
       namelist /grid_nml/ &
         grid_format,    grid_type,       grid_file,     kmt_file,       &
+        ncat,           nilyr,           nslyr,         nblyr,          &
         kcatbound,      gridcpl_file,    dxrect,        dyrect,         &
         land_override
 
@@ -951,7 +957,13 @@ subroutine input_data
                                kcatbound
          write(nu_diag,1020) ' land_override             = ', &
                                land_override
-         write(nu_diag,1020) ' kdyn                      = ', kdyn
+         if (kdyn == 1) then
+           write(nu_diag,1021) ' kdyn                      = ','evp ', kdyn
+         elseif (kdyn == 2) then
+           write(nu_diag,1021) ' kdyn                      = ','eap ', kdyn
+         else
+           write(nu_diag,1020) ' kdyn                      = ', kdyn
+         endif
          write(nu_diag,1020) ' ndtd                      = ', ndtd
          write(nu_diag,1020) ' ndte                      = ', ndte
          write(nu_diag,1010) ' revised_evp               = ', &

cicecore/cicedynB/infrastructure/ice_grid.F90

@@ -209,8 +209,6 @@ subroutine init_grid1
       use ice_blocks, only: nx_block, ny_block
       use ice_broadcast, only: broadcast_array
       use ice_constants, only: c1
-      use ice_domain_size, only: max_blocks
-      use ice_domain, only: land_override
 
       integer (kind=int_kind) :: &
          fid_grid, &     ! file id for netCDF grid file
@@ -1122,7 +1120,6 @@ subroutine rectgrid
       use ice_blocks, only: nx_block, ny_block
       use ice_constants, only: c0, c1, c2, radius, cm_to_m, &
           field_loc_center, field_loc_NEcorner, field_type_scalar
-      use ice_domain_size, only: max_blocks
       use ice_domain, only: land_override
 
       integer (kind=int_kind) :: &

cicecore/drivers/cice/CICE_RunMod.F90

@@ -47,7 +47,7 @@ subroutine CICE_Run
 
       use ice_calendar, only: istep, istep1, time, dt, stop_now, calendar
       use ice_forcing, only: get_forcing_atmo, get_forcing_ocn, atm_data_type
-      use ice_forcing_bgc, only: get_forcing_bgc, get_atm_bgc, fzaero_data, & 
+      use ice_forcing_bgc, only: get_forcing_bgc, get_atm_bgc, & 
           faero_default
       use ice_flux, only: init_flux_atm, init_flux_ocn
       use ice_timers, only: ice_timer_start, ice_timer_stop, &
@@ -56,6 +56,7 @@ subroutine CICE_Run
           tr_aero, tr_zaero, skl_bgc, z_tracers
       integer (kind=int_kind) :: &
           land_override   ! if=1, set land on edges of outer 2 rows/columns
+      character(len=*), parameter :: subname = '(CICE_Run)'
 
    !--------------------------------------------------------------------
    !  initialize error code and step timer
@@ -139,8 +140,7 @@ subroutine ice_step
       use ice_calendar, only: dt, dt_dyn, ndtd, diagfreq, write_restart, istep
       use ice_diagnostics, only: init_mass_diags, runtime_diags
       use ice_diagnostics_bgc, only: hbrine_diags, zsal_diags, bgc_diags
-      use ice_domain, only: halo_info, nblocks, land_override
-      use ice_domain_size, only: nslyr
+      use ice_domain, only: halo_info, nblocks
       use ice_dyn_eap, only: write_restart_eap
       use ice_dyn_shared, only: kdyn, kridge, ktransport
       use ice_flux, only: scale_factor, init_history_therm, &
@@ -213,7 +213,7 @@ subroutine ice_step
       ! Scale radiation fields
       !-----------------------------------------------------------------
             if(ktherm.gt.0) then
-               if (calc_Tsfc) call prep_radiation (dt, iblk)
+               if (calc_Tsfc) call prep_radiation (iblk)
 
       !-----------------------------------------------------------------
       ! thermodynamics and biogeochemistry

configuration/scripts/ice_in

@@ -65,6 +65,10 @@
     maskhalo_dyn      = .false.
     maskhalo_remap    = .false.
     maskhalo_bound    = .false.
+    ncat         = 5
+    nilyr        = 7
+    nslyr        = 1
+    nblyr        = 7
 /
 
 &tracer_nml

doc/source/user_guide/ug_case_settings.rst

@@ -149,6 +149,10 @@ Table of namelist options
    "", "``-1``", "one category", ""
    "``dxrect``", "real", "x-direction grid spacing (meters) for rectangular grid", ""
    "``dyrect``", "real", "y-direction grid spacing (meters) for rectangular grid", ""
+   "``ncat``", "integer", "number of ice thickness categories", "5"
+   "``nilyr``", "integer", "number of vertical layers in ice", "7"
+   "``nslyr``", "integer", "number of vertical layers in snow", "1"
+   "``nblyr``", "integer", "number of zbgc layers", "7"
    "", "", "", ""
    "*domain_nml*", "", "", ""
    "", "", "*Domain*", ""