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

Update GFSv17 branch to v1.1.0 #34

Merged
merged 92 commits into from
Aug 28, 2024

Conversation

KateFriedman-NOAA
Copy link
Member

This PR updates the dev/gfsv17 branch to the new operational prepobs/v1.1.0. Additionally, it applies similar updates made to the obsproc package in NOAA-EMC/obsproc#92 for consolidating the spack version files and introducing spack_stack_mod_path into the modulefiles and version files. The bufr version is also updated to 1.7.0 on WCOSS2 to match the R&Ds.

The MODULEPATH for Jet is also updated to the new /contrib location after the /lfs5 migration.

Reviewers should focus on the build/module updates. The code/script updates are from the v1.1.0 upgrade in ops and are simply being synced into the dev/gfsv17 branch.

Tested in a low-res cycled experiment on Hera. Similar test is being run on WCOSS2.

Resolves #33

Related to NOAA-EMC/global-workflow#2840

ShelleyMelchior-NOAA and others added 30 commits April 25, 2022 18:08
commit cfc992f
Merge: 2b39440 4e238c5
Author: Shelley Melchior <53050457+ShelleyMelchior-NOAA@users.noreply.github.com>
Date:   Fri Apr 15 14:02:16 2022 -0400

    Merge pull request NOAA-EMC#7 from NOAA-EMC/feature/prepobs.SATEM.fix

    feature/prepobs.SATEM.fix corrects JDATE and IDSAT types for WCOSS2 compiler

commit 4e238c5
Author: Iliana Genkova <iliana.genkova@noaa.gov>
Date:   Fri Apr 15 16:54:49 2022 +0000

    Added comments

commit a8bd7d7
Author: Iliana Genkova <iliana.genkova@noaa.gov>
Date:   Fri Apr 15 14:17:26 2022 +0000

    Changed variable type and  definitions,JDATE and IDSAT, b/c WCOSS2 compiler

commit 211f42c
Author: Iliana Genkova <iliana.genkova@noaa.gov>
Date:   Fri Apr 15 03:09:43 2022 +0000

    Fixes for including ATOVS (SATEMP) in cdas prepbufr

commit d10b79e
Merge: 13bbcc0 2b39440
Author: iliana Genkova <59100254+ilianagenkova@users.noreply.github.com>
Date:   Thu Apr 7 18:54:29 2022 -0500

    Merge pull request NOAA-EMC#5 from NOAA-EMC/release/prepobs.v1.0.0

    Release/prepobs.v1.0.0

commit 2b39440
Merge: 7467fe6 c562d0f
Author: Shelley Melchior <53050457+ShelleyMelchior-NOAA@users.noreply.github.com>
Date:   Tue Mar 29 20:24:21 2022 -0400

    Merge pull request NOAA-EMC#3 from NOAA-EMC/feature/rel_prepobs.v1.0.0_div0

    Comment compute/print of "nave" as nonessential that causes division by zero

commit c562d0f
Author: Iliana Genkova <iliana.genkova@noaa.gov>
Date:   Fri Mar 18 21:35:54 2022 +0000

    Comment compute/print of nave as it's nonessential
commit d10b79e
Merge: 13bbcc0 2b39440
Author: iliana Genkova <59100254+ilianagenkova@users.noreply.github.com>
Date:   Thu Apr 7 18:54:29 2022 -0500

    Merge pull request NOAA-EMC#5 from NOAA-EMC/release/prepobs.v1.0.0

    Release/prepobs.v1.0.0

commit 2b39440
Merge: 7467fe6 c562d0f
Author: Shelley Melchior <53050457+ShelleyMelchior-NOAA@users.noreply.github.com>
Date:   Tue Mar 29 20:24:21 2022 -0400

    Merge pull request NOAA-EMC#3 from NOAA-EMC/feature/rel_prepobs.v1.0.0_div0

    Comment compute/print of "nave" as nonessential that causes division by zero

commit c562d0f
Author: Iliana Genkova <iliana.genkova@noaa.gov>
Date:   Fri Mar 18 21:35:54 2022 +0000

    Comment compute/print of nave as it's nonessential
commit cfc992f
Merge: 2b39440 4e238c5
Author: Shelley Melchior <53050457+ShelleyMelchior-NOAA@users.noreply.github.com>
Date:   Fri Apr 15 14:02:16 2022 -0400

    Merge pull request NOAA-EMC#7 from NOAA-EMC/feature/prepobs.SATEM.fix

    feature/prepobs.SATEM.fix corrects JDATE and IDSAT types for WCOSS2 compiler

commit 4e238c5
Author: Iliana Genkova <iliana.genkova@noaa.gov>
Date:   Fri Apr 15 16:54:49 2022 +0000

    Added comments

