Skip to content

Commit

Permalink
Merge pull request #6 from GEOS-ESM/develop
Browse files Browse the repository at this point in the history 
AERO_PROVIDER can now be GOCART2G, GMICHEM;  get SZA from MAPL
  • Loading branch information
@mathomp4
mathomp4 authored Apr 24, 2023
2 parents 23da685 + 5b296c2 commit 1d1945c
Show file tree
Hide file tree
Showing 17 changed files with 702 additions and 1,346 deletions.
18 changes: 18 additions & 0 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,24 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

### Deprecated


## [1.1.0] - 2023-04-24

### Added

- Capability for AERO_PROVIDER=GOCART2G
- Capability for AERO_PROVIDER=GMICHEM
- Capability for AERO_PROVIDER=CARMA (uses GMICHEM right now)

### Changed

- Instead of calling the GMI routines for SZA (in Chem_Shared), now call a wrapper for the corresponding MAPL routine
- Changed default aerosdust filename (for case AERO_PROVIDER=GMICHEM)

### Removed

- Code that might have eventually run GOCART-like aerosols from within the GMI framework (note: doubtful this ever worked and would take significant effort to get working IMHO)

## [1.0.0] - 2023-01-18

### Added
Expand Down
33 changes: 16 additions & 17 deletions GMI_GridComp/GMI_ExtData.rc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -79,23 +79,22 @@ MEGAN_LAI_009 'cm cm-1' Y N - none none AVHRR_LAI_009 ExtData/g5
MEGAN_LAI_010 'cm cm-1' Y N - none none AVHRR_LAI_010 ExtData/g5chem/sfc/MEGAN_AEF_LAI_Heracles.x288_y181_t12.2008.nc
MEGAN_LAI_011 'cm cm-1' Y N - none none AVHRR_LAI_011 ExtData/g5chem/sfc/MEGAN_AEF_LAI_Heracles.x288_y181_t12.2008.nc
MEGAN_LAI_012 'cm cm-1' Y N - none none AVHRR_LAI_012 ExtData/g5chem/sfc/MEGAN_AEF_LAI_Heracles.x288_y181_t12.2008.nc
BC1 'kg m-3' Y Y %y4-%m2-%d2T12:00:00 none none BC1 /dev/null
BC2 'kg m-3' Y Y %y4-%m2-%d2T12:00:00 none none BC2 /dev/null
OC1 'kg m-3' Y Y %y4-%m2-%d2T12:00:00 none none OC1 /dev/null
OC2 'kg m-3' Y Y %y4-%m2-%d2T12:00:00 none none OC2 /dev/null
SS1 'kg m-3' Y Y %y4-%m2-%d2T12:00:00 none none SS1 /dev/null
SS2 'kg m-3' Y Y %y4-%m2-%d2T12:00:00 none none SS2 /dev/null
SS3 'kg m-3' Y Y %y4-%m2-%d2T12:00:00 none none SS3 /dev/null
SS4 'kg m-3' Y Y %y4-%m2-%d2T12:00:00 none none SS4 /dev/null
SO4 'kg m-3' Y Y %y4-%m2-%d2T12:00:00 none none SO4 /dev/null
SO4v 'kg m-3' Y Y %y4-%m2-%d2T12:00:00 none none SO4v /dev/null
MDUST1 'kg m-3' Y Y %y4-%m2-%d2T12:00:00 none none MDUST1 /dev/null
MDUST2 'kg m-3' Y Y %y4-%m2-%d2T12:00:00 none none MDUST2 /dev/null
MDUST3 'kg m-3' Y Y %y4-%m2-%d2T12:00:00 none none MDUST3 /dev/null
MDUST4 'kg m-3' Y Y %y4-%m2-%d2T12:00:00 none none MDUST4 /dev/null
MDUST5 'kg m-3' Y Y %y4-%m2-%d2T12:00:00 none none MDUST5 /dev/null
MDUST6 'kg m-3' Y Y %y4-%m2-%d2T12:00:00 none none MDUST6 /dev/null
MDUST7 'kg m-3' Y Y %y4-%m2-%d2T12:00:00 none none MDUST7 /dev/null
BCphobic 'kg m-3' Y Y %y4-%m2-%d2T12:00:00 none none BCPHOBIC ExtData/chemistry/GMI/aerosols/GEOSCCM_aerodust_MERRA2_tavg3D_monavg_2017_2022.nc4
BCphilic 'kg m-3' Y Y %y4-%m2-%d2T12:00:00 none none BCPHILIC ExtData/chemistry/GMI/aerosols/GEOSCCM_aerodust_MERRA2_tavg3D_monavg_2017_2022.nc4
OCphobic 'kg m-3' Y Y %y4-%m2-%d2T12:00:00 none none OCPHOBIC ExtData/chemistry/GMI/aerosols/GEOSCCM_aerodust_MERRA2_tavg3D_monavg_2017_2022.nc4
OCphilic 'kg m-3' Y Y %y4-%m2-%d2T12:00:00 none none OCPHILIC ExtData/chemistry/GMI/aerosols/GEOSCCM_aerodust_MERRA2_tavg3D_monavg_2017_2022.nc4
ss001 'kg m-3' Y Y %y4-%m2-%d2T12:00:00 none none SS001 ExtData/chemistry/GMI/aerosols/GEOSCCM_aerodust_MERRA2_tavg3D_monavg_2017_2022.nc4
ss002 'kg m-3' Y Y %y4-%m2-%d2T12:00:00 none none SS002 ExtData/chemistry/GMI/aerosols/GEOSCCM_aerodust_MERRA2_tavg3D_monavg_2017_2022.nc4
ss003 'kg m-3' Y Y %y4-%m2-%d2T12:00:00 none none SS003 ExtData/chemistry/GMI/aerosols/GEOSCCM_aerodust_MERRA2_tavg3D_monavg_2017_2022.nc4
ss004 'kg m-3' Y Y %y4-%m2-%d2T12:00:00 none none SS004 ExtData/chemistry/GMI/aerosols/GEOSCCM_aerodust_MERRA2_tavg3D_monavg_2017_2022.nc4
ss005 'kg m-3' Y Y %y4-%m2-%d2T12:00:00 none none SS005 ExtData/chemistry/GMI/aerosols/GEOSCCM_aerodust_MERRA2_tavg3D_monavg_2017_2022.nc4
SO4 'kg m-3' Y Y %y4-%m2-%d2T12:00:00 none none SO4 ExtData/chemistry/GMI/aerosols/GEOSCCM_aerodust_MERRA2_tavg3D_monavg_2017_2022.nc4
SO4v 'kg m-3' Y Y %y4-%m2-%d2T12:00:00 none none SO4v /dev/null
du001 'kg m-3' Y Y %y4-%m2-%d2T12:00:00 none none DU001 ExtData/chemistry/GMI/aerosols/GEOSCCM_aerodust_MERRA2_tavg3D_monavg_2017_2022.nc4
du002 'kg m-3' Y Y %y4-%m2-%d2T12:00:00 none none DU002 ExtData/chemistry/GMI/aerosols/GEOSCCM_aerodust_MERRA2_tavg3D_monavg_2017_2022.nc4
du003 'kg m-3' Y Y %y4-%m2-%d2T12:00:00 none none DU003 ExtData/chemistry/GMI/aerosols/GEOSCCM_aerodust_MERRA2_tavg3D_monavg_2017_2022.nc4
du004 'kg m-3' Y Y %y4-%m2-%d2T12:00:00 none none DU004 ExtData/chemistry/GMI/aerosols/GEOSCCM_aerodust_MERRA2_tavg3D_monavg_2017_2022.nc4
du005 'kg m-3' Y Y %y4-%m2-%d2T12:00:00 none none DU005 ExtData/chemistry/GMI/aerosols/GEOSCCM_aerodust_MERRA2_tavg3D_monavg_2017_2022.nc4
# -----------|--------------|-----|---|----------------------|--------|-------|-----------------|----------------------
%%

