From b00bf62dc3433517b730c42ec392b0c42b2c6ab1 Mon Sep 17 00:00:00 2001 From: William Putman Date: Tue, 4 Apr 2023 10:36:21 -0400 Subject: [PATCH 1/4] updted moist_import to reduce rst size, alt FV3 sponge and new FV3 diagnostics --- AGCM.rc.tmpl | 26 +++++++++++++------------- fvcore_layout.rc | 4 ++-- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/AGCM.rc.tmpl b/AGCM.rc.tmpl index b6b2e352..0f54e44a 100644 --- a/AGCM.rc.tmpl +++ b/AGCM.rc.tmpl @@ -1,23 +1,23 @@ # 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 ########################################################### # dynamics options @@ -50,7 +50,7 @@ ORBIT_ANAL2B: .TRUE. # ---------------------------------------- @GFDL_1M_CLDMICR_OPTION: GFDL_1M @GFDL_1M_HYDROSTATIC: @GFDL_HYDRO -@GFDL_1M_USE_BERGERON: .FALSE. +@GFDL_1M_USE_AEROSOL_NN: .FALSE. ########################################################### ########################################################### diff --git a/fvcore_layout.rc b/fvcore_layout.rc index 50603168..832242cf 100644 --- a/fvcore_layout.rc +++ b/fvcore_layout.rc @@ -23,8 +23,8 @@ &gfdl_cloud_microphysics_nml sedi_transport = .true. - do_evap = .false. - do_subl = .false. + do_evap = .true. + do_subl = .true. do_qa = .false. tau_l2v = 150. tau_i2v = 150. From 02a2845ac152ca5abe3e68cca2d25bc2a6a19235 Mon Sep 17 00:00:00 2001 From: William Putman Date: Tue, 4 Apr 2023 19:18:06 -0400 Subject: [PATCH 2/4] disabled cn evap/subl in GFDL --- fvcore_layout.rc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/fvcore_layout.rc b/fvcore_layout.rc index 832242cf..50603168 100644 --- a/fvcore_layout.rc +++ b/fvcore_layout.rc @@ -23,8 +23,8 @@ &gfdl_cloud_microphysics_nml sedi_transport = .true. - do_evap = .true. - do_subl = .true. + do_evap = .false. + do_subl = .false. do_qa = .false. tau_l2v = 150. tau_i2v = 150. From 37998c06834a808b1838320cc604861bdec0e2c6 Mon Sep 17 00:00:00 2001 From: Scott Rabenhorst Date: Mon, 1 May 2023 13:44:03 -0400 Subject: [PATCH 3/4] changes to enable wet scavenging tendencies --- AGCM.rc.tmpl | 13 +++++++++++++ HISTORY.AGCM.rc.tmpl | 14 +++++++------- 2 files changed, 20 insertions(+), 7 deletions(-) diff --git a/AGCM.rc.tmpl b/AGCM.rc.tmpl index 0f54e44a..727d48c3 100644 --- a/AGCM.rc.tmpl +++ b/AGCM.rc.tmpl @@ -89,6 +89,19 @@ CLOSURE_CONGESTUS: 3 # ------------------------ ########################################################### +########################################################### +# Enable wet scavenging +MTRI_increments:: +DU::DU default +SS::SS default +SU::SO4 default +CA.bc::CA.bcphilic default +CA.br::CA.brphilic default +CA.oc::CA.ocphilic default +NI::NO3an1 "NI::NO3an2,NI::NO3an3" +:: +########################################################### + ########################################################### # Ocean Model Configuration Parameters # ------------------------------------ diff --git a/HISTORY.AGCM.rc.tmpl b/HISTORY.AGCM.rc.tmpl index 56c2b74a..ae84551c 100644 --- a/HISTORY.AGCM.rc.tmpl +++ b/HISTORY.AGCM.rc.tmpl @@ -989,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' , + 'MTRI%DU::DUIM' , 'PHYSICS' , 'DUSV' , + 'MTRI%SS::SSIM' , 'PHYSICS' , 'SSSV' , + 'MTRI%CA.oc::CA.ocphilicIM' , 'PHYSICS' , 'OCSV' , + 'MTRI%CA.bc::CA.bcphilicIM' , 'PHYSICS' , 'BCSV' , + 'MTRI%CA.br::CA.brphilicIM' , 'PHYSICS' , 'BRSV' , + 'MTRI%SU::SO4IM' , 'PHYSICS' , 'SUSV' , + 'MTRI%NI::NO3an1IM' , 'PHYSICS' , 'NISV' , :: tavg3d_aer_p.template: '%y4%m2%d2_%h2%n2z.nc4', From d9fbde4e7e1d6c96c366b4b04c34023b11026505 Mon Sep 17 00:00:00 2001 From: Scott Rabenhorst Date: Thu, 4 May 2023 11:30:07 -0400 Subject: [PATCH 4/4] replicate wet scavenging tendency changes to das histories --- HISTORY.rc.tmpl | 14 +++++++------- HISTORY_FP.rc.03z.tmpl | 28 ++++++++++++++-------------- HISTORY_FP.rc.09z.tmpl | 30 +++++++++++++++--------------- HISTORY_FP.rc.15z.tmpl | 28 ++++++++++++++-------------- HISTORY_FP.rc.21z.tmpl | 28 ++++++++++++++-------------- 5 files changed, 64 insertions(+), 64 deletions(-) diff --git a/HISTORY.rc.tmpl b/HISTORY.rc.tmpl index 785216d6..cae7266c 100644 --- a/HISTORY.rc.tmpl +++ b/HISTORY.rc.tmpl @@ -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' , @@ -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', @@ -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' , @@ -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' , @@ -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' , diff --git a/HISTORY_FP.rc.03z.tmpl b/HISTORY_FP.rc.03z.tmpl index a50200ac..7ad67703 100644 --- a/HISTORY_FP.rc.03z.tmpl +++ b/HISTORY_FP.rc.03z.tmpl @@ -1493,7 +1493,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' , @@ -1504,7 +1504,7 @@ 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' , @@ -1513,7 +1513,7 @@ COLLECTIONS: 'inst3_3d_asm_Np-' 'DUEXTTFM' , 'DU' , 'DUSCATFM' , 'DU' , 'DUAERIDX' , 'DU' , -# 'DDU2gDT' , 'MOIST' , 'DUSV' , + 'MTRI%DU::DUIM' , 'PHYSICS' , 'DUSV' , # Seasalt 'SSEM' , 'SS' , 'SSEM001;SSEM002;SSEM003;SSEM004;SSEM005' , 'SSSD' , 'SS' , 'SSSD001;SSSD002;SSSD003;SSSD004;SSSD005' , @@ -1522,7 +1522,7 @@ COLLECTIONS: 'inst3_3d_asm_Np-' 'SSEXTTFM' , 'SS' , 'SSSCATFM' , 'SS' , 'SSAERIDX' , 'SS' , -# 'DSS2gDT' , 'MOIST' , 'SSSV' , + 'MTRI%SS::SSIM' , 'PHYSICS' , 'SSSV' , # Sulfates 'SUEM' , 'SU' , 'SUEM001;SUEM002;SUEM003;SUEM004', 'SUSD' , 'SU' , 'SUSD001;SUSD002;SUSD003;SUSD004', @@ -1538,7 +1538,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' , @@ -1549,7 +1549,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' , @@ -1567,7 +1567,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' , @@ -2427,7 +2427,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' , @@ -2436,7 +2436,7 @@ COLLECTIONS: 'inst3_3d_asm_Np-' 'CA.brEMBB' , 'CA.br' , 'BREMBB' , 'CA.brEMBF' , 'CA.br' , 'BREMBF' , 'CA.brEMAN' , 'CA.br' , 'BREMAN' , -# 'DBRC2gDT' , 'MOIST' , 'BRSV' , + 'MTRI%CA.br::CA.brphilicIM' , 'PHYSICS' , 'BRSV' , # Dust 'DUEM' , 'DU' , 'DUSD' , 'DU' , @@ -2445,7 +2445,7 @@ COLLECTIONS: 'inst3_3d_asm_Np-' 'DUEXTTFM' , 'DU' , 'DUSCATFM' , 'DU' , 'DUAERIDX' , 'DU' , -# 'DDU2gDT' , 'MOIST' , 'DUSV' , + 'MTRI%DU::DUIM' , 'PHYSICS' , 'DUSV' , # Seasalt 'SSEM' , 'SS' , 'SSSD' , 'SS' , @@ -2454,7 +2454,7 @@ COLLECTIONS: 'inst3_3d_asm_Np-' 'SSEXTTFM' , 'SS' , 'SSSCATFM' , 'SS' , 'SSAERIDX' , 'SS' , -# 'DSS2gDT' , 'MOIST' , 'SSSV' , + 'MTRI%SS::SSIM' , 'PHYSICS' , 'SSSV' , # Sulfates 'SUEM' , 'SU' , 'SUEM001;SUEM002;SUEM003;SUEM004', 'SUSD' , 'SU' , 'SUSD001;SUSD002;SUSD003;SUSD004', @@ -2470,7 +2470,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', @@ -2480,7 +2480,7 @@ COLLECTIONS: 'inst3_3d_asm_Np-' 'CA.ocEMAN' , 'CA.oc' , 'OCEMAN' , 'CA.ocEMBG' , 'CA.oc' , 'OCEMBG' , 'CA.ocHYPHIL' , 'CA.oc' , 'OCHYPHIL' , -# 'DOC2gDT' , 'MOIST' , 'OCSV' , + 'MTRI%CA.oc::CA.ocphilicIM' , 'PHYSICS' , 'OCSV' , # Nitrate 'NIPNO3AQ' , 'NI' , 'NIPNH4AQ' , 'NI' , @@ -2498,7 +2498,7 @@ COLLECTIONS: 'inst3_3d_asm_Np-' 'NH4DP' , 'NI' , 'NH4WT' , 'NI' , 'NH4SV' , 'NI' , -# 'DNI2gDT' , 'MOIST' , 'NISV' , + 'MTRI%NI::NO3an1IM' , 'PHYSICS' , 'NISV' , :: ####################################################################### diff --git a/HISTORY_FP.rc.09z.tmpl b/HISTORY_FP.rc.09z.tmpl index b11cd340..881dedf3 100644 --- a/HISTORY_FP.rc.09z.tmpl +++ b/HISTORY_FP.rc.09z.tmpl @@ -1530,7 +1530,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' , @@ -1541,7 +1541,7 @@ 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' , @@ -1550,7 +1550,7 @@ COLLECTIONS: 'inst3_3d_asm_Np-' 'DUEXTTFM' , 'DU' , 'DUSCATFM' , 'DU' , 'DUAERIDX' , 'DU' , -# 'DDU2gDT' , 'MOIST' , 'DUSV' , + 'MTRI%DU::DUIM' , 'PHYSICS' , 'DUSV' , # Seasalt 'SSEM' , 'SS' , 'SSEM001;SSEM002;SSEM003;SSEM004;SSEM005' , 'SSSD' , 'SS' , 'SSSD001;SSSD002;SSSD003;SSSD004;SSSD005' , @@ -1559,7 +1559,7 @@ COLLECTIONS: 'inst3_3d_asm_Np-' 'SSEXTTFM' , 'SS' , 'SSSCATFM' , 'SS' , 'SSAERIDX' , 'SS' , -# 'DSS2gDT' , 'MOIST' , 'SSSV' , + 'MTRI%SS::SSIM' , 'PHYSICS' , 'SSSV' , # Sulfates 'SUEM' , 'SU' , 'SUEM001;SUEM002;SUEM003;SUEM004', 'SUSD' , 'SU' , 'SUSD001;SUSD002;SUSD003;SUSD004', @@ -1575,7 +1575,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' , @@ -1586,7 +1586,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' , @@ -1604,7 +1604,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' , @@ -2464,7 +2464,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' , @@ -2473,7 +2473,7 @@ COLLECTIONS: 'inst3_3d_asm_Np-' 'CA.brEMBB' , 'CA.br' , 'BREMBB' , 'CA.brEMBF' , 'CA.br' , 'BREMBF' , 'CA.brEMAN' , 'CA.br' , 'BREMAN' , -# 'DBRC2gDT' , 'MOIST' , 'BRSV' , + 'MTRI%CA.br::CA.brphilicIM' , 'PHYSICS' , 'BRSV' , # Dust 'DUEM' , 'DU' , 'DUSD' , 'DU' , @@ -2482,7 +2482,7 @@ COLLECTIONS: 'inst3_3d_asm_Np-' 'DUEXTTFM' , 'DU' , 'DUSCATFM' , 'DU' , 'DUAERIDX' , 'DU' , -# 'DDU2gDT' , 'MOIST' , 'DUSV' , + 'MTRI%DU::DUIM' , 'PHYSICS' , 'DUSV' , # Seasalt 'SSEM' , 'SS' , 'SSSD' , 'SS' , @@ -2491,7 +2491,7 @@ COLLECTIONS: 'inst3_3d_asm_Np-' 'SSEXTTFM' , 'SS' , 'SSSCATFM' , 'SS' , 'SSAERIDX' , 'SS' , -# 'DSS2gDT' , 'MOIST' , 'SSSV' , + 'MTRI%SS::SSIM' , 'PHYSICS' , 'SSSV' , # Sulfates 'SUEM' , 'SU' , 'SUEM001;SUEM002;SUEM003;SUEM004', 'SUSD' , 'SU' , 'SUSD001;SUSD002;SUSD003;SUSD004', @@ -2507,7 +2507,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', @@ -2517,7 +2517,7 @@ COLLECTIONS: 'inst3_3d_asm_Np-' 'CA.ocEMAN' , 'CA.oc' , 'OCEMAN' , 'CA.ocEMBG' , 'CA.oc' , 'OCEMBG' , 'CA.ocHYPHIL' , 'CA.oc' , 'OCHYPHIL' , -# 'DOC2gDT' , 'MOIST' , 'OCSV' , + 'MTRI%CA.oc::CA.ocphilicIM' , 'PHYSICS' , 'OCSV' , # Nitrate 'NIPNO3AQ' , 'NI' , 'NIPNH4AQ' , 'NI' , @@ -2535,7 +2535,7 @@ COLLECTIONS: 'inst3_3d_asm_Np-' 'NH4DP' , 'NI' , 'NH4WT' , 'NI' , 'NH4SV' , 'NI' , -# 'DNI2gDT' , 'MOIST' , 'NISV' , + 'MTRI%NI::NO3an1IM' , 'PHYSICS' , 'NISV' , :: ####################################################################### @@ -2817,7 +2817,7 @@ COLLECTIONS: 'inst3_3d_asm_Np-' 'CA.brEMAN' , 'CA.br' , 'BREMAN' , 'CA.brFLUXU' , 'CA.br' , 'BRFLUXU' , 'CA.brFLUXV' , 'CA.br' , 'BRFLUXV' , -# 'DBRC2gDT' , 'MOIST' , 'BRSV' , + 'MTRI%CA.br::CA.brphilicIM' , 'PHYSICS' , 'BRSV' , # Dust 'DUSMASS' , 'DU' , 'DUCMASS' , 'DU' , diff --git a/HISTORY_FP.rc.15z.tmpl b/HISTORY_FP.rc.15z.tmpl index 0413c3f2..37c79728 100644 --- a/HISTORY_FP.rc.15z.tmpl +++ b/HISTORY_FP.rc.15z.tmpl @@ -1493,7 +1493,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' , @@ -1504,7 +1504,7 @@ 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' , @@ -1513,7 +1513,7 @@ COLLECTIONS: 'inst3_3d_asm_Np-' 'DUEXTTFM' , 'DU' , 'DUSCATFM' , 'DU' , 'DUAERIDX' , 'DU' , -# 'DDU2gDT' , 'MOIST' , 'DUSV' , + 'MTRI%DU::DUIM' , 'PHYSICS' , 'DUSV' , # Seasalt 'SSEM' , 'SS' , 'SSEM001;SSEM002;SSEM003;SSEM004;SSEM005' , 'SSSD' , 'SS' , 'SSSD001;SSSD002;SSSD003;SSSD004;SSSD005' , @@ -1522,7 +1522,7 @@ COLLECTIONS: 'inst3_3d_asm_Np-' 'SSEXTTFM' , 'SS' , 'SSSCATFM' , 'SS' , 'SSAERIDX' , 'SS' , -# 'DSS2gDT' , 'MOIST' , 'SSSV' , + 'MTRI%SS::SSIM' , 'PHYSICS' , 'SSSV' , # Sulfates 'SUEM' , 'SU' , 'SUEM001;SUEM002;SUEM003;SUEM004', 'SUSD' , 'SU' , 'SUSD001;SUSD002;SUSD003;SUSD004', @@ -1538,7 +1538,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' , @@ -1549,7 +1549,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' , @@ -1567,7 +1567,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' , @@ -2427,7 +2427,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' , @@ -2436,7 +2436,7 @@ COLLECTIONS: 'inst3_3d_asm_Np-' 'CA.brEMBB' , 'CA.br' , 'BREMBB' , 'CA.brEMBF' , 'CA.br' , 'BREMBF' , 'CA.brEMAN' , 'CA.br' , 'BREMAN' , -# 'DBRC2gDT' , 'MOIST' , 'BRSV' , + 'MTRI%CA.br::CA.brphilicIM' , 'PHYSICS' , 'BRSV' , # Dust 'DUEM' , 'DU' , 'DUSD' , 'DU' , @@ -2445,7 +2445,7 @@ COLLECTIONS: 'inst3_3d_asm_Np-' 'DUEXTTFM' , 'DU' , 'DUSCATFM' , 'DU' , 'DUAERIDX' , 'DU' , -# 'DDU2gDT' , 'MOIST' , 'DUSV' , + 'MTRI%DU::DUIM' , 'PHYSICS' , 'DUSV' , # Seasalt 'SSEM' , 'SS' , 'SSSD' , 'SS' , @@ -2454,7 +2454,7 @@ COLLECTIONS: 'inst3_3d_asm_Np-' 'SSEXTTFM' , 'SS' , 'SSSCATFM' , 'SS' , 'SSAERIDX' , 'SS' , -# 'DSS2gDT' , 'MOIST' , 'SSSV' , + 'MTRI%SS::SSIM' , 'PHYSICS' , 'SSSV' , # Sulfates 'SUEM' , 'SU' , 'SUEM001;SUEM002;SUEM003;SUEM004', 'SUSD' , 'SU' , 'SUSD001;SUSD002;SUSD003;SUSD004', @@ -2470,7 +2470,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', @@ -2480,7 +2480,7 @@ COLLECTIONS: 'inst3_3d_asm_Np-' 'CA.ocEMAN' , 'CA.oc' , 'OCEMAN' , 'CA.ocEMBG' , 'CA.oc' , 'OCEMBG' , 'CA.ocHYPHIL' , 'CA.oc' , 'OCHYPHIL' , -# 'DOC2gDT' , 'MOIST' , 'OCSV' , + 'MTRI%CA.oc::CA.ocphilicIM' , 'PHYSICS' , 'OCSV' , # Nitrate 'NIPNO3AQ' , 'NI' , 'NIPNH4AQ' , 'NI' , @@ -2498,7 +2498,7 @@ COLLECTIONS: 'inst3_3d_asm_Np-' 'NH4DP' , 'NI' , 'NH4WT' , 'NI' , 'NH4SV' , 'NI' , -# 'DNI2gDT' , 'MOIST' , 'NISV' , + 'MTRI%NI::NO3an1IM' , 'PHYSICS' , 'NISV' , :: ####################################################################### diff --git a/HISTORY_FP.rc.21z.tmpl b/HISTORY_FP.rc.21z.tmpl index cd5d67d1..77fb25bc 100644 --- a/HISTORY_FP.rc.21z.tmpl +++ b/HISTORY_FP.rc.21z.tmpl @@ -1493,7 +1493,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' , @@ -1504,7 +1504,7 @@ 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' , @@ -1513,7 +1513,7 @@ COLLECTIONS: 'inst3_3d_asm_Np-' 'DUEXTTFM' , 'DU' , 'DUSCATFM' , 'DU' , 'DUAERIDX' , 'DU' , -# 'DDU2gDT' , 'MOIST' , 'DUSV' , + 'MTRI%DU::DUIM' , 'PHYSICS' , 'DUSV' , # Seasalt 'SSEM' , 'SS' , 'SSEM001;SSEM002;SSEM003;SSEM004;SSEM005' , 'SSSD' , 'SS' , 'SSSD001;SSSD002;SSSD003;SSSD004;SSSD005' , @@ -1522,7 +1522,7 @@ COLLECTIONS: 'inst3_3d_asm_Np-' 'SSEXTTFM' , 'SS' , 'SSSCATFM' , 'SS' , 'SSAERIDX' , 'SS' , -# 'DSS2gDT' , 'MOIST' , 'SSSV' , + 'MTRI%SS::SSIM' , 'PHYSICS' , 'SSSV' , # Sulfates 'SUEM' , 'SU' , 'SUEM001;SUEM002;SUEM003;SUEM004', 'SUSD' , 'SU' , 'SUSD001;SUSD002;SUSD003;SUSD004', @@ -1538,7 +1538,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' , @@ -1549,7 +1549,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' , @@ -1567,7 +1567,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' , @@ -2427,7 +2427,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' , @@ -2436,7 +2436,7 @@ COLLECTIONS: 'inst3_3d_asm_Np-' 'CA.brEMBB' , 'CA.br' , 'BREMBB' , 'CA.brEMBF' , 'CA.br' , 'BREMBF' , 'CA.brEMAN' , 'CA.br' , 'BREMAN' , -# 'DBRC2gDT' , 'MOIST' , 'BRSV' , + 'MTRI%CA.br::CA.brphilicIM' , 'PHYSICS' , 'BRSV' , # Dust 'DUEM' , 'DU' , 'DUSD' , 'DU' , @@ -2445,7 +2445,7 @@ COLLECTIONS: 'inst3_3d_asm_Np-' 'DUEXTTFM' , 'DU' , 'DUSCATFM' , 'DU' , 'DUAERIDX' , 'DU' , -# 'DDU2gDT' , 'MOIST' , 'DUSV' , + 'MTRI%DU::DUIM' , 'PHYSICS' , 'DUSV' , # Seasalt 'SSEM' , 'SS' , 'SSSD' , 'SS' , @@ -2454,7 +2454,7 @@ COLLECTIONS: 'inst3_3d_asm_Np-' 'SSEXTTFM' , 'SS' , 'SSSCATFM' , 'SS' , 'SSAERIDX' , 'SS' , -# 'DSS2gDT' , 'MOIST' , 'SSSV' , + 'MTRI%SS::SSIM' , 'PHYSICS' , 'SSSV' , # Sulfates 'SUEM' , 'SU' , 'SUEM001;SUEM002;SUEM003;SUEM004', 'SUSD' , 'SU' , 'SUSD001;SUSD002;SUSD003;SUSD004', @@ -2470,7 +2470,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', @@ -2480,7 +2480,7 @@ COLLECTIONS: 'inst3_3d_asm_Np-' 'CA.ocEMAN' , 'CA.oc' , 'OCEMAN' , 'CA.ocEMBG' , 'CA.oc' , 'OCEMBG' , 'CA.ocHYPHIL' , 'CA.oc' , 'OCHYPHIL' , -# 'DOC2gDT' , 'MOIST' , 'OCSV' , + 'MTRI%CA.oc::CA.ocphilicIM' , 'PHYSICS' , 'OCSV' , # Nitrate 'NIPNO3AQ' , 'NI' , 'NIPNH4AQ' , 'NI' , @@ -2498,7 +2498,7 @@ COLLECTIONS: 'inst3_3d_asm_Np-' 'NH4DP' , 'NI' , 'NH4WT' , 'NI' , 'NH4SV' , 'NI' , -# 'DNI2gDT' , 'MOIST' , 'NISV' , + 'MTRI%NI::NO3an1IM' , 'PHYSICS' , 'NISV' , :: #######################################################################