NOAA-EMC / UPP

Other
32 stars 95 forks source link

RRFS updates #938

Closed EricJames-NOAA closed 2 months ago

EricJames-NOAA commented 2 months ago

This PR provides some updates for RRFS, including:

(1) Rename RRFS UPP control files as requested by Benjamin Blake (EMC) to get rid of "fv3lam" reference. (2) Correct the reading of smoke emissions (EBB) to read the correct 3-D variable ebu_smoke. (3) Enable output of 2-D smoke emissions computed as the vertically integrated smoke emissions. (4) Update HWP to be a 1-h average (hwp_ave in netCDF files). (5) Get rid of vertically integrated hydrometeor output which doesn't include subgrid components.

The code was tested for RRFS_NA_3km system on Jet.

WenMeng-NOAA commented 2 months ago

@EricJames-NOAA Can you sync your branch with the latest UPP develop and provide me sample model files for testing?

WenMeng-NOAA commented 2 months ago

@EricJames-NOAA Can you open a new issue for your proposed changes 2) to 5)?

EricJames-NOAA commented 2 months ago

@WenMeng-NOAA I have some test files for you here on Hera:

/scratch1/BMC/wrfruc/ejames/wen_ebb_hwp/

WenMeng-NOAA commented 2 months ago

@EricJames-NOAA My test indicates regenerating the RRFS flat control file 'postxconfig-NT-rrfs.txt' is needed. Please validate my test results at /home/Wen.Meng/stmp2/rrfs_2024032812 on Hera.

EricJames-NOAA commented 2 months ago

/scratch1/BMC/wrfruc/ejames/wen_ebb_hwp/

@WenMeng-NOAA thanks for catching that, I have regenerated the postxconfig-NT-rrfs.txt file.

I accidentally copied over the wrong netCDF files. Could you please run a test using these new ones:

/scratch1/BMC/wrfruc/ejames/wen_ebb_hwp/

I'm very sorry for my mistake.

WenMeng-NOAA commented 2 months ago

@EricJames-NOAA Please see my new run at /home/Wen.Meng/stmp2/rrfs_2024042315.

EricJames-NOAA commented 2 months ago

@EricJames-NOAA Please see my new run at /home/Wen.Meng/stmp2/rrfs_2024042315.

@WenMeng-NOAA your results are consistent with mine...I see the updated fields. Thanks!

WenMeng-NOAA commented 2 months ago

@EricJames-NOAA Thanks for verifying. We will wrap this PR for the final testing.

WenMeng-NOAA commented 2 months ago

@FernandoAndrade-NOAA You may start the UPP RTs on Hera and Orion. For your reference, my tests on Hera are at /home/Wen.Meng/stmp2:

Wen.Meng@hfe02 stmp2$ ls -ltr */*diff
-rw-r--r-- 1 Wen.Meng stmp    75 Apr 25 17:35 rap_2020072316_pe_test/WRFPRS.GrbF16.diff
-rw-r--r-- 1 Wen.Meng stmp 13064 Apr 25 17:37 fv3r_2023062800/PRSLEV10.tm00.diff
-rw-r--r-- 1 Wen.Meng stmp 13064 Apr 25 17:37 fv3r_2023062800_pe_test/PRSLEV10.tm00.diff
-rw-r--r-- 1 Wen.Meng stmp 25456 Apr 25 17:37 rtma_2023040400_pe_test/NATLEV00.tm00.diff
-rw-r--r-- 1 Wen.Meng stmp 25456 Apr 25 17:37 rtma_2023040400/NATLEV00.tm00.diff
-rw-r--r-- 1 Wen.Meng stmp 25172 Apr 25 17:39 fv3r_2023062800/NATLEV10.tm00.diff
-rw-r--r-- 1 Wen.Meng stmp 25172 Apr 25 17:39 fv3r_2023062800_pe_test/NATLEV10.tm00.diff
-rw-r--r-- 1 Wen.Meng stmp 14470 Apr 25 17:39 rtma_2023040400_pe_test/PRSLEV00.tm00.diff
-rw-r--r-- 1 Wen.Meng stmp 14470 Apr 25 17:39 rtma_2023040400/PRSLEV00.tm00.diff

You should change the control file 'postxconfig-NT-fv3rlam_rrfs.txt' into 'postxconfig-NT-rrfs.txt' in job cards runfv3r and run3drtma.

FernandoAndrade-NOAA commented 2 months ago

@FernandoAndrade-NOAA You may start the UPP RTs on Hera and Orion. For your reference, my tests on Hera are at /home/Wen.Meng/stmp2:

Wen.Meng@hfe02 stmp2$ ls -ltr */*diff
-rw-r--r-- 1 Wen.Meng stmp    75 Apr 25 17:35 rap_2020072316_pe_test/WRFPRS.GrbF16.diff
-rw-r--r-- 1 Wen.Meng stmp 13064 Apr 25 17:37 fv3r_2023062800/PRSLEV10.tm00.diff
-rw-r--r-- 1 Wen.Meng stmp 13064 Apr 25 17:37 fv3r_2023062800_pe_test/PRSLEV10.tm00.diff
-rw-r--r-- 1 Wen.Meng stmp 25456 Apr 25 17:37 rtma_2023040400_pe_test/NATLEV00.tm00.diff
-rw-r--r-- 1 Wen.Meng stmp 25456 Apr 25 17:37 rtma_2023040400/NATLEV00.tm00.diff
-rw-r--r-- 1 Wen.Meng stmp 25172 Apr 25 17:39 fv3r_2023062800/NATLEV10.tm00.diff
-rw-r--r-- 1 Wen.Meng stmp 25172 Apr 25 17:39 fv3r_2023062800_pe_test/NATLEV10.tm00.diff
-rw-r--r-- 1 Wen.Meng stmp 14470 Apr 25 17:39 rtma_2023040400_pe_test/PRSLEV00.tm00.diff
-rw-r--r-- 1 Wen.Meng stmp 14470 Apr 25 17:39 rtma_2023040400/PRSLEV00.tm00.diff

You should change the control file 'postxconfig-NT-fv3rlam_rrfs.txt' into 'postxconfig-NT-rrfs.txt' in job cards runfv3r and run3drtma.

Orion and Hercules are still running likely due to the ongoing maintenance. On Hera, I'm seeing NATLEV matching while PRSLEV are differing a bit from your results in both fv3r and 3drtma, if you could verify comparison at /scratch2/NAGAPE/epic/Fernando.Andrade-maldonado/regression-tests/upp/938/UPP/ci/rundir/upp-HERA

WenMeng-NOAA commented 2 months ago

@FernandoAndrade-NOAA You may start the UPP RTs on Hera and Orion. For your reference, my tests on Hera are at /home/Wen.Meng/stmp2:

