Skip to content

Output hourly PM2.5 and O3 for AQM #591

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.

Sign up for GitHub

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

Merged
WenMeng-NOAA merged 18 commits into from
Dec 14, 2022
Merged

Output hourly PM2.5 and O3 for AQM #591

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
be78562
1)Add new control file for AQM; 2)Output hourly averaged PM2.5 and O3
WenMeng-NOAA Nov 13, 2022
8ed3878
Merge remote-tracking branch 'upstream/develop' into post_aqm
WenMeng-NOAA Nov 14, 2022
a382e3b
1)output hourly averaged PM2.5 and O3; 2)Remove instant PM2.5
WenMeng-NOAA Nov 14, 2022
e6997da
Remove unit conversion for hourly pm2.5
WenMeng-NOAA Nov 22, 2022
5c51ff8
Solved the conflicts.
WenMeng-NOAA Dec 1, 2022
0293cde
Remove O3MR from AQM control files
WenMeng-NOAA Dec 2, 2022
0da6486
1)Add new variable entire atmosphere aod; 2)add entire atmosphere aod
WenMeng-NOAA Dec 12, 2022
c680dd6
Add some fixes for CI failture per Alex's suggestions.
WenMeng-NOAA Dec 12, 2022
8eb22f6
Add gfortan 12 installed in ubuntu-latest
WenMeng-NOAA Dec 12, 2022
aa3bd3b
Add "sudo apt install cmake"
WenMeng-NOAA Dec 12, 2022
c44027d
Add "sudo apt install cmake" in gcc.yml
WenMeng-NOAA Dec 12, 2022
1887e70
Pick up the changes from Alex.
WenMeng-NOAA Dec 12, 2022
8c63c61
Add back "spack compiler find"
WenMeng-NOAA Dec 12, 2022
0f5b266
tweaking gcc.yml
WenMeng-NOAA Dec 13, 2022
f14475b
1) Add changes based on Kai's comments; 2) Pick up changes of CI from
WenMeng-NOAA Dec 13, 2022
24ca12c
1)tweak aod ouput; 2)add latest changes of CI from Alex.
WenMeng-NOAA Dec 13, 2022
f6b1d14
update change logs
WenMeng-NOAA Dec 14, 2022
34f82e0
update change log based on Huiya's comments
WenMeng-NOAA Dec 14, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 9 additions & 10 deletions .github/workflows/gcc.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,11 @@ jobs:
runs-on: ubuntu-latest

steps:
- name: checkout-upp # This is for getting spack.yaml
uses: actions/checkout@v2
with:
path: UPP

# Cache spack, compiler and dependencies
- name: cache-env
id: cache-env
Expand All @@ -42,13 +47,7 @@ jobs:
path: |
spack
~/.spack
key: spack-${{ runner.os }}-${{ env.cache_key }}

- name: checkout-upp # This is for getting spack.yaml
if: steps.cache-env.outputs.cache-hit != 'true'
uses: actions/checkout@v2
with:
path: UPP
key: spack-${{ runner.os }}-${{ env.cache_key }}-${{ hashFiles('UPP/ci/spack.yaml') }}

# Install dependencies using Spack
- name: install-dependencies-with-spack
Expand All @@ -58,11 +57,11 @@ jobs:
source spack/share/spack/setup-env.sh
spack env create upp-env UPP/ci/spack.yaml
spack env activate upp-env
spack compiler find
sudo apt install cmake
spack external find
spack add mpich@3.4.2
spack concretize
spack install --dirty -v
spack install -v --fail-fast --dirty

build:
needs: setup
Expand All @@ -81,7 +80,7 @@ jobs:
path: |
spack
~/.spack
key: spack-${{ runner.os }}-${{ env.cache_key }}
key: spack-${{ runner.os }}-${{ env.cache_key }}-${{ hashFiles('UPP/ci/spack.yaml') }}

- name: build-upp
run: |
Expand Down
21 changes: 11 additions & 10 deletions .github/workflows/intel.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,12 @@ jobs:
runs-on: ubuntu-latest

steps:
- name: checkout-upp # This is for getting spack.yaml
if: steps.cache-env.outputs.cache-hit != 'true'
uses: actions/checkout@v2
with:
path: UPP

# Cache spack, compiler and dependencies
- name: cache-env
id: cache-env
Expand All @@ -45,10 +51,9 @@ jobs:
spack
~/.spack
/opt/intel
key: spack-${{ runner.os }}-${{ env.cache_key }}
key: spack-${{ runner.os }}-${{ env.cache_key }}-${{ hashFiles('UPP/ci/spack.yaml') }}

- name: install-intel-compilers
if: steps.cache-env.outputs.cache-hit != 'true'
run: |
wget https://apt.repos.intel.com/intel-gpg-keys/GPG-PUB-KEY-INTEL-SW-PRODUCTS.PUB
sudo apt-key add GPG-PUB-KEY-INTEL-SW-PRODUCTS.PUB
Expand All @@ -57,25 +62,21 @@ jobs:
sudo apt-get install intel-oneapi-dev-utilities intel-oneapi-mpi-devel intel-oneapi-openmp intel-oneapi-compiler-fortran intel-oneapi-compiler-dpcpp-cpp-and-cpp-classic
echo "source /opt/intel/oneapi/setvars.sh" >> ~/.bash_profile

- name: checkout-upp # This is for getting spack.yaml
if: steps.cache-env.outputs.cache-hit != 'true'
uses: actions/checkout@v2
with:
path: UPP

# Install dependencies using Spack
- name: install-dependencies-with-spack
if: steps.cache-env.outputs.cache-hit != 'true'
run: |
sudo mv /usr/local/ /usr_local_mv
git clone -c feature.manyFiles=true https://github.com/NOAA-EMC/spack.git
source spack/share/spack/setup-env.sh
spack env create upp-env UPP/ci/spack.yaml
spack env activate upp-env
spack compiler find
sudo apt install cmake
spack external find
spack add intel-oneapi-mpi
spack concretize
spack install --dirty -v
spack install --dirty -v --fail-fast

build:
needs: setup
Expand All @@ -99,7 +100,7 @@ jobs:
spack
~/.spack
/opt/intel
key: spack-${{ runner.os }}-${{ env.cache_key }}
key: spack-${{ runner.os }}-${{ env.cache_key }}-${{ hashFiles('UPP/ci/spack.yaml') }}

- name: build-upp
run: |
Expand Down
4 changes: 3 additions & 1 deletion ci/spack.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,9 @@
spack:
packages:
all:
compiler: [intel, gcc]
compiler:
- intel
- gcc@10:10
specs:
- netcdf-c@4.7.4
- netcdf-fortran@4.5.3
Expand Down
200 changes: 200 additions & 0 deletions parm/aqm.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,200 @@
<?xml version="1.0" encoding="UTF-8"?>
<postxml xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="EMC_POST_CTRL_Schema.xsd">
<!-- Lin Gan: 20150427 validated -->
<paramset>
<datset>CMAQ</datset>
<grid_num>32769</grid_num>
<sub_center>ncep_nco</sub_center>
<version_no>v2003</version_no>
<local_table_vers_no>local_tab_yes1</local_table_vers_no>
<sigreftime>fcst</sigreftime>
<prod_status>oper</prod_status>
<data_type>fcst</data_type>
<gen_proc_type>fcst</gen_proc_type>
<time_range_unit>hour</time_range_unit>
<orig_center>nws_ncep</orig_center>
<gen_proc>nmm_8km</gen_proc>
<packing_method>complex_packing_spatial_diff</packing_method>
<order_of_sptdiff>2nd_ord_sptdiff</order_of_sptdiff>
<field_datatype>fltng_pnt</field_datatype>
<comprs_type>lossless</comprs_type>

<param>
<shortname>AVE_PM25TOT_ON_HYBRID_LVL</shortname>
<pname>PMTF</pname>
<table_info>NCEP</table_info>
<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. 51. 52. 53. 54. 55. 56. 57. 58. 59. 60. 61. 62. 63. 64.</level>
<scale>7.0</scale>
</param>

<param>
<shortname>AVE_OZCON_ON_HYBRID_LVL</shortname>
<pname>OZCON</pname>
<table_info>NCEP</table_info>
<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. 51. 52. 53. 54. 55. 56. 57. 58. 59. 60. 61. 62. 63. 64.</level>
<scale>7.0</scale>
</param>

<param>
<shortname>TMP_ON_HYBRID_LVL</shortname>
<pname>TMP</pname>
<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. 51. 52. 53. 54. 55. 56. 57. 58. 59. 60. 61. 62. 63. 64.</level>
<scale>4.0</scale>
</param>

<param>
<shortname>SPFH_ON_HYBRID_LVL</shortname>
<pname>SPFH</pname>
<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. 51. 52. 53. 54. 55. 56. 57. 58. 59. 60. 61. 62. 63. 64.</level>
<scale>7.0</scale>
</param>

<param>
<shortname>UGRD_ON_HYBRID_LVL</shortname>
<pname>UGRD</pname>
<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. 51. 52. 53. 54. 55. 56. 57. 58. 59. 60. 61. 62. 63. 64.</level>
<scale>4.0</scale>
</param>

<param>
<shortname>VGRD_ON_HYBRID_LVL</shortname>
<pname>VGRD</pname>
<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. 51. 52. 53. 54. 55. 56. 57. 58. 59. 60. 61. 62. 63. 64.</level>
<scale>4.0</scale>
</param>

<param>
<shortname>DZDT_ON_HYBRID_LVL</shortname>
<pname>DZDT</pname>
<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. 51. 52. 53. 54. 55. 56. 57. 58. 59. 60. 61. 62. 63. 64.</level>
<scale>4.0</scale>
</param>

<param>
<shortname>TCDC_ON_HYBRID_LVL</shortname>
<pname>TCDC</pname>
<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. 51. 52. 53. 54. 55. 56. 57. 58. 59. 60. 61. 62. 63. 64.</level>
<scale>3.0</scale>
</param>

<param>
<shortname>TMP_ON_SPEC_HGT_LVL_ABOVE_GRND_2m</shortname>
<pname>TMP</pname>
<scale>4.0</scale>
</param>

<param>
<shortname>SPFH_ON_SPEC_HGT_LVL_ABOVE_GRND_2m</shortname>
<pname>SPFH</pname>
<scale>4.0</scale>
</param>

<param>
<shortname>DPT_ON_SPEC_HGT_LVL_ABOVE_GRND_2m</shortname>
<pname>DPT</pname>
<scale>4.0</scale>
</param>

<param>
<shortname>RH_ON_SPEC_HGT_LVL_ABOVE_GRND_2m</shortname>
<pname>RH</pname>
<scale>3.0</scale>
</param>

<param>
<shortname>UGRD_ON_SPEC_HGT_LVL_ABOVE_GRND_10m</shortname>
<pname>UGRD</pname>
<level>10.</level>
<scale>4.0</scale>
</param>

<param>
<shortname>VGRD_ON_SPEC_HGT_LVL_ABOVE_GRND_10m</shortname>
<pname>VGRD</pname>
<level>10.</level>
<scale>4.0</scale>
</param>

<param>
<shortname>PBLREG_ON_SURFACE</shortname>
<pname>PBLREG</pname>
<scale>2.0</scale>
</param>

<param>
<shortname>TMP_ON_ISOBARIC_SFC</shortname>
<level>50000. 70000. 85000. 92500. 100000.</level>
<scale>-4.0</scale>
</param>

<param>
<shortname>DPT_ON_ISOBARIC_SFC</shortname>
<level>50000. 70000. 85000. 92500. 100000.</level>
<scale>-4.0</scale>
</param>

<param>
<shortname>HGT_ON_ISOBARIC_SFC</shortname>
<level>50000. 70000. 85000. 100000.</level>
<scale>-5.0</scale>
</param>

<param>
<shortname>UGRD_ON_ISOBARIC_SFC</shortname>
<level>25000. 30000. 50000. 70000. 85000. 92500. 100000.</level>
<scale>-4.0</scale>
</param>

<param>
<shortname>VGRD_ON_ISOBARIC_SFC</shortname>
<level>25000. 30000. 50000. 70000. 85000. 92500. 100000.</level>
<scale>-4.0</scale>
</param>

<param>
<shortname>CAPE_ON_SURFACE</shortname>
<scale>3.0</scale>
</param>

<param>
<shortname>BEST_CAPE_ON_SPEC_PRES_ABOVE_GRND</shortname>
<level>18000.</level>
<level2>0.</level2>
<scale>3.0</scale>
</param>

<param>
<shortname>MIXED_LAYER_CAPE_ON_SPEC_PRES_ABOVE_GRND</shortname>
<level>9000.</level>
<level2>0.</level2>
<scale>3.0</scale>
</param>

<param>
<shortname>AER_OPT_AQM_at550</shortname>
</param>

<param>
<shortname>HPBL_ON_SURFACE</shortname>
<table_info>NCEP</table_info>
<scale>6.0</scale>
</param>

</paramset>
</postxml>
53 changes: 0 additions & 53 deletions parm/fv3lam_cmaq.xml
View file
Open in desktop

This file was deleted.

Loading