+Simplified the logic about setting ocean albedos

  Cleaned up the logic for when to reset the ocean albedo, and split the single
internal interface for set_ocean_albedo into set_ocean_albedo_from_astronomy and
set_ocean_albedo_from_coszen.  Also removed the element frequent_albedo_update
from the ice_rad_type, as it is no longer used.  Also cleaned up the module use
statements at the top of ice_model.F90 and SIS_types.F90, alphabetizing entries
and removing references to unused routines and types.  All answers are bitwise
identical.

src/SIS_types.F90

@@ -3,22 +3,18 @@
 !! these types, including allocation, deallocation, registration for restarts, and checksums.
 module SIS_types
 
-use mpp_domains_mod,  only : domain2D, CORNER, EAST, NORTH, mpp_redistribute
-use fms_io_mod,       only : register_restart_field, restart_file_type
-use fms_io_mod,       only : restore_state, query_initialized
 use coupler_types_mod, only : coupler_1d_bc_type, coupler_2d_bc_type, coupler_3d_bc_type
 use coupler_types_mod, only : coupler_type_spawn, coupler_type_initialized
 use coupler_types_mod, only : coupler_type_redistribute_data, coupler_type_copy_data
 use coupler_types_mod, only : coupler_type_register_restarts
-use SIS_hor_grid,      only : SIS_hor_grid_type
-use ice_grid,          only : ice_grid_type
-
-use SIS2_ice_thm, only : ice_thermo_type, SIS2_ice_thm_CS, enth_from_TS, energy_melt_EnthS
-use SIS2_ice_thm, only : get_SIS2_thermo_coefs, temp_from_En_S
+use fms_io_mod,        only : register_restart_field, restart_file_type
+use fms_io_mod,        only : restore_state, query_initialized
+use mpp_domains_mod,   only : domain2D, CORNER, EAST, NORTH, mpp_redistribute
 
-use MOM_coms,          only : PE_here, max_across_PEs
+use ice_grid,          only : ice_grid_type
+use MOM_coms,          only : PE_here
 use MOM_domains,       only : MOM_domain_type, pass_vector, BGRID_NE, CGRID_NE, clone_MOM_domain
-use MOM_error_handler, only : SIS_error=>MOM_error, FATAL, WARNING, SIS_mesg=>MOM_mesg, is_root_pe
+use MOM_error_handler, only : SIS_error=>MOM_error, FATAL, WARNING, SIS_mesg=>MOM_mesg
 use MOM_file_parser,   only : param_file_type
 use MOM_hor_index,     only : hor_index_type
 use MOM_time_manager,  only : time_type, time_type_to_real
@@ -27,7 +23,10 @@ module SIS_types
 use SIS_diag_mediator, only : register_SIS_diag_field, register_static_field
 use SIS_debugging,     only : chksum, Bchksum, Bchksum_pair, hchksum, uvchksum
 use SIS_debugging,     only : check_redundant_B, check_redundant_C
+use SIS_hor_grid,      only : SIS_hor_grid_type
 use SIS_tracer_registry, only : SIS_tracer_registry_type
+use SIS2_ice_thm,      only : ice_thermo_type, SIS2_ice_thm_CS, get_SIS2_thermo_coefs
+use SIS2_ice_thm,      only : enth_from_TS, energy_melt_EnthS, temp_from_En_S
 
 implicit none ; private
 
@@ -332,10 +331,6 @@ module SIS_types
                                   !! the shortwave radiation.
   logical :: do_sun_angle_for_alb !< If true, find the sun angle for calculating
                                   !! the ocean albedo in the frame of the ice model.
-  logical :: frequent_albedo_update !< If true, update the ice and ocean albedos
-                                  !! within the fast ice model update.  Otherwise,
-                                  !! the albedos are only updated within
-                                  !! set_ice_surface_state.
 
   !!@{ Diagnostic IDs
   integer, allocatable, dimension(:)   :: id_sw_abs_ice