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
+4 −21
Merged

update to gfdl 20210806 #74

Changes from 1 commit
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
Next Next commit
remove white space and fix comment
@pjpegion
pjpegion committed Jul 29, 2021
commit a4ca3073c0cd8b7d3a106e4f3fbbe3760c3e3cd2
2 changes: 1 addition & 1 deletion src/ocean_data_assim/MOM_oda_incupd.F90
View file
Original file line number Diff line number Diff line change
@@ -450,7 +450,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)
2 changes: 1 addition & 1 deletion src/parameterizations/vertical/MOM_diabatic_driver.F90
View file
Original file line number Diff line number Diff line change
@@ -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