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

Bring GFS.v16 features back to develop branch #274

Merged
merged 25 commits into from
Nov 17, 2020

Conversation

junwang-noaa
Copy link
Collaborator

@junwang-noaa junwang-noaa commented Nov 12, 2020

Description

This PR merges the GFS.v16 dycore changes back to the EMC dev/emc branch. Also nceppost is changed to upp version in GFSv16.
Due to the upp lib and post control file changes, the results are expected to change for post RT test, no change for other test.

Issue(s) addressed

#251 : Bring GFS.v16 features back to develop branch

Testing

RT tests have been run on supported platforms; hera, orion, dell and cray.
The post RT test has results change while other RT tests have not.

Dependencies

Associate PRs:
dycore PR #44
fv3atm PR #196
ufs-weather-model PR #274

Copy link
Contributor

@WenMeng-NOAA WenMeng-NOAA left a comment

Choose a reason for hiding this comment

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

The UPP part looks good to me.

@WenMeng-NOAA
Copy link
Contributor

@junwang-noaa I saw some updates of paths of hpc-stack in modulefiles. I assume with this PR merged, the develop will be used for the upcoming developments e.g. GFS V17?

@junwang-noaa
Copy link
Collaborator Author

junwang-noaa commented Nov 12, 2020 via email

@WenMeng-NOAA
Copy link
Contributor

WenMeng-NOAA commented Nov 12, 2020 via email

@@ -15,13 +15,13 @@ setenv CMAKE_CXX_COMPILER mpiicpc
setenv CMAKE_Fortran_COMPILER mpiifort
setenv CMAKE_Platform hera.intel

module use /scratch2/NCEPDEV/nwprod/hpc-stack/libs/hpc-stack/v1.0.0-beta1/modulefiles/stack
module use /scratch2/NCEPDEV/nwprod/hpc-stack/test/modulefiles/stack
Copy link
Collaborator

Choose a reason for hiding this comment

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

Please use the same naming convention for hpc-stack installation (lib/hpc-stack/vX.Y.Z). hpc-stack repo must have a tag pointing to that exact version number.

@junwang-noaa
Copy link
Collaborator Author

junwang-noaa commented Nov 13, 2020 via email

gfsv16_20201015: modulefiles and regression test logs for cheyenne.{intel,gnu} and hera.{intel,gnu}
@junwang-noaa
Copy link
Collaborator Author

junwang-noaa commented Nov 17, 2020 via email

@climbfuji
Copy link
Collaborator

Thanks, Dom. I will copy the baseline to hera. My orion job has not finished yet.

No problem. I already started copying the baseline directories on hera, but it's very slow again:

rsync -av /scratch1/BMC/gmtb/Dom.Heinzeller/FV3_RT/TMP_PR274_BASELINE_GNU/ /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20201112/GNU/
rsync -av /scratch1/BMC/gmtb/Dom.Heinzeller/FV3_RT/TMP_PR274_BASELINE_INTEL/ /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20201112/INTEL/

Will let you know when it is done.

Copy link
Collaborator

@climbfuji climbfuji left a comment

Choose a reason for hiding this comment

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

I created new baselines on hera.{intel,gnu} and cheyenne.{intel,gnu}, and verified successfully against them. Changes look good to me, but we need to clarify the version number in the next commit at least (see @DusanJovic-NOAA's comments).

@junwang-noaa junwang-noaa added Baseline Updates Current baselines will be updated. Ready for Commit Queue The PR is ready for the Commit Queue. All checkboxes in PR template have been checked. Waiting for Reviews The PR is waiting for reviews from associated component PR's. labels Nov 17, 2020
@climbfuji
Copy link
Collaborator

Thanks, Dom. I will copy the baseline to hera. My orion job has not finished yet.

No problem. I already started copying the baseline directories on hera, but it's very slow again:

rsync -av /scratch1/BMC/gmtb/Dom.Heinzeller/FV3_RT/TMP_PR274_BASELINE_GNU/ /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20201112/GNU/
rsync -av /scratch1/BMC/gmtb/Dom.Heinzeller/FV3_RT/TMP_PR274_BASELINE_INTEL/ /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20201112/INTEL/

Will let you know when it is done.

This is done. I am going to delete the temporary baselines now.

Copy link
Contributor

@aerorahul aerorahul left a comment

Choose a reason for hiding this comment

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

Need tag of hpc-stack and not branches from some individual developers.

@@ -15,13 +15,13 @@ setenv CMAKE_CXX_COMPILER mpicxx
setenv CMAKE_Fortran_COMPILER mpif90
setenv CMAKE_Platform hera.gnu

module use /scratch2/NCEPDEV/nwprod/hpc-stack/libs/hpc-stack/v1.0.0-beta1/modulefiles/stack

module use /scratch2/NCEPDEV/nwprod/hpc-stack/test/modulefiles/stack
Copy link
Contributor

Choose a reason for hiding this comment

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

Here and elsewhere, please use a tagged version from hpc-stack before merging this in develop

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

It looks to me that this is an issue with NCEPLIBS group, not the model. If there is an requirement that hpc-stack needs to have version number, then nceplibs group needs to know it and follow that. We need to get the GFS.v16 merged to develop branch so people can start further development. This is the only hpc stack lib provided to us. We can have a meeting with NCEPLIBS group asking them to accept the rule about version requirement, when they come out a new hpc-stack version, we will update it in the model. But so far we have tested this hpc stack library in the model and it is working and we can not afford further delay.

@@ -15,13 +15,13 @@ setenv CMAKE_CXX_COMPILER mpiicpc
setenv CMAKE_Fortran_COMPILER mpiifort
setenv CMAKE_Platform hera.intel

module use /scratch2/NCEPDEV/nwprod/hpc-stack/libs/hpc-stack/v1.0.0-beta1/modulefiles/stack
module use /scratch2/NCEPDEV/nwprod/hpc-stack/test/modulefiles/stack
Copy link
Contributor

Choose a reason for hiding this comment

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

need a tag.

@@ -15,13 +15,13 @@ setenv CMAKE_CXX_COMPILER mpiicpc
setenv CMAKE_Fortran_COMPILER mpiifort
setenv CMAKE_Platform hera.intel

module use /scratch2/NCEPDEV/nwprod/hpc-stack/libs/hpc-stack/v1.0.0-beta1/modulefiles/stack
module use /scratch2/NCEPDEV/nwprod/hpc-stack/test/modulefiles/stack
Copy link
Contributor

Choose a reason for hiding this comment

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

need a tag.

@@ -14,13 +14,13 @@ setenv CMAKE_CXX_COMPILER mpiicpc
setenv CMAKE_Fortran_COMPILER mpiifort
setenv CMAKE_Platform orion.intel

module use /apps/contrib/NCEP/libs/hpc-stack/v1.0.0-beta1/modulefiles/stack
module use /apps/contrib/NCEP/test/hpc-stack-nco/modulefiles/stack
Copy link
Contributor

Choose a reason for hiding this comment

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

need a tag from develop

@@ -18,13 +18,13 @@ setenv CMAKE_CXX_COMPILER mpiicpc
setenv CMAKE_Fortran_COMPILER mpiifort
setenv CMAKE_Platform wcoss_dell_p3

module use /usrx/local/nceplibs/dev/hpc-stack/libs/hpc-stack/v1.0.0-beta1/modulefiles/stack
module use /usrx/local/nceplibs/dev/hpc-stack/test/hpc-stack/modulefiles/stack
Copy link
Contributor

Choose a reason for hiding this comment

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

NCEPLIBS team decided on using tags and versions with x.y.z and not using test or branches.

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

@aerorahul would you please open an issue in NCEPLIBS about this requirement?

@DomHeinzeller
Copy link
Contributor

For my planning, can we get started with merging the PRs, or do the modulefile comments (use proper versions instead of test) need to be addressed first?

@junwang-noaa
Copy link
Collaborator Author

@aerorahul Please bring the issue with NCEPLIBS team about the requirement. Model only uses the hpc-stack lib provided to us.

@aerorahul aerorahul self-requested a review November 17, 2020 21:16
@aerorahul
Copy link
Contributor

@junwang-noaa I removed my block.

@aerorahul aerorahul requested review from aerorahul and removed request for aerorahul November 17, 2020 21:25
@junwang-noaa
Copy link
Collaborator Author

junwang-noaa commented Nov 17, 2020 via email

@aerorahul
Copy link
Contributor

@aerorahul this PR still shows " [image: @aerorahul] https://github.com/aerorahul aerorahul requested changes ".

On Tue, Nov 17, 2020 at 4:25 PM Rahul Mahajan @.***> wrote: @junwang-noaa https://github.com/junwang-noaa I removed my block. — You are receiving this because you were mentioned. Reply to this email directly, view it on GitHub <#274 (comment)>, or unsubscribe https://github.com/notifications/unsubscribe-auth/AI7D6TM2BNCLLBO5Q2QFQ3TSQLS3HANCNFSM4TTTQ4JA .

Not to me.
I dismissed my review.

@climbfuji
Copy link
Collaborator

climbfuji commented Nov 17, 2020

@aerorahul this PR still shows " [image: @aerorahul] https://github.com/aerorahul aerorahul requested changes ".

On Tue, Nov 17, 2020 at 4:25 PM Rahul Mahajan @.***> wrote: @junwang-noaa https://github.com/junwang-noaa I removed my block. — You are receiving this because you were mentioned. Reply to this email directly, view it on GitHub <#274 (comment)>, or unsubscribe https://github.com/notifications/unsubscribe-auth/AI7D6TM2BNCLLBO5Q2QFQ3TSQLS3HANCNFSM4TTTQ4JA .

Not to me.
I dismissed my review.

I think @DusanJovic-NOAA needs to approve (his review still says "requesting changes").

@junwang-noaa junwang-noaa merged commit b771e5b into ufs-community:develop Nov 17, 2020
@climbfuji
Copy link
Collaborator

Hooray!

@junwang-noaa junwang-noaa deleted the gfsv16_20201015 branch April 20, 2021 18:24
pjpegion pushed a commit to NOAA-PSL/ufs-weather-model.p7b that referenced this pull request Jul 20, 2021
epic-cicd-jenkins pushed a commit that referenced this pull request Apr 17, 2023
…es and add support for global/regional grib2 functionality in chgres_cube (#274)

* Remove all references to /lfs3 on Jet

* Add Ben and Ratko to the CODEOWNERS file

* Replace hard-coded make_orog module file with build-level module file in UFS_UTILS

* Remove hard-coded make_sfc_climo module file

* Add changes for merged chgres_cube code

* Add changes for merged chgres_cube code

* Minor tweak to FCST_LEN_HRS default in config.community.sh

* Changes to make the release version of chgres_cube run in regional_workflow

* Changes for regional_grid build on Jet

* Changes to regional_grid build for Hera

* Change regional_grid makefile for hera

* Remove leading zero from FCST_LEN_HRS in config.community.sh

* Remove /sorc directory

* Remove build module files for codes originally in the regional_workflow repository.  Remove run-time make_grid module file for all platforms.  Will be sourced from UFS_UTILS from now on.

* Update regional grid template for newest code

* Copy make_grid module file from UFS_UTILS

* Add make_grid.local file for most platforms

* Remove alpha and kappa parameters from the regional_grid namelist

* Modifications to file type conventions in the chgres_cube namelist for FV3GFS and GSMGFS nemsio files

* Set convert_nst=False for global grib2 FV3GFS files when running chgres_cube

* Add tracers back into nemsio file processing

* Changes to the make_lbcs ex-script (remove all surface-related variables)

* Fix for modulefiles

* Fixes after merging authoritative repo into fork

* Add Thompson climo to chgres_cube namelist for appropriate external model/SDF combinations

* Commit new locations for Thompson climo fix file

* Change FIXsar to FIXLAM

* Change gfs_bndy.nc to gfs.bndy.nc

* Move file

* Bug fixes to setup.sh and exregional_make_ics.sh

* Add support for NAM grib2 files

* Path fix

* Typo fix

* Fix extension on UPP grib2 files

* Bug fix for if statement

* Add .grib2 extension to soft links

* Fix nsoill_out values based on LSM scheme in CCPP suite

* Fix grib2 extensions

* Add if statement for varmap tables when using Thompson MP and initializing from non-RAP/HRRR data

* Final modifications to support NAM grib2 files in regional_workflow

* Set climo as default for soil variables when using HRRRX (user will need change this if they know these variables are available for the dates they are running).

* Add FV3_CPT_v0 to varmap if statement

* Changes to post file names to make model lowercase and move ${fhr} to three values instead of two

* Change "rrfs" to "${NET}" instead

* Revert "Add FV3_CPT_v0 to varmap if statement"

This reverts commit b04ad0b3c8c554f664c6790030a4f33b5a395023.

* Add HALO_BLEND back into config_defaults.sh

* Set do_deep=false for RRFS_v1beta and other RAP/HRRR suites

* Fix if statement for lsoil variable in generate step.

* Remove link to fixed file in UFS_UTILS source code directory, now points to FIXgsm

* Typo in config_defaults.sh and remove unused SDFs from the make_ics/lbcs scripts, from Gerard's PR

* Add FV3_CPT_v0 to list of SDFs that use the GFS varmap table

* Remove wgrib2 module load from local make_ics/lbcs files

* Use correct system calls for setting up Cheyenne python environment now that these are proper modulefiles

Co-authored-by: Michael Kavulich, Jr <kavulich@ucar.edu>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Baseline Updates Current baselines will be updated. Ready for Commit Queue The PR is ready for the Commit Queue. All checkboxes in PR template have been checked. Waiting for Reviews The PR is waiting for reviews from associated component PR's.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants