Merge branch 'NOAA-EMC:dev/emc' into ocn_stoch_july2021

Author: pjpegion

src/ocean_data_assim/MOM_oda_incupd.F90

@@ -65,22 +65,6 @@ module MOM_oda_incupd
 type, public :: oda_incupd_CS ; private
   integer :: nz        !< The total number of layers.
   integer :: nz_data   !< The total number of arbritary layers (used by older code).
-  integer :: isc       !< The starting i-index of the computational domain at h.
-  integer :: iec       !< The ending i-index of the computational domain at h.
-  integer :: jsc       !< The starting j-index of the computational domain at h.
-  integer :: jec       !< The ending j-index of the computational domain at h.
-  integer :: IscB      !< The starting I-index of the computational domain at u/v.
-  integer :: IecB      !< The ending I-index of the computational domain at u/v.
-  integer :: JscB      !< The starting J-index of the computational domain at u/v.
-  integer :: JecB      !< The ending J-index of the computational domain at h.
-  integer :: isd       !< The starting i-index of the data domain at h.
-  integer :: ied       !< The ending i-index of the data domain at h.
-  integer :: jsd       !< The starting j-index of the data domain at h.
-  integer :: jed       !< The ending j-index of the data domain at h.
-  integer :: IsdB      !< The starting I-index of the data domain at u/v.
-  integer :: IedB      !< The ending I-index of the data domain at u/v.
-  integer :: JsdB      !< The starting J-index of the data domain at u/v.
-  integer :: JedB      !< The ending J-index of the data domain at h.
   integer :: fldno = 0 !< The number of fields which have already been
                        !! registered by calls to set_up_oda_incupd_field
 
@@ -224,9 +208,6 @@ subroutine initialize_oda_incupd( G, GV, US, param_file, CS, data_h,nz_data, res
                  default=.true.)
 
   CS%nz = GV%ke
-  CS%isc = G%isc ; CS%iec = G%iec ; CS%jsc = G%jsc ; CS%jec = G%jec
-  CS%isd = G%isd ; CS%ied = G%ied ; CS%jsd = G%jsd ; CS%jed = G%jed
-  CS%isdB = G%isdB ; CS%iedB = G%iedB; CS%jsdB = G%jsdB ; CS%jedB = G%jedB
 
   ! increments on horizontal grid
   if (.not. CS%incupdDataOngrid) call MOM_error(FATAL,'initialize_oda_incupd: '// &
@@ -421,6 +402,8 @@ subroutine calc_oda_increments(h, tv, u, v, G, GV, US, CS)
 
         do k=1,nz_data
           sum_h2 = sum_h2+h_obs(i,j,k)
+        enddo
+        do k=1,nz_data
           tmp_h(k)=(sum_h1/sum_h2)*h_obs(i,j,k)
         enddo
         ! get temperature
@@ -450,7 +433,7 @@ subroutine calc_oda_increments(h, tv, u, v, G, GV, US, CS)
         enddo
      endif
   enddo; enddo
-   
+
   ! remap u to h_obs to get increment
   if (CS%uv_inc) then
      call pass_var(h, G%Domain)

src/parameterizations/vertical/MOM_diabatic_driver.F90

@@ -112,7 +112,7 @@ module MOM_diabatic_driver
                                      !! domain.  The exact location and properties of
                                      !! those sponges are set by calls to
                                      !! initialize_sponge and set_up_sponge_field.
-  logical :: use_oda_incupd          !!< If True, DA incremental update is
+  logical :: use_oda_incupd          !< If True, DA incremental update is
                                      !! applied everywhere
   logical :: use_geothermal          !< If true, apply geothermal heating.
   logical :: use_int_tides           !< If true, use the code that advances a separate set