Wen.Meng@hfe02 stmp2$ ls -ltr */*diff
-rw-r--r-- 1 Wen.Meng stmp    75 Apr 25 17:35 rap_2020072316_pe_test/WRFPRS.GrbF16.diff
-rw-r--r-- 1 Wen.Meng stmp 13064 Apr 25 17:37 fv3r_2023062800/PRSLEV10.tm00.diff
-rw-r--r-- 1 Wen.Meng stmp 13064 Apr 25 17:37 fv3r_2023062800_pe_test/PRSLEV10.tm00.diff
-rw-r--r-- 1 Wen.Meng stmp 25456 Apr 25 17:37 rtma_2023040400_pe_test/NATLEV00.tm00.diff
-rw-r--r-- 1 Wen.Meng stmp 25456 Apr 25 17:37 rtma_2023040400/NATLEV00.tm00.diff
-rw-r--r-- 1 Wen.Meng stmp 25172 Apr 25 17:39 fv3r_2023062800/NATLEV10.tm00.diff
-rw-r--r-- 1 Wen.Meng stmp 25172 Apr 25 17:39 fv3r_2023062800_pe_test/NATLEV10.tm00.diff
-rw-r--r-- 1 Wen.Meng stmp 14470 Apr 25 17:39 rtma_2023040400_pe_test/PRSLEV00.tm00.diff
-rw-r--r-- 1 Wen.Meng stmp 14470 Apr 25 17:39 rtma_2023040400/PRSLEV00.tm00.diff

You should change the control file 'postxconfig-NT-fv3rlam_rrfs.txt' into 'postxconfig-NT-rrfs.txt' in job cards runfv3r and run3drtma.

Orion and Hercules are still running likely due to the ongoing maintenance. On Hera, I'm seeing NATLEV matching while PRSLEV are differing a bit from your results in both fv3r and 3drtma, if you could verify comparison at /scratch2/NAGAPE/epic/Fernando.Andrade-maldonado/regression-tests/upp/938/UPP/ci/rundir/upp-HERA

@FernandoAndrade-NOAA I have examined the results in both your run directories and mine, and they are consistent. I forgot to recreate the baselines from last PR in my RTs, which seems to be the root cause. Your RTs on Hera are good to me.

FernandoAndrade-NOAA commented 2 months ago

@FernandoAndrade-NOAA You may start the UPP RTs on Hera and Orion. For your reference, my tests on Hera are at /home/Wen.Meng/stmp2:

Wen.Meng@hfe02 stmp2$ ls -ltr */*diff
-rw-r--r-- 1 Wen.Meng stmp    75 Apr 25 17:35 rap_2020072316_pe_test/WRFPRS.GrbF16.diff
-rw-r--r-- 1 Wen.Meng stmp 13064 Apr 25 17:37 fv3r_2023062800/PRSLEV10.tm00.diff
-rw-r--r-- 1 Wen.Meng stmp 13064 Apr 25 17:37 fv3r_2023062800_pe_test/PRSLEV10.tm00.diff
-rw-r--r-- 1 Wen.Meng stmp 25456 Apr 25 17:37 rtma_2023040400_pe_test/NATLEV00.tm00.diff
-rw-r--r-- 1 Wen.Meng stmp 25456 Apr 25 17:37 rtma_2023040400/NATLEV00.tm00.diff
-rw-r--r-- 1 Wen.Meng stmp 25172 Apr 25 17:39 fv3r_2023062800/NATLEV10.tm00.diff
-rw-r--r-- 1 Wen.Meng stmp 25172 Apr 25 17:39 fv3r_2023062800_pe_test/NATLEV10.tm00.diff
-rw-r--r-- 1 Wen.Meng stmp 14470 Apr 25 17:39 rtma_2023040400_pe_test/PRSLEV00.tm00.diff
-rw-r--r-- 1 Wen.Meng stmp 14470 Apr 25 17:39 rtma_2023040400/PRSLEV00.tm00.diff

You should change the control file 'postxconfig-NT-fv3rlam_rrfs.txt' into 'postxconfig-NT-rrfs.txt' in job cards runfv3r and run3drtma.

Orion and Hercules are still running likely due to the ongoing maintenance. On Hera, I'm seeing NATLEV matching while PRSLEV are differing a bit from your results in both fv3r and 3drtma, if you could verify comparison at /scratch2/NAGAPE/epic/Fernando.Andrade-maldonado/regression-tests/upp/938/UPP/ci/rundir/upp-HERA

@FernandoAndrade-NOAA I have examined the results in both your run directories and mine, and they are consistent. I forgot to recreate the baselines from last PR in my RTs, which seems to be the root cause. Your RTs on Hera are good to me.

Orion will be unavailable for testing at the moment as they prepare for a shutdown for maintenance. Hercules showed similar results to Hera RTs with differences due to the inability to update baselines in the previous PR caused by instability. Only the expected test cases are showing differences this run so Hercules should be good to go. I'll keep an eye out for when Orion is available again to proceed with the merge process.

WenMeng-NOAA commented 2 months ago

@EricJames-NOAA Can you sync your branch one more time?

FernandoAndrade-NOAA commented 2 months ago

Orion RTs match with the Hera run, this PR should be ready to go following a final re-sync.

WenMeng-NOAA commented 2 months ago

This PR is ready for merging.