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

Sync develop into main #458

Merged
merged 81 commits into from
May 10, 2023
Merged

Sync develop into main #458

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
81 commits
Select commit Hold shift + click to select a range
a43e82e
Setup Fixes for GOCART2G Data Driven
mathomp4 Mar 8, 2023
787374d
Fixes for History: Remove THIM and Aerosol Moist Tendencies
mathomp4 Mar 14, 2023
38e03c0
Fixes for WSUB Handling
mathomp4 Mar 14, 2023
79a7f6f
Remove ExtData1 from SCM
mathomp4 Mar 14, 2023
7279ed2
Add an additional input question to gcm_setup asking the user for the…
sdrabenh Mar 14, 2023
6470e8c
Don't update HISTORY_MERRA2-DD.rc.tmpl
mathomp4 Mar 14, 2023
3d357ee
Don't update HISTORY_GEOSIT.rc.tmpl
mathomp4 Mar 14, 2023
7680c82
Don't update HISTORY_S2S.rc.tmpl
mathomp4 Mar 14, 2023
3a7067b
Don't update GCMPROG.rc.tmpl
mathomp4 Mar 14, 2023
da1b4f7
Merge pull request #424 from GEOS-ESM/bugfix/mathomp4/fix-history
mathomp4 Mar 14, 2023
5e15f02
Merge branch 'develop' into bugfix/mathomp4/fix-run-scripts-wsub
mathomp4 Mar 14, 2023
9ecfe27
Merge pull request #425 from GEOS-ESM/bugfix/mathomp4/fix-run-scripts…
mathomp4 Mar 14, 2023
6d307d5
Merge branch 'develop' into feature/sdrabenh/add_HB_question_to_setup
mathomp4 Mar 15, 2023
b8741ce
Update BCs Version
mathomp4 Mar 15, 2023
518cee0
Update other setup scripts
mathomp4 Mar 15, 2023
b6065bb
Merge pull request #426 from GEOS-ESM/feature/sdrabenh/add_HB_questio…
sdrabenh Mar 15, 2023
0c91913
updates GFDL evap/subl settings
wmputman Mar 16, 2023
186e555
Merge remote-tracking branch 'origin/feature/sdrabenh/merge_v10.25.0_…
sdrabenh Mar 16, 2023
cc4438b
WSUB_* fix after name change in MGB2_2MOM
wmputman Mar 20, 2023
7e14611
Add connectivity between GOCART2G aerosols and GMI chem
Mar 23, 2023
75d8598
Update gcm_regress.j to include small history
mathomp4 Mar 23, 2023
d091fbb
Make history 6 hourly
mathomp4 Mar 23, 2023
4538882
Merge pull request #430 from GEOS-ESM/feature/sdrabenh/v11.0.0-rc.1_u…
sdrabenh Mar 24, 2023
537615e
Merge branch 'develop' into feature/vvalenti/gocart2g_to_gmi_connecti…
Mar 24, 2023
73d8d90
Merge pull request #433 from GEOS-ESM/feature/vvalenti/gocart2g_to_gm…
mathomp4 Mar 24, 2023
89ca642
Merge branch 'develop' into feature/mathomp4/add-history-to-regress
mathomp4 Mar 24, 2023
a31522d
multiple updates for GFDL tunings
wmputman Mar 26, 2023
a69e774
new radar and helicity exports
wmputman Mar 27, 2023
5232adf
Merge branch 'develop' into feature/mathomp4/gocart2g-data-setup
mathomp4 Mar 27, 2023
2bfc1eb
hand-resolve merge conflicts regarding WSUB
sdrabenh Mar 28, 2023
84469f8
Remove echo
mathomp4 Mar 29, 2023
39074d4
Merge pull request #435 from GEOS-ESM/feature/sdrabenh/v11.0.0-rc.1_u…
sdrabenh Mar 29, 2023
b4d5634
Merge branch 'develop' into feature/mathomp4/add-history-to-regress
mathomp4 Mar 29, 2023
147c96b
Merge branch 'develop' into feature/mathomp4/gocart2g-data-setup
mathomp4 Mar 29, 2023
df80e0c
Merge pull request #419 from GEOS-ESM/feature/mathomp4/gocart2g-data-…
sdrabenh Mar 29, 2023
9ffb765
Update logging.yaml with example, some changes
mathomp4 Apr 4, 2023
9dd2eb8
Add URL
mathomp4 Apr 4, 2023
1355bf3
Remove trailing space
mathomp4 Apr 4, 2023
b00bf62
updted moist_import to reduce rst size, alt FV3 sponge and new FV3 di…
wmputman Apr 4, 2023
02a2845
disabled cn evap/subl in GFDL
wmputman Apr 4, 2023
b69b157
Enable coupled run test
mathomp4 Apr 10, 2023
c50d2f5
Merge branch 'develop' into feature/mathomp4/add-history-to-regress
mathomp4 Apr 11, 2023
bab0033
First attempt at separated regress
mathomp4 Apr 11, 2023
f5f075d
Fix many bugs
mathomp4 Apr 11, 2023
b01c71b
Label successes and failures
mathomp4 Apr 11, 2023
13bb563
Fixes for MOM6
mathomp4 Apr 12, 2023
5c3fbeb
Merge pull request #442 from GEOS-ESM/feature/mathomp4/separate-regress
mathomp4 Apr 12, 2023
0e982ed
Merge pull request #440 from GEOS-ESM/feature/mathomp4/update-ci-gcmapp
sdrabenh Apr 13, 2023
9642f3a
Merge branch 'develop' into feature/mathomp4/update-logging-yaml
sdrabenh Apr 13, 2023
f81ff39
Merge pull request #438 from GEOS-ESM/feature/mathomp4/update-logging…
sdrabenh Apr 13, 2023
9049b98
Allow running only startstop or layout
mathomp4 Apr 13, 2023
9e68c15
added options for CONUS stretched grid and updated revp/frz timescale…
wmputman Apr 16, 2023
1f369e9
Merge branch 'develop' into feature/mathomp4/add-history-to-regress
mathomp4 Apr 17, 2023
359af00
Better integration of GOCART2G in gmichem_setup and stratchem_setup; …
mmanyin Apr 17, 2023
4d52ecc
Merge branch 'develop' into feature/mmanyin/setup_mods
mmanyin Apr 17, 2023
b7421cc
final preps for the HWT spring forecast experiments
wmputman Apr 29, 2023
67fbad7
updated heartbeat and long_dt settings
wmputman May 1, 2023
58cce76
updated NX choices
wmputman May 1, 2023
37998c0
changes to enable wet scavenging tendencies
sdrabenh May 1, 2023
2153eac
DT updates
wmputman May 2, 2023
f443322
disable ADJUST_DT: dynamic FV3 nsplit option
wmputman May 2, 2023
d9fbde4
replicate wet scavenging tendency changes to das histories
sdrabenh May 4, 2023
da02ee8
Merge branch 'develop' into feature/sdrabenh/hwt03_changes_into_v11.0.0
mathomp4 May 4, 2023
78ea84f
Merge pull request #449 from GEOS-ESM/feature/sdrabenh/hwt03_changes_…
sdrabenh May 4, 2023
0e1cf64
Merge branch 'develop' into feature/mathomp4/add-history-to-regress
sdrabenh May 4, 2023
02867c6
removed USE_AEROSOL_NN override in AGCM.rc.tmpl
wmputman May 4, 2023
cfb2e91
switch FV3_CONFIG: HWT when running CONUS grids
wmputman May 4, 2023
6662458
Merge remote-tracking branch 'origin/feature/wmputman/hwt_spring_exp'…
sdrabenh May 5, 2023
2f5c658
set DT_LONG = 450 for BACM
sdrabenh May 5, 2023
139eda4
Merge remote-tracking branch 'origin/feature/mathomp4/add-history-to-…
sdrabenh May 5, 2023
945ca7b
change name of MTRI for wet scavenging bundle
bena-nasa May 9, 2023
5202c50
Note about running gocart.data
sdrabenh May 9, 2023
b8b162a
Merge pull request #451 from GEOS-ESM/feature/sdrabenh/hwt04_into_dev
sdrabenh May 9, 2023
40b7918
Merge branch 'develop' into feature/mmanyin/setup_mods
mathomp4 May 10, 2023
4df8ba1
Merge pull request #445 from GEOS-ESM/feature/mmanyin/setup_mods
sdrabenh May 10, 2023
eaf6118
Update GOCART Data handling, update other setup scripts
mathomp4 May 10, 2023
c6e8399
Add geoschemchem
mathomp4 May 10, 2023
b674159
Merge pull request #454 from GEOS-ESM/feature/mathomp4/fix-gocartdata…
sdrabenh May 10, 2023
8178230
reduced tau_revp for GFDL
wmputman May 10, 2023
61ffcbf
Merge remote-tracking branch 'origin/feature/wmputman/hwt_spring_exp'…
sdrabenh May 10, 2023
ccf6f8c
Merge pull request #457 from GEOS-ESM/feature/sdrabenh/hwt04_into_dev
mathomp4 May 10, 2023
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
20 changes: 18 additions & 2 deletions .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ version: 2.1

