Merging release tag with trunk through r169.

Author: eclare108213

drivers/cice4/CICE_InitMod.F90

@@ -136,7 +136,7 @@ subroutine cice_init
 
       call init_calendar        ! initialize some calendar stuff
       call init_hist (dt)       ! initialize output history file
-      call init_evp (dt)        ! define evp dynamics parameters, variables
+      call init_evp (dyn_dt)    ! define evp dynamics parameters, variables
       call init_coupler_flux    ! initialize fluxes exchanged with coupler
 #ifdef popcice
       call sst_sss              ! POP data for CICE initialization

drivers/cice4/CICE_RunMod.F90

@@ -627,7 +627,7 @@ subroutine coupling_prep
          i,j         , & ! horizontal indices
          ilo,ihi,jlo,jhi ! beginning and end of physical domain
 
-      real (kind=dbl_kind) :: & cszn
+      real (kind=dbl_kind) :: cszn ! counter for history averaging
 
       call ice_timer_start(timer_column)
 

drivers/cice4/CICE_RunMod.F90_debug

@@ -650,7 +650,7 @@
          i,j         , & ! horizontal indices
          ilo,ihi,jlo,jhi ! beginning and end of physical domain
 
-      real (kind=dbl_kind) :: & cszn
+      real (kind=dbl_kind) :: cszn ! counter for history averaging
 
       call ice_timer_start(timer_column)
 

drivers/esmf/CICE_InitMod.F90

@@ -200,7 +200,7 @@ subroutine cice_init
 
       call init_calendar        ! initialize some calendar stuff
       call init_hist (dt)       ! initialize output history file
-      call init_evp (dt)        ! define evp dynamics parameters, variables
+      call init_evp (dyn_dt)    ! define evp dynamics parameters, variables
       call init_coupler_flux    ! initialize fluxes exchanged with coupler
 #ifdef popcice
       call sst_sss              ! POP data for CICE initialization

drivers/esmf/CICE_RunMod.F90

@@ -739,7 +739,7 @@ subroutine coupling_prep
          i,j         , & ! horizontal indices
          ilo,ihi,jlo,jhi ! beginning and end of physical domain
 
-      real (kind=dbl_kind) :: & cszn
+      real (kind=dbl_kind) :: cszn ! counter for history averaging
 
       call ice_timer_start(timer_column)
 

source/ice_forcing.F90

@@ -3246,14 +3246,14 @@ subroutine ocn_data_ncar_init
 ! 
 ! For ocean mixed layer-----------------------------units 
 ! 
-! 1  sst------temperature---------------------------(C)   \\
-! 2  sss------salinity------------------------------(ppt) \\
-! 3  hbl------depth---------------------------------(m)   \\ 
-! 4  u--------surface u current---------------------(m/s) \\
-! 5  v--------surface v current---------------------(m/s) \\
-! 6  dhdx-----surface tilt x direction--------------(m/m) \\
-! 7  dhdy-----surface tilt y direction--------------(m/m) \\
-! 8  qdp------ocean sub-mixed layer heat flux-------(W/m2)\\ 
+! 1  sst------temperature---------------------------(C)   
+! 2  sss------salinity------------------------------(ppt) 
+! 3  hbl------depth---------------------------------(m)   
+! 4  u--------surface u current---------------------(m/s) 
+! 5  v--------surface v current---------------------(m/s) 
+! 6  dhdx-----surface tilt x direction--------------(m/m) 
+! 7  dhdy-----surface tilt y direction--------------(m/m) 
+! 8  qdp------ocean sub-mixed layer heat flux-------(W/m2)
 !
 ! Fields 4, 5, 6, 7 are on the U-grid; 1, 2, 3, and 8 are
 ! on the T-grid.

source/ice_shortwave.F90

@@ -162,7 +162,7 @@ subroutine init_shortwave
          il1, il2    , & ! ice layer indices for eice
          sl1, sl2        ! snow layer indices for esno
 
-      real (kind=dbl_kind) :: & cszn
+      real (kind=dbl_kind) :: cszn ! counter for history averaging
 
       type (block) :: &
          this_block      ! block information for current block