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

Adding AHI and SEVIRI satwnd thinning, enrolling AHI-H9, SEVIRI-M9, SEVIRI-M10 #1263

Merged
merged 5 commits into from
Sep 4, 2024

Conversation

BrettHoover-NOAA
Copy link
Collaborator

This PR enrolls AHI-Himawari9, SEVIRI-METEOSAT9, and SEVIRI-METEOSAT10 satwnd types into JEDI, and establishes thinning for AHI and SEVIRI satwnd observations in their corresponding *.yaml.j2 files. This is the NOAA-EMC/GDASApp portion of the work, which enrolls the updated AHI and SEVIRI satwnd types in the bufr2ioda JSON files.

This is dependent on NOAA-EMC/jcb-gdas#25, which has the corresponding yaml.j2 files for AHI and SEVIRI satwnd observations and the thinning filters.

Thinning tests to define the filter settings can be found in #1143

@BrettHoover-NOAA BrettHoover-NOAA self-assigned this Aug 26, 2024
CoryMartin-NOAA pushed a commit to NOAA-EMC/jcb-gdas that referenced this pull request Aug 27, 2024
…EVIRI-M10 (#25)

This PR enrolls AHI-Himawari9, SEVIRI-METEOSAT9, and SEVIRI-METEOSAT10
satwnd types into JEDI, and establishes thinning for AHI and SEVIRI
satwnd observations in their corresponding *.yaml.j2 files. This is the
NOAA-EMC/jcb-gdas portion of the work, which provides the yaml.j2 files
for AHI and SEVIRI satwnd types with proper thinning filter settings.

This is dependent on NOAA-EMC/GDASApp#1263,
which has the corresponding bufr2ioda JSON files for enrolling the
updated AHI and SEVIRI satwnd types.

Thinning tests to define the filter settings can be found in
NOAA-EMC/GDASApp#1143

Co-authored-by: Brett Hoover <bhoover@orion-login-3.hpc.msstate.edu>
@CoryMartin-NOAA
Copy link
Contributor

@BrettHoover-NOAA go ahead and update the JCB-GDAS hash

Copy link
Collaborator

@nicholasesposito nicholasesposito left a comment

Choose a reason for hiding this comment

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

Looks fine

Copy link
Collaborator

@PraveenKumar-NOAA PraveenKumar-NOAA left a comment

Choose a reason for hiding this comment

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

Looks good to me.

@CoryMartin-NOAA
Copy link
Contributor

@BrettHoover-NOAA please update the jcb-gdas hash in this PR and then it should be ready to merge

@BrettHoover-NOAA
Copy link
Collaborator Author

@BrettHoover-NOAA please update the jcb-gdas hash in this PR and then it should be ready to merge

@CoryMartin-NOAA how do i update the jcb-gdas hash?

@CoryMartin-NOAA
Copy link
Contributor

@BrettHoover-NOAA
cd parm/jcb-gdas
git checkout develop
cd ../
git add jcb-gdas
git commit

I think that should do the trick.

@BrettHoover-NOAA
Copy link
Collaborator Author

@CoryMartin-NOAA Doesn't seem to work, jcb-gdas doesn't show up as something to add when I do a git status after checking out develop branch in parm/jcb-gdas

@BrettHoover-NOAA
Copy link
Collaborator Author

I'm going to update with develop here and pull a fresh version to local repository before doing anything

@CoryMartin-NOAA
Copy link
Contributor

@BrettHoover-NOAA you might need to do a git pull on the jcb-gdas submodule once you are in develop to ensure you are getting the latest hash there

@BrettHoover-NOAA
Copy link
Collaborator Author

@CoryMartin-NOAA I'm running into an issue with which branch updates what. I can move to parm/jcb-gdas and checkout develop, and perform a git pull and bring the hash up to date. But when I move back to GDASApp/ I'm still on the develop branch. If I checkout the feature/add_satwnd_thinning branch, it reverts parm/jcb-gdas to its original hash. I can't seem to update jcb-gdas hash on my feature branch.

@CoryMartin-NOAA
Copy link
Contributor

@BrettHoover-NOAA are you on your feature branch before you try to cd parm/jcb-gdas and checkout/pull develop inside of there? This sounds odd.

@BrettHoover-NOAA
Copy link
Collaborator Author

@CoryMartin-NOAA The sequence I have been trying is:
start in feature branch of GDASApp
cd parm/jcb-gdas
checkout develop
git pull
cd ../.. back to GDASApp
now I am in develop branch of GDASApp. I can checkout my feature branch from here, but it reverts jcb-gdas back to whatever hash it was set on in the feature branch.

Is there a step I'm missing?

@CoryMartin-NOAA
Copy link
Contributor

@BrettHoover-NOAA I just did the following:

   19  git checkout -b feature/test
   20  git branch
   21  git status
   22  cd jcb-gdas/
   23  git checkout develop
   24  git log
   25  cd ..
   26  git branch
   27  history
   28  git status
   29  history

and I see with git status

On branch feature/test
Changes not staged for commit:
  (use "git add <file>..." to update what will be committed)
  (use "git restore <file>..." to discard changes in working directory)
	modified:   jcb-gdas (new commits)

no changes added to commit (use "git add" and/or "git commit -a")

So it seems it is working for me. I wonder if by some chance your submodules are screwed up.

When you cd into jcb-gdas what does git remote -v say? It should say

origin	https://github.com/noaa-emc/jcb-gdas (fetch)
origin	https://github.com/noaa-emc/jcb-gdas (push)

I fear it may say

origin	https://github.com/NOAA-EMC/GDASApp.git (fetch)
origin	https://github.com/NOAA-EMC/GDASApp.git (push)

@BrettHoover-NOAA
Copy link
Collaborator Author

@CoryMartin-NOAA it is as you feared:

git remote -v
origin	https://github.com/NOAA-EMC/GDASApp.git (fetch)
origin	https://github.com/NOAA-EMC/GDASApp.git (push)

@CoryMartin-NOAA
Copy link
Contributor

@BrettHoover-NOAA huh weird. Well I vote we don't worry too much about this and I can push the updated hash to this branch, does that work for you?

@BrettHoover-NOAA
Copy link
Collaborator Author

@CoryMartin-NOAA sure, that works fine for me

@CoryMartin-NOAA CoryMartin-NOAA merged commit 1357564 into develop Sep 4, 2024
5 checks passed
@CoryMartin-NOAA CoryMartin-NOAA deleted the feature/add_satwnd_thinning branch September 4, 2024 21:10
DavidHuber-NOAA added a commit to DavidHuber-NOAA/GDASApp that referenced this pull request Sep 9, 2024
* origin/develop:
  Turn on OMA diagnostics after JEDI minimization (NOAA-EMC#1274)
  Adding AHI and SEVIRI satwnd thinning, enrolling AHI-H9, SEVIRI-M9, SEVIRI-M10 (NOAA-EMC#1263)
  add ctest to create yaml for lgetkf observer ctest (NOAA-EMC#1272)
  add soca fix yaml file for 1deg (NOAA-EMC#1270)
  Fix to marine post and archiving (NOAA-EMC#1266)
  Add JPSSRR sea-ice product to ioda converter (NOAA-EMC#1259)
  enable atmospheric lgetkf ctests to run in combined and split modes (NOAA-EMC#1262)
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.

4 participants