Skip to content

Commit

Permalink
UPP bugfixes for inline post and g2tmpl 1.12.0 compatibility (and num…
Browse files Browse the repository at this point in the history 
…ber concentration updates) (#974)

* number concentration and HAFS-AR xml that use it

* .txt equivalents to new .xml files

* remove synonyms and rename GSD_NC fields instead

* deallocate smoke_ave, dust_ave, and coarsepm_ave

* correct pressure levels for hafs-ar

* bugfix: fixed_sfc2_type defaults to fixed_sfc1_type

* Apply suggestions from code review

Co-authored-by: WenMeng-NOAA <48260754+WenMeng-NOAA@users.noreply.github.com>

* hera RT log

* hercules RT log

---------

Co-authored-by: WenMeng-NOAA <48260754+WenMeng-NOAA@users.noreply.github.com>
Co-authored-by: FernandoAndrade-NOAA <fernando.andrade-maldonado@noaa.gov>
  • Loading branch information
@SamuelTrahanNOAA @WenMeng-NOAA @FernandoAndrade-NOAA
3 people committed Jun 20, 2024
1 parent d5a7944 commit 70fc762
Show file tree
Hide file tree
Showing 20 changed files with 10,895 additions and 159 deletions.
6 changes: 3 additions & 3 deletions parm/hrrr_postcntrl.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1099,23 +1099,23 @@
</param>

<param>
<shortname>GSD_NCCD_ON_HYBRID_LVL</shortname>
<shortname>NCCD_ON_HYBRID_LVL</shortname>
<level>1. 2. 3. 4. 5. 6. 7. 8. 9. 10. 11. 12. 13. 14. 15. 16. 17. 18. 19.
20. 21. 22. 23. 24. 25. 26. 27. 28. 29. 30. 31. 32. 33. 34. 35. 36. 37. 38. 39.
40. 41. 42. 43. 44. 45. 46. 47. 48. 49. 50.</level>
<scale>3.0</scale>
</param>

<param>
<shortname>GSD_NCIP_ON_HYBRID_LVL</shortname>
<shortname>NCIP_ON_HYBRID_LVL</shortname>
<level>1. 2. 3. 4. 5. 6. 7. 8. 9. 10. 11. 12. 13. 14. 15. 16. 17. 18. 19.
20. 21. 22. 23. 24. 25. 26. 27. 28. 29. 30. 31. 32. 33. 34. 35. 36. 37. 38. 39.
40. 41. 42. 43. 44. 45. 46. 47. 48. 49. 50.</level>
<scale>3.0</scale>
</param>

<param>
<shortname>GSD_NCRAIN_ON_HYBRID_LVL</shortname>
<shortname>NCRAIN_ON_HYBRID_LVL</shortname>
<level>1. 2. 3. 4. 5. 6. 7. 8. 9. 10. 11. 12. 13. 14. 15. 16. 17. 18. 19.
20. 21. 22. 23. 24. 25. 26. 27. 28. 29. 30. 31. 32. 33. 34. 35. 36. 37. 38. 39.
40. 41. 42. 43. 44. 45. 46. 47. 48. 49. 50.</level>
Expand Down
4 changes: 4 additions & 0 deletions parm/makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,8 @@ ALL_TXT= \
postxconfig-NT-NGAC.txt \
postxconfig-NT-GEFS.txt \
postxconfig-NT-GEFS-F00.txt \
postxconfig-NT-hafs_ar_nosat.txt \
postxconfig-NT-hafs_ar_nosat_l65.txt \
postxconfig-NT-hafs_sat.txt \
postxconfig-NT-hafs_nosat.txt \
postxconfig-NT-hafs.txt \
Expand Down Expand Up @@ -61,6 +63,8 @@ postxconfig-NT-GEFS.txt: postcntrl_gefs.xml post_avblfld
postxconfig-NT-GEFS-F00.txt: postcntrl_gefs_f00.xml post_avblflds.xml
postxconfig-NT-hafs_sat.txt: postcntrl_hafs_sat.xml post_avblflds.xml
postxconfig-NT-hafs_nosat.txt: postcntrl_hafs_nosat.xml post_avblflds.xml
postxconfig-NT-hafs_ar_nosat.txt: postcntrl_hafs_ar_nosat.xml post_avblflds.xml
postxconfig-NT-hafs_ar_nosat_l65.txt: postcntrl_hafs_ar_nosat_l65.xml post_avblflds.xml
postxconfig-NT-hafs.txt: postcntrl_hafs.xml post_avblflds.xml
postxconfig-NT-GFS-TWO.txt: postcntrl_gfs_two.xml post_avblflds.xml
postxconfig-NT-GFS-F00-TWO.txt: postcntrl_gfs_f00_two.xml post_avblflds.xml
Expand Down
4 changes: 2 additions & 2 deletions parm/nam_post_avblflds.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5115,7 +5115,7 @@

<param>
<post_avblfldidx>752</post_avblfldidx>
<shortname>GSD_NCIP_ON_HYBRID_LVL</shortname>
<shortname>NCIP_ON_HYBRID_LVL</shortname>
<longname>Number concentration for ice particles on hybrid level</longname>
<pname>NCIP</pname>
<fixed_sfc1_type>hybrid_lvl</fixed_sfc1_type>
Expand All @@ -5124,7 +5124,7 @@

<param>
<post_avblfldidx>754</post_avblfldidx>
<shortname>GSD_NCRAIN_ON_HYBRID_LVL</shortname>
<shortname>NCRAIN_ON_HYBRID_LVL</shortname>
<pname>NCRAIN</pname>
<fixed_sfc1_type>hybrid_lvl</fixed_sfc1_type>
<scale>3.0</scale>
Expand Down
4 changes: 2 additions & 2 deletions parm/ngac_post_avblflds.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5114,7 +5114,7 @@

<param>
<post_avblfldidx>752</post_avblfldidx>
<shortname>GSD_NCIP_ON_HYBRID_LVL</shortname>
<shortname>NCIP_ON_HYBRID_LVL</shortname>
<longname>Number concentration for ice particles on hybrid level</longname>
<pname>NCIP</pname>
<fixed_sfc1_type>hybrid_lvl</fixed_sfc1_type>
Expand All @@ -5123,7 +5123,7 @@

<param>
<post_avblfldidx>754</post_avblfldidx>
<shortname>GSD_NCRAIN_ON_HYBRID_LVL</shortname>
<shortname>NCRAIN_ON_HYBRID_LVL</shortname>
<pname>NCRAIN</pname>
<fixed_sfc1_type>hybrid_lvl</fixed_sfc1_type>
<scale>3.0</scale>
Expand Down
35 changes: 31 additions & 4 deletions parm/post_avblflds.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6889,7 +6889,7 @@

<param>
<post_avblfldidx>747</post_avblfldidx>
<shortname>GSD_NCCD_ON_HYBRID_LVL</shortname>
<shortname>NCCD_ON_HYBRID_LVL</shortname>
<longname>Number concentration for cloud water drops on hybrid level</longname>
<pname>NCONCD</pname>
<fixed_sfc1_type>hybrid_lvl</fixed_sfc1_type>
Expand Down Expand Up @@ -6933,7 +6933,7 @@

<param>
<post_avblfldidx>752</post_avblfldidx>
<shortname>GSD_NCIP_ON_HYBRID_LVL</shortname>
<shortname>NCIP_ON_HYBRID_LVL</shortname>
<longname>Number concentration for ice particles on hybrid level</longname>
<pname>NCCICE</pname>
<fixed_sfc1_type>hybrid_lvl</fixed_sfc1_type>
Expand All @@ -6951,7 +6951,7 @@

<param>
<post_avblfldidx>754</post_avblfldidx>
<shortname>GSD_NCRAIN_ON_HYBRID_LVL</shortname>
<shortname>NCRAIN_ON_HYBRID_LVL</shortname>
<pname>SPNCR</pname>
<fixed_sfc1_type>hybrid_lvl</fixed_sfc1_type>
<scale>3.0</scale>
Expand Down Expand Up @@ -7059,7 +7059,7 @@

<param>
<post_avblfldidx>766</post_avblfldidx>
<shortname>GSD_NCWFA_ON_HYBRID_LVL</shortname>
<shortname>NCWFA_ON_HYBRID_LVL</shortname>
<pname>PMTF</pname>
<table_info>NCEP</table_info>
<fixed_sfc1_type>hybrid_lvl</fixed_sfc1_type>
Expand Down Expand Up @@ -8452,5 +8452,32 @@
<scale>6.0</scale>
</param>

<param>
<post_avblfldidx>1018</post_avblfldidx>
<shortname>NCCD_ON_ISOBARIC_SFC</shortname>
<longname>Number concentration for cloud water drops on isobaric surfaces</longname>
<pname>NCONCD</pname>
<fixed_sfc1_type>isobaric_sfc</fixed_sfc1_type>
<scale>3.0</scale>
</param>

<param>
<post_avblfldidx>1019</post_avblfldidx>
<shortname>NCIP_ON_ISOBARIC_SFC</shortname>
<longname>Number concentration for ice particles on isobaric surfaces</longname>
<pname>NCCICE</pname>
<fixed_sfc1_type>isobaric_sfc</fixed_sfc1_type>
<scale>3.0</scale>
</param>

<param>
<post_avblfldidx>1020</post_avblfldidx>
<shortname>NCRAIN_ON_ISOBARIC_SFC</shortname>
<longname>Number concentration for rain on isobaric surfaces</longname>
<pname>SPNCR</pname>
<fixed_sfc1_type>isobaric_sfc</fixed_sfc1_type>
<scale>3.0</scale>
</param>

</post_avblflds>
</postxml>
6 changes: 3 additions & 3 deletions parm/post_avblflds_raphrrr.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5298,7 +5298,7 @@

<param>
<post_avblfldidx>747</post_avblfldidx>
<shortname>GSD_NCCD_ON_HYBRID_LVL</shortname>
<shortname>NCCD_ON_HYBRID_LVL</shortname>
<longname>Number concentration for cloud water drops on hybrid level</longname>
<pname>NCONCD</pname>
<fixed_sfc1_type>hybrid_lvl</fixed_sfc1_type>
Expand All @@ -5324,7 +5324,7 @@

<param>
<post_avblfldidx>752</post_avblfldidx>
<shortname>GSD_NCIP_ON_HYBRID_LVL</shortname>
<shortname>NCIP_ON_HYBRID_LVL</shortname>
<longname>Number concentration for ice particles on hybrid level</longname>
<pname>NCCICE</pname>
<fixed_sfc1_type>hybrid_lvl</fixed_sfc1_type>
Expand All @@ -5333,7 +5333,7 @@

<param>
<post_avblfldidx>754</post_avblfldidx>
<shortname>GSD_NCRAIN_ON_HYBRID_LVL</shortname>
<shortname>NCRAIN_ON_HYBRID_LVL</shortname>
<pname>SPNCR</pname>
<fixed_sfc1_type>hybrid_lvl</fixed_sfc1_type>
<scale>3.0</scale>
Expand Down
Loading

0 comments on commit 70fc762

Please sign in to comment.