Skip to content

Commit

Permalink
Coupling merra2 aerosol climatology and GOCART forecasted aerosols wi…
Browse files Browse the repository at this point in the history 
…th the Thompson microphysics scheme (#1438)

* added test case merra2_thompson

* version worked for producing nifa and nwfa

* added mraerosol for testing

* use ltaersol=.true. and merra2

* using field table instead of code change for mraerosol

* DNATS value was traced to merra2_thompson.nml.IN

* added field and diag tables for regression tests

* gocart aerosol coupled with thompson microphysics

* Made CmakeModules and GOCART point to the correct hash

* Updated FV3 for modifying the Thompson scheme

Co-authored-by: anning.cheng <anning.cheng@noaa.gov>
Co-authored-by: Dom Heinzeller <climbfuji@ymail.com>
Co-authored-by: AnningCheng-NOAA <48297505+AnningCheng-NOAA@users.noreply.github.com>
Co-authored-by: JONG KIM <jong.kim@noaa.gov>
Co-authored-by: Brian Curtis <brian.curtis@noaa.gov>
  • Loading branch information
@ChunxiZhang-NOAA @AnningCheng-NOAA
@climbfuji @jkbk2004 @BrianCurtis-NOAA
6 people authored Sep 30, 2022
1 parent ff2f0af commit 8925cdb
Show file tree
Hide file tree
Showing 18 changed files with 7,169 additions and 5,270 deletions.
2 changes: 1 addition & 1 deletion FV3
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

Large diffs are not rendered by default.

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

Large diffs are not rendered by default.

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

Large diffs are not rendered by default.

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

Large diffs are not rendered by default.

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

Large diffs are not rendered by default.

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

Large diffs are not rendered by default.

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

Large diffs are not rendered by default.

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

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
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

Large diffs are not rendered by default.

65 changes: 65 additions & 0 deletions tests/parm/field_table/field_table_mr2
View file
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
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

0 comments on commit 8925cdb

Please sign in to comment.