Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

update to gfdl 20210806 #74

Merged
merged 4 commits into from
Aug 16, 2021
Merged

update to gfdl 20210806 #74

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a4ca307
remove white space and fix comment
pjpegion Jul 29, 2021
cf46bc9
Update MOM_oda_incupd.F90
pjpegion Aug 5, 2021
3fb3a4c
Merge pull request #5 from pjpegion/patch-1
jiandewang Aug 5, 2021
e794c41
Merge pull request #1454 from jiandewang/EMC-IAU-candidate-20210727
marshallward Aug 6, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 3 additions & 20 deletions src/ocean_data_assim/MOM_oda_incupd.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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: '// &
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion src/parameterizations/vertical/MOM_diabatic_driver.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,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
Expand Down