# Anchors to prevent forgetting to update a version
baselibs_version: &baselibs_version v7.7.0
bcs_version: &bcs_version v10.25.0
bcs_version: &bcs_version v11.00.0

orbs:
ci: geos-esm/circleci-tools@1
Expand All @@ -23,7 +23,8 @@ workflows:
checkout_fixture: true
mepodevelop: true
persist_workspace: true # Needs to be true to run fv3/gcm experiment, costs extra
# Run GCM (1 hour, no ExtData)

# Run AMIP GCM (1 hour, no ExtData)
- ci/run_gcm:
name: run-GCM-on-<< matrix.compiler >>
context:
Expand All @@ -37,3 +38,18 @@ workflows:
baselibs_version: *baselibs_version
bcs_version: *bcs_version

# Run Coupled GCM (1 hour, no ExtData)
- ci/run_gcm:
name: run-coupled-GCM-on-<< matrix.compiler >>
context:
- docker-hub-creds
matrix:
parameters:
compiler: [gfortran, ifort]
requires:
- build-GEOSgcm-on-<< matrix.compiler >>
repo: GEOSgcm
baselibs_version: *baselibs_version
bcs_version: *bcs_version
gcm_ocean_type: MOM6
change_layout: false
62 changes: 46 additions & 16 deletions AGCM.rc.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,38 +1,54 @@

# Atmospheric Model Configuration Parameters
# ------------------------------------------
NX: @NX
NY: @NY
NX: @NX
NY: @NY

IOSERVER_NODES: @NUM_OSERVER_NODES
IOSERVER_NODES: @NUM_OSERVER_NODES
NUM_BACKEND_PES: @NUM_BACKEND_PES

AGCM_IM: @AGCM_IM
AGCM_JM: @AGCM_JM
AGCM_LM: @AGCM_LM
AGCM_IM: @AGCM_IM
AGCM_JM: @AGCM_JM
AGCM_LM: @AGCM_LM
AGCM_GRIDNAME: @AGCM_GRIDNAME

AGCM.GRID_TYPE: @GRID_TYPE
AGCM.GRIDNAME: @AGCM_GRIDNAME
@CUBE_AGCM AGCM.NF: @AGCM_NF
AGCM.LM: @AGCM_LM
AGCM.IM_WORLD: @AGCM_IM
@LATLON_AGCM AGCM.JM_WORLD: @AGCM_JM
AGCM.GRID_TYPE: @GRID_TYPE
AGCM.GRIDNAME: @AGCM_GRIDNAME
@CUBE_AGCM AGCM.NF: @AGCM_NF
AGCM.LM: @AGCM_LM
AGCM.IM_WORLD: @AGCM_IM
@LATLON_AGCM AGCM.JM_WORLD: @AGCM_JM

@CONUS AGCM.STRETCH_FACTOR: @STRETCH_FACTOR
@CONUS AGCM.TARGET_LAT: 39.5
@CONUS AGCM.TARGET_LON: -98.35

###########################################################
# long physics DT options
# ----------------------------------------
ADJUST_DT: .FALSE.
CHEMISTRY_RUN_AT_INTERVAL_START: .TRUE.
CHEMISTRY_DT: @LONG_DT
GOCART_DT: @LONG_DT
HEMCO_DT: @LONG_DT
GF_DT: @LONG_DT
UW_DT: @LONG_DT
###########################################################

###########################################################
# dynamics options
# ----------------------------------------
DYCORE: @DYCORE
#FV3_CONFIG: MONOTONIC
@CONUS FV3_CONFIG: HWT
AdvCore_Advection: 0
###########################################################

###########################################################
# radiation options
# ----------------------------------------
SOLAR_DT: 3600
IRRAD_DT: 3600
SATSIM_DT: 3600
SOLAR_DT: @SOLAR_DT
IRRAD_DT: @IRRAD_DT
SATSIM_DT: @IRRAD_DT
SOLARAvrg: 0
IRRADAvrg: 0
EOT: .TRUE.
Expand Down Expand Up @@ -88,6 +104,20 @@ CLOSURE_CONGESTUS: 3
# ------------------------
###########################################################

>>>HIST_GOCART<<<###########################################################
>>>HIST_GOCART<<<# Enable wet scavenging
>>>HIST_GOCART<<<# NOTE: this section should be commented out when running gocart.data
>>>HIST_GOCART<<<MCHEMTRI_increments::
>>>HIST_GOCART<<<DU::DU default
>>>HIST_GOCART<<<SS::SS default
>>>HIST_GOCART<<<SU::SO4 default
>>>HIST_GOCART<<<CA.bc::CA.bcphilic default
>>>HIST_GOCART<<<CA.br::CA.brphilic default
>>>HIST_GOCART<<<CA.oc::CA.ocphilic default
>>>HIST_GOCART<<<NI::NO3an1 "NI::NO3an2,NI::NO3an3"
>>>HIST_GOCART<<<::
>>>HIST_GOCART<<<###########################################################

###########################################################
# Ocean Model Configuration Parameters
# ------------------------------------
Expand Down
23 changes: 16 additions & 7 deletions HISTORY.AGCM.rc.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -201,6 +201,15 @@ PC@HIST_IMx@HIST_JM-DC.LM: @AGCM_LM
'ASNOW' , 'SURFACE' ,
'RADSRF' , 'RADIATION' ,
'TBISCCP' , 'SATSIM' ,
'DBZ_MAX' , 'MOIST' , 'DBZMAX' , 'MAX' ,
'DBZ_TOP' , 'MOIST' , 'DBZTOP' , 'MAX' ,
'DBZ_1KM' , 'MOIST' , 'DBZ1KM' , 'MAX' ,
'DBZ_M10C' , 'MOIST' , 'DBZM10C' , 'MAX' ,
'UH25' , 'DYN' , 'UH25MX' , 'MAX' ,
'UH03' , 'DYN' , 'UH03MX' , 'MAX' ,
'SRH25' , 'DYN' , 'SRH25MX' , 'MAX' ,
'SRH03' , 'DYN' , 'SRH03MX' , 'MAX' ,
'SRH01' , 'DYN' , 'SRH01MX' , 'MAX' ,
'FLNS' , 'IRRAD' ,
'FLNSC' , 'IRRAD' ,
'FLNSA' , 'IRRAD' , 'FLNSCNA' ,
Expand Down Expand Up @@ -980,15 +989,15 @@ PC@HIST_IMx@HIST_JM-DC.LM: @AGCM_LM
'NH4WT' , 'NI' ,
'NIFLUXU' , 'NI' ,
'NIFLUXV' , 'NI' ,
# 'DDU2gDT' , 'MOIST' , 'DUSV' ,
# 'DSS2gDT' , 'MOIST' , 'SSSV' ,
# 'DOC2gDT' , 'MOIST' , 'OCSV' ,
# 'DBC2gDT' , 'MOIST' , 'BCSV' ,
# 'DSU2gDT' , 'MOIST' , 'SUSV' ,
# 'DNI2gDT' , 'MOIST' , 'NISV' ,
# 'DBRC2gDT' , 'MOIST' , 'BRSV' ,
'NH3SV' , 'NI' ,
'NH4SV' , 'NI' ,
'MCHEMTRI%DU::DUIM' , 'PHYSICS' , 'DUSV' ,
'MCHEMTRI%SS::SSIM' , 'PHYSICS' , 'SSSV' ,
'MCHEMTRI%CA.oc::CA.ocphilicIM' , 'PHYSICS' , 'OCSV' ,
'MCHEMTRI%CA.bc::CA.bcphilicIM' , 'PHYSICS' , 'BCSV' ,
'MCHEMTRI%CA.br::CA.brphilicIM' , 'PHYSICS' , 'BRSV' ,
'MCHEMTRI%SU::SO4IM' , 'PHYSICS' , 'SUSV' ,
'MCHEMTRI%NI::NO3an1IM' , 'PHYSICS' , 'NISV' ,
::

tavg3d_aer_p.template: '%y4%m2%d2_%h2%n2z.nc4',
Expand Down
15 changes: 7 additions & 8 deletions HISTORY.AOGCM-MOM5.rc.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -481,7 +481,6 @@ PC@HIST_IMx@HIST_JM-DC.LM: @AGCM_LM
'RSU_CN' , 'MOIST' , 'RSUCN' ,
'RSU_AN' , 'MOIST' , 'RSUAN' ,
'RSU_LS' , 'MOIST' , 'RSULS' ,
'THIM' , 'PHYSICS' ,
'EVAPC' , 'MOIST' ,
'SUBLC' , 'MOIST' ,
'FCLD' , 'MOIST' ,
Expand Down Expand Up @@ -991,13 +990,13 @@ PC@HIST_IMx@HIST_JM-DC.LM: @AGCM_LM
'NH4WT' , 'NI' ,
'NIFLUXU' , 'NI' ,
'NIFLUXV' , 'NI' ,
'DDU2gDT' , 'MOIST' , 'DUSV' ,
'DSS2gDT' , 'MOIST' , 'SSSV' ,
'DOC2gDT' , 'MOIST' , 'OCSV' ,
'DBC2gDT' , 'MOIST' , 'BCSV' ,
'DSU2gDT' , 'MOIST' , 'SUSV' ,
'DNI2gDT' , 'MOIST' , 'NISV' ,
'DBRC2gDT' , 'MOIST' , 'BRSV' ,
# 'DDU2gDT' , 'MOIST' , 'DUSV' ,
# 'DSS2gDT' , 'MOIST' , 'SSSV' ,
# 'DOC2gDT' , 'MOIST' , 'OCSV' ,
# 'DBC2gDT' , 'MOIST' , 'BCSV' ,
# 'DSU2gDT' , 'MOIST' , 'SUSV' ,
# 'DNI2gDT' , 'MOIST' , 'NISV' ,
# 'DBRC2gDT' , 'MOIST' , 'BRSV' ,
'NH3SV' , 'NI' ,
'NH4SV' , 'NI' ,
::
Expand Down
15 changes: 7 additions & 8 deletions HISTORY.AOGCM.rc.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -478,7 +478,6 @@ PC@HIST_IMx@HIST_JM-DC.LM: @AGCM_LM
'RSU_CN' , 'MOIST' , 'RSUCN' ,
'RSU_AN' , 'MOIST' , 'RSUAN' ,
'RSU_LS' , 'MOIST' , 'RSULS' ,
'THIM' , 'PHYSICS' ,
'EVAPC' , 'MOIST' ,
'SUBLC' , 'MOIST' ,
'FCLD' , 'MOIST' ,
Expand Down Expand Up @@ -988,13 +987,13 @@ PC@HIST_IMx@HIST_JM-DC.LM: @AGCM_LM
'NH4WT' , 'NI' ,
'NIFLUXU' , 'NI' ,
'NIFLUXV' , 'NI' ,
'DDU2gDT' , 'MOIST' , 'DUSV' ,
'DSS2gDT' , 'MOIST' , 'SSSV' ,
'DOC2gDT' , 'MOIST' , 'OCSV' ,
'DBC2gDT' , 'MOIST' , 'BCSV' ,
'DSU2gDT' , 'MOIST' , 'SUSV' ,
'DNI2gDT' , 'MOIST' , 'NISV' ,
'DBRC2gDT' , 'MOIST' , 'BRSV' ,
# 'DDU2gDT' , 'MOIST' , 'DUSV' ,
# 'DSS2gDT' , 'MOIST' , 'SSSV' ,
# 'DOC2gDT' , 'MOIST' , 'OCSV' ,
# 'DBC2gDT' , 'MOIST' , 'BCSV' ,
# 'DSU2gDT' , 'MOIST' , 'SUSV' ,
# 'DNI2gDT' , 'MOIST' , 'NISV' ,
# 'DBRC2gDT' , 'MOIST' , 'BRSV' ,
'NH3SV' , 'NI' ,
'NH4SV' , 'NI' ,
::
Expand Down
19 changes: 9 additions & 10 deletions HISTORY.BENCHMARK.rc.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -498,7 +498,6 @@ PC23040x11521-DC.LM: 181
'RSU_CN' , 'MOIST' , 'RSUCN' ,
'RSU_AN' , 'MOIST' , 'RSUAN' ,
'RSU_LS' , 'MOIST' , 'RSULS' ,
'THIM' , 'PHYSICS' ,
'EVAPC' , 'MOIST' ,
'SUBLC' , 'MOIST' ,
'FCLD' , 'MOIST' ,
Expand Down Expand Up @@ -1057,15 +1056,15 @@ PC23040x11521-DC.LM: 181
'NH4WT' , 'NI' ,
'NIFLUXU' , 'NI' ,
'NIFLUXV' , 'NI' ,
'DDU2gDT' , 'MOIST' , 'DUSV' ,
'DSS2gDT' , 'MOIST' , 'SSSV' ,
'DOC2gDT' , 'MOIST' , 'OCSV' ,
'DBC2gDT' , 'MOIST' , 'BCSV' ,
'DSU2gDT' , 'MOIST' , 'SUSV' ,
'DNI2gDT' , 'MOIST' , 'NISV' ,
'DBRC2gDT' , 'MOIST' , 'BRSV' ,
'DNH32gDT' , 'MOIST' , 'NH3SV' ,
'DNH4A2gDT' , 'MOIST' , 'NH4SV' ,
# 'DDU2gDT' , 'MOIST' , 'DUSV' ,
# 'DSS2gDT' , 'MOIST' , 'SSSV' ,
# 'DOC2gDT' , 'MOIST' , 'OCSV' ,
# 'DBC2gDT' , 'MOIST' , 'BCSV' ,
# 'DSU2gDT' , 'MOIST' , 'SUSV' ,
# 'DNI2gDT' , 'MOIST' , 'NISV' ,
# 'DBRC2gDT' , 'MOIST' , 'BRSV' ,
# 'DNH32gDT' , 'MOIST' , 'NH3SV' ,
# 'DNH4A2gDT' , 'MOIST' , 'NH4SV' ,
::

tavg3d_aer_p.template: '%y4%m2%d2_%h2%n2z.nc4',
Expand Down
14 changes: 7 additions & 7 deletions HISTORY.rc.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1478,7 +1478,7 @@ COLLECTIONS: 'inst3_3d_asm_Np-'
'CA.bcEMBB' , 'CA.bc' , 'BCEMBB' ,
'CA.bcEMBF' , 'CA.bc' , 'BCEMBF' ,
'CA.bcEMAN' , 'CA.bc' , 'BCEMAN' ,
# 'DBC2gDT' , 'MOIST' , 'BCSV' ,
'MTRI%CA.bc::CA.bcphilicIM' , 'PHYSICS' , 'BCSV' ,
# Brown Carbon
'CA.brEM' , 'CA.br' , 'BREM001;BREM002' ,
'CA.brDP' , 'CA.br' , 'BRDP001;BRDP002' ,
Expand All @@ -1488,19 +1488,19 @@ COLLECTIONS: 'inst3_3d_asm_Np-'
'CA.brEMAN' , 'CA.br' , 'BREMAN' ,
'CA.brPSOA' , 'CA.br' , 'BRPSOA' ,
'CA.brHYPHIL' , 'CA.br' , 'BRHYPHIL' ,
# 'DBRC2gDT' , 'MOIST' , 'BRSV' ,
'MTRI%CA.br::CA.brphilicIM' , 'PHYSICS' , 'BRSV' ,
# Dust
'DUEM' , 'DU' , 'DUEM001;DUEM002;DUEM003;DUEM004;DUEM005',
'DUSD' , 'DU' , 'DUSD001;DUSD002;DUSD003;DUSD004;DUSD005',
'DUDP' , 'DU' , 'DUDP001;DUDP002;DUDP003;DUDP004;DUDP005',
'DUWT' , 'DU' , 'DUWT001;DUWT002;DUWT003;DUWT004;DUWT005',
# 'DDU2gDT' , 'MOIST' , 'DUSV' ,
'MTRI%DU::DUIM' , 'PHYSICS' , 'DUSV' ,
# Seasalt
'SSEM' , 'SS' , 'SSEM001;SSEM002;SSEM003;SSEM004;SSEM005',
'SSSD' , 'SS' , 'SSSD001;SSSD002;SSSD003;SSSD004;SSSD005',
'SSDP' , 'SS' , 'SSDP001;SSDP002;SSDP003;SSDP004;SSDP005',
'SSWT' , 'SS' , 'SSWT001;SSWT002;SSWT003;SSWT004;SSWT005',
# 'DSS2gDT' , 'MOIST' , 'SSSV' ,
'MTRI%SS::SSIM' , 'PHYSICS' , 'SSSV' ,
# Sulfates
'SUEM' , 'SU' , 'SUEM001;SUEM002;SUEM003;SUEM004',
'SUSD' , 'SU' , 'SUSD001;SUSD002;SUSD003;SUSD004',
Expand All @@ -1516,7 +1516,7 @@ COLLECTIONS: 'inst3_3d_asm_Np-'
'SO2EMBB' , 'SU' ,
'SO2EMVN' , 'SU' ,
'SO2EMVE' , 'SU' ,
# 'DSU2gDT' , 'MOIST' , 'SUSV' ,
'MTRI%SU::SO4IM' , 'PHYSICS' , 'SUSV' ,
# Organic Carbon
'CA.ocEM' , 'CA.oc' , 'OCEM001;OCEM002' ,
'CA.ocDP' , 'CA.oc' , 'OCDP001;OCDP002' ,
Expand All @@ -1527,7 +1527,7 @@ COLLECTIONS: 'inst3_3d_asm_Np-'
'CA.ocEMBG' , 'CA.oc' , 'OCEMBG' ,
'CA.ocPSOA' , 'CA.oc' , 'OCPSOA' ,
'CA.ocHYPHIL' , 'CA.oc' , 'OCHYPHIL' ,
# 'DOC2gDT' , 'MOIST' , 'OCSV' ,
'MTRI%CA.oc::CA.ocphilicIM' , 'PHYSICS' , 'OCSV' ,
# Nitrate
'NIPNO3AQ' , 'NI' ,
'NIPNH4AQ' , 'NI' ,
Expand All @@ -1544,7 +1544,7 @@ COLLECTIONS: 'inst3_3d_asm_Np-'
'NH4DP' , 'NI' ,
'NH4WT' , 'NI' ,
'NH4SV' , 'NI' ,
# 'DNI2gDT' , 'MOIST' , 'NISV' ,
'MTRI%NI::NO3an1IM' , 'PHYSICS' , 'NISV' ,
::

tavg3_2d_chm_Nx-.format: 'CFIO' ,
Expand Down
Loading