commit a8bd7d7
Author: Iliana Genkova <iliana.genkova@noaa.gov>
Date:   Fri Apr 15 14:17:26 2022 +0000

    Changed variable type and  definitions,JDATE and IDSAT, b/c WCOSS2 compiler

commit 211f42c
Author: Iliana Genkova <iliana.genkova@noaa.gov>
Date:   Fri Apr 15 03:09:43 2022 +0000

    Fixes for including ATOVS (SATEMP) in cdas prepbufr

commit d10b79e
Merge: 13bbcc0 2b39440
Author: iliana Genkova <59100254+ilianagenkova@users.noreply.github.com>
Date:   Thu Apr 7 18:54:29 2022 -0500

    Merge pull request NOAA-EMC#5 from NOAA-EMC/release/prepobs.v1.0.0

    Release/prepobs.v1.0.0

commit 2b39440
Merge: 7467fe6 c562d0f
Author: Shelley Melchior <53050457+ShelleyMelchior-NOAA@users.noreply.github.com>
Date:   Tue Mar 29 20:24:21 2022 -0400

    Merge pull request NOAA-EMC#3 from NOAA-EMC/feature/rel_prepobs.v1.0.0_div0

    Comment compute/print of "nave" as nonessential that causes division by zero

commit c562d0f
Author: Iliana Genkova <iliana.genkova@noaa.gov>
Date:   Fri Mar 18 21:35:54 2022 +0000

    Comment compute/print of nave as it's nonessential
commit ebbad4c
Merge: d10b79e 0db456e
Author: iliana Genkova <59100254+ilianagenkova@users.noreply.github.com>
Date:   Thu Jun 2 09:08:55 2022 -0500

    Merge pull request NOAA-EMC#9 from NOAA-EMC/release/prepobs.v1.0.0

    Release/prepobs.v1.0.0

commit 0db456e
Author: Shelley Melchior <Shelley.Melchior@noaa.gov>
Date:   Wed Jun 1 16:15:44 2022 +0000

    Updated to correctly locate global error table and tcvitals file.

commit cfc992f
Merge: 2b39440 4e238c5
Author: Shelley Melchior <53050457+ShelleyMelchior-NOAA@users.noreply.github.com>
Date:   Fri Apr 15 14:02:16 2022 -0400

    Merge pull request NOAA-EMC#7 from NOAA-EMC/feature/prepobs.SATEM.fix

    feature/prepobs.SATEM.fix corrects JDATE and IDSAT types for WCOSS2 compiler

commit 4e238c5
Author: Iliana Genkova <iliana.genkova@noaa.gov>
Date:   Fri Apr 15 16:54:49 2022 +0000

    Added comments

commit a8bd7d7
Author: Iliana Genkova <iliana.genkova@noaa.gov>
Date:   Fri Apr 15 14:17:26 2022 +0000

    Changed variable type and  definitions,JDATE and IDSAT, b/c WCOSS2 compiler

commit 211f42c
Author: Iliana Genkova <iliana.genkova@noaa.gov>
Date:   Fri Apr 15 03:09:43 2022 +0000

    Fixes for including ATOVS (SATEMP) in cdas prepbufr

commit d10b79e
Merge: 13bbcc0 2b39440
Author: iliana Genkova <59100254+ilianagenkova@users.noreply.github.com>
Date:   Thu Apr 7 18:54:29 2022 -0500

    Merge pull request NOAA-EMC#5 from NOAA-EMC/release/prepobs.v1.0.0

    Release/prepobs.v1.0.0

commit 2b39440
Merge: 7467fe6 c562d0f
Author: Shelley Melchior <53050457+ShelleyMelchior-NOAA@users.noreply.github.com>
Date:   Tue Mar 29 20:24:21 2022 -0400

    Merge pull request NOAA-EMC#3 from NOAA-EMC/feature/rel_prepobs.v1.0.0_div0

    Comment compute/print of "nave" as nonessential that causes division by zero

commit c562d0f
Author: Iliana Genkova <iliana.genkova@noaa.gov>
Date:   Fri Mar 18 21:35:54 2022 +0000

    Comment compute/print of nave as it's nonessential
commit d9f7fa9
Merge: 7f0b713 40fe459
Author: iliana Genkova <59100254+ilianagenkova@users.noreply.github.com>
Date:   Tue Jun 28 23:10:30 2022 -0500

    Merge pull request NOAA-EMC#10 from NOAA-EMC/feature/reconcile-release-with-NCO-4golive

    Including NCO changes for consideration to be included in

commit 40fe459
Merge: 5b599ce 7f0b713
Author: iliana Genkova <59100254+ilianagenkova@users.noreply.github.com>
Date:   Tue Jun 28 23:10:19 2022 -0500

    Merge branch 'release/prepobs.v1.0.0' into feature/reconcile-release-with-NCO-4golive

