Merge branch 'Hallberg-NOAA-remove_Verona_interfaces' into dev/gfdl

NOAA-GFDL · Apr 11, 2019 · d9bf834 · d9bf834
2 parents edddaad + c9ff8d5
commit d9bf834
Show file tree

Hide file tree

Showing 32 changed files with 5,511 additions and 3,112 deletions.
diff --git a/src/SIS2_ice_thm.F90 b/src/SIS2_ice_thm.F90
diff --git a/src/SIS_continuity.F90 b/src/SIS_continuity.F90
diff --git a/src/SIS_ctrl_types.F90 b/src/SIS_ctrl_types.F90
@@ -4,14 +4,15 @@ module SIS_ctrl_types
 
 ! use mpp_mod,          only: mpp_sum, stdout, input_nml_file, PE_here => mpp_pe
 ! use mpp_domains_mod,  only: domain2D, mpp_get_compute_domain, CORNER, EAST, NORTH
-use mpp_domains_mod,  only: domain2D, CORNER, EAST, NORTH
-! use mpp_parameter_mod, only: CGRID_NE, BGRID_NE, AGRID
-use coupler_types_mod,only: coupler_2d_bc_type, coupler_3d_bc_type
-use coupler_types_mod,only: coupler_type_initialized, coupler_type_set_diags
+use mpp_domains_mod,   only : domain2D, CORNER, EAST, NORTH
+! use mpp_parameter_mod, only : CGRID_NE, BGRID_NE, AGRID
+use coupler_types_mod, only : coupler_2d_bc_type, coupler_3d_bc_type
+use coupler_types_mod, only : coupler_type_initialized, coupler_type_set_diags
 
 use SIS_dyn_trans,   only : dyn_trans_CS
 use SIS_fast_thermo, only : fast_thermo_CS
 use SIS_slow_thermo, only : slow_thermo_CS
+use specified_ice,   only : specified_ice_CS
 
 use SIS_hor_grid, only : SIS_hor_grid_type
 use ice_grid, only : ice_grid_type
@@ -99,6 +100,7 @@ module SIS_ctrl_types
   logical :: Cgrid_dyn      !< If true use a C-grid discretization of the
                             !! sea-ice dynamics.
 
+  logical :: slab_ice       !< If true, use the archaic GFDL slab ice.
   logical :: specified_ice  !< If true, the sea ice is specified and there is
                             !! no need for ice dynamics.
   logical :: pass_stress_mag !< If true, calculate the time-mean magnitude of the
@@ -127,6 +129,8 @@ module SIS_ctrl_types
                             !! structure for the slow ice thermodynamics.
   type(dyn_trans_CS),   pointer :: dyn_trans_CSp => NULL() !< A pointer to the control
                             !! structure for the ice dynamics and transport.
+  type(specified_ice_CS),   pointer :: specified_ice_CSp => NULL() !< A pointer to the control
+                            !! structure for the specified ice.
   type(fast_thermo_CS), pointer :: fast_thermo_CSp => NULL() !< A pointer to the control
                             !! structure for the fast ice thermodynamics.
   type(SIS_optics_CS), pointer  :: optics_CSp => NULL() !< A pointer to the control
@@ -187,7 +191,7 @@ subroutine ice_diagnostics_init(IOF, OSS, FIA, G, IG, diag, Time, Cgrid)
                                                     !! sea ice velocities.  The default is true.
 
   real, dimension(G%isc:G%iec,G%jsc:G%jec) :: tmp_diag ! A temporary diagnostic array
-  real                  :: I_area_Earth ! The inverse of the area of the sphere, in m-2.
+  real                  :: I_area_Earth ! The inverse of the area of the sphere [m-2].
   real, parameter       :: missing = -1e34  ! The fill value for missing data.
   integer               :: id_geo_lon, id_geo_lat, id_sin_rot, id_cos_rot, id_cell_area
   logical               :: Cgrid_dyn

diff --git a/src/SIS_debugging.F90 b/src/SIS_debugging.F90
@@ -115,12 +115,6 @@ subroutine check_redundant_vC3d(mesg, u_comp, v_comp, G, is, ie, js, je, &
   integer,                   optional, intent(in)    :: js   !< The starting j-index to work on
   integer,                   optional, intent(in)    :: je   !< The ending j-index to work on
   integer,                   optional, intent(in)    :: direction !< The direction flag to pass to pass_vector
-! Arguments: u_comp - The u-component of the vector being checked.
-!  (in)      v_comp - The v-component of the vector being checked.
-!  (in)      mesg - A message indicating what is being checked.
-!  (in)      G - The ocean's grid structure.
-!  (in/opt)  is, ie, js, je - the i- and j- range of indices to check.
-!  (in/opt)  direction - the direction flag to be passed to pass_vector.
 
   character(len=24) :: mesg_k
   integer :: k

diff --git a/src/SIS_diag_mediator.F90 b/src/SIS_diag_mediator.F90
@@ -478,8 +478,8 @@ end subroutine post_data_3d
 
 !> Enable the accumulation of time averages over the specified time interval.
 subroutine enable_SIS_averaging(time_int_in, time_end_in, diag_cs)
-  real,                intent(in)    :: time_int_in !< The time interval in s over which any
-!                                                   !! values that are offered are valid.
+  real,                intent(in)    :: time_int_in !< The time interval over which any values
+!                                                   !! that are offered are valid [s].
   type(time_type),     intent(in)    :: time_end_in !< The end time of the valid interval.
   type(SIS_diag_ctrl), intent(inout) :: diag_cs !< A structure that is used to regulate diagnostic output
 ! This subroutine enables the accumulation of time averages over the
@@ -503,7 +503,7 @@ end subroutine disable_SIS_averaging
 !> Indicate whether averaging diagnostics is currently enabled
 logical function query_SIS_averaging_enabled(diag_cs, time_int, time_end)
   type(SIS_diag_ctrl),           intent(in)  :: diag_cs !< A structure that is used to regulate diagnostic output
-  real,            optional, intent(out) :: time_int !< The current setting of diag_cs%time_int, in s.
+  real,            optional, intent(out) :: time_int !< The current setting of diag_cs%time_int [s].
   type(time_type), optional, intent(out) :: time_end !< The current setting of diag_cs%time_end.
 
   if (present(time_int)) time_int = diag_cs%time_int