Expand Down
100 changes: 64 additions & 36 deletions GMI_GridComp/GMI_ExtData.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,8 @@ Collections:
template: ExtData/CMIP6/L72/SAD/sad_wt_CMIP6_288x181x72_%y4.nc
GMI_veg_fraction_x720_y360_t12_2008.nc:
template: ExtData/g5chem/sfc/LAI/veg_fraction_x720_y360_t12_2008.nc
GMI_aerodust_file:
template: ExtData/chemistry/GMI/aerosols/GEOSCCM_aerodust_MERRA2_tavg3D_monavg_2017_2022.nc4

Samplings:
GMI_sample_0:
Expand All @@ -54,6 +56,68 @@ Samplings:
extrapolation: clim

Exports:
BCphobic:
collection: GMI_aerodust_file
sample: GMI_sample_2
variable: BCPHOBIC
BCphilic:
collection: GMI_aerodust_file
sample: GMI_sample_2
variable: BCPHILIC
OCphobic:
collection: GMI_aerodust_file
sample: GMI_sample_2
variable: OCPHOBIC
OCphilic:
collection: GMI_aerodust_file
sample: GMI_sample_2
variable: OCPHILIC
SO4:
collection: GMI_aerodust_file
sample: GMI_sample_2
variable: SO4
SO4v:
collection: /dev/null
ss001:
collection: GMI_aerodust_file
sample: GMI_sample_2
variable: SS001
ss002:
collection: GMI_aerodust_file
sample: GMI_sample_2
variable: SS002
ss003:
collection: GMI_aerodust_file
sample: GMI_sample_2
variable: SS003
ss004:
collection: GMI_aerodust_file
sample: GMI_sample_2
variable: SS004
ss005:
collection: GMI_aerodust_file
sample: GMI_sample_2
variable: SS005
du001:
collection: GMI_aerodust_file
sample: GMI_sample_2
variable: DU001
du002:
collection: GMI_aerodust_file
sample: GMI_sample_2
variable: DU002
du003:
collection: GMI_aerodust_file
sample: GMI_sample_2
variable: DU003
du004:
collection: GMI_aerodust_file
sample: GMI_sample_2
variable: DU004
du005:
collection: GMI_aerodust_file
sample: GMI_sample_2
variable: DU005
ACET_FIXED:
collection: GMI_acetone_fixed_GMI.x288_y181_z72_t12.2001.nc
sample: GMI_sample_0
Expand All @@ -77,10 +141,6 @@ Exports:
regrid: CONSERVE
sample: GMI_sample_1
variable: ALK4_ff
BC1:
collection: /dev/null
BC2:
collection: /dev/null
C2H6_biof:
collection: /dev/null
C2H6_biom:
Expand Down Expand Up @@ -177,20 +237,6 @@ Exports:
collection: GMI_lai_x720_y360_v72_t12_2008.nc
sample: GMI_sample_0
variable: LAI_FRAC
MDUST1:
collection: /dev/null
MDUST2:
collection: /dev/null
MDUST3:
collection: /dev/null
MDUST4:
collection: /dev/null
MDUST5:
collection: /dev/null
MDUST6:
collection: /dev/null
MDUST7:
collection: /dev/null
MEGAN_ISOP:
collection: GMI_MEGAN_AEF_LAI_Heracles.x288_y181_t12.2008.nc
regrid: CONSERVE
Expand Down Expand Up @@ -309,10 +355,6 @@ Exports:
collection: /dev/null
NO_ship:
collection: /dev/null
OC1:
collection: /dev/null
OC2:
collection: /dev/null
OCS_CLIMO:
collection: GMI_OCS_vmr.x360_y181_z72.t12.2016.nc4
sample: GMI_sample_0
Expand Down Expand Up @@ -363,10 +405,6 @@ Exports:
regrid: CONSERVE
sample: GMI_sample_1
variable: SO2_shipping
SO4:
collection: /dev/null
SO4v:
collection: /dev/null
SOILFERT:
collection: GMI_fertilizer_GMI.x288_y181_t12.2006.nc
regrid: CONSERVE
Expand All @@ -376,17 +414,7 @@ Exports:
collection: GMI_precipitation_GMI.x288_y181_t12.2006.nc
sample: GMI_sample_0
variable: soilPrecip
SS1:
collection: /dev/null
SS2:
collection: /dev/null
SS3:
collection: /dev/null
SS4:
collection: /dev/null
VEG_FRAC:
collection: GMI_veg_fraction_x720_y360_t12_2008.nc
sample: GMI_sample_0
variable: VEG_FRAC


