adding extra surface fields to the model output#378

Merged

WenMeng-NOAA merged 18 commits into

NOAA-EMC:developfrom

HelinWei-NOAA:develop

Sep 22, 2021

Contributor

HelinWei-NOAA commented Sep 11, 2021

as described in the issue 376

HelinWei-NOAA and others added 5 commits

September 11, 2021 13:45


          add some extra surface fields to the model output

49eaec1


          Merge branch 'develop' into add_new_land_output

342c029


          Merge pull request #1 from HelinWei-NOAA/add_new_land_output

a2324ed

add some extra surface fields to the model output


          correct the name of the variable

f6af0a3


          Merge pull request #2 from HelinWei-NOAA/correct_name

0f1443b

correct the name of the variable

WenMeng-NOAA reviewed

View reviewed changes

parm/post_avblflds.xml Outdated

HelinWei-NOAA and others added 2 commits

September 12, 2021 20:00


          fix typo

f86a368


          Merge pull request #3 from HelinWei-NOAA/fixtypo

455e1dc

fix typo

Contributor Author

HelinWei-NOAA commented Sep 13, 2021

one sample history that includes all of these additional surface fields:
/scratch1/NCEPDEV/stmp2/Helin.Wei/RUNDIRS/ufs2scm/gfs.20200121/00/gfs.t00z.sfcf006.nc on hera

WenMeng-NOAA linked an issue

that may be closed by this pull request

adding some extra surface fields to the model output #376

Closed

WenMeng-NOAA added the GFSV17 label

HelinWei-NOAA and others added 6 commits

September 13, 2021 22:15


          correct the index in the surface.f

02a8290


          Merge pull request #4 from HelinWei-NOAA/correct_index_surface

0143ec5

correct the index in the surface.f


          fix the time stamp

3d08189


          Merge pull request #5 from HelinWei-NOAA/fixtimestamp

488e850

fix the time stamp


          put most extra fields to the flux instead of the master file

bb128c4


          Merge pull request #6 from HelinWei-NOAA/fixtimestamp

3eaf432

put most extra fields to the flux instead of the master file

Collaborator

WenMeng-NOAA commented Sep 20, 2021

@HelinWei-NOAA Could you sync your branch with upstream/develop? The procedure can be found at https://github.com/NOAA-EMC/UPP/wiki/UPP-Code-Development#update-your-branch-at-your-fork-with-branch-develop-at-authoritative-repository


          Merge branch 'NOAA-EMC:develop' into develop

WenMeng-NOAA added the Baseline Change label

Contributor Author

HelinWei-NOAA commented Sep 20, 2021

the new test data
/scratch1/NCEPDEV/stmp2/Helin.Wei/RUNDIRS/ufs2scm/gfs.20190620/00

WenMeng-NOAA added the New input data required label

Collaborator

WenMeng-NOAA commented Sep 20, 2021

the new test data
/scratch1/NCEPDEV/stmp2/Helin.Wei/RUNDIRS/ufs2scm/gfs.20190620/00
I conducted the UPP standalone test on GFS with your new model history files. The results are at
/scratch1/NCEPDEV/stmp2/Wen.Meng/com2/gfs/test/gfs.20190620/00. Please verify them.

HelinWei-NOAA and others added 2 commits

September 20, 2021 13:02


          update control file

42549df


          Merge pull request #7 from HelinWei-NOAA/update_control_file

7f44720

update control file

WenMeng-NOAA requested a review from barlage

September 20, 2021 17:16

WenMeng-NOAA mentioned this pull request

adding some extra surface fields to the model output #376

Closed

Contributor Author

HelinWei-NOAA commented Sep 20, 2021

@HelinWei-NOAA

the new test data
/scratch1/NCEPDEV/stmp2/Helin.Wei/RUNDIRS/ufs2scm/gfs.20190620/00
I conducted the UPP standalone test on GFS with your new model history files. The results are at
/scratch1/NCEPDEV/stmp2/Wen.Meng/com2/gfs/test/gfs.20190620/00. Please verify them.

The results look good.

Collaborator

WenMeng-NOAA commented Sep 21, 2021

The UPP regression tests were conducted on WCOSS-Dell, WCOSS-Cray, Hera. A new baseline for gfs is needed after this PR merging.

WenMeng-NOAA reviewed

View reviewed changes

sorc/ncep_post.fd/SURFCE.f Outdated

+              !
+                       IF (IGET(1002)>0) THEN
+                        IF(MODELNAME == 'NCAR'.OR.MODELNAME=='RSM' .OR. &

Collaborator

WenMeng-NOAA Sep 21, 2021

@HelinWei-NOAA I don't think a specified setting is needed for RAPR, NCAR, RSM models since this is total new field.

Contributor Author

HelinWei-NOAA Sep 21, 2021

removed

WenMeng-NOAA reviewed

View reviewed changes

sorc/ncep_post.fd/SURFCE.f Outdated

+                       ENDDO
+                       ID(1:25) = 0
+                       ITPREC     = NINT(TPREC)
+              !mp

Collaborator

WenMeng-NOAA Sep 21, 2021

@HelinWei-NOAA Please remove this comment line.

Contributor Author

HelinWei-NOAA Sep 21, 2021

removed

WenMeng-NOAA reviewed

View reviewed changes

sorc/ncep_post.fd/SURFCE.f Outdated

+                       else
+                         IFINCR     = 0
+                       endif
+              !mp

Collaborator

WenMeng-NOAA Sep 21, 2021

@HelinWei-NOAA Please remove this comment line.

WenMeng-NOAA reviewed

View reviewed changes

sorc/ncep_post.fd/SURFCE.f Outdated

+                       ENDDO
+                       ID(1:25) = 0
+                       ITPREC     = NINT(TPREC)
+              !mp

Collaborator

WenMeng-NOAA Sep 21, 2021

@HelinWei-NOAA Please remove this comment line.

Contributor Author

HelinWei-NOAA Sep 21, 2021

removed

WenMeng-NOAA reviewed

View reviewed changes

sorc/ncep_post.fd/SURFCE.f Outdated

+                       else
+                         IFINCR     = 0
+                       endif
+              !mp

Collaborator

WenMeng-NOAA Sep 21, 2021

@HelinWei-NOAA Please remove this comment line.

Contributor Author

HelinWei-NOAA Sep 21, 2021

removed

WenMeng-NOAA reviewed

View reviewed changes

sorc/ncep_post.fd/SURFCE.f Outdated

+                       ENDDO
+                       ID(1:25) = 0
+                       ITPREC     = NINT(TPREC)
+              !mp

Collaborator

WenMeng-NOAA Sep 21, 2021

@HelinWei-NOAA Please remove this comment line.

Contributor Author

HelinWei-NOAA Sep 21, 2021

removed

WenMeng-NOAA reviewed

View reviewed changes

sorc/ncep_post.fd/SURFCE.f Outdated

+                       else
+                         IFINCR     = 0
+                       endif
+              !mp

Collaborator

WenMeng-NOAA Sep 21, 2021

@HelinWei-NOAA Please remove this comment line.

Contributor Author

HelinWei-NOAA Sep 21, 2021

removed

HelinWei-NOAA and others added 2 commits

September 21, 2021 19:30


          clean the code

e8fb7fe


          Merge pull request #8 from HelinWei-NOAA/update_control_file

clean the code

Contributor Author

HelinWei-NOAA commented Sep 22, 2021

The test data for C768 can be found from /scratch1/NCEPDEV/stmp2/Helin.Wei/RUNDIRS/ufs2scm/gfs.20210216/00

barlage approved these changes

View reviewed changes

barlage left a comment

As much as I understand this, everything looks good to me.

Collaborator

WenMeng-NOAA commented Sep 22, 2021

@barlage Thanks for code review.

Collaborator

WenMeng-NOAA commented Sep 22, 2021

The UPP regression test baseline for gfs was recreated with model output provided by the developer from 2021021600 F006 on Hera, WCOSS-Dell and WCOSS-Cray.

WenMeng-NOAA approved these changes

View reviewed changes

WenMeng-NOAA merged commit 1aaec8d into NOAA-EMC:develop

WenMeng-NOAA mentioned this pull request

Updates in branch develop #166

Closed

HelinWei-NOAA mentioned this pull request

Noah MP updates for Prototype 8 (GFSv17) ufs-community/ufs-weather-model#927

Merged

16 tasks

EricJames-NOAA pushed a commit to EricJames-NOAA/UPP that referenced this pull request


          Feature/update model namelist definitions (NOAA-EMC#377)

6ebb6d9

## DESCRIPTION OF CHANGES: 
Part of the effort described in ufs-community/ufs-srweather-app#71 to update the master branch of ufs-srweather-app to a functioning state.

Updates include:

 - Cherry-picking 5a4b90e7 from release branch in order to include the RRFS_v1alpha CCPP suite, as well as fixing some updated namelist settings in the ufs-weather-model
 - Fixing other namelist options that have been updated in ufs-weather-model

This PR must be merged prior to ufs-community/ufs-srweather-app#71, then that PR updated to point to this PR's hash.

## TESTS CONDUCTED: 

The following end-to-end tests are now all successful on Hera:

- DOT_OR_USCORE
- GST_release_public_v1
- get_extrn_files_from_hpss_FV3GFS_FV3GFS
- get_extrn_files_from_hpss_GSMGFS_GSMGFS
- get_extrn_files_from_hpss_HRRR_RAP
- get_extrn_files_from_hpss_RAP_RAP
- grid_GSD_HRRR_AK_50km
- grid_GSD_RAP13km
- grid_RRFS_AK_13km_FV3GFS_FV3GFS
- grid_RRFS_CONUS_13km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v15p2
- grid_RRFS_CONUS_13km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v16beta
- grid_RRFS_CONUS_13km_ics_HRRR_lbcs_RAP_suite_GSD_SAR
-  grid_RRFS_CONUS_13km_ics_HRRR_lbcs_RAP_suite_RRFS_v1beta
- grid_RRFS_CONUS_25km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v15p2
- grid_RRFS_CONUS_25km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v16beta
- grid_RRFS_CONUS_25km_ics_HRRR_lbcs_RAP_suite_GSD_SAR
- grid_RRFS_CONUS_25km_ics_HRRR_lbcs_RAP_suite_RRFS_v1beta
- new_ESGgrid
- new_GFDLgrid
- new_GFDLgrid__GFDLgrid_USE_GFDLgrid_RES_IN_FILENAMES_eq_FALSE
- new_GFDLgrid__GFDLgrid_USE_GFDLgrid_RES_IN_FILENAMES_eq_TRUE
- regional_001
- regional_002
- suite_FV3_GFS_v15p2
- suite_FV3_GFS_v16beta
- suite_FV3_GSD_SAR
- suite_FV3_GSD_v0
- suite_FV3_RRFS_v1beta

The following end-to-end tests were successful on Jet:
 - DOT_OR_USCORE
 - get_extrn_files_from_hpss_FV3GFS_FV3GFS
 - get_extrn_files_from_hpss_GSMGFS_GSMGFS
 - get_extrn_files_from_hpss_HRRR_RAP
 - get_extrn_files_from_hpss_RAP_RAP
 - grid_RRFS_AK_13km_FV3GFS_FV3GFS
 - grid_RRFS_CONUS_13km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v15p2
 - grid_RRFS_CONUS_13km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v16beta
 - grid_RRFS_CONUS_25km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v15p2
 - grid_RRFS_CONUS_25km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v16beta
 - new_ESGgrid
 - new_GFDLgrid
 - new_GFDLgrid__GFDLgrid_USE_GFDLgrid_RES_IN_FILENAMES_eq_FALSE
 - regional_001
 - regional_002
 - suite_FV3_GFS_v16beta


A few tests on Hera and Jet are still failing, but they are known errors and will be fixed at a later date.

Cheyenne tests are failing but this is fixed by NOAA-EMC#378 

## ISSUE (optional): 
In conjunction with NOAA-EMC#378 and ufs-community/ufs-srweather-app#71, will solve ufs-community/ufs-srweather-app#57, fixing the master branch of ufs-srweather-app so everyone will be happy and nothing will be broken and we will all live happily ever after.

EricJames-NOAA pushed a commit to EricJames-NOAA/UPP that referenced this pull request


          Cherry-pick NOAA-EMC#343 from release branch: Allow running from cron…

b8f9819

…tab on Cheyenne, as well as fix workflow generation on Cheyenne (NOAA-EMC#378)

## DESCRIPTION OF CHANGES: 
A fix was applied to the release branch for the Cheyenne workflow and automated testing in NOAA-EMC#343, this PR applies the same to develop.

## TESTS CONDUCTED: 
Workflow built and ran on Cheyenne; the following tests were run and all passed:
 - grid_RRFS_CONUS_13km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v15p2
 - grid_RRFS_CONUS_25km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v15p2
 - grid_RRFS_CONUS_3km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v15p2

## ISSUE (optional): 
Fully resolves NOAA-EMC#326

EricJames-NOAA pushed a commit to EricJames-NOAA/UPP that referenced this pull request


          adding some options and some small changes/fixes for 13km NA RRFS run…

4e25782

…s. (NOAA-EMC#378)

zhanglikate pushed a commit to zhanglikate/UPP that referenced this pull request


          sfcsub.F land-mask bug fix in ccpp-physics (NOAA-EMC#378)

2fe2998

1. changes in NCAR/ccpp-physics#721 (sfcsub.F land-mask bug fix)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Baseline Change GFSV17 New input data required