Skip to content

cam6_4_090: GEOS-Chem 14.5 and dependencies #1247

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.

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
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 3 additions & 3 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -51,14 +51,14 @@
path = src/chemistry/geoschem/geoschem_src
url = https://github.com/geoschem/geos-chem.git
fxrequired = AlwaysRequired
fxtag = 14.4.3
fxtag = 14.5.3
fxDONOTUSEurl = https://github.com/geoschem/geos-chem.git

[submodule "cloud_j"]
path = src/chemistry/cloud_j
url = https://github.com/geoschem/cloud-j.git
fxrequired = AlwaysRequired
fxtag = 7.7.3
fxtag = 8.0.1
fxDONOTUSEurl = https://github.com/geoschem/cloud-j.git

[submodule "hetp"]
Expand All @@ -71,7 +71,7 @@
[submodule "hemco"]
path = src/hemco
url = https://github.com/ESCOMP/HEMCO_CESM.git
fxtag = hemco-cesm2_1_0_hemco3_9_0
fxtag = hemco-cesm2_2_0_hemco3_10_3
fxrequired = AlwaysRequired
fxDONOTUSEurl = https://github.com/ESCOMP/HEMCO_CESM.git

Expand Down
2 changes: 1 addition & 1 deletion bld/configure
Original file line number Diff line number Diff line change
Expand Up @@ -1332,7 +1332,7 @@ if ($chem_pkg =~ '_mam3') {
if ($chem_pkg =~ 'geoschem') {
$chem_cppdefs .= ' -DEXTERNAL_GRID -DEXTERNAL_FORCING -DMODEL_CESM -DMODEL_GEOSCHEM';
if ($chem_pkg =~ '_mam4') {
$chem_nadv = 269; # includes all GEOS-Chem advected species, CO2, and MAM aerosols
$chem_nadv = 312; # includes all GEOS-Chem advected species, CO2, and MAM aerosols
}
}
# CARMA sectional microphysics
Expand Down
82 changes: 60 additions & 22 deletions bld/namelist_files/geoschem_master_gas_drydep_list.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,18 +5,45 @@
<!-- gas-phase species -->
<list id="gas_phase">
ACET
ACR
ACTA
AERI
ALD2
ALK4N2
ALK4P
AONITA
APAN
APINN
APINP
AROMCHO
AROMP4
AROMP5
AROMPN
ASOA1
ASOA2
ASOA3
ASOAN
ASOG1
ASOG2
ASOG3
ATOOH
BALD
BENZP
BPINN
BPINO
BPINON
BPINOOH
BPINP
BR2
BRCL
BRNO3
BRSALA
BRSALC
BUTN
BZCO3H
BZPAN
C96N
C96O2H
CH2O
CL2
CLNO2
Expand All @@ -35,6 +62,7 @@
GLYX
H2O2
HAC
HACTA
HBR
HC5A
HCL
Expand Down Expand Up @@ -73,14 +101,26 @@
IHN2
IHN3
IHN4
INDIOL
INPB
INPD
IONITA
IONO
IONO2
IPRNO3
ISALA
ISALC
ITCN
ITHN
LIMAL
LIMKB
LIMKET
LIMN
LIMNB
LIMO
LIMO2H
LIMO3H
LIMPAN
LVOC
LVOCOA
MACR
Expand All @@ -92,12 +132,15 @@
MCRHNB
MCRHP
MCT
MEKPN
MENO3
MGLY
MOH
MONITA
MONITS
MONITU
MPAN
MSA
MTPA
MTPO
MVK
Expand All @@ -107,56 +150,52 @@
MVKHP
MVKN
MVKPC
MYRCO
N2O5
NH3
NH4
NIT
NITS
NO2
NPHEN
NPRNO3
O3
PAN
PFE
PHAN
PHEN
PIN
PINAL
PINO3H
PINONIC
PINPAN
PP
PPN
PROPNN
PRPN
PYAC
R4N2
R4P
R7N2
R7P
RA3P
RB3P
RCOOH
RIPA
RIPB
RIPC
RIPD
RNO3
RP
SO2
AERI
AONITA
ASOA1
ASOA2
ASOA3
ASOAN
ASOG1
ASOG2
ASOG3
BRSALA
BRSALC
INDIOL
IONITA
ISALA
ISALC
MONITA
MSA
NH4
NIT
NITS
SALAAL
SALACL
SALCAL
SALCCL
SO2
SO4S
SOAGX
SOAIE
TLFUONE
TSOA0
TSOA1
TSOA2
Expand All @@ -165,7 +204,6 @@
TSOG1
TSOG2
TSOG3
PFE
</list>

</drydep_list_definition>
81 changes: 59 additions & 22 deletions bld/namelist_files/geoschem_master_gas_wetdep_list.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,42 @@
<!-- list of gas phase species that undergo wet deposition -->
<list id="gas">
ACTA
AERI
ALD2
ALK4N2
ALK4P
AONITA
APAN
APINN
APINP
AROMCHO
AROMP4
AROMP5
AROMPN
ASOA1
ASOA2
ASOA3
ASOAN
ASOG1
ASOG2
ASOG3
ATOOH
BALD
BENZP
BPINN
BPINO
BPINON
BPINOOH
BPINP
BR2
BRCL
BRSALA
BRSALC
BUTN
BZCO3H
BZPAN
C96N
C96O2H
CH2O
CSL
EOH
Expand All @@ -25,6 +51,7 @@
GLYX
H2O2
HAC
HACTA
HBR
HC5A
HCL
Expand Down Expand Up @@ -58,13 +85,25 @@
IHN2
IHN3
IHN4
INDIOL
INPB
INPD
IONITA
IONO
IONO2
ISALA
ISALC
ITCN
ITHN
LIMAL
LIMKB
LIMKET
LIMN
LIMNB
LIMO
LIMO2H
LIMO3H
LIMPAN
LVOC
LVOCOA
MACR1OOH
Expand All @@ -76,13 +115,16 @@
MCRHP
MCT
MEK
MEKPN
MGLY
MOH
MONITA
MONITS
MONITU
MP
MPAN
MPN
MSA
MTPA
MTPO
MVK
Expand All @@ -92,10 +134,21 @@
MVKHP
MVKN
MVKPC
MYRCO
NH3
NH4
NIT
NITS
NPHEN
PAN
PFE
PHAN
PHEN
PIN
PINAL
PINO3H
PINONIC
PINPAN
PP
PPN
PROPNN
Expand All @@ -104,41 +157,26 @@
PYAC
R4N2
R4P
R7N2
R7P
RA3P
RB3P
RCOOH
RIPA
RIPB
RIPC
RIPD
RNO3
RP
SO2
AERI
AONITA
ASOA1
ASOA2
ASOA3
ASOAN
ASOG1
ASOG2
ASOG3
BRSALA
BRSALC
INDIOL
IONITA
ISALA
ISALC
MONITA
MSA
NH4
NIT
NITS
SALAAL
SALACL
SALCAL
SALCCL
SO2
SO4S
SOAGX
SOAIE
TLFUONE
TSOA0
TSOA1
TSOA2
Expand All @@ -147,7 +185,6 @@
TSOG1
TSOG2
TSOG3
PFE
</list>

</gas_wetdep_list_definition>
Loading