diff --git a/HISTORY_FP.rc.03z.tmpl b/HISTORY_FP.rc.03z.tmpl index 11243c17..aa561251 100644 --- a/HISTORY_FP.rc.03z.tmpl +++ b/HISTORY_FP.rc.03z.tmpl @@ -1383,8 +1383,7 @@ COLLECTIONS: 'inst3_3d_asm_Np-' 'CA.bcSTEXTTAU' , 'CA.bc' , 'BCSTEXTTAU' , 'CA.bcSTSCATAU' , 'CA.bc' , 'BCSTSCATAU' , 'CA.bcANGSTR' , 'CA.bc' , 'BCANGSTR' , - 'CA.bcFLUXU' , 'CA.bc' , 'BCFLUXU' , - 'CA.bcFLUXV' , 'CA.bc' , 'BCFLUXV' , + # Brown Carbon 'CA.brSMASS' , 'CA.br' , 'BRSMASS' , 'CA.brCMASS' , 'CA.br' , 'BRCMASS' , @@ -1393,8 +1392,7 @@ COLLECTIONS: 'inst3_3d_asm_Np-' 'CA.brSTEXTTAU' , 'CA.br' , 'BRSTEXTTAU' , 'CA.brSTSCATAU' , 'CA.br' , 'BRSTSCATAU' , 'CA.brANGSTR' , 'CA.br' , 'BRANGSTR' , - 'CA.brFLUXU' , 'CA.br' , 'BRFLUXU' , - 'CA.brFLUXV' , 'CA.br' , 'BRFLUXV' , + # Dust 'DUSMASS' , 'DU' , 'DUCMASS' , 'DU' , @@ -1407,8 +1405,7 @@ COLLECTIONS: 'inst3_3d_asm_Np-' 'DUCMASS25' , 'DU' , 'DUEXTT25' , 'DU' , 'DUSCAT25' , 'DU' , - 'DUFLUXU' , 'DU' , - 'DUFLUXV' , 'DU' , + # Seasalt 'SSSMASS' , 'SS' , 'SSCMASS' , 'SS' , @@ -1421,8 +1418,7 @@ COLLECTIONS: 'inst3_3d_asm_Np-' 'SSCMASS25' , 'SS' , 'SSEXTT25' , 'SS' , 'SSSCAT25' , 'SS' , - 'SSFLUXU' , 'SS' , - 'SSFLUXV' , 'SS' , + # Sulfates 'SO2SMASS' , 'SU' , 'SO2CMASS' , 'SU' , @@ -1435,8 +1431,7 @@ COLLECTIONS: 'inst3_3d_asm_Np-' 'SUSTEXTTAU' , 'SU' , 'SUSTSCATAU' , 'SU' , 'SUANGSTR' , 'SU' , - 'SUFLUXU' , 'SU' , - 'SUFLUXV' , 'SU' , + # Organic Carbon 'CA.ocSMASS' , 'CA.oc' , 'OCSMASS' , 'CA.ocCMASS' , 'CA.oc' , 'OCCMASS' , @@ -1445,8 +1440,7 @@ COLLECTIONS: 'inst3_3d_asm_Np-' 'CA.ocSTEXTTAU' , 'CA.oc' , 'OCSTEXTTAU' , 'CA.ocSTSCATAU' , 'CA.oc' , 'OCSTSCATAU' , 'CA.ocANGSTR' , 'CA.oc' , 'OCANGSTR' , - 'CA.ocFLUXU' , 'CA.oc' , 'OCFLUXU' , - 'CA.ocFLUXV' , 'CA.oc' , 'OCFLUXV' , + # Nitrate 'HNO3SMASS' , 'NI' , 'NH3SMASS' , 'NI' , @@ -1463,8 +1457,7 @@ COLLECTIONS: 'inst3_3d_asm_Np-' 'NIEXTTAU' , 'NI' , 'NISCATAU' , 'NI' , 'NIANGSTR' , 'NI' , - 'NIFLUXU' , 'NI' , - 'NIFLUXV' , 'NI' , + # Combined Aerosols 'TOTEXTTAU' , 'GOCART2G' , 'TOTSCATAU' , 'GOCART2G' , @@ -1496,6 +1489,8 @@ COLLECTIONS: 'inst3_3d_asm_Np-' 'CA.bcEMBF' , 'CA.bc' , 'BCEMBF' , 'CA.bcEMAN' , 'CA.bc' , 'BCEMAN' , 'MCHEMTRI%CA.bc::CA.bcphilicIM' , 'PHYSICS' , 'BCSV' , + 'CA.bcFLUXU' , 'CA.bc' , 'BCFLUXU' , + 'CA.bcFLUXV' , 'CA.bc' , 'BCFLUXV' , # Brown Carbon 'CA.brEM' , 'CA.br' , 'BRPHOBICEM;BRPHILICEM' , 'CA.brDP' , 'CA.br' , 'BRPHOBICDP;BRPHILICDP' , @@ -1506,6 +1501,8 @@ COLLECTIONS: 'inst3_3d_asm_Np-' 'CA.brEMAN' , 'CA.br' , 'BREMAN' , 'CA.brPSOA' , 'CA.br' , 'BRPSOA' , 'MCHEMTRI%CA.br::CA.brphilicIM' , 'PHYSICS' , 'BRSV' , + 'CA.brFLUXU' , 'CA.br' , 'BRFLUXU' , + 'CA.brFLUXV' , 'CA.br' , 'BRFLUXV' , # Dust 'DUEM' , 'DU' , 'DUEM001;DUEM002;DUEM003;DUEM004;DUEM005' , 'DUSD' , 'DU' , 'DUSD001;DUSD002;DUSD003;DUSD004;DUSD005' , @@ -1515,6 +1512,8 @@ COLLECTIONS: 'inst3_3d_asm_Np-' 'DUSCATFM' , 'DU' , 'DUAERIDX' , 'DU' , 'MCHEMTRI%DU::DUIM' , 'PHYSICS' , 'DUSV' , + 'DUFLUXU' , 'DU' , + 'DUFLUXV' , 'DU' , # Seasalt 'SSEM' , 'SS' , 'SSEM001;SSEM002;SSEM003;SSEM004;SSEM005' , 'SSSD' , 'SS' , 'SSSD001;SSSD002;SSSD003;SSSD004;SSSD005' , @@ -1524,6 +1523,8 @@ COLLECTIONS: 'inst3_3d_asm_Np-' 'SSSCATFM' , 'SS' , 'SSAERIDX' , 'SS' , 'MCHEMTRI%SS::SSIM' , 'PHYSICS' , 'SSSV' , + 'SSFLUXU' , 'SS' , + 'SSFLUXV' , 'SS' , # Sulfates 'SUEM' , 'SU' , 'DMSEM;SO2EM;SO4EM;MSAEM' , 'SUSD' , 'SU' , 'DMSSD;SO2SD;SO4SD;MSASD' , @@ -1540,6 +1541,8 @@ COLLECTIONS: 'inst3_3d_asm_Np-' 'SO2EMVN' , 'SU' , 'SO2EMVE' , 'SU' , 'MCHEMTRI%SU::SO4IM' , 'PHYSICS' , 'SUSV' , + 'SUFLUXU' , 'SU' , + 'SUFLUXV' , 'SU' , # Organic Carbon 'CA.ocEM' , 'CA.oc' , 'OCPHOBICEM;OCPHILICEM' , 'CA.ocDP' , 'CA.oc' , 'OCPHOBICDP;OCPHILICDP' , @@ -1551,6 +1554,8 @@ COLLECTIONS: 'inst3_3d_asm_Np-' 'CA.ocPSOA' , 'CA.oc' , 'OCPSOA' , 'CA.ocHYPHIL' , 'CA.oc' , 'OCPHOB2PHIL' , 'MCHEMTRI%CA.oc::CA.ocphilicIM' , 'PHYSICS' , 'OCSV' , + 'CA.ocFLUXU' , 'CA.oc' , 'OCFLUXU' , + 'CA.ocFLUXV' , 'CA.oc' , 'OCFLUXV' , # Nitrate 'NIPNO3AQ' , 'NI' , 'NIPNH4AQ' , 'NI' , @@ -1569,6 +1574,8 @@ COLLECTIONS: 'inst3_3d_asm_Np-' 'NH4WT' , 'NI' , 'NH4SV' , 'NI' , 'MCHEMTRI%NI::NO3an1IM' , 'PHYSICS' , 'NISV' , + 'NIFLUXU' , 'NI' , + 'NIFLUXV' , 'NI' , :: tavg3_2d_chm_Nx-.format: 'CFIO' , @@ -2384,6 +2391,8 @@ COLLECTIONS: 'inst3_3d_asm_Np-' 'CA.bcEMBF' , 'CA.bc' , 'BCEMBF' , 'CA.bcEMAN' , 'CA.bc' , 'BCEMAN' , 'MCHEMTRI%CA.bc::CA.bcphilicIM' , 'PHYSICS' , 'BCSV' , + 'CA.bcFLUXU' , 'CA.bc' , 'BCFLUXU' , + 'CA.bcFLUXV' , 'CA.bc' , 'BCFLUXV' , # Brown Carbon 'CA.brEM' , 'CA.br' , 'BRPHOBICEM;BRPHILICEM' , 'CA.brDP' , 'CA.br' , 'BRPHOBICDP;BRPHILICDP' , @@ -2393,6 +2402,8 @@ COLLECTIONS: 'inst3_3d_asm_Np-' 'CA.brEMBF' , 'CA.br' , 'BREMBF' , 'CA.brEMAN' , 'CA.br' , 'BREMAN' , 'MCHEMTRI%CA.br::CA.brphilicIM' , 'PHYSICS' , 'BRSV' , + 'CA.brFLUXU' , 'CA.br' , 'BRFLUXU' , + 'CA.brFLUXV' , 'CA.br' , 'BRFLUXV' , # Dust 'DUEM' , 'DU' , 'DUSD' , 'DU' , @@ -2402,6 +2413,8 @@ COLLECTIONS: 'inst3_3d_asm_Np-' 'DUSCATFM' , 'DU' , 'DUAERIDX' , 'DU' , 'MCHEMTRI%DU::DUIM' , 'PHYSICS' , 'DUSV' , + 'DUFLUXU' , 'DU' , + 'DUFLUXV' , 'DU' , # Seasalt 'SSEM' , 'SS' , 'SSSD' , 'SS' , @@ -2411,6 +2424,8 @@ COLLECTIONS: 'inst3_3d_asm_Np-' 'SSSCATFM' , 'SS' , 'SSAERIDX' , 'SS' , 'MCHEMTRI%SS::SSIM' , 'PHYSICS' , 'SSSV' , + 'SSFLUXU' , 'SS' , + 'SSFLUXV' , 'SS' , # Sulfates 'SUEM' , 'SU' , 'DMSEM;SO2EM;SO4EM;MSAEM', 'SUSD' , 'SU' , 'DMSSD;SO2SD;SO4SD;MSASD', @@ -2427,6 +2442,8 @@ COLLECTIONS: 'inst3_3d_asm_Np-' 'SO2EMVN' , 'SU' , 'SO2EMVE' , 'SU' , 'MCHEMTRI%SU::SO4IM' , 'PHYSICS' , 'SUSV' , + 'SUFLUXU' , 'SU' , + 'SUFLUXV' , 'SU' , # Organic Carbon 'CA.ocEM' , 'CA.oc' , 'OCPHOBICEM;OCPHILICEM', 'CA.ocDP' , 'CA.oc' , 'OCPHOBICDP;OCPHILICDP', @@ -2437,6 +2454,8 @@ COLLECTIONS: 'inst3_3d_asm_Np-' 'CA.ocEMBG' , 'CA.oc' , 'OCEMBG' , 'CA.ocHYPHIL' , 'CA.oc' , 'OCPHOB2PHIL' , 'MCHEMTRI%CA.oc::CA.ocphilicIM' , 'PHYSICS' , 'OCSV' , + 'CA.ocFLUXU' , 'CA.oc' , 'OCFLUXU' , + 'CA.ocFLUXV' , 'CA.oc' , 'OCFLUXV' , # Nitrate 'NIPNO3AQ' , 'NI' , 'NIPNH4AQ' , 'NI' , @@ -2455,6 +2474,8 @@ COLLECTIONS: 'inst3_3d_asm_Np-' 'NH4WT' , 'NI' , 'NH4SV' , 'NI' , 'MCHEMTRI%NI::NO3an1IM' , 'PHYSICS' , 'NISV' , + 'NIFLUXU' , 'NI' , + 'NIFLUXV' , 'NI' , :: ####################################################################### @@ -2719,16 +2740,14 @@ COLLECTIONS: 'inst3_3d_asm_Np-' 'CA.bcEXTTAU' , 'CA.bc' , 'BCEXTTAU' , 'CA.bcSCATAU' , 'CA.bc' , 'BCSCATAU' , 'CA.bcANGSTR' , 'CA.bc' , 'BCANGSTR' , - 'CA.bcFLUXU' , 'CA.bc' , 'BCFLUXU' , - 'CA.bcFLUXV' , 'CA.bc' , 'BCFLUXV' , + # Brown Carbon 'CA.brSMASS' , 'CA.br' , 'BRSMASS' , 'CA.brCMASS' , 'CA.br' , 'BRCMASS' , 'CA.brEXTTAU' , 'CA.br' , 'BREXTTAU' , 'CA.brSCATAU' , 'CA.br' , 'BRSCATAU' , 'CA.brANGSTR' , 'CA.br' , 'BRANGSTR' , - 'CA.brFLUXU' , 'CA.br' , 'BRFLUXU' , - 'CA.brFLUXV' , 'CA.br' , 'BRFLUXV' , + # Dust 'DUSMASS' , 'DU' , 'DUCMASS' , 'DU' , @@ -2739,8 +2758,7 @@ COLLECTIONS: 'inst3_3d_asm_Np-' 'DUCMASS25' , 'DU' , 'DUEXTT25' , 'DU' , 'DUSCAT25' , 'DU' , - 'DUFLUXU' , 'DU' , - 'DUFLUXV' , 'DU' , + # Seasalt 'SSSMASS' , 'SS' , 'SSCMASS' , 'SS' , @@ -2751,8 +2769,7 @@ COLLECTIONS: 'inst3_3d_asm_Np-' 'SSCMASS25' , 'SS' , 'SSEXTT25' , 'SS' , 'SSSCAT25' , 'SS' , - 'SSFLUXU' , 'SS' , - 'SSFLUXV' , 'SS' , + # Sulfates 'SO2SMASS' , 'SU' , 'SO2CMASS' , 'SU' , @@ -2763,16 +2780,14 @@ COLLECTIONS: 'inst3_3d_asm_Np-' 'SUEXTTAU' , 'SU' , 'SUSCATAU' , 'SU' , 'SUANGSTR' , 'SU' , - 'SUFLUXU' , 'SU' , - 'SUFLUXV' , 'SU' , + # Organic Carbon 'CA.ocSMASS' , 'CA.oc' , 'OCSMASS' , 'CA.ocCMASS' , 'CA.oc' , 'OCCMASS' , 'CA.ocEXTTAU' , 'CA.oc' , 'OCEXTTAU' , 'CA.ocSCATAU' , 'CA.oc' , 'OCSCATAU' , 'CA.ocANGSTR' , 'CA.oc' , 'OCANGSTR' , - 'CA.ocFLUXU' , 'CA.oc' , 'OCFLUXU' , - 'CA.ocFLUXV' , 'CA.oc' , 'OCFLUXV' , + # Nitrate 'HNO3SMASS' , 'NI' , 'NH3SMASS' , 'NI' , @@ -2789,8 +2804,7 @@ COLLECTIONS: 'inst3_3d_asm_Np-' 'NIEXTTAU' , 'NI' , 'NISCATAU' , 'NI' , 'NIANGSTR' , 'NI' , - 'NIFLUXU' , 'NI' , - 'NIFLUXV' , 'NI' , + # Combined Aerosols 'TOTEXTTAU' , 'GOCART2G' , 'TOTSCATAU' , 'GOCART2G' , diff --git a/HISTORY_FP.rc.09z.tmpl b/HISTORY_FP.rc.09z.tmpl index e6573e5b..dd788de3 100644 --- a/HISTORY_FP.rc.09z.tmpl +++ b/HISTORY_FP.rc.09z.tmpl @@ -1413,8 +1413,7 @@ COLLECTIONS: 'inst3_3d_asm_Np-' 'CA.bcSTEXTTAU' , 'CA.bc' , 'BCSTEXTTAU' , 'CA.bcSTSCATAU' , 'CA.bc' , 'BCSTSCATAU' , 'CA.bcANGSTR' , 'CA.bc' , 'BCANGSTR' , - 'CA.bcFLUXU' , 'CA.bc' , 'BCFLUXU' , - 'CA.bcFLUXV' , 'CA.bc' , 'BCFLUXV' , + # Brown Carbon 'CA.brSMASS' , 'CA.br' , 'BRSMASS' , 'CA.brCMASS' , 'CA.br' , 'BRCMASS' , @@ -1423,8 +1422,7 @@ COLLECTIONS: 'inst3_3d_asm_Np-' 'CA.brSTEXTTAU' , 'CA.br' , 'BRSTEXTTAU' , 'CA.brSTSCATAU' , 'CA.br' , 'BRSTSCATAU' , 'CA.brANGSTR' , 'CA.br' , 'BRANGSTR' , - 'CA.brFLUXU' , 'CA.br' , 'BRFLUXU' , - 'CA.brFLUXV' , 'CA.br' , 'BRFLUXV' , + # Dust 'DUSMASS' , 'DU' , 'DUCMASS' , 'DU' , @@ -1437,8 +1435,7 @@ COLLECTIONS: 'inst3_3d_asm_Np-' 'DUCMASS25' , 'DU' , 'DUEXTT25' , 'DU' , 'DUSCAT25' , 'DU' , - 'DUFLUXU' , 'DU' , - 'DUFLUXV' , 'DU' , + # Seasalt 'SSSMASS' , 'SS' , 'SSCMASS' , 'SS' , @@ -1451,8 +1448,7 @@ COLLECTIONS: 'inst3_3d_asm_Np-' 'SSCMASS25' , 'SS' , 'SSEXTT25' , 'SS' , 'SSSCAT25' , 'SS' , - 'SSFLUXU' , 'SS' , - 'SSFLUXV' , 'SS' , + # Sulfates 'SO2SMASS' , 'SU' , 'SO2CMASS' , 'SU' , @@ -1465,8 +1461,7 @@ COLLECTIONS: 'inst3_3d_asm_Np-' 'SUSTEXTTAU' , 'SU' , 'SUSTSCATAU' , 'SU' , 'SUANGSTR' , 'SU' , - 'SUFLUXU' , 'SU' , - 'SUFLUXV' , 'SU' , + # Organic Carbon 'CA.ocSMASS' , 'CA.oc' , 'OCSMASS' , 'CA.ocCMASS' , 'CA.oc' , 'OCCMASS' , @@ -1475,8 +1470,7 @@ COLLECTIONS: 'inst3_3d_asm_Np-' 'CA.ocSTEXTTAU' , 'CA.oc' , 'OCSTEXTTAU' , 'CA.ocSTSCATAU' , 'CA.oc' , 'OCSTSCATAU' , 'CA.ocANGSTR' , 'CA.oc' , 'OCANGSTR' , - 'CA.ocFLUXU' , 'CA.oc' , 'OCFLUXU' , - 'CA.ocFLUXV' , 'CA.oc' , 'OCFLUXV' , + # Nitrate 'HNO3SMASS' , 'NI' , 'NH3SMASS' , 'NI' , @@ -1493,8 +1487,7 @@ COLLECTIONS: 'inst3_3d_asm_Np-' 'NIEXTTAU' , 'NI' , 'NISCATAU' , 'NI' , 'NIANGSTR' , 'NI' , - 'NIFLUXU' , 'NI' , - 'NIFLUXV' , 'NI' , + # Combined Aerosols 'TOTEXTTAU' , 'GOCART2G' , 'TOTSCATAU' , 'GOCART2G' , @@ -1526,6 +1519,8 @@ COLLECTIONS: 'inst3_3d_asm_Np-' 'CA.bcEMBF' , 'CA.bc' , 'BCEMBF' , 'CA.bcEMAN' , 'CA.bc' , 'BCEMAN' , 'MCHEMTRI%CA.bc::CA.bcphilicIM' , 'PHYSICS' , 'BCSV' , + 'CA.bcFLUXU' , 'CA.bc' , 'BCFLUXU' , + 'CA.bcFLUXV' , 'CA.bc' , 'BCFLUXV' , # Brown Carbon 'CA.brEM' , 'CA.br' , 'BRPHOBICEM;BRPHILICEM' , 'CA.brDP' , 'CA.br' , 'BRPHOBICDP;BRPHILICDP' , @@ -1536,6 +1531,8 @@ COLLECTIONS: 'inst3_3d_asm_Np-' 'CA.brEMAN' , 'CA.br' , 'BREMAN' , 'CA.brPSOA' , 'CA.br' , 'BRPSOA' , 'MCHEMTRI%CA.br::CA.brphilicIM' , 'PHYSICS' , 'BRSV' , + 'CA.brFLUXU' , 'CA.br' , 'BRFLUXU' , + 'CA.brFLUXV' , 'CA.br' , 'BRFLUXV' , # Dust 'DUEM' , 'DU' , 'DUEM001;DUEM002;DUEM003;DUEM004;DUEM005' , 'DUSD' , 'DU' , 'DUSD001;DUSD002;DUSD003;DUSD004;DUSD005' , @@ -1544,6 +1541,8 @@ COLLECTIONS: 'inst3_3d_asm_Np-' 'DUEXTTFM' , 'DU' , 'DUSCATFM' , 'DU' , 'MCHEMTRI%DU::DUIM' , 'PHYSICS' , 'DUSV' , + 'DUFLUXU' , 'DU' , + 'DUFLUXV' , 'DU' , # Seasalt 'SSEM' , 'SS' , 'SSEM001;SSEM002;SSEM003;SSEM004;SSEM005' , 'SSSD' , 'SS' , 'SSSD001;SSSD002;SSSD003;SSSD004;SSSD005' , @@ -1552,6 +1551,9 @@ COLLECTIONS: 'inst3_3d_asm_Np-' 'SSEXTTFM' , 'SS' , 'SSSCATFM' , 'SS' , 'MCHEMTRI%SS::SSIM' , 'PHYSICS' , 'SSSV' , + 'SSFLUXU' , 'SS' , + 'SSFLUXV' , 'SS' , + # Sulfates 'SUEM' , 'SU' , 'DMSEM;SO2EM;SO4EM;MSAEM' , 'SUSD' , 'SU' , 'DMSSD;SO2SD;SO4SD;MSASD' , @@ -1568,6 +1570,8 @@ COLLECTIONS: 'inst3_3d_asm_Np-' 'SO2EMVN' , 'SU' , 'SO2EMVE' , 'SU' , 'MCHEMTRI%SU::SO4IM' , 'PHYSICS' , 'SUSV' , + 'SUFLUXU' , 'SU' , + 'SUFLUXV' , 'SU' , # Organic Carbon 'CA.ocEM' , 'CA.oc' , 'OCPHOBICEM;OCPHILICEM' , 'CA.ocDP' , 'CA.oc' , 'OCPHOBICDP;OCPHILICDP' , @@ -1579,6 +1583,8 @@ COLLECTIONS: 'inst3_3d_asm_Np-' 'CA.ocPSOA' , 'CA.oc' , 'OCPSOA' , 'CA.ocHYPHIL' , 'CA.oc' , 'OCPHOB2PHIL' , 'MCHEMTRI%CA.oc::CA.ocphilicIM' , 'PHYSICS' , 'OCSV' , + 'CA.ocFLUXU' , 'CA.oc' , 'OCFLUXU' , + 'CA.ocFLUXV' , 'CA.oc' , 'OCFLUXV' , # Nitrate 'NIPNO3AQ' , 'NI' , 'NIPNH4AQ' , 'NI' , @@ -1587,7 +1593,6 @@ COLLECTIONS: 'inst3_3d_asm_Np-' 'NISD' , 'NI' , 'NISD001;NISD002;NISD003', 'NIDP' , 'NI' , 'NIDP001;NIDP002;NIDP003', 'NIWT' , 'NI' , 'NIWT001;NIWT002;NIWT003', - 'NI2gSV' , 'NI' , 'NH3EM' , 'NI' , 'NH3DP' , 'NI' , 'NH3WT' , 'NI' , @@ -1597,6 +1602,8 @@ COLLECTIONS: 'inst3_3d_asm_Np-' 'NH4WT' , 'NI' , 'NH4SV' , 'NI' , 'MCHEMTRI%NI::NO3an1IM' , 'PHYSICS' , 'NISV' , + 'NIFLUXU' , 'NI' , + 'NIFLUXV' , 'NI' , :: tavg3_2d_chm_Nx-.format: 'CFIO' , @@ -2412,6 +2419,8 @@ COLLECTIONS: 'inst3_3d_asm_Np-' 'CA.bcEMBF' , 'CA.bc' , 'BCEMBF' , 'CA.bcEMAN' , 'CA.bc' , 'BCEMAN' , 'MCHEMTRI%CA.bc::CA.bcphilicIM' , 'PHYSICS' , 'BCSV' , + 'CA.bcFLUXU' , 'CA.bc' , 'BCFLUXU' , + 'CA.bcFLUXV' , 'CA.bc' , 'BCFLUXV' , # Brown Carbon 'CA.brEM' , 'CA.br' , 'BRPHOBICEM;BRPHILICEM' , 'CA.brDP' , 'CA.br' , 'BRPHOBICDP;BRPHILICDP' , @@ -2421,6 +2430,8 @@ COLLECTIONS: 'inst3_3d_asm_Np-' 'CA.brEMBF' , 'CA.br' , 'BREMBF' , 'CA.brEMAN' , 'CA.br' , 'BREMAN' , 'MCHEMTRI%CA.br::CA.brphilicIM' , 'PHYSICS' , 'BRSV' , + 'CA.brFLUXU' , 'CA.br' , 'BRFLUXU' , + 'CA.brFLUXV' , 'CA.br' , 'BRFLUXV' , # Dust 'DUEM' , 'DU' , 'DUSD' , 'DU' , @@ -2429,6 +2440,8 @@ COLLECTIONS: 'inst3_3d_asm_Np-' 'DUEXTTFM' , 'DU' , 'DUSCATFM' , 'DU' , 'MCHEMTRI%DU::DUIM' , 'PHYSICS' , 'DUSV' , + 'DUFLUXU' , 'DU' , + 'DUFLUXV' , 'DU' , # Seasalt 'SSEM' , 'SS' , 'SSSD' , 'SS' , @@ -2437,6 +2450,8 @@ COLLECTIONS: 'inst3_3d_asm_Np-' 'SSEXTTFM' , 'SS' , 'SSSCATFM' , 'SS' , 'MCHEMTRI%SS::SSIM' , 'PHYSICS' , 'SSSV' , + 'SSFLUXU' , 'SS' , + 'SSFLUXV' , 'SS' , # Sulfates 'SUEM' , 'SU' , 'DMSEM;SO2EM;SO4EM;MSAEM', 'SUSD' , 'SU' , 'DMSSD;SO2SD;SO4SD;MSASD', @@ -2453,6 +2468,8 @@ COLLECTIONS: 'inst3_3d_asm_Np-' 'SO2EMVN' , 'SU' , 'SO2EMVE' , 'SU' , 'MCHEMTRI%SU::SO4IM' , 'PHYSICS' , 'SUSV' , + 'SUFLUXU' , 'SU' , + 'SUFLUXV' , 'SU' , # Organic Carbon 'CA.ocEM' , 'CA.oc' , 'OCPHOBICEM;OCPHILICEM', 'CA.ocDP' , 'CA.oc' , 'OCPHOBICDP;OCPHILICDP', @@ -2463,6 +2480,8 @@ COLLECTIONS: 'inst3_3d_asm_Np-' 'CA.ocEMBG' , 'CA.oc' , 'OCEMBG' , 'CA.ocHYPHIL' , 'CA.oc' , 'OCPHOB2PHIL' , 'MCHEMTRI%CA.oc::CA.ocphilicIM' , 'PHYSICS' , 'OCSV' , + 'CA.ocFLUXU' , 'CA.oc' , 'OCFLUXU' , + 'CA.ocFLUXV' , 'CA.oc' , 'OCFLUXV' , # Nitrate 'NIPNO3AQ' , 'NI' , 'NIPNH4AQ' , 'NI' , @@ -2481,6 +2500,8 @@ COLLECTIONS: 'inst3_3d_asm_Np-' 'NH4WT' , 'NI' , 'NH4SV' , 'NI' , 'MCHEMTRI%NI::NO3an1IM' , 'PHYSICS' , 'NISV' , + 'NIFLUXU' , 'NI' , + 'NIFLUXV' , 'NI' , :: ####################################################################### @@ -2745,17 +2766,15 @@ COLLECTIONS: 'inst3_3d_asm_Np-' 'CA.bcEXTTAU' , 'CA.bc' , 'BCEXTTAU' , 'CA.bcSCATAU' , 'CA.bc' , 'BCSCATAU' , 'CA.bcANGSTR' , 'CA.bc' , 'BCANGSTR' , - 'CA.bcFLUXU' , 'CA.bc' , 'BCFLUXU' , - 'CA.bcFLUXV' , 'CA.bc' , 'BCFLUXV' , + # Brown Carbon 'CA.brSMASS' , 'CA.br' , 'BRSMASS' , 'CA.brCMASS' , 'CA.br' , 'BRCMASS' , 'CA.brEXTTAU' , 'CA.br' , 'BREXTTAU' , 'CA.brSCATAU' , 'CA.br' , 'BRSCATAU' , 'CA.brANGSTR' , 'CA.br' , 'BRANGSTR' , - 'CA.brFLUXU' , 'CA.br' , 'BRFLUXU' , - 'CA.brFLUXV' , 'CA.br' , 'BRFLUXV' , - 'MCHEMTRI%CA.br::CA.brphilicIM' , 'PHYSICS' , 'BRSV' , + + # Dust 'DUSMASS' , 'DU' , 'DUCMASS' , 'DU' , @@ -2766,8 +2785,7 @@ COLLECTIONS: 'inst3_3d_asm_Np-' 'DUCMASS25' , 'DU' , 'DUEXTT25' , 'DU' , 'DUSCAT25' , 'DU' , - 'DUFLUXU' , 'DU' , - 'DUFLUXV' , 'DU' , + # Seasalt 'SSSMASS' , 'SS' , 'SSCMASS' , 'SS' , @@ -2778,8 +2796,7 @@ COLLECTIONS: 'inst3_3d_asm_Np-' 'SSCMASS25' , 'SS' , 'SSEXTT25' , 'SS' , 'SSSCAT25' , 'SS' , - 'SSFLUXU' , 'SS' , - 'SSFLUXV' , 'SS' , + # Sulfates 'SO2SMASS' , 'SU' , 'SO2CMASS' , 'SU' , @@ -2790,16 +2807,14 @@ COLLECTIONS: 'inst3_3d_asm_Np-' 'SUEXTTAU' , 'SU' , 'SUSCATAU' , 'SU' , 'SUANGSTR' , 'SU' , - 'SUFLUXU' , 'SU' , - 'SUFLUXV' , 'SU' , + # Organic Carbon 'CA.ocSMASS' , 'CA.oc' , 'OCSMASS' , 'CA.ocCMASS' , 'CA.oc' , 'OCCMASS' , 'CA.ocEXTTAU' , 'CA.oc' , 'OCEXTTAU' , 'CA.ocSCATAU' , 'CA.oc' , 'OCSCATAU' , 'CA.ocANGSTR' , 'CA.oc' , 'OCANGSTR' , - 'CA.ocFLUXU' , 'CA.oc' , 'OCFLUXU' , - 'CA.ocFLUXV' , 'CA.oc' , 'OCFLUXV' , + # Nitrate 'HNO3SMASS' , 'NI' , 'NH3SMASS' , 'NI' , @@ -2816,8 +2831,7 @@ COLLECTIONS: 'inst3_3d_asm_Np-' 'NIEXTTAU' , 'NI' , 'NISCATAU' , 'NI' , 'NIANGSTR' , 'NI' , - 'NIFLUXU' , 'NI' , - 'NIFLUXV' , 'NI' , + # Combined Aerosols 'TOTEXTTAU' , 'GOCART2G' , 'TOTSCATAU' , 'GOCART2G' , diff --git a/HISTORY_FP.rc.15z.tmpl b/HISTORY_FP.rc.15z.tmpl index 250ae8ef..f49f7259 100644 --- a/HISTORY_FP.rc.15z.tmpl +++ b/HISTORY_FP.rc.15z.tmpl @@ -1383,8 +1383,7 @@ COLLECTIONS: 'inst3_3d_asm_Np-' 'CA.bcSTEXTTAU' , 'CA.bc' , 'BCSTEXTTAU' , 'CA.bcSTSCATAU' , 'CA.bc' , 'BCSTSCATAU' , 'CA.bcANGSTR' , 'CA.bc' , 'BCANGSTR' , - 'CA.bcFLUXU' , 'CA.bc' , 'BCFLUXU' , - 'CA.bcFLUXV' , 'CA.bc' , 'BCFLUXV' , + # Brown Carbon 'CA.brSMASS' , 'CA.br' , 'BRSMASS' , 'CA.brCMASS' , 'CA.br' , 'BRCMASS' , @@ -1393,8 +1392,7 @@ COLLECTIONS: 'inst3_3d_asm_Np-' 'CA.brSTEXTTAU' , 'CA.br' , 'BRSTEXTTAU' , 'CA.brSTSCATAU' , 'CA.br' , 'BRSTSCATAU' , 'CA.brANGSTR' , 'CA.br' , 'BRANGSTR' , - 'CA.brFLUXU' , 'CA.br' , 'BRFLUXU' , - 'CA.brFLUXV' , 'CA.br' , 'BRFLUXV' , + # Dust 'DUSMASS' , 'DU' , 'DUCMASS' , 'DU' , @@ -1407,8 +1405,7 @@ COLLECTIONS: 'inst3_3d_asm_Np-' 'DUCMASS25' , 'DU' , 'DUEXTT25' , 'DU' , 'DUSCAT25' , 'DU' , - 'DUFLUXU' , 'DU' , - 'DUFLUXV' , 'DU' , + # Seasalt 'SSSMASS' , 'SS' , 'SSCMASS' , 'SS' , @@ -1421,8 +1418,7 @@ COLLECTIONS: 'inst3_3d_asm_Np-' 'SSCMASS25' , 'SS' , 'SSEXTT25' , 'SS' , 'SSSCAT25' , 'SS' , - 'SSFLUXU' , 'SS' , - 'SSFLUXV' , 'SS' , + # Sulfates 'SO2SMASS' , 'SU' , 'SO2CMASS' , 'SU' , @@ -1435,8 +1431,7 @@ COLLECTIONS: 'inst3_3d_asm_Np-' 'SUSTEXTTAU' , 'SU' , 'SUSTSCATAU' , 'SU' , 'SUANGSTR' , 'SU' , - 'SUFLUXU' , 'SU' , - 'SUFLUXV' , 'SU' , + # Organic Carbon 'CA.ocSMASS' , 'CA.oc' , 'OCSMASS' , 'CA.ocCMASS' , 'CA.oc' , 'OCCMASS' , @@ -1445,8 +1440,7 @@ COLLECTIONS: 'inst3_3d_asm_Np-' 'CA.ocSTEXTTAU' , 'CA.oc' , 'OCSTEXTTAU' , 'CA.ocSTSCATAU' , 'CA.oc' , 'OCSTSCATAU' , 'CA.ocANGSTR' , 'CA.oc' , 'OCANGSTR' , - 'CA.ocFLUXU' , 'CA.oc' , 'OCFLUXU' , - 'CA.ocFLUXV' , 'CA.oc' , 'OCFLUXV' , + # Nitrate 'HNO3SMASS' , 'NI' , 'NH3SMASS' , 'NI' , @@ -1463,8 +1457,7 @@ COLLECTIONS: 'inst3_3d_asm_Np-' 'NIEXTTAU' , 'NI' , 'NISCATAU' , 'NI' , 'NIANGSTR' , 'NI' , - 'NIFLUXU' , 'NI' , - 'NIFLUXV' , 'NI' , + # Combined Aerosols 'TOTEXTTAU' , 'GOCART2G' , 'TOTSCATAU' , 'GOCART2G' , @@ -1496,6 +1489,8 @@ COLLECTIONS: 'inst3_3d_asm_Np-' 'CA.bcEMBF' , 'CA.bc' , 'BCEMBF' , 'CA.bcEMAN' , 'CA.bc' , 'BCEMAN' , 'MCHEMTRI%CA.bc::CA.bcphilicIM' , 'PHYSICS' , 'BCSV' , + 'CA.bcFLUXU' , 'CA.bc' , 'BCFLUXU' , + 'CA.bcFLUXV' , 'CA.bc' , 'BCFLUXV' , # Brown Carbon 'CA.brEM' , 'CA.br' , 'BRPHOBICEM;BRPHILICEM' , 'CA.brDP' , 'CA.br' , 'BRPHOBICDP;BRPHILICDP' , @@ -1506,6 +1501,8 @@ COLLECTIONS: 'inst3_3d_asm_Np-' 'CA.brEMAN' , 'CA.br' , 'BREMAN' , 'CA.brPSOA' , 'CA.br' , 'BRPSOA' , 'MCHEMTRI%CA.br::CA.brphilicIM' , 'PHYSICS' , 'BRSV' , + 'CA.brFLUXU' , 'CA.br' , 'BRFLUXU' , + 'CA.brFLUXV' , 'CA.br' , 'BRFLUXV' , # Dust 'DUEM' , 'DU' , 'DUEM001;DUEM002;DUEM003;DUEM004;DUEM005' , 'DUSD' , 'DU' , 'DUSD001;DUSD002;DUSD003;DUSD004;DUSD005' , @@ -1514,6 +1511,8 @@ COLLECTIONS: 'inst3_3d_asm_Np-' 'DUEXTTFM' , 'DU' , 'DUSCATFM' , 'DU' , 'MCHEMTRI%DU::DUIM' , 'PHYSICS' , 'DUSV' , + 'DUFLUXU' , 'DU' , + 'DUFLUXV' , 'DU' , # Seasalt 'SSEM' , 'SS' , 'SSEM001;SSEM002;SSEM003;SSEM004;SSEM005' , 'SSSD' , 'SS' , 'SSSD001;SSSD002;SSSD003;SSSD004;SSSD005' , @@ -1522,6 +1521,8 @@ COLLECTIONS: 'inst3_3d_asm_Np-' 'SSEXTTFM' , 'SS' , 'SSSCATFM' , 'SS' , 'MCHEMTRI%SS::SSIM' , 'PHYSICS' , 'SSSV' , + 'SSFLUXU' , 'SS' , + 'SSFLUXV' , 'SS' , # Sulfates 'SUEM' , 'SU' , 'DMSEM;SO2EM;SO4EM;MSAEM' , 'SUSD' , 'SU' , 'DMSSD;SO2SD;SO4SD;MSASD' , @@ -1538,6 +1539,8 @@ COLLECTIONS: 'inst3_3d_asm_Np-' 'SO2EMVN' , 'SU' , 'SO2EMVE' , 'SU' , 'MCHEMTRI%SU::SO4IM' , 'PHYSICS' , 'SUSV' , + 'SUFLUXU' , 'SU' , + 'SUFLUXV' , 'SU' , # Organic Carbon 'CA.ocEM' , 'CA.oc' , 'OCPHOBICEM;OCPHILICEM' , 'CA.ocDP' , 'CA.oc' , 'OCPHOBICDP;OCPHILICDP' , @@ -1549,6 +1552,8 @@ COLLECTIONS: 'inst3_3d_asm_Np-' 'CA.ocPSOA' , 'CA.oc' , 'OCPSOA' , 'CA.ocHYPHIL' , 'CA.oc' , 'OCPHOB2PHIL' , 'MCHEMTRI%CA.oc::CA.ocphilicIM' , 'PHYSICS' , 'OCSV' , + 'CA.ocFLUXU' , 'CA.oc' , 'OCFLUXU' , + 'CA.ocFLUXV' , 'CA.oc' , 'OCFLUXV' , # Nitrate 'NIPNO3AQ' , 'NI' , 'NIPNH4AQ' , 'NI' , @@ -1567,6 +1572,8 @@ COLLECTIONS: 'inst3_3d_asm_Np-' 'NH4WT' , 'NI' , 'NH4SV' , 'NI' , 'MCHEMTRI%NI::NO3an1IM' , 'PHYSICS' , 'NISV' , + 'NIFLUXU' , 'NI' , + 'NIFLUXV' , 'NI' , :: tavg3_2d_chm_Nx-.format: 'CFIO' , @@ -2382,6 +2389,8 @@ COLLECTIONS: 'inst3_3d_asm_Np-' 'CA.bcEMBF' , 'CA.bc' , 'BCEMBF' , 'CA.bcEMAN' , 'CA.bc' , 'BCEMAN' , 'MCHEMTRI%CA.bc::CA.bcphilicIM' , 'PHYSICS' , 'BCSV' , + 'CA.bcFLUXU' , 'CA.bc' , 'BCFLUXU' , + 'CA.bcFLUXV' , 'CA.bc' , 'BCFLUXV' , # Brown Carbon 'CA.brEM' , 'CA.br' , 'BRPHOBICEM;BRPHILICEM' , 'CA.brDP' , 'CA.br' , 'BRPHOBICDP;BRPHILICDP' , @@ -2391,6 +2400,8 @@ COLLECTIONS: 'inst3_3d_asm_Np-' 'CA.brEMBF' , 'CA.br' , 'BREMBF' , 'CA.brEMAN' , 'CA.br' , 'BREMAN' , 'MCHEMTRI%CA.br::CA.brphilicIM' , 'PHYSICS' , 'BRSV' , + 'CA.brFLUXU' , 'CA.br' , 'BRFLUXU' , + 'CA.brFLUXV' , 'CA.br' , 'BRFLUXV' , # Dust 'DUEM' , 'DU' , 'DUSD' , 'DU' , @@ -2399,6 +2410,8 @@ COLLECTIONS: 'inst3_3d_asm_Np-' 'DUEXTTFM' , 'DU' , 'DUSCATFM' , 'DU' , 'MCHEMTRI%DU::DUIM' , 'PHYSICS' , 'DUSV' , + 'DUFLUXU' , 'DU' , + 'DUFLUXV' , 'DU' , # Seasalt 'SSEM' , 'SS' , 'SSSD' , 'SS' , @@ -2407,6 +2420,8 @@ COLLECTIONS: 'inst3_3d_asm_Np-' 'SSEXTTFM' , 'SS' , 'SSSCATFM' , 'SS' , 'MCHEMTRI%SS::SSIM' , 'PHYSICS' , 'SSSV' , + 'SSFLUXU' , 'SS' , + 'SSFLUXV' , 'SS' , # Sulfates 'SUEM' , 'SU' , 'DMSEM;SO2EM;SO4EM;MSAEM' , 'SUSD' , 'SU' , 'DMSSD;SO2SD;SO4SD;MSASD' , @@ -2423,6 +2438,8 @@ COLLECTIONS: 'inst3_3d_asm_Np-' 'SO2EMVN' , 'SU' , 'SO2EMVE' , 'SU' , 'MCHEMTRI%SU::SO4IM' , 'PHYSICS' , 'SUSV' , + 'SUFLUXU' , 'SU' , + 'SUFLUXV' , 'SU' , # Organic Carbon 'CA.ocEM' , 'CA.oc' , 'OCPHOBICEM;OCPHILICEM' , 'CA.ocDP' , 'CA.oc' , 'OCPHOBICDP;OCPHILICDP' , @@ -2433,6 +2450,8 @@ COLLECTIONS: 'inst3_3d_asm_Np-' 'CA.ocEMBG' , 'CA.oc' , 'OCEMBG' , 'CA.ocHYPHIL' , 'CA.oc' , 'OCPHOB2PHIL' , 'MCHEMTRI%CA.oc::CA.ocphilicIM' , 'PHYSICS' , 'OCSV' , + 'CA.ocFLUXU' , 'CA.oc' , 'OCFLUXU' , + 'CA.ocFLUXV' , 'CA.oc' , 'OCFLUXV' , # Nitrate 'NIPNO3AQ' , 'NI' , 'NIPNH4AQ' , 'NI' , @@ -2451,6 +2470,8 @@ COLLECTIONS: 'inst3_3d_asm_Np-' 'NH4WT' , 'NI' , 'NH4SV' , 'NI' , 'MCHEMTRI%NI::NO3an1IM' , 'PHYSICS' , 'NISV' , + 'NIFLUXU' , 'NI' , + 'NIFLUXV' , 'NI' , :: ####################################################################### @@ -2715,16 +2736,14 @@ COLLECTIONS: 'inst3_3d_asm_Np-' 'CA.bcEXTTAU' , 'CA.bc' , 'BCEXTTAU' , 'CA.bcSCATAU' , 'CA.bc' , 'BCSCATAU' , 'CA.bcANGSTR' , 'CA.bc' , 'BCANGSTR' , - 'CA.bcFLUXU' , 'CA.bc' , 'BCFLUXU' , - 'CA.bcFLUXV' , 'CA.bc' , 'BCFLUXV' , + # Brown Carbon 'CA.brSMASS' , 'CA.br' , 'BRSMASS' , 'CA.brCMASS' , 'CA.br' , 'BRCMASS' , 'CA.brEXTTAU' , 'CA.br' , 'BREXTTAU' , 'CA.brSCATAU' , 'CA.br' , 'BRSCATAU' , 'CA.brANGSTR' , 'CA.br' , 'BRANGSTR' , - 'CA.brFLUXU' , 'CA.br' , 'BRFLUXU' , - 'CA.brFLUXV' , 'CA.br' , 'BRFLUXV' , + # Dust 'DUSMASS' , 'DU' , 'DUCMASS' , 'DU' , @@ -2735,8 +2754,7 @@ COLLECTIONS: 'inst3_3d_asm_Np-' 'DUCMASS25' , 'DU' , 'DUEXTT25' , 'DU' , 'DUSCAT25' , 'DU' , - 'DUFLUXU' , 'DU' , - 'DUFLUXV' , 'DU' , + # Seasalt 'SSSMASS' , 'SS' , 'SSCMASS' , 'SS' , @@ -2747,8 +2765,7 @@ COLLECTIONS: 'inst3_3d_asm_Np-' 'SSCMASS25' , 'SS' , 'SSEXTT25' , 'SS' , 'SSSCAT25' , 'SS' , - 'SSFLUXU' , 'SS' , - 'SSFLUXV' , 'SS' , + # Sulfates 'SO2SMASS' , 'SU' , 'SO2CMASS' , 'SU' , @@ -2759,16 +2776,14 @@ COLLECTIONS: 'inst3_3d_asm_Np-' 'SUEXTTAU' , 'SU' , 'SUSCATAU' , 'SU' , 'SUANGSTR' , 'SU' , - 'SUFLUXU' , 'SU' , - 'SUFLUXV' , 'SU' , + # Organic Carbon 'CA.ocSMASS' , 'CA.oc' , 'OCSMASS' , 'CA.ocCMASS' , 'CA.oc' , 'OCCMASS' , 'CA.ocEXTTAU' , 'CA.oc' , 'OCEXTTAU' , 'CA.ocSCATAU' , 'CA.oc' , 'OCSCATAU' , 'CA.ocANGSTR' , 'CA.oc' , 'OCANGSTR' , - 'CA.ocFLUXU' , 'CA.oc' , 'OCFLUXU' , - 'CA.ocFLUXV' , 'CA.oc' , 'OCFLUXV' , + # Nitrate 'HNO3SMASS' , 'NI' , 'NH3SMASS' , 'NI' , @@ -2785,8 +2800,7 @@ COLLECTIONS: 'inst3_3d_asm_Np-' 'NIEXTTAU' , 'NI' , 'NISCATAU' , 'NI' , 'NIANGSTR' , 'NI' , - 'NIFLUXU' , 'NI' , - 'NIFLUXV' , 'NI' , + # Combined Aerosols 'TOTEXTTAU' , 'GOCART2G' , 'TOTSCATAU' , 'GOCART2G' , diff --git a/HISTORY_FP.rc.21z.tmpl b/HISTORY_FP.rc.21z.tmpl index 9904a628..c7ea3850 100644 --- a/HISTORY_FP.rc.21z.tmpl +++ b/HISTORY_FP.rc.21z.tmpl @@ -1383,8 +1383,7 @@ COLLECTIONS: 'inst3_3d_asm_Np-' 'CA.bcSTEXTTAU' , 'CA.bc' , 'BCSTEXTTAU' , 'CA.bcSTSCATAU' , 'CA.bc' , 'BCSTSCATAU' , 'CA.bcANGSTR' , 'CA.bc' , 'BCANGSTR' , - 'CA.bcFLUXU' , 'CA.bc' , 'BCFLUXU' , - 'CA.bcFLUXV' , 'CA.bc' , 'BCFLUXV' , + # Brown Carbon 'CA.brSMASS' , 'CA.br' , 'BRSMASS' , 'CA.brCMASS' , 'CA.br' , 'BRCMASS' , @@ -1393,8 +1392,7 @@ COLLECTIONS: 'inst3_3d_asm_Np-' 'CA.brSTEXTTAU' , 'CA.br' , 'BRSTEXTTAU' , 'CA.brSTSCATAU' , 'CA.br' , 'BRSTSCATAU' , 'CA.brANGSTR' , 'CA.br' , 'BRANGSTR' , - 'CA.brFLUXU' , 'CA.br' , 'BRFLUXU' , - 'CA.brFLUXV' , 'CA.br' , 'BRFLUXV' , + # Dust 'DUSMASS' , 'DU' , 'DUCMASS' , 'DU' , @@ -1407,8 +1405,7 @@ COLLECTIONS: 'inst3_3d_asm_Np-' 'DUCMASS25' , 'DU' , 'DUEXTT25' , 'DU' , 'DUSCAT25' , 'DU' , - 'DUFLUXU' , 'DU' , - 'DUFLUXV' , 'DU' , + # Seasalt 'SSSMASS' , 'SS' , 'SSCMASS' , 'SS' , @@ -1421,8 +1418,7 @@ COLLECTIONS: 'inst3_3d_asm_Np-' 'SSCMASS25' , 'SS' , 'SSEXTT25' , 'SS' , 'SSSCAT25' , 'SS' , - 'SSFLUXU' , 'SS' , - 'SSFLUXV' , 'SS' , + # Sulfates 'SO2SMASS' , 'SU' , 'SO2CMASS' , 'SU' , @@ -1435,8 +1431,7 @@ COLLECTIONS: 'inst3_3d_asm_Np-' 'SUSTEXTTAU' , 'SU' , 'SUSTSCATAU' , 'SU' , 'SUANGSTR' , 'SU' , - 'SUFLUXU' , 'SU' , - 'SUFLUXV' , 'SU' , + # Organic Carbon 'CA.ocSMASS' , 'CA.oc' , 'OCSMASS' , 'CA.ocCMASS' , 'CA.oc' , 'OCCMASS' , @@ -1445,8 +1440,7 @@ COLLECTIONS: 'inst3_3d_asm_Np-' 'CA.ocSTEXTTAU' , 'CA.oc' , 'OCSTEXTTAU' , 'CA.ocSTSCATAU' , 'CA.oc' , 'OCSTSCATAU' , 'CA.ocANGSTR' , 'CA.oc' , 'OCANGSTR' , - 'CA.ocFLUXU' , 'CA.oc' , 'OCFLUXU' , - 'CA.ocFLUXV' , 'CA.oc' , 'OCFLUXV' , + # Nitrate 'HNO3SMASS' , 'NI' , 'NH3SMASS' , 'NI' , @@ -1463,8 +1457,7 @@ COLLECTIONS: 'inst3_3d_asm_Np-' 'NIEXTTAU' , 'NI' , 'NISCATAU' , 'NI' , 'NIANGSTR' , 'NI' , - 'NIFLUXU' , 'NI' , - 'NIFLUXV' , 'NI' , + # Combined Aerosols 'TOTEXTTAU' , 'GOCART2G' , 'TOTSCATAU' , 'GOCART2G' , @@ -1496,6 +1489,8 @@ COLLECTIONS: 'inst3_3d_asm_Np-' 'CA.bcEMBF' , 'CA.bc' , 'BCEMBF' , 'CA.bcEMAN' , 'CA.bc' , 'BCEMAN' , 'MCHEMTRI%CA.bc::CA.bcphilicIM' , 'PHYSICS' , 'BCSV' , + 'CA.bcFLUXU' , 'CA.bc' , 'BCFLUXU' , + 'CA.bcFLUXV' , 'CA.bc' , 'BCFLUXV' , # Brown Carbon 'CA.brEM' , 'CA.br' , 'BRPHOBICEM;BRPHILICEM' , 'CA.brDP' , 'CA.br' , 'BRPHOBICDP;BRPHILICDP' , @@ -1506,6 +1501,8 @@ COLLECTIONS: 'inst3_3d_asm_Np-' 'CA.brEMAN' , 'CA.br' , 'BREMAN' , 'CA.brPSOA' , 'CA.br' , 'BRPSOA' , 'MCHEMTRI%CA.br::CA.brphilicIM' , 'PHYSICS' , 'BRSV' , + 'CA.brFLUXU' , 'CA.br' , 'BRFLUXU' , + 'CA.brFLUXV' , 'CA.br' , 'BRFLUXV' , # Dust 'DUEM' , 'DU' , 'DUEM001;DUEM002;DUEM003;DUEM004;DUEM005' , 'DUSD' , 'DU' , 'DUSD001;DUSD002;DUSD003;DUSD004;DUSD005' , @@ -1515,6 +1512,8 @@ COLLECTIONS: 'inst3_3d_asm_Np-' 'DUSCATFM' , 'DU' , 'DUAERIDX' , 'DU' , 'MCHEMTRI%DU::DUIM' , 'PHYSICS' , 'DUSV' , + 'DUFLUXU' , 'DU' , + 'DUFLUXV' , 'DU' , # Seasalt 'SSEM' , 'SS' , 'SSEM001;SSEM002;SSEM003;SSEM004;SSEM005' , 'SSSD' , 'SS' , 'SSSD001;SSSD002;SSSD003;SSSD004;SSSD005' , @@ -1523,6 +1522,8 @@ COLLECTIONS: 'inst3_3d_asm_Np-' 'SSEXTTFM' , 'SS' , 'SSSCATFM' , 'SS' , 'MCHEMTRI%SS::SSIM' , 'PHYSICS' , 'SSSV' , + 'SSFLUXU' , 'SS' , + 'SSFLUXV' , 'SS' , # Sulfates 'SUEM' , 'SU' , 'DMSEM;SO2EM;SO4EM;MSAEM' , 'SUSD' , 'SU' , 'DMSSD;SO2SD;SO4SD;MSASD' , @@ -1539,6 +1540,8 @@ COLLECTIONS: 'inst3_3d_asm_Np-' 'SO2EMVN' , 'SU' , 'SO2EMVE' , 'SU' , 'MCHEMTRI%SU::SO4IM' , 'PHYSICS' , 'SUSV' , + 'SUFLUXU' , 'SU' , + 'SUFLUXV' , 'SU' , # Organic Carbon 'CA.ocEM' , 'CA.oc' , 'OCPHOBICEM;OCPHILICEM' , 'CA.ocDP' , 'CA.oc' , 'OCPHOBICDP;OCPHILICDP' , @@ -1550,6 +1553,8 @@ COLLECTIONS: 'inst3_3d_asm_Np-' 'CA.ocPSOA' , 'CA.oc' , 'OCPSOA' , 'CA.ocHYPHIL' , 'CA.oc' , 'OCPHOB2PHIL' , 'MCHEMTRI%CA.oc::CA.ocphilicIM' , 'PHYSICS' , 'OCSV' , + 'CA.ocFLUXU' , 'CA.oc' , 'OCFLUXU' , + 'CA.ocFLUXV' , 'CA.oc' , 'OCFLUXV' , # Nitrate 'NIPNO3AQ' , 'NI' , 'NIPNH4AQ' , 'NI' , @@ -1568,6 +1573,8 @@ COLLECTIONS: 'inst3_3d_asm_Np-' 'NH4WT' , 'NI' , 'NH4SV' , 'NI' , 'MCHEMTRI%NI::NO3an1IM' , 'PHYSICS' , 'NISV' , + 'NIFLUXU' , 'NI' , + 'NIFLUXV' , 'NI' , :: tavg3_2d_chm_Nx-.format: 'CFIO' , @@ -2383,6 +2390,8 @@ COLLECTIONS: 'inst3_3d_asm_Np-' 'CA.bcEMBF' , 'CA.bc' , 'BCEMBF' , 'CA.bcEMAN' , 'CA.bc' , 'BCEMAN' , 'MCHEMTRI%CA.bc::CA.bcphilicIM' , 'PHYSICS' , 'BCSV' , + 'CA.bcFLUXU' , 'CA.bc' , 'BCFLUXU' , + 'CA.bcFLUXV' , 'CA.bc' , 'BCFLUXV' , # Brown Carbon 'CA.brEM' , 'CA.br' , 'BRPHOBICEM;BRPHILICEM' , 'CA.brDP' , 'CA.br' , 'BRPHOBICDP;BRPHILICDP' , @@ -2392,6 +2401,8 @@ COLLECTIONS: 'inst3_3d_asm_Np-' 'CA.brEMBF' , 'CA.br' , 'BREMBF' , 'CA.brEMAN' , 'CA.br' , 'BREMAN' , 'MCHEMTRI%CA.br::CA.brphilicIM' , 'PHYSICS' , 'BRSV' , + 'CA.brFLUXU' , 'CA.br' , 'BRFLUXU' , + 'CA.brFLUXV' , 'CA.br' , 'BRFLUXV' , # Dust 'DUEM' , 'DU' , 'DUSD' , 'DU' , @@ -2400,6 +2411,8 @@ COLLECTIONS: 'inst3_3d_asm_Np-' 'DUEXTTFM' , 'DU' , 'DUSCATFM' , 'DU' , 'MCHEMTRI%DU::DUIM' , 'PHYSICS' , 'DUSV' , + 'DUFLUXU' , 'DU' , + 'DUFLUXV' , 'DU' , # Seasalt 'SSEM' , 'SS' , 'SSSD' , 'SS' , @@ -2408,6 +2421,8 @@ COLLECTIONS: 'inst3_3d_asm_Np-' 'SSEXTTFM' , 'SS' , 'SSSCATFM' , 'SS' , 'MCHEMTRI%SS::SSIM' , 'PHYSICS' , 'SSSV' , + 'SSFLUXU' , 'SS' , + 'SSFLUXV' , 'SS' , # Sulfates 'SUEM' , 'SU' , 'DMSEM;SO2EM;SO4EM;MSAEM' , 'SUSD' , 'SU' , 'DMSSD;SO2SD;SO4SD;MSASD' , @@ -2424,6 +2439,8 @@ COLLECTIONS: 'inst3_3d_asm_Np-' 'SO2EMVN' , 'SU' , 'SO2EMVE' , 'SU' , 'MCHEMTRI%SU::SO4IM' , 'PHYSICS' , 'SUSV' , + 'SUFLUXU' , 'SU' , + 'SUFLUXV' , 'SU' , # Organic Carbon 'CA.ocEM' , 'CA.oc' , 'OCPHOBICEM;OCPHILICEM' , 'CA.ocDP' , 'CA.oc' , 'OCPHOBICDP;OCPHILICDP' , @@ -2434,6 +2451,8 @@ COLLECTIONS: 'inst3_3d_asm_Np-' 'CA.ocEMBG' , 'CA.oc' , 'OCEMBG' , 'CA.ocHYPHIL' , 'CA.oc' , 'OCPHOB2PHIL' , 'MCHEMTRI%CA.oc::CA.ocphilicIM' , 'PHYSICS' , 'OCSV' , + 'CA.ocFLUXU' , 'CA.oc' , 'OCFLUXU' , + 'CA.ocFLUXV' , 'CA.oc' , 'OCFLUXV' , # Nitrate 'NIPNO3AQ' , 'NI' , 'NIPNH4AQ' , 'NI' , @@ -2452,6 +2471,8 @@ COLLECTIONS: 'inst3_3d_asm_Np-' 'NH4WT' , 'NI' , 'NH4SV' , 'NI' , 'MCHEMTRI%NI::NO3an1IM' , 'PHYSICS' , 'NISV' , + 'NIFLUXU' , 'NI' , + 'NIFLUXV' , 'NI' , :: ####################################################################### @@ -2716,16 +2737,14 @@ COLLECTIONS: 'inst3_3d_asm_Np-' 'CA.bcEXTTAU' , 'CA.bc' , 'BCEXTTAU' , 'CA.bcSCATAU' , 'CA.bc' , 'BCSCATAU' , 'CA.bcANGSTR' , 'CA.bc' , 'BCANGSTR' , - 'CA.bcFLUXU' , 'CA.bc' , 'BCFLUXU' , - 'CA.bcFLUXV' , 'CA.bc' , 'BCFLUXV' , + # Brown Carbon 'CA.brSMASS' , 'CA.br' , 'BRSMASS' , 'CA.brCMASS' , 'CA.br' , 'BRCMASS' , 'CA.brEXTTAU' , 'CA.br' , 'BREXTTAU' , 'CA.brSCATAU' , 'CA.br' , 'BRSCATAU' , 'CA.brANGSTR' , 'CA.br' , 'BRANGSTR' , - 'CA.brFLUXU' , 'CA.br' , 'BRFLUXU' , - 'CA.brFLUXV' , 'CA.br' , 'BRFLUXV' , + # Dust 'DUSMASS' , 'DU' , 'DUCMASS' , 'DU' , @@ -2736,8 +2755,7 @@ COLLECTIONS: 'inst3_3d_asm_Np-' 'DUCMASS25' , 'DU' , 'DUEXTT25' , 'DU' , 'DUSCAT25' , 'DU' , - 'DUFLUXU' , 'DU' , - 'DUFLUXV' , 'DU' , + # Seasalt 'SSSMASS' , 'SS' , 'SSCMASS' , 'SS' , @@ -2748,8 +2766,7 @@ COLLECTIONS: 'inst3_3d_asm_Np-' 'SSCMASS25' , 'SS' , 'SSEXTT25' , 'SS' , 'SSSCAT25' , 'SS' , - 'SSFLUXU' , 'SS' , - 'SSFLUXV' , 'SS' , + # Sulfates 'SO2SMASS' , 'SU' , 'SO2CMASS' , 'SU' , @@ -2760,16 +2777,14 @@ COLLECTIONS: 'inst3_3d_asm_Np-' 'SUEXTTAU' , 'SU' , 'SUSCATAU' , 'SU' , 'SUANGSTR' , 'SU' , - 'SUFLUXU' , 'SU' , - 'SUFLUXV' , 'SU' , + # Organic Carbon 'CA.ocSMASS' , 'CA.oc' , 'OCSMASS' , 'CA.ocCMASS' , 'CA.oc' , 'OCCMASS' , 'CA.ocEXTTAU' , 'CA.oc' , 'OCEXTTAU' , 'CA.ocSCATAU' , 'CA.oc' , 'OCSCATAU' , 'CA.ocANGSTR' , 'CA.oc' , 'OCANGSTR' , - 'CA.ocFLUXU' , 'CA.oc' , 'OCFLUXU' , - 'CA.ocFLUXV' , 'CA.oc' , 'OCFLUXV' , + # Nitrate 'HNO3SMASS' , 'NI' , 'NH3SMASS' , 'NI' , @@ -2786,8 +2801,7 @@ COLLECTIONS: 'inst3_3d_asm_Np-' 'NIEXTTAU' , 'NI' , 'NISCATAU' , 'NI' , 'NIANGSTR' , 'NI' , - 'NIFLUXU' , 'NI' , - 'NIFLUXV' , 'NI' , + # Combined Aerosols 'TOTEXTTAU' , 'GOCART2G' , 'TOTSCATAU' , 'GOCART2G' , diff --git a/gcm_setup b/gcm_setup index d7e379b1..04a9d636 100755 --- a/gcm_setup +++ b/gcm_setup @@ -420,6 +420,7 @@ if ( $SITE == 'NCCS' ) then if ("$BUILT_ON_SLES15" == "TRUE") then echo "Enter the ${C1}Processor Type${CN} you wish to run on:" echo " ${C2}mil (Milan)${CN} (default)" + echo " ${C2}cas (Cascade Lake)${CN}" echo " " set MODEL = `echo $<` set MODEL = `echo $MODEL | tr "[:upper:]" "[:lower:]"` @@ -427,11 +428,20 @@ if ( $SITE == 'NCCS' ) then set MODEL = 'mil' endif - if( $MODEL != 'mil' ) goto ASKPROC + if( $MODEL != 'mil' & \ + $MODEL != 'cas' ) goto ASKPROC if ($MODEL == 'mil') then # We save a couple processes for the kernel set NCPUS_PER_NODE = 126 + else if ($MODEL == 'cas') then + # NCCS currently recommends that users do not run with + # 48 cores per node on SCU16 due to OS issues and + # recommends that CPU-intensive works run with 46 or less + # cores. As 45 is a multiple of 3, it's the best value + # that doesn't waste too much + #set NCPUS_PER_NODE = 48 + set NCPUS_PER_NODE = 45 endif else echo "Enter the ${C1}Processor Type${CN} you wish to run on:" @@ -2279,6 +2289,9 @@ if ( $SITE == 'NCCS' ) then if ("$BUILT_ON_SLES15" == "TRUE") then cat >> $HOMDIR/SETENV.commands << EOF +setenv I_MPI_ADJUST_ALLREDUCE 12 +setenv I_MPI_ADJUST_GATHERV 3 + setenv I_MPI_FABRICS shm:ofi setenv I_MPI_OFI_PROVIDER psm3 EOF diff --git a/geoschemchem_setup b/geoschemchem_setup index 77b5d553..73f23cb9 100755 --- a/geoschemchem_setup +++ b/geoschemchem_setup @@ -420,6 +420,7 @@ if ( $SITE == 'NCCS' ) then if ("$BUILT_ON_SLES15" == "TRUE") then echo "Enter the ${C1}Processor Type${CN} you wish to run on:" echo " ${C2}mil (Milan)${CN} (default)" + echo " ${C2}cas (Cascade Lake)${CN}" echo " " set MODEL = `echo $<` set MODEL = `echo $MODEL | tr "[:upper:]" "[:lower:]"` @@ -427,11 +428,20 @@ if ( $SITE == 'NCCS' ) then set MODEL = 'mil' endif - if( $MODEL != 'mil' ) goto ASKPROC + if( $MODEL != 'mil' & \ + $MODEL != 'cas' ) goto ASKPROC if ($MODEL == 'mil') then # We save a couple processes for the kernel set NCPUS_PER_NODE = 126 + else if ($MODEL == 'cas') then + # NCCS currently recommends that users do not run with + # 48 cores per node on SCU16 due to OS issues and + # recommends that CPU-intensive works run with 46 or less + # cores. As 45 is a multiple of 3, it's the best value + # that doesn't waste too much + #set NCPUS_PER_NODE = 48 + set NCPUS_PER_NODE = 45 endif else echo "Enter the ${C1}Processor Type${CN} you wish to run on:" @@ -2309,6 +2319,9 @@ if ( $SITE == 'NCCS' ) then if ("$BUILT_ON_SLES15" == "TRUE") then cat >> $HOMDIR/SETENV.commands << EOF +setenv I_MPI_ADJUST_ALLREDUCE 12 +setenv I_MPI_ADJUST_GATHERV 3 + setenv I_MPI_FABRICS shm:ofi setenv I_MPI_OFI_PROVIDER psm3 EOF diff --git a/gmichem_setup b/gmichem_setup index 3858c3b3..70aabfb0 100755 --- a/gmichem_setup +++ b/gmichem_setup @@ -420,6 +420,7 @@ if ( $SITE == 'NCCS' ) then if ("$BUILT_ON_SLES15" == "TRUE") then echo "Enter the ${C1}Processor Type${CN} you wish to run on:" echo " ${C2}mil (Milan)${CN} (default)" + echo " ${C2}cas (Cascade Lake)${CN}" echo " " set MODEL = `echo $<` set MODEL = `echo $MODEL | tr "[:upper:]" "[:lower:]"` @@ -427,11 +428,20 @@ if ( $SITE == 'NCCS' ) then set MODEL = 'mil' endif - if( $MODEL != 'mil' ) goto ASKPROC + if( $MODEL != 'mil' & \ + $MODEL != 'cas' ) goto ASKPROC if ($MODEL == 'mil') then # We save a couple processes for the kernel set NCPUS_PER_NODE = 126 + else if ($MODEL == 'cas') then + # NCCS currently recommends that users do not run with + # 48 cores per node on SCU16 due to OS issues and + # recommends that CPU-intensive works run with 46 or less + # cores. As 45 is a multiple of 3, it's the best value + # that doesn't waste too much + #set NCPUS_PER_NODE = 48 + set NCPUS_PER_NODE = 45 endif else echo "Enter the ${C1}Processor Type${CN} you wish to run on:" @@ -2481,6 +2491,9 @@ if ( $SITE == 'NCCS' ) then if ("$BUILT_ON_SLES15" == "TRUE") then cat >> $HOMDIR/SETENV.commands << EOF +setenv I_MPI_ADJUST_ALLREDUCE 12 +setenv I_MPI_ADJUST_GATHERV 3 + setenv I_MPI_FABRICS shm:ofi setenv I_MPI_OFI_PROVIDER psm3 EOF diff --git a/scm_setup b/scm_setup index d4f8331d..06052f46 100755 --- a/scm_setup +++ b/scm_setup @@ -458,6 +458,9 @@ cat $expdir/WSUB_ExtData.tmp | sed '/collection:/ s#WSUB_SWclim.*#/dev/null#' > /bin/cp $SOURCEDIR/sedfile.CASE $expdir /bin/cp $SOURCEDIR/AGCM.CASE.txt $expdir +# These are the weights files +/bin/cp $SOURCEDIR/rh_* $expdir + # MAT These sed commands have to be done in the experiment directory. # This should probably be fixed at some point diff --git a/stratchem_setup b/stratchem_setup index 9d168df1..0b0ea880 100755 --- a/stratchem_setup +++ b/stratchem_setup @@ -420,6 +420,7 @@ if ( $SITE == 'NCCS' ) then if ("$BUILT_ON_SLES15" == "TRUE") then echo "Enter the ${C1}Processor Type${CN} you wish to run on:" echo " ${C2}mil (Milan)${CN} (default)" + echo " ${C2}cas (Cascade Lake)${CN}" echo " " set MODEL = `echo $<` set MODEL = `echo $MODEL | tr "[:upper:]" "[:lower:]"` @@ -427,11 +428,20 @@ if ( $SITE == 'NCCS' ) then set MODEL = 'mil' endif - if( $MODEL != 'mil' ) goto ASKPROC + if( $MODEL != 'mil' & \ + $MODEL != 'cas' ) goto ASKPROC if ($MODEL == 'mil') then # We save a couple processes for the kernel set NCPUS_PER_NODE = 126 + else if ($MODEL == 'cas') then + # NCCS currently recommends that users do not run with + # 48 cores per node on SCU16 due to OS issues and + # recommends that CPU-intensive works run with 46 or less + # cores. As 45 is a multiple of 3, it's the best value + # that doesn't waste too much + #set NCPUS_PER_NODE = 48 + set NCPUS_PER_NODE = 45 endif else echo "Enter the ${C1}Processor Type${CN} you wish to run on:" @@ -2294,6 +2304,9 @@ if ( $SITE == 'NCCS' ) then if ("$BUILT_ON_SLES15" == "TRUE") then cat >> $HOMDIR/SETENV.commands << EOF +setenv I_MPI_ADJUST_ALLREDUCE 12 +setenv I_MPI_ADJUST_GATHERV 3 + setenv I_MPI_FABRICS shm:ofi setenv I_MPI_OFI_PROVIDER psm3 EOF