Update version, remove trailing blanks (#901)

CICE-Consortium · Oct 27, 2023 · ea241fa · ea241fa
1 parent 32f233d
commit ea241fa
Show file tree

Hide file tree

Showing 7 changed files with 26 additions and 26 deletions.
diff --git a/cicecore/cicedyn/dynamics/ice_transport_remap.F90 b/cicecore/cicedyn/dynamics/ice_transport_remap.F90
@@ -308,12 +308,12 @@ subroutine init_remap
       !  regions are adjusted to obtain the desired area.
       ! If false, edgearea is computed in locate_triangles and passed out.
       !
-      ! l_fixed_area = .false. has been the default approach in CICE. It is 
-      ! used like this for the B-grid. However, idealized tests with the 
-      ! C-grid have shown that l_fixed_area = .false. leads to a checkerboard 
-      ! pattern in prognostic fields (e.g. aice). Using l_fixed_area = .true. 
+      ! l_fixed_area = .false. has been the default approach in CICE. It is
+      ! used like this for the B-grid. However, idealized tests with the
+      ! C-grid have shown that l_fixed_area = .false. leads to a checkerboard
+      ! pattern in prognostic fields (e.g. aice). Using l_fixed_area = .true.
       ! eliminates the checkerboard pattern in C-grid simulations.
-      ! 
+      !
       !-------------------------------------------------------------------
 
       if (grid_ice == 'CD' .or. grid_ice == 'C') then
@@ -1725,7 +1725,7 @@ subroutine locate_triangles (nx_block,     ny_block,   &
          dpy          , & ! y coordinates of departure points at cell corners
          dxu          , & ! E-W dimension of U-cell (m)
          dyu          , & ! N-S dimension of U-cell (m)
-         earea        , & ! area of E-cell 
+         earea        , & ! area of E-cell
          narea            ! area of N-cell
 
       real (kind=dbl_kind), dimension (nx_block,ny_block,0:nvert,ngroups), intent(out) :: &
@@ -1762,8 +1762,8 @@ subroutine locate_triangles (nx_block,     ny_block,   &
          ishift_br, jshift_br , & ! i,j indices of BR cell relative to edge
          ishift_tc, jshift_tc , & ! i,j indices of TC cell relative to edge
          ishift_bc, jshift_bc , & ! i,j indices of BC cell relative to edge
-         is_l, js_l           , & ! i,j shifts for TL1, BL2 for area consistency 
-         is_r, js_r           , & ! i,j shifts for TR1, BR2 for area consistency 
+         is_l, js_l           , & ! i,j shifts for TL1, BL2 for area consistency
+         is_r, js_r           , & ! i,j shifts for TR1, BR2 for area consistency
          ise_tl, jse_tl       , & ! i,j of TL other edge relative to edge
          ise_bl, jse_bl       , & ! i,j of BL other edge relative to edge
          ise_tr, jse_tr       , & ! i,j of TR other edge relative to edge
@@ -1871,7 +1871,7 @@ subroutine locate_triangles (nx_block,     ny_block,   &
 
       areafac_c(:,:)  = c0
       areafac_ce(:,:) = c0
-      
+
       do ng = 1, ngroups
          do j = 1, ny_block
          do i = 1, nx_block
@@ -1908,7 +1908,7 @@ subroutine locate_triangles (nx_block,     ny_block,   &
          ishift_bc =  0
          jshift_bc =  0
 
-         ! index shifts for TL1, BL2, TR1 and BR2 for area consistency 
+         ! index shifts for TL1, BL2, TR1 and BR2 for area consistency
 
          is_l = -1
          js_l =  0
@@ -1936,7 +1936,7 @@ subroutine locate_triangles (nx_block,     ny_block,   &
          enddo
 
          ! area scale factor for other edge (east)
-         
+
          do j = 1, ny_block
          do i = 1, nx_block
             areafac_ce(i,j) = earea(i,j)
@@ -1960,7 +1960,7 @@ subroutine locate_triangles (nx_block,     ny_block,   &
          ishift_bc =  0
          jshift_bc =  0
 
-         ! index shifts for TL1, BL2, TR1 and BR2 for area consistency 
+         ! index shifts for TL1, BL2, TR1 and BR2 for area consistency
 
          is_l =  0
          js_l =  1
@@ -2114,11 +2114,11 @@ subroutine locate_triangles (nx_block,     ny_block,   &
          !-------------------------------------------------------------------
          ! Locate triangles in TL cell (NW for north edge, NE for east edge)
          ! and BL cell (W for north edge, N for east edge).
-         ! 
+         !
          ! areafact_c or areafac_ce (areafact_c for the other edge) are used
-         ! (with shifted indices) to make sure that a flux area on one edge 
-         ! is consistent with the analogous area on the other edge and to 
-         ! ensure that areas add up when using l_fixed_area = T. See PR #849 
+         ! (with shifted indices) to make sure that a flux area on one edge
+         ! is consistent with the analogous area on the other edge and to
+         ! ensure that areas add up when using l_fixed_area = T. See PR #849
          ! for details.
          !
          !-------------------------------------------------------------------
@@ -2476,7 +2476,7 @@ subroutine locate_triangles (nx_block,     ny_block,   &
             iflux   (i,j,ng) = i + ishift_tc
             jflux   (i,j,ng) = j + jshift_tc
             areafact(i,j,ng) = -areafac_c(i,j)
- 
+
             ! TC2a (group 5)
 
             ng = 5
@@ -2489,7 +2489,7 @@ subroutine locate_triangles (nx_block,     ny_block,   &
             iflux   (i,j,ng) = i + ishift_tc
             jflux   (i,j,ng) = j + jshift_tc
             areafact(i,j,ng) = -areafac_c(i,j)
- 
+
             ! TC3a (group 6)
 
             ng = 6

diff --git a/cicecore/cicedyn/general/ice_forcing.F90 b/cicecore/cicedyn/general/ice_forcing.F90
@@ -2251,7 +2251,7 @@ subroutine JRA55_files(yr)
          if (cnt == 3) uwind_file = trim(atm_data_dir)//'/'//trim(atm_data_type_prefix)// &
                                     '/8XDAILY/'//trim(atm_data_type_prefix)//             &
                                     '_03hr_forcing'//trim(atm_data_version)//'_2005.nc'
-         
+
          if (cnt == 4) uwind_file = trim(atm_data_dir)//                                      &
                                     '/8XDAILY/'//trim(atm_data_type_prefix)//'_'//trim(grd)// &
                                     '_03hr_forcing'//trim(atm_data_version)//'_2005.nc'

diff --git a/cicecore/cicedyn/general/ice_init.F90 b/cicecore/cicedyn/general/ice_init.F90
@@ -501,7 +501,7 @@ subroutine input_data
       atm_data_format = 'bin'     ! file format ('bin'=binary or 'nc'=netcdf)
       atm_data_type   = 'default'
       atm_data_dir    = ' '
-      atm_data_version = '_undef'  ! date atm_data_file was generated. 
+      atm_data_version = '_undef'  ! date atm_data_file was generated.
       rotate_wind     = .true.    ! rotate wind/stress composants to computational grid orientation
       calc_strair     = .true.    ! calculate wind stress
       formdrag        = .false.   ! calculate form drag
@@ -2383,7 +2383,7 @@ subroutine input_data
          write(nu_diag,1021) ' ycycle           = ', ycycle
          write(nu_diag,1031) ' atm_data_type    = ', trim(atm_data_type)
          write(nu_diag,1031) ' atm_data_version = ', trim(atm_data_version)
-         
+
          if (trim(atm_data_type) /= 'default') then
             write(nu_diag,1031) ' atm_data_dir     = ', trim(atm_data_dir)
             write(nu_diag,1031) ' precip_units     = ', trim(precip_units)

diff --git a/cicecore/cicedyn/general/ice_step_mod.F90 b/cicecore/cicedyn/general/ice_step_mod.F90
@@ -757,7 +757,7 @@ subroutine update_state (dt, daidt, dvidt, dagedt, offset)
       use ice_state, only: aicen, trcrn, vicen, vsnon, &
                            aice,  trcr,  vice,  vsno, aice0, trcr_depend, &
                            bound_state, trcr_base, nt_strata, n_trcr_strata
-      use ice_flux,  only: Tf 
+      use ice_flux,  only: Tf
       use ice_timers, only: ice_timer_start, ice_timer_stop, timer_bound, timer_updstate
 
       real (kind=dbl_kind), intent(in) :: &

diff --git a/cicecore/drivers/unittest/opticep/ice_step_mod.F90 b/cicecore/drivers/unittest/opticep/ice_step_mod.F90
@@ -760,7 +760,7 @@ subroutine update_state (dt, daidt, dvidt, dagedt, offset)
       use ice_state, only: aicen, trcrn, vicen, vsnon, &
                            aice,  trcr,  vice,  vsno, aice0, trcr_depend, &
                            bound_state, trcr_base, nt_strata, n_trcr_strata
-      use ice_flux,  only: Tf 
+      use ice_flux,  only: Tf
       use ice_timers, only: ice_timer_start, ice_timer_stop, timer_bound, timer_updstate
 
       real (kind=dbl_kind), intent(in) :: &

diff --git a/cicecore/version.txt b/cicecore/version.txt
@@ -1 +1 @@
-CICE 6.4.2
+CICE 6.5.0
diff --git a/doc/source/conf.py b/doc/source/conf.py
@@ -65,9 +65,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = u'6.4.2' 
+version = u'6.5.0' 
 # The full version, including alpha/beta/rc tags.
-version = u'6.4.2' 
+version = u'6.5.0' 
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.