1 change: 0 additions & 1 deletion GMI_GridComp/GmiChem_GridCompClassMod.F90
View file
Original file line number Diff line number Diff line change
Expand Up @@ -672,7 +672,6 @@ SUBROUTINE GmiChemistry_GridCompRun ( self, bgg, bxx, impChem, expChem, nymd, nh
USE GmiTimeControl_mod, ONLY : Set_numTimeSteps, Get_numTimeSteps
USE GmiTimeControl_mod, ONLY : Set_gmiSeconds, GetSecondsFromJanuary1
USE GmiSpcConcentrationMethod_mod, ONLY : resetFixedConcentration
USE GmiSolar_mod, ONLY : CalcCosSolarZenithAngle
USE GmiChemistryMethod_mod, ONLY : RunChemistry

IMPLICIT none
Expand Down
2 changes: 1 addition & 1 deletion GMI_GridComp/GmiChemistry/AerosolDust/GmiAerDustODSA_mod.F90
View file
Original file line number Diff line number Diff line change
Expand Up @@ -561,7 +561,7 @@ subroutine Dust_OptDep_SurfArea(gridBoxHeight, concentration, &
! !LOCAL VARIABLES:
REAL*8 :: MSDENS(NSADdust)

integer :: i, j , k, l, n, r
integer :: i, j, k, l, n, r
!
! !REVISION HISTORY:
! February2005, Jules Kouatchou (Jules.Kouatchou.1@gsfc.nasa.gov)
Expand Down
57 changes: 29 additions & 28 deletions GMI_GridComp/GmiChemistry/StratTrop_HFC_S/GMI_Registry.rc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -142,23 +142,22 @@
MEGAN_LAI_010 | cm cm-2 | xy | | | | | | | x | AVHRR_leaf_area_index_oct_2000
MEGAN_LAI_011 | cm cm-2 | xy | | | | | | | x | AVHRR_leaf_area_index_nov_2000
MEGAN_LAI_012 | cm cm-2 | xy | | | | | | | x | AVHRR_leaf_area_index_dec_2000
BC1 | kg m-3 | xyz | C | | | | | | x | hydrophobic_black_carbon
BC2 | kg m-3 | xyz | C | | | | | | x | hydrophilic_black_carbon
OC1 | kg m-3 | xyz | C | | | | | | x | hydrophobic_organic_carbon
OC2 | kg m-3 | xyz | C | | | | | | x | hydrophilic_organic_carbon
SS1 | kg m-3 | xyz | C | | | | | | x | sea_salt
SS2 | kg m-3 | xyz | C | | | | | | x | sea_salt
SS3 | kg m-3 | xyz | C | | | | | | x | sea_salt
SS4 | kg m-3 | xyz | C | | | | | | x | sea_salt
BCphobic | kg m-3 | xyz | C | | | | | | x | hydrophobic_black_carbon
BCphilic | kg m-3 | xyz | C | | | | | | x | hydrophilic_black_carbon
OCphobic | kg m-3 | xyz | C | | | | | | x | hydrophobic_organic_carbon
OCphilic | kg m-3 | xyz | C | | | | | | x | hydrophilic_organic_carbon
ss001 | kg m-3 | xyz | C | | | | | | x | sea_salt
ss002 | kg m-3 | xyz | C | | | | | | x | sea_salt
ss003 | kg m-3 | xyz | C | | | | | | x | sea_salt
ss004 | kg m-3 | xyz | C | | | | | | x | sea_salt
ss005 | kg m-3 | xyz | C | | | | | | x | sea_salt
SO4 | kg m-3 | xyz | C | | | | | | x | sulfate
SO4v | kg m-3 | xyz | C | | | | | | x | sulfate_from_volcanos
MDUST1 | kg m-3 | xyz | C | | | | | | x | dust
MDUST2 | kg m-3 | xyz | C | | | | | | x | dust
MDUST3 | kg m-3 | xyz | C | | | | | | x | dust
MDUST4 | kg m-3 | xyz | C | | | | | | x | dust
MDUST5 | kg m-3 | xyz | C | | | | | | x | dust
MDUST6 | kg m-3 | xyz | C | | | | | | x | dust
MDUST7 | kg m-3 | xyz | C | | | | | | x | dust
du001 | kg m-3 | xyz | C | | | | | | x | dust
du002 | kg m-3 | xyz | C | | | | | | x | dust
du003 | kg m-3 | xyz | C | | | | | | x | dust
du004 | kg m-3 | xyz | C | | | | | | x | dust
du005 | kg m-3 | xyz | C | | | | | | x | dust
# -------------------|-----------------|-----|---|----|---|---|-----|------|--------------------------
</ImportSpec>

Expand All @@ -171,19 +170,21 @@
# Short | | | V |Item|Intervl| Sub | Long
# Name | Units | Dim |Loc|Type| R | A |Tiles| Name
# ------------------|----------------|-----|---|----|---|---|-----|---------------------------------
GMICHEM::BCphobic | kg kg-1 | xyz | C | | | | | prescribed_hydrophobic_black_carbon_from_GMICHEM
GMICHEM::BCphilic | kg kg-1 | xyz | C | | | | | prescribed_hydrophylic_black_carbon_from_GMICHEM
GMICHEM::du001 | kg kg-1 | xyz | C | | | | | prescribed_dust_bin_1_from_GMICHEM
GMICHEM::du002 | kg kg-1 | xyz | C | | | | | prescribed_dust_bin_2_from_GMICHEM
GMICHEM::du003 | kg kg-1 | xyz | C | | | | | prescribed_dust_bin_3_from_GMICHEM
GMICHEM::du004 | kg kg-1 | xyz | C | | | | | prescribed_dust_bin_4_from_GMICHEM
GMICHEM::OCphobic | kg kg-1 | xyz | C | | | | | prescribed_hydrophobic_organic_carbon_from_GMICHEM
GMICHEM::OCphilic | kg kg-1 | xyz | C | | | | | prescribed_hydrophylic_organic_carbon_from_GMICHEM
GMICHEM::ss001 | kg kg-1 | xyz | C | | | | | prescribed_sea_salt_bin_1_from_GMICHEM
GMICHEM::ss003 | kg kg-1 | xyz | C | | | | | prescribed_sea_salt_bin_3_from_GMICHEM
GMICHEM::ss004 | kg kg-1 | xyz | C | | | | | prescribed_sea_salt_bin_4_from_GMICHEM
GMICHEM::ss005 | kg kg-1 | xyz | C | | | | | prescribed_sea_salt_bin_5_from_GMICHEM
GMICHEM::SO4 | kg kg-1 | xyz | C | | | | | prescribed_sulfate_from_GMICHEM
BCphobic | kg kg-1 | xyz | C | | | | | prescribed_hydrophobic_black_carbon_from_GMICHEM
BCphilic | kg kg-1 | xyz | C | | | | | prescribed_hydrophylic_black_carbon_from_GMICHEM
du001 | kg kg-1 | xyz | C | | | | | prescribed_dust_bin_1_from_GMICHEM
du002 | kg kg-1 | xyz | C | | | | | prescribed_dust_bin_2_from_GMICHEM
du003 | kg kg-1 | xyz | C | | | | | prescribed_dust_bin_3_from_GMICHEM
du004 | kg kg-1 | xyz | C | | | | | prescribed_dust_bin_4_from_GMICHEM
du005 | kg kg-1 | xyz | C | | | | | prescribed_dust_bin_4_from_GMICHEM
OCphobic | kg kg-1 | xyz | C | | | | | prescribed_hydrophobic_organic_carbon_from_GMICHEM
OCphilic | kg kg-1 | xyz | C | | | | | prescribed_hydrophylic_organic_carbon_from_GMICHEM
ss001 | kg kg-1 | xyz | C | | | | | prescribed_sea_salt_bin_1_from_GMICHEM
ss002 | kg kg-1 | xyz | C | | | | | prescribed_sea_salt_bin_1_from_GMICHEM
ss003 | kg kg-1 | xyz | C | | | | | prescribed_sea_salt_bin_3_from_GMICHEM
ss004 | kg kg-1 | xyz | C | | | | | prescribed_sea_salt_bin_4_from_GMICHEM
ss005 | kg kg-1 | xyz | C | | | | | prescribed_sea_salt_bin_5_from_GMICHEM
SO4 | kg kg-1 | xyz | C | | | | | prescribed_sulfate_from_GMICHEM
REFFICE | cm | xyz | C | | | | | ice_aerosol_effective_radius
REFFSTS | cm | xyz | C | | | | | STS_aerosol_effective_radius
VFALL | cm s-1 | xyz | C | | | | | effective_aerosol_fall_velocity
Expand Down
Loading

0 comments on commit 1d1945c

Please sign in to comment.