commit 7f0b713
Author: Iliana Genkova <iliana.genkova@noaa.gov>
Date:   Thu Jun 23 17:17:11 2022 +0000

    Adding nco suggested changes

commit 5b599ce
Author: Shelley Melchior <Shelley.Melchior@noaa.gov>
Date:   Fri Jun 10 00:15:03 2022 +0000

    Including NCO changes for consideration to be included in
    release/prepobs.v1.0.0.

commit 0db456e
Author: Shelley Melchior <Shelley.Melchior@noaa.gov>
Date:   Wed Jun 1 16:15:44 2022 +0000

    Updated to correctly locate global error table and tcvitals file.

commit cfc992f
Merge: 2b39440 4e238c5
Author: Shelley Melchior <53050457+ShelleyMelchior-NOAA@users.noreply.github.com>
Date:   Fri Apr 15 14:02:16 2022 -0400

    Merge pull request NOAA-EMC#7 from NOAA-EMC/feature/prepobs.SATEM.fix

    feature/prepobs.SATEM.fix corrects JDATE and IDSAT types for WCOSS2 compiler

commit 4e238c5
Author: Iliana Genkova <iliana.genkova@noaa.gov>
Date:   Fri Apr 15 16:54:49 2022 +0000

    Added comments

commit a8bd7d7
Author: Iliana Genkova <iliana.genkova@noaa.gov>
Date:   Fri Apr 15 14:17:26 2022 +0000

    Changed variable type and  definitions,JDATE and IDSAT, b/c WCOSS2 compiler

commit 211f42c
Author: Iliana Genkova <iliana.genkova@noaa.gov>
Date:   Fri Apr 15 03:09:43 2022 +0000

    Fixes for including ATOVS (SATEMP) in cdas prepbufr

commit d10b79e
Merge: 13bbcc0 2b39440
Author: iliana Genkova <59100254+ilianagenkova@users.noreply.github.com>
Date:   Thu Apr 7 18:54:29 2022 -0500

    Merge pull request NOAA-EMC#5 from NOAA-EMC/release/prepobs.v1.0.0

    Release/prepobs.v1.0.0

commit 2b39440
Merge: 7467fe6 c562d0f
Author: Shelley Melchior <53050457+ShelleyMelchior-NOAA@users.noreply.github.com>
Date:   Tue Mar 29 20:24:21 2022 -0400

    Merge pull request NOAA-EMC#3 from NOAA-EMC/feature/rel_prepobs.v1.0.0_div0

    Comment compute/print of "nave" as nonessential that causes division by zero

commit c562d0f
Author: Iliana Genkova <iliana.genkova@noaa.gov>
Date:   Fri Mar 18 21:35:54 2022 +0000

    Comment compute/print of nave as it's nonessential
module.  Completion of changes to iw3unpbf forthcoming.
Inicidental inclusion of aircraft subtype assignments for prepdata.
are ported from WCOSS1 to WCOSS2, or otherwise configured for WCOSS2.
otherwise, throughout the depth of each BUFR profile.
Refs NOAA-EMC#33
* origin/develop:
  GLERL imatch (8000,600)->(8000,900)
  Add diag print in timetwin
  para run fixes + RN + upa_* timetwin.f fix
  para run fixes + RN
  MAXOUT to 50000 in oiqcbufr.f
  update RN
  use bufr v11.7
  Replaced bufr_4_DA with bufr_4 calls
  Write RN
  Add 2 fix files thata NCO had        new file:   fix/prepobs_landc        new file:   fix/syndat_syndata.slmask.t126.gaussian
  add missing replacing IMISS with BMISS
  Add missed changes from NOAA-EMC#20
  change version
  Assure running *.ur generation on dev machine only
  do not overwrite .nr, make new .ur
  Set version to v1.1.1
  comment out stations with iprint to reduce log size
  Create modulefile for Jet
  Add references to Jet in README and build
  few last removals of prints, etc
  remove 1 more print
  delete prints, TEST1,2,3 -> GPST,X,Y
  limit for gps data is now BMISS
  Few small updates to GPSFLAG now that I can build on cactus
  Replace mpiexec with launcher_PREP
  more spacing update, more documentation
  add documentation
  add gpsflag 1(for t data) and 2(loc data)
  spacing issues, add GPSFLAG
  balloon drift arrays, vars, math fixed.
  fix xdr/lon and ydr/lat equivalencies
  add gps info to cat2. merge works all the way through
  data for 1,10 fixed.
  fixed some DAT that caused 100->**. Good now
  a
  more prints, latest trial 1/5/23
  things work, getting stuck on 0 change
  idk
  smerge works again
  prints but MCAT inc to 14 from 11
  fxi versoin
  idk
  Remove old versions/README, update VERSION
  HRDR XDR YDR all the way into balloon_drift. balloon_drift is next
  add NUMGPS
  add HP XP YP to REAL
  update order of RCAT when setting
  Updates 12.16. RDAT, other changes in prepdata.f
  testing RCAT
  1.0.0 -> 1.1.0
  ?
  add xdrydrhrdr to RCAT
  add print, xdr,ydr,hrdr
  newest adds
  add LATDH LONDH LTDH
  Updating the capability to capture vertical levels, mandatory and otherwise, throughout the depth of each BUFR profile.
  Update VERSION
  Iss49636 - Multiple changes to allow uprair data processing to prepbufr are ported from WCOSS1 to WCOSS2, or otherwise configured for WCOSS2.
  module purge -> reset
  Updatte README.md
  reshuffled files
  updated for nsst_subpfl
  Adding iw3unpbf, with vertical level sampling needing refinement. Inicidental inclusion of aircraft subtype assignments for prepdata.
  Introducing modifications for BUFR sonde processing within the prepobs module.  Completion of changes to iw3unpbf forthcoming.
  Squashed commit of the following:
  Squashed commit of the following:
  Squashed commit of the following:
  Squashed commit of the following:
  Squashed commit of the following:
- Use spack_stack_mod_path for MODULEPATH in modulefiles
- Set spack_stack_mod_path in version files
- Update bufr_ver to 11.7.0 in run.wcoss2.ver to match build
- Add modulefiles/prepobs to .gitignore

Refs NOAA-EMC#33
@KateFriedman-NOAA
Copy link
Member Author

Test on WCOSS2 was successful.

@KateFriedman-NOAA
Copy link
Member Author

@ilianagenkova In addition to my PR changes, please also see the comments from @DavidHuber-NOAA above and let me know your thoughts. Our branch will eventually make its way into whichever version of prepobs will implement alongside GFSv17 so I want to check if you're ok with them or not. Thanks! :)

@ilianagenkova
Copy link
Collaborator

@DavidHuber-NOAA , many thanks for the close inspection of the code and pointing out what could be improved!

@KateFriedman-NOAA , I am happy with @DavidHuber-NOAA's suggestions and just saw and agree your reply on the PROCESS_REMOREST_dm2 check.

Copy link
Collaborator

@ilianagenkova ilianagenkova left a comment

Choose a reason for hiding this comment

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

Good to have new eyes read our code, thanks!

@ilianagenkova
Copy link
Collaborator

@KateFriedman-NOAA should I "commit" Dave's suggestions or will you?

@KateFriedman-NOAA
Copy link
Member Author

@KateFriedman-NOAA should I "commit" Dave's suggestions or will you?

@ilianagenkova Good question. Would you prefer that we send Dave's suggestions into the develop branch directly or a release branch you're currently working on or keep them in our dev/gfsv17 branch until we merge it into a future release branch?

@ilianagenkova
Copy link
Collaborator

My preference would be to keep it in dev/gfs17 until dev/gfs17 is merged into a future release branch (which might be as soon as obsproc v1.3 - Daryl asked for something that may impact prepobs so it will be a good time to pull your changes in too). I'll keep you posted!

@KateFriedman-NOAA
Copy link
Member Author

@ilianagenkova okie dokie, thanks for that update! I'll commit @DavidHuber-NOAA's changes and we'll hold them in dev/gfsv17 for now.

KateFriedman-NOAA and others added 5 commits August 27, 2024 14:54
Refs NOAA-EMC#33

Co-authored-by: David Huber <69919478+DavidHuber-NOAA@users.noreply.github.com>
Refs NOAA-EMC#33

Co-authored-by: David Huber <69919478+DavidHuber-NOAA@users.noreply.github.com>
Refs NOAA-EMC#33

Co-authored-by: David Huber <69919478+DavidHuber-NOAA@users.noreply.github.com>
Refs NOAA-EMC#33

Co-authored-by: David Huber <69919478+DavidHuber-NOAA@users.noreply.github.com>
Copy link
Collaborator

@DavidHuber-NOAA DavidHuber-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, thanks!

@KateFriedman-NOAA KateFriedman-NOAA merged commit 234857a into NOAA-EMC:dev/gfsv17 Aug 28, 2024
KateFriedman-NOAA added a commit to KateFriedman-NOAA/prepobs that referenced this pull request Jan 31, 2025
* upstream/dev/gfsv17:
  Add/update files to build and run prepobs on Gaea C5 (NOAA-EMC#35)
  Update GFSv17 branch to v1.1.0 (NOAA-EMC#34)
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.

6 participants