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.

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

Coupling merra2 aerosol climatology and GOCART forecasted aerosols with the Thompson microphysics scheme #1438

Merged
merged 50 commits into from
Sep 30, 2022
Merged

Coupling merra2 aerosol climatology and GOCART forecasted aerosols with the Thompson microphysics scheme #1438

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
50 commits
Select commit Hold shift + click to select a range
e1080af
established a merra2_thompson branch and the version passed compilation
AnningCheng-NOAA Aug 24, 2021
cf45c2a
added test case merra2_thompson
AnningCheng-NOAA Aug 25, 2021
721c160
version worked for producing nifa and nwfa
AnningCheng-NOAA Aug 26, 2021
248d233
added mraerosol for testing
AnningCheng-NOAA Sep 3, 2021
3970021
use ltaersol=.true. and merra2
AnningCheng-NOAA Sep 3, 2021
1495841
Merge branch 'merra2_thompson' of https://github.com/AnningCheng-NOAA…
AnningCheng-NOAA Sep 21, 2021
b6df5a4
establish branch mraerosol
AnningCheng-NOAA Sep 23, 2021
18e1508
mraerosol branch can pass control regression tests
AnningCheng-NOAA Oct 6, 2021
43e810f
add logs
AnningCheng-NOAA Oct 8, 2021
230c331
using field table instead of code change for mraerosol
AnningCheng-NOAA Oct 18, 2021
218005e
bring mraerosol up2date
AnningCheng-NOAA Oct 18, 2021
180cea5
Fix submodule pointers
climbfuji Oct 18, 2021
73c37ca
Revert changes to rt.sh
climbfuji Oct 18, 2021
c54d7fe
Update submodule pointer for fv3atm
climbfuji Oct 18, 2021
3d2a051
Merge pull request #1 from climbfuji/mraerosol_update_dom_20211008
AnningCheng-NOAA Oct 18, 2021
463ac4a
sync branch
AnningCheng-NOAA Feb 10, 2022
2a6dc11
update UFS
AnningCheng-NOAA Mar 15, 2022
a2955ed
merge to the develop branch in ufs-weather-model
AnningCheng-NOAA Mar 17, 2022
7b2ed75
synchronize with trunk and pass compilation
AnningCheng-NOAA Mar 21, 2022
b445423
passed compilation
AnningCheng-NOAA Apr 5, 2022
c0c675f
mraerosl begins to run
AnningCheng-NOAA Apr 11, 2022
c06f7e9
DNATS value was traced to merra2_thompson.nml.IN
AnningCheng-NOAA Apr 11, 2022
147f316
added field and diag tables for regression tests
AnningCheng-NOAA Apr 11, 2022
76c848c
works well on hera now
AnningCheng-NOAA Apr 12, 2022
13c8e2e
logs update
AnningCheng-NOAA May 9, 2022
2c7f650
merge to the develop branch in ufs-weather-model
AnningCheng-NOAA May 9, 2022
c485caf
pass regression tests in orion
AnningCheng-NOAA May 13, 2022
4f966c5
synchronize with trunk
AnningCheng-NOAA Aug 24, 2022
bcb0a00
pass regression tests
AnningCheng-NOAA Aug 26, 2022
1d36e04
gocart aerosol coupled with thompson microphysics
AnningCheng-NOAA Sep 2, 2022
c447b23
change fv3atm branch to feature/merra_thompson
ChunxiZhang-NOAA Sep 9, 2022
c47597e
Merge remote-tracking branch 'anning/mraerosol' into feature/merra2_t…
ChunxiZhang-NOAA Sep 9, 2022
3c215de
Made CmakeModules and GOCART point to the correct hash
ChunxiZhang-NOAA Sep 9, 2022
909e44f
Merge remote-tracking branch 'upstream/develop' into feature/merra2_t…
ChunxiZhang-NOAA Sep 13, 2022
f1a3a06
Updated FV3 and added RT merra2_thompson
ChunxiZhang-NOAA Sep 16, 2022
9174f61
Updated FV3
ChunxiZhang-NOAA Sep 23, 2022
4930e0b
Merge remote-tracking branch 'upstream/develop' into feature/merra2_t…
ChunxiZhang-NOAA Sep 23, 2022
172a5ce
add new BL_DATE
jkbk2004 Sep 27, 2022
d9e925b
Updated FV3 for modifying the Thompson scheme
ChunxiZhang-NOAA Sep 28, 2022
438336c
Merge remote-tracking branch 'upstream/develop' into feature/merra2_t…
ChunxiZhang-NOAA Sep 29, 2022
a4de164
add new BL_DATE
jkbk2004 Sep 29, 2022
9ed6b78
[AutoRT] hera.gnu Job Completed.
BrianCurtis-NOAA Sep 29, 2022
faa534e
[AutoRT] hera.intel Job Completed.
BrianCurtis-NOAA Sep 29, 2022
b07bc54
[AutoRT] gaea.intel Job Completed.
BrianCurtis-NOAA Sep 30, 2022
f09264e
add orion.intel RT log: add passed
jkbk2004 Sep 30, 2022
de320a1
add cheyenne intel/gnu RT logs: passed
jkbk2004 Sep 30, 2022
73f84cc
add jet.intel RT log: passed
jkbk2004 Sep 30, 2022
cd2071b
WCOSS2.intel RT Log
BrianCurtis-NOAA Sep 30, 2022
10190fe
Update submodule pointer for fv3atm
ChunxiZhang-NOAA Sep 30, 2022
adc1b57
Merge branch 'feature/merra2_thompson' of https://github.com/ChunxiZh…
ChunxiZhang-NOAA Sep 30, 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
2 changes: 1 addition & 1 deletion FV3
Open in desktop
Submodule FV3 updated 4 files
+11 −2 ccpp/data/GFS_typedefs.F90
+6 −0 ccpp/data/GFS_typedefs.meta
+66 −40 ccpp/driver/GFS_diagnostics.F90
+1 −1 ccpp/physics
420 changes: 210 additions & 210 deletions tests/RegressionTests_cheyenne.gnu.log
View file
Open in desktop

Large diffs are not rendered by default.

1,771 changes: 938 additions & 833 deletions tests/RegressionTests_cheyenne.intel.log
View file
Open in desktop

Large diffs are not rendered by default.

1,771 changes: 938 additions & 833 deletions tests/RegressionTests_gaea.intel.log
View file
Open in desktop

Large diffs are not rendered by default.

424 changes: 212 additions & 212 deletions tests/RegressionTests_hera.gnu.log
View file
Open in desktop

Large diffs are not rendered by default.

1,793 changes: 949 additions & 844 deletions tests/RegressionTests_hera.intel.log
View file
Open in desktop

Large diffs are not rendered by default.

1,773 changes: 939 additions & 834 deletions tests/RegressionTests_jet.intel.log
View file
Open in desktop

Large diffs are not rendered by default.

1,795 changes: 950 additions & 845 deletions tests/RegressionTests_orion.intel.log
View file
Open in desktop

Large diffs are not rendered by default.

1,374 changes: 720 additions & 654 deletions tests/RegressionTests_wcoss2.intel.log
View file
Open in desktop

Large diffs are not rendered by default.

6 changes: 4 additions & 2 deletions .../parm/diag_table/diag_table_gfsv16_merra2 → tests/parm/diag_table/diag_table_mr2
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
20210322.06Z.C96.64bit.non-mono
2021 03 22 06 0 0
20161003.00Z.C96.64bit.non-mono
2016 10 03 00 0 0

"fv3_history", 0, "hours", 1, "hours", "time"
"fv3_history2d", 0, "hours", 1, "hours", "time"
Expand Down Expand Up @@ -74,6 +74,8 @@
"gfs_phys", "psurf", "pressfc", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "u10m", "ugrd10m", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "v10m", "vgrd10m", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "nwfa", "nwfa", "fv3_history", "all", .false., "none", 2
"gfs_phys", "nifa", "nifa", "fv3_history", "all", .false., "none", 2
"gfs_sfc", "crain", "crain", "fv3_history2d", "all", .false., "none", 2
"gfs_sfc", "tprcp", "tprcp", "fv3_history2d", "all", .false., "none", 2
"gfs_sfc", "hgtsfc", "orog", "fv3_history2d", "all", .false., "none", 2
Expand Down
306 changes: 306 additions & 0 deletions tests/parm/diag_table/diag_table_p8_gocart_micro
View file
Open in desktop

Large diffs are not rendered by default.

65 changes: 65 additions & 0 deletions tests/parm/field_table/field_table_mr2
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,65 @@
# added by FRE: sphum must be present in atmos
# specific humidity for moist runs
"TRACER", "atmos_mod", "sphum"
"longname", "specific humidity"
"units", "kg/kg"
"profile_type", "fixed", "surface_value=3.e-6" /
# prognostic cloud water mixing ratio
"TRACER", "atmos_mod", "liq_wat"
"longname", "cloud water mixing ratio"
"units", "kg/kg"
"profile_type", "fixed", "surface_value=1.e30" /
# prognostic ice water mixing ratio
"TRACER", "atmos_mod", "ice_wat"
"longname", "cloud ice mixing ratio"
"units", "kg/kg"
"profile_type", "fixed", "surface_value=1.e30" /
# prognostic rain water mixing ratio
"TRACER", "atmos_mod", "rainwat"
"longname", "rain water mixing ratio"
"units", "kg/kg"
"profile_type", "fixed", "surface_value=1.e30" /
# prognostic snow water mixing ratio
"TRACER", "atmos_mod", "snowwat"
"longname", "snow water mixing ratio"
"units", "kg/kg"
"profile_type", "fixed", "surface_value=1.e30" /
# prognostic Grau water mixing ratio
"TRACER", "atmos_mod", "graupel"
"longname", "graupel mixing ratio"
"units", "kg/kg"
"profile_type", "fixed", "surface_value=1.e30" /
# prognostic cloud water number concentration
"TRACER", "atmos_mod", "water_nc"
"longname", "cloud liquid water number concentration"
"units", "/kg"
"profile_type", "fixed", "surface_value=0.0" /
# prognostic cloud ice number concentration
"TRACER", "atmos_mod", "ice_nc"
"longname", "cloud ice water number concentration"
"units", "/kg"
"profile_type", "fixed", "surface_value=0.0" /
# prognostic rain number concentration
"TRACER", "atmos_mod", "rain_nc"
"longname", "rain number concentration"
"units", "/kg"
"profile_type", "fixed", "surface_value=0.0" /
# prognostic ozone mixing ratio tracer
"TRACER", "atmos_mod", "o3mr"
"longname", "ozone mixing ratio"
"units", "kg/kg"
"profile_type", "fixed", "surface_value=1.e30" /
# prognostic subgrid scale turbulent kinetic energy
"TRACER", "atmos_mod", "sgs_tke"
"longname", "subgrid scale turbulent kinetic energy"
"units", "m2/s2"
"profile_type", "fixed", "surface_value=0.0" /
# water- and ice-friendly aerosols (Thompson)
"TRACER", "atmos_mod", "liq_aero"
"longname", "water-friendly aerosol number concentration"
"units", "/kg"
"profile_type", "fixed", "surface_value=0.0" /
"TRACER", "atmos_mod", "ice_aero"
"longname", "ice-friendly aerosol number concentration"
"units", "/kg"
"profile_type", "fixed", "surface_value=0.0" /
192 changes: 192 additions & 0 deletions tests/parm/field_table/field_table_thompson_aero_tke_GOCART
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,192 @@
# added by FRE: sphum must be present in atmos
# specific humidity for moist runs
"TRACER", "atmos_mod", "sphum"
"longname", "specific humidity"
"units", "kg/kg"
"profile_type", "fixed", "surface_value=3.e-6" /
# prognostic cloud water mixing ratio
"TRACER", "atmos_mod", "liq_wat"
"longname", "cloud water mixing ratio"
"units", "kg/kg"
"profile_type", "fixed", "surface_value=1.e30" /
# prognostic ice water mixing ratio
"TRACER", "atmos_mod", "ice_wat"
"longname", "cloud ice mixing ratio"
"units", "kg/kg"
"profile_type", "fixed", "surface_value=1.e30" /
# prognostic rain water mixing ratio
"TRACER", "atmos_mod", "rainwat"
"longname", "rain water mixing ratio"
"units", "kg/kg"
"profile_type", "fixed", "surface_value=1.e30" /
# prognostic snow water mixing ratio
"TRACER", "atmos_mod", "snowwat"
"longname", "snow water mixing ratio"
"units", "kg/kg"
"profile_type", "fixed", "surface_value=1.e30" /
# prognostic Grau water mixing ratio
"TRACER", "atmos_mod", "graupel"
"longname", "graupel mixing ratio"
"units", "kg/kg"
"profile_type", "fixed", "surface_value=1.e30" /
# prognostic cloud water number concentration - not for non-aerosol runs
"TRACER", "atmos_mod", "water_nc"
"longname", "cloud liquid water number concentration"
"units", "/kg"
"profile_type", "fixed", "surface_value=0.0" /
# prognostic cloud ice number concentration
"TRACER", "atmos_mod", "ice_nc"
"longname", "cloud ice water number concentration"
"units", "/kg"
"profile_type", "fixed", "surface_value=0.0" /
# prognostic rain number concentration
"TRACER", "atmos_mod", "rain_nc"
"longname", "rain number concentration"
"units", "/kg"
"profile_type", "fixed", "surface_value=0.0" /
# prognostic ozone mixing ratio tracer
"TRACER", "atmos_mod", "o3mr"
"longname", "ozone mixing ratio"
"units", "kg/kg"
"profile_type", "fixed", "surface_value=1.e30" /
# prognostic subgrid scale turbulent kinetic energy
"TRACER", "atmos_mod", "sgs_tke"
"longname", "subgrid scale turbulent kinetic energy"
"units", "m2/s2"
"profile_type", "fixed", "surface_value=0.0" /
# prognostic aerosols
"TRACER", "atmos_mod", "so2"
"longname", "so2 mixing ratio"
"units", "ppm"
"tracer_usage", "chemistry"
"profile_type", "fixed", "surface_value=0.0" /
"TRACER", "atmos_mod", "so4"
"longname", "sulfate mixing ratio"
"units", "ug/kg"
"tracer_usage", "chemistry"
"profile_type", "fixed", "surface_value=0.0" /
"TRACER", "atmos_mod", "dms"
"longname", "DMS mixing ratio"
"units", "ppm"
"tracer_usage", "chemistry"
"profile_type", "fixed", "surface_value=0.0" /
"TRACER", "atmos_mod", "msa"
"longname", "msa mixing ratio"
"units", "ppm"
"tracer_usage", "chemistry"
"profile_type", "fixed", "surface_value=0.0" /
"TRACER", "atmos_mod", "bc1"
"longname", "hydrophobic black carbon mixing ratio"
"units", "ug/kg"
"tracer_usage", "chemistry"
"profile_type", "fixed", "surface_value=0.0" /
"TRACER", "atmos_mod", "bc2"
"longname", "hydrophillic black carbon mixing ratio"
"units", "ug/kg"
"tracer_usage", "chemistry"
"profile_type", "fixed", "surface_value=0.0" /
"TRACER", "atmos_mod", "oc1"
"longname", "hydrophobic organic carbon mixing ratio"
"units", "ug/kg"
"tracer_usage", "chemistry"
"profile_type", "fixed", "surface_value=0.0" /
"TRACER", "atmos_mod", "oc2"
"longname", "hydrophillic organic carbon mixing ratio"
"units", "ug/kg"
"tracer_usage", "chemistry"
"profile_type", "fixed", "surface_value=0.0" /
"TRACER", "atmos_mod", "dust1"
"longname", "fine dust1 mixing ratio"
"units", "ug/kg"
"tracer_usage", "chemistry"
"profile_type", "fixed", "surface_value=0.0" /
"TRACER", "atmos_mod", "dust2"
"longname", "fine dust2 mixing ratio"
"units", "ug/kg"
"tracer_usage", "chemistry"
"profile_type", "fixed", "surface_value=0.0" /
"TRACER", "atmos_mod", "dust3"
"longname", "coarse dust3 mixing ratio"
"units", "ug/kg"
"tracer_usage", "chemistry"
"profile_type", "fixed", "surface_value=0.0" /
"TRACER", "atmos_mod", "dust4"
"longname", "coarse dust4 mixing ratio"
"units", "ug/kg"
"tracer_usage", "chemistry"
"profile_type", "fixed", "surface_value=0.0" /
"TRACER", "atmos_mod", "dust5"
"longname", "coarse dust5 mixing ratio"
"units", "ug/kg"
"tracer_usage", "chemistry"
"profile_type", "fixed", "surface_value=0.0" /
"TRACER", "atmos_mod", "seas1"
"longname", "seasalt1 mixing ratio"
"units", "ug/kg"
"tracer_usage", "chemistry"
"profile_type", "fixed", "surface_value=0.0" /
"TRACER", "atmos_mod", "seas2"
"longname", "seasalt2 mixing ratio"
"units", "ug/kg"
"tracer_usage", "chemistry"
"profile_type", "fixed", "surface_value=0.0" /
"TRACER", "atmos_mod", "seas3"
"longname", "seasalt3 mixing ratio"
"units", "ug/kg"
"tracer_usage", "chemistry"
"profile_type", "fixed", "surface_value=0.0" /
"TRACER", "atmos_mod", "seas4"
"longname", "seasalt4 mixing ratio"
"units", "ug/kg"
"tracer_usage", "chemistry"
"profile_type", "fixed", "surface_value=0.0" /
"TRACER", "atmos_mod", "seas5"
"longname", "seasalt5 mixing ratio"
"units", "ug/kg"
"tracer_usage", "chemistry"
"profile_type", "fixed", "surface_value=0.0" /
"TRACER", "atmos_mod", "nh3"
"longname", "primary NH3 mixing ratio"
"units", "ug/kg"
"tracer_usage", "chemistry"
"profile_type", "fixed", "surface_value=0.0" /
"TRACER", "atmos_mod", "nh4a"
"longname", "primary NH4a mixing ratio"
"units", "ug/kg"
"tracer_usage", "chemistry"
"profile_type", "fixed", "surface_value=0.0" /
"TRACER", "atmos_mod", "no3an1"
"longname", "primary NO3an1 mixing ratio"
"units", "ug/kg"
"tracer_usage", "chemistry"
"profile_type", "fixed", "surface_value=0.0" /
"TRACER", "atmos_mod", "no3an2"
"longname", "primary NO3an2 mixing ratio"
"units", "ug/kg"
"tracer_usage", "chemistry"
"profile_type", "fixed", "surface_value=0.0" /
"TRACER", "atmos_mod", "no3an3"
"longname", "primary NO3an3 mixing ratio"
"units", "ug/kg"
"tracer_usage", "chemistry"
"profile_type", "fixed", "surface_value=0.0" /
# diagnostic PM tracers
"TRACER", "atmos_mod", "pm25"
"longname", "primary PM25 mixing ratio"
"units", "ug/m3"
"tracer_usage", "chemistry", "type=diagnostic"
"profile_type", "fixed", "surface_value=0.0" /
"TRACER", "atmos_mod", "pm10"
"longname", "primary PM10 mixing ratio"
"units", "ug/m3"
"tracer_usage", "chemistry", "type=diagnostic"
"profile_type", "fixed", "surface_value=0.0" /
# water- and ice-friendly aerosols (Thompson)
"TRACER", "atmos_mod", "liq_aero"
"longname", "water-friendly aerosol number concentration"
"units", "/kg"
"profile_type", "fixed", "surface_value=0.0" /
"TRACER", "atmos_mod", "ice_aero"
"longname", "ice-friendly aerosol number concentration"
"units", "/kg"
"profile_type", "fixed", "surface_value=0.0" /
Loading