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.

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

GitHub Issue NOAA-EMC/GSI#353. RO Updates #354

Merged
merged 1 commit into from
Apr 20, 2022

Conversation

ADCollard
Copy link
Contributor

This pull request is related to Issue #353.

This updates the src/ components of the changes proposed by @LidiaCucurull-NOAA. Fix and workflow updates will follow.

One very minor change to src/gsi/pcgsoi.f90 is also included which is a change suggested by @jderber-NOAA to improve convergence.

Regression tests have passed except where differences are expected.

Copy link
Contributor

@MichaelLueken MichaelLueken left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hi Andrew,

I went ahead and completed a quick initial visual inspection of the changes. There were two minor issues, both in src/gsi/setupbend.f90:

  1. Please ensure 132 character limit per line on lines 587 - 598.
  2. Please add proper precision to real value 0.05 on line 798.

Also, I noted a second commit message. To remove the extraneous commit messages, please do the following in your local copy of RO_Updates:

  1. git reset --soft HEAD~1 (this will remove the current commit message, but keep the changes to the four files).
  2. git commit -m "GitHub issue NOAA-EMC/GSI#353: GNSS RO Upgrade" (this will add back in the correct commit message that you currently have).
  3. git push origin RO_Updates --force (this will allow you to push the corrected commit message and other changes back to your fork and update this PR).

If you have any questions or encounter any issues, please let me know.


! Accumulate diagnostic information
rdiagbuf( 5,i) = (data(igps,i)-dbend)/data(igps,i) ! incremental bending angle (x100 %)

data(igps,i)=data(igps,i)-dbend !innovation vector

! Remove very large simulated values
if(dbend > 0.05) then
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please add proper precision to real value, 0.05 (i.e., 0.05_r_kind)

Comment on lines 587 to 602
if ((tpdpres(i)<ref_rad(top_layer_SR+1)).and.(tpdpres(i)<ref_rad(bot_layer_SR))) then !obs below model SR/close-to-SR layer
qcfail(i)=.true.
elseif (tpdpres(i)>ref_rad(top_layer_SR+5)) then ! obs above SR/close-to-SR layer
qcfail(i)=.false.
if(hob < top_layer_SR+1) then !location might be aliased to the lower section of the non-monotonicity
hob = tpdpres(i)
call grdcrd1(hob,ref_rad(top_layer_SR+1),nsig-top_layer_SR-1,1) ! only non-monotonic section above SR layer
data(ihgt,i) = hob+top_layer_SR
hob = hob+top_layer_SR
rdiagbuf(19,i) = hob
endif
else ! obs inside model SR/shadow or close-to-SR layer
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please ensure that the 132 character limit per line is met. There are several empty spaces on lines 586, 587, 589, 591, 593, and line 598. After the removal of the blank spaces, line 587 will still exceed the 132 character limit per line. Please break up line 587 so that the 132 character limit is maintained.

@ADCollard
Copy link
Contributor Author

ADCollard commented Apr 4, 2022 via email

@ADCollard
Copy link
Contributor Author

ADCollard commented Apr 4, 2022 via email

@emilyhcliu
Copy link
Contributor

@ADCollard I got the same error before. I just did what was suggested by the system (do "git pull" before doing "git push")

@MichaelLueken
Copy link
Contributor

@ADCollard When you use the git reset --soft HEAD~1 command, you will need to use:

git push origin RO_Updates --force in order for GitHub to accept the update.

Using git pull, then git push origin RO_Updates will bring back the extra commit message, which isn't desired.

@ADCollard
Copy link
Contributor Author

ADCollard commented Apr 4, 2022 via email

@MichaelLueken
Copy link
Contributor

@ADCollard Thank you very much for removing the previous commit message and making the requested updates to src/gsi/setupbend.f90. To return the PR to having a single commit message:

  1. git reset --soft HEAD~1
  2. git commit --amend
  3. Please save and close commit message window without altering commit message
  4. git push origin RO_Updates --force

Then, so long as there are no further feedback from reviewers (and if there is additional changes to be made, please use git commit --amend rather than git commit after the changes have been made), I should be able to get this work out to the review committee shortly.

Please let me know if you have any questions or encounter issues.

@HaixiaLiu-NOAA
Copy link
Contributor

The sentinel-6 needs to added into the global_convinfo.txt. And one minor comment on the code changes: Is there a need that the Jacobian QC is changed as a option to switch on/off instead of completely being removed in case we need it in the future?

@ADCollard
Copy link
Contributor Author

@HaixiaLiu-NOAA , I was going to add the fix changes later as suggested by @MichaelLueken-NOAA. My understanding is that the Jacobian QC is no longer needed because of other QC modifications (p7 of the attached presentation), so making this switchable is probably not necessary.

@CatherineThomas-NOAA
Copy link
Collaborator

Has @dtkleist signed off on removing the Jacobian QC? When the bug fixes were added in DO-3, he pushed keeping the QC as a risk mitigation measure. It doesn't do any harm if it sticks around and doesn't catch anything, correct? Or would this QC stop good observations from getting in now that the bugs and other QC have been addressed?

@LidiaCucurull-NOAA
Copy link
Contributor

LidiaCucurull-NOAA commented Apr 5, 2022 via email

@ADCollard
Copy link
Contributor Author

Based on feedback from @HaixiaLiu-NOAA and @CatherineThomas-NOAA and an abundance of caution, I have modified the code to allow the Jacobian QC to be switchable with the addition of the gps_jacqc variable in the OBSQC namelist. This is set to .false. by default, so the results do not change from @LidiaCucurull-NOAA 's original unless this variable is set.

Copy link
Contributor

@HaixiaLiu-NOAA HaixiaLiu-NOAA left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

changes look good to me. Approved.

Copy link
Collaborator

@CatherineThomas-NOAA CatherineThomas-NOAA left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Changes look good.

@ADCollard
Copy link
Contributor Author

I was planning to add a change to the exglobal_atmos_analysis.sh, but I think this is best done in the workflow. So I believe this is good to go except for the fix changes.

@HaixiaLiu-NOAA, I think you need to re-approve as I made the jacobian QC change after you approved.

Copy link
Contributor

@HaixiaLiu-NOAA HaixiaLiu-NOAA left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

changes are good.

@MichaelLueken MichaelLueken changed the title RO Updates GitHub Issue NOAA-EMC/GSI#353. RO Updates Apr 20, 2022
@MichaelLueken
Copy link
Contributor

There has been no feedback from the review committee for this PR, so I will now give final approval and merge this work to the authoritative repository.

@MichaelLueken MichaelLueken merged commit 0c6548e into NOAA-EMC:master Apr 20, 2022
@ADCollard
Copy link
Contributor Author

Thanks @MichaelLueken-NOAA . I do still have fix file changes - should these be coordinated with one of the other pull requests?

@MichaelLueken
Copy link
Contributor

Hi @ADCollard. Fix files can go in so long as there are no changes out to the review committee. Please follow the guidance to update the fix files, then give me the name of the branch in the fix submodule so I can merge it in. All fix branches need to be manually merged back into rev2 by me, so this is the best and easiest way to work fix changes.

EdwardSafford-NOAA pushed a commit to EdwardSafford-NOAA/GSI that referenced this pull request May 27, 2022
AndrewEichmann-NOAA pushed a commit to AndrewEichmann-NOAA/GSI that referenced this pull request Jun 6, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

GNSS RO algorithm changes for GFS v16.x
6 participants