Skip to content

Commit 2b7162c

Browse files
sdrabenhsdrabenh
authored
Merge pull request #678 from GEOS-ESM/feature/acollow/aerosolhistory
Move aerosol fluxes to adg. NOTE THIS SHOULD BE IN FPP!
2 parents 2166062 + 1551f1f commit 2b7162c

File tree

4 files changed

+170
-114
lines changed

4 files changed

+170
-114
lines changed

‎HISTORY_FP.rc.03z.tmpl‎

Lines changed: 42 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1383,8 +1383,7 @@ COLLECTIONS: 'inst3_3d_asm_Np-'
13831383
'CA.bcSTEXTTAU' , 'CA.bc' , 'BCSTEXTTAU' ,
13841384
'CA.bcSTSCATAU' , 'CA.bc' , 'BCSTSCATAU' ,
13851385
'CA.bcANGSTR' , 'CA.bc' , 'BCANGSTR' ,
1386-
'CA.bcFLUXU' , 'CA.bc' , 'BCFLUXU' ,
1387-
'CA.bcFLUXV' , 'CA.bc' , 'BCFLUXV' ,
1386+
13881387
# Brown Carbon
13891388
'CA.brSMASS' , 'CA.br' , 'BRSMASS' ,
13901389
'CA.brCMASS' , 'CA.br' , 'BRCMASS' ,
@@ -1393,8 +1392,7 @@ COLLECTIONS: 'inst3_3d_asm_Np-'
13931392
'CA.brSTEXTTAU' , 'CA.br' , 'BRSTEXTTAU' ,
13941393
'CA.brSTSCATAU' , 'CA.br' , 'BRSTSCATAU' ,
13951394
'CA.brANGSTR' , 'CA.br' , 'BRANGSTR' ,
1396-
'CA.brFLUXU' , 'CA.br' , 'BRFLUXU' ,
1397-
'CA.brFLUXV' , 'CA.br' , 'BRFLUXV' ,
1395+
13981396
# Dust
13991397
'DUSMASS' , 'DU' ,
14001398
'DUCMASS' , 'DU' ,
@@ -1407,8 +1405,7 @@ COLLECTIONS: 'inst3_3d_asm_Np-'
14071405
'DUCMASS25' , 'DU' ,
14081406
'DUEXTT25' , 'DU' ,
14091407
'DUSCAT25' , 'DU' ,
1410-
'DUFLUXU' , 'DU' ,
1411-
'DUFLUXV' , 'DU' ,
1408+
14121409
# Seasalt
14131410
'SSSMASS' , 'SS' ,
14141411
'SSCMASS' , 'SS' ,
@@ -1421,8 +1418,7 @@ COLLECTIONS: 'inst3_3d_asm_Np-'
14211418
'SSCMASS25' , 'SS' ,
14221419
'SSEXTT25' , 'SS' ,
14231420
'SSSCAT25' , 'SS' ,
1424-
'SSFLUXU' , 'SS' ,
1425-
'SSFLUXV' , 'SS' ,
1421+
14261422
# Sulfates
14271423
'SO2SMASS' , 'SU' ,
14281424
'SO2CMASS' , 'SU' ,
@@ -1435,8 +1431,7 @@ COLLECTIONS: 'inst3_3d_asm_Np-'
14351431
'SUSTEXTTAU' , 'SU' ,
14361432
'SUSTSCATAU' , 'SU' ,
14371433
'SUANGSTR' , 'SU' ,
1438-
'SUFLUXU' , 'SU' ,
1439-
'SUFLUXV' , 'SU' ,
1434+
14401435
# Organic Carbon
14411436
'CA.ocSMASS' , 'CA.oc' , 'OCSMASS' ,
14421437
'CA.ocCMASS' , 'CA.oc' , 'OCCMASS' ,
@@ -1445,8 +1440,7 @@ COLLECTIONS: 'inst3_3d_asm_Np-'
14451440
'CA.ocSTEXTTAU' , 'CA.oc' , 'OCSTEXTTAU' ,
14461441
'CA.ocSTSCATAU' , 'CA.oc' , 'OCSTSCATAU' ,
14471442
'CA.ocANGSTR' , 'CA.oc' , 'OCANGSTR' ,
1448-
'CA.ocFLUXU' , 'CA.oc' , 'OCFLUXU' ,
1449-
'CA.ocFLUXV' , 'CA.oc' , 'OCFLUXV' ,
1443+
14501444
# Nitrate
14511445
'HNO3SMASS' , 'NI' ,
14521446
'NH3SMASS' , 'NI' ,
@@ -1463,8 +1457,7 @@ COLLECTIONS: 'inst3_3d_asm_Np-'
14631457
'NIEXTTAU' , 'NI' ,
14641458
'NISCATAU' , 'NI' ,
14651459
'NIANGSTR' , 'NI' ,
1466-
'NIFLUXU' , 'NI' ,
1467-
'NIFLUXV' , 'NI' ,
1460+
14681461
# Combined Aerosols
14691462
'TOTEXTTAU' , 'GOCART2G' ,
14701463
'TOTSCATAU' , 'GOCART2G' ,
@@ -1496,6 +1489,8 @@ COLLECTIONS: 'inst3_3d_asm_Np-'
14961489
'CA.bcEMBF' , 'CA.bc' , 'BCEMBF' ,
14971490
'CA.bcEMAN' , 'CA.bc' , 'BCEMAN' ,
14981491
'MCHEMTRI%CA.bc::CA.bcphilicIM' , 'PHYSICS' , 'BCSV' ,
1492+
'CA.bcFLUXU' , 'CA.bc' , 'BCFLUXU' ,
1493+
'CA.bcFLUXV' , 'CA.bc' , 'BCFLUXV' ,
14991494
# Brown Carbon
15001495
'CA.brEM' , 'CA.br' , 'BRPHOBICEM;BRPHILICEM' ,
15011496
'CA.brDP' , 'CA.br' , 'BRPHOBICDP;BRPHILICDP' ,
@@ -1506,6 +1501,8 @@ COLLECTIONS: 'inst3_3d_asm_Np-'
15061501
'CA.brEMAN' , 'CA.br' , 'BREMAN' ,
15071502
'CA.brPSOA' , 'CA.br' , 'BRPSOA' ,
15081503
'MCHEMTRI%CA.br::CA.brphilicIM' , 'PHYSICS' , 'BRSV' ,
1504+
'CA.brFLUXU' , 'CA.br' , 'BRFLUXU' ,
1505+
'CA.brFLUXV' , 'CA.br' , 'BRFLUXV' ,
15091506
# Dust
15101507
'DUEM' , 'DU' , 'DUEM001;DUEM002;DUEM003;DUEM004;DUEM005' ,
15111508
'DUSD' , 'DU' , 'DUSD001;DUSD002;DUSD003;DUSD004;DUSD005' ,
@@ -1515,6 +1512,8 @@ COLLECTIONS: 'inst3_3d_asm_Np-'
15151512
'DUSCATFM' , 'DU' ,
15161513
'DUAERIDX' , 'DU' ,
15171514
'MCHEMTRI%DU::DUIM' , 'PHYSICS' , 'DUSV' ,
1515+
'DUFLUXU' , 'DU' ,
1516+
'DUFLUXV' , 'DU' ,
15181517
# Seasalt
15191518
'SSEM' , 'SS' , 'SSEM001;SSEM002;SSEM003;SSEM004;SSEM005' ,
15201519
'SSSD' , 'SS' , 'SSSD001;SSSD002;SSSD003;SSSD004;SSSD005' ,
@@ -1524,6 +1523,8 @@ COLLECTIONS: 'inst3_3d_asm_Np-'
15241523
'SSSCATFM' , 'SS' ,
15251524
'SSAERIDX' , 'SS' ,
15261525
'MCHEMTRI%SS::SSIM' , 'PHYSICS' , 'SSSV' ,
1526+
'SSFLUXU' , 'SS' ,
1527+
'SSFLUXV' , 'SS' ,
15271528
# Sulfates
15281529
'SUEM' , 'SU' , 'DMSEM;SO2EM;SO4EM;MSAEM' ,
15291530
'SUSD' , 'SU' , 'DMSSD;SO2SD;SO4SD;MSASD' ,
@@ -1540,6 +1541,8 @@ COLLECTIONS: 'inst3_3d_asm_Np-'
15401541
'SO2EMVN' , 'SU' ,
15411542
'SO2EMVE' , 'SU' ,
15421543
'MCHEMTRI%SU::SO4IM' , 'PHYSICS' , 'SUSV' ,
1544+
'SUFLUXU' , 'SU' ,
1545+
'SUFLUXV' , 'SU' ,
15431546
# Organic Carbon
15441547
'CA.ocEM' , 'CA.oc' , 'OCPHOBICEM;OCPHILICEM' ,
15451548
'CA.ocDP' , 'CA.oc' , 'OCPHOBICDP;OCPHILICDP' ,
@@ -1551,6 +1554,8 @@ COLLECTIONS: 'inst3_3d_asm_Np-'
15511554
'CA.ocPSOA' , 'CA.oc' , 'OCPSOA' ,
15521555
'CA.ocHYPHIL' , 'CA.oc' , 'OCPHOB2PHIL' ,
15531556
'MCHEMTRI%CA.oc::CA.ocphilicIM' , 'PHYSICS' , 'OCSV' ,
1557+
'CA.ocFLUXU' , 'CA.oc' , 'OCFLUXU' ,
1558+
'CA.ocFLUXV' , 'CA.oc' , 'OCFLUXV' ,
15541559
# Nitrate
15551560
'NIPNO3AQ' , 'NI' ,
15561561
'NIPNH4AQ' , 'NI' ,
@@ -1569,6 +1574,8 @@ COLLECTIONS: 'inst3_3d_asm_Np-'
15691574
'NH4WT' , 'NI' ,
15701575
'NH4SV' , 'NI' ,
15711576
'MCHEMTRI%NI::NO3an1IM' , 'PHYSICS' , 'NISV' ,
1577+
'NIFLUXU' , 'NI' ,
1578+
'NIFLUXV' , 'NI' ,
15721579
::
15731580

15741581
tavg3_2d_chm_Nx-.format: 'CFIO' ,
@@ -2384,6 +2391,8 @@ COLLECTIONS: 'inst3_3d_asm_Np-'
23842391
'CA.bcEMBF' , 'CA.bc' , 'BCEMBF' ,
23852392
'CA.bcEMAN' , 'CA.bc' , 'BCEMAN' ,
23862393
'MCHEMTRI%CA.bc::CA.bcphilicIM' , 'PHYSICS' , 'BCSV' ,
2394+
'CA.bcFLUXU' , 'CA.bc' , 'BCFLUXU' ,
2395+
'CA.bcFLUXV' , 'CA.bc' , 'BCFLUXV' ,
23872396
# Brown Carbon
23882397
'CA.brEM' , 'CA.br' , 'BRPHOBICEM;BRPHILICEM' ,
23892398
'CA.brDP' , 'CA.br' , 'BRPHOBICDP;BRPHILICDP' ,
@@ -2393,6 +2402,8 @@ COLLECTIONS: 'inst3_3d_asm_Np-'
23932402
'CA.brEMBF' , 'CA.br' , 'BREMBF' ,
23942403
'CA.brEMAN' , 'CA.br' , 'BREMAN' ,
23952404
'MCHEMTRI%CA.br::CA.brphilicIM' , 'PHYSICS' , 'BRSV' ,
2405+
'CA.brFLUXU' , 'CA.br' , 'BRFLUXU' ,
2406+
'CA.brFLUXV' , 'CA.br' , 'BRFLUXV' ,
23962407
# Dust
23972408
'DUEM' , 'DU' ,
23982409
'DUSD' , 'DU' ,
@@ -2402,6 +2413,8 @@ COLLECTIONS: 'inst3_3d_asm_Np-'
24022413
'DUSCATFM' , 'DU' ,
24032414
'DUAERIDX' , 'DU' ,
24042415
'MCHEMTRI%DU::DUIM' , 'PHYSICS' , 'DUSV' ,
2416+
'DUFLUXU' , 'DU' ,
2417+
'DUFLUXV' , 'DU' ,
24052418
# Seasalt
24062419
'SSEM' , 'SS' ,
24072420
'SSSD' , 'SS' ,
@@ -2411,6 +2424,8 @@ COLLECTIONS: 'inst3_3d_asm_Np-'
24112424
'SSSCATFM' , 'SS' ,
24122425
'SSAERIDX' , 'SS' ,
24132426
'MCHEMTRI%SS::SSIM' , 'PHYSICS' , 'SSSV' ,
2427+
'SSFLUXU' , 'SS' ,
2428+
'SSFLUXV' , 'SS' ,
24142429
# Sulfates
24152430
'SUEM' , 'SU' , 'DMSEM;SO2EM;SO4EM;MSAEM',
24162431
'SUSD' , 'SU' , 'DMSSD;SO2SD;SO4SD;MSASD',
@@ -2427,6 +2442,8 @@ COLLECTIONS: 'inst3_3d_asm_Np-'
24272442
'SO2EMVN' , 'SU' ,
24282443
'SO2EMVE' , 'SU' ,
24292444
'MCHEMTRI%SU::SO4IM' , 'PHYSICS' , 'SUSV' ,
2445+
'SUFLUXU' , 'SU' ,
2446+
'SUFLUXV' , 'SU' ,
24302447
# Organic Carbon
24312448
'CA.ocEM' , 'CA.oc' , 'OCPHOBICEM;OCPHILICEM',
24322449
'CA.ocDP' , 'CA.oc' , 'OCPHOBICDP;OCPHILICDP',
@@ -2437,6 +2454,8 @@ COLLECTIONS: 'inst3_3d_asm_Np-'
24372454
'CA.ocEMBG' , 'CA.oc' , 'OCEMBG' ,
24382455
'CA.ocHYPHIL' , 'CA.oc' , 'OCPHOB2PHIL' ,
24392456
'MCHEMTRI%CA.oc::CA.ocphilicIM' , 'PHYSICS' , 'OCSV' ,
2457+
'CA.ocFLUXU' , 'CA.oc' , 'OCFLUXU' ,
2458+
'CA.ocFLUXV' , 'CA.oc' , 'OCFLUXV' ,
24402459
# Nitrate
24412460
'NIPNO3AQ' , 'NI' ,
24422461
'NIPNH4AQ' , 'NI' ,
@@ -2455,6 +2474,8 @@ COLLECTIONS: 'inst3_3d_asm_Np-'
24552474
'NH4WT' , 'NI' ,
24562475
'NH4SV' , 'NI' ,
24572476
'MCHEMTRI%NI::NO3an1IM' , 'PHYSICS' , 'NISV' ,
2477+
'NIFLUXU' , 'NI' ,
2478+
'NIFLUXV' , 'NI' ,
24582479
::
24592480

24602481
#######################################################################
@@ -2719,16 +2740,14 @@ COLLECTIONS: 'inst3_3d_asm_Np-'
27192740
'CA.bcEXTTAU' , 'CA.bc' , 'BCEXTTAU' ,
27202741
'CA.bcSCATAU' , 'CA.bc' , 'BCSCATAU' ,
27212742
'CA.bcANGSTR' , 'CA.bc' , 'BCANGSTR' ,
2722-
'CA.bcFLUXU' , 'CA.bc' , 'BCFLUXU' ,
2723-
'CA.bcFLUXV' , 'CA.bc' , 'BCFLUXV' ,
2743+
27242744
# Brown Carbon
27252745
'CA.brSMASS' , 'CA.br' , 'BRSMASS' ,
27262746
'CA.brCMASS' , 'CA.br' , 'BRCMASS' ,
27272747
'CA.brEXTTAU' , 'CA.br' , 'BREXTTAU' ,
27282748
'CA.brSCATAU' , 'CA.br' , 'BRSCATAU' ,
27292749
'CA.brANGSTR' , 'CA.br' , 'BRANGSTR' ,
2730-
'CA.brFLUXU' , 'CA.br' , 'BRFLUXU' ,
2731-
'CA.brFLUXV' , 'CA.br' , 'BRFLUXV' ,
2750+
27322751
# Dust
27332752
'DUSMASS' , 'DU' ,
27342753
'DUCMASS' , 'DU' ,
@@ -2739,8 +2758,7 @@ COLLECTIONS: 'inst3_3d_asm_Np-'
27392758
'DUCMASS25' , 'DU' ,
27402759
'DUEXTT25' , 'DU' ,
27412760
'DUSCAT25' , 'DU' ,
2742-
'DUFLUXU' , 'DU' ,
2743-
'DUFLUXV' , 'DU' ,
2761+
27442762
# Seasalt
27452763
'SSSMASS' , 'SS' ,
27462764
'SSCMASS' , 'SS' ,
@@ -2751,8 +2769,7 @@ COLLECTIONS: 'inst3_3d_asm_Np-'
27512769
'SSCMASS25' , 'SS' ,
27522770
'SSEXTT25' , 'SS' ,
27532771
'SSSCAT25' , 'SS' ,
2754-
'SSFLUXU' , 'SS' ,
2755-
'SSFLUXV' , 'SS' ,
2772+
27562773
# Sulfates
27572774
'SO2SMASS' , 'SU' ,
27582775
'SO2CMASS' , 'SU' ,
@@ -2763,16 +2780,14 @@ COLLECTIONS: 'inst3_3d_asm_Np-'
27632780
'SUEXTTAU' , 'SU' ,
27642781
'SUSCATAU' , 'SU' ,
27652782
'SUANGSTR' , 'SU' ,
2766-
'SUFLUXU' , 'SU' ,
2767-
'SUFLUXV' , 'SU' ,
2783+
27682784
# Organic Carbon
27692785
'CA.ocSMASS' , 'CA.oc' , 'OCSMASS' ,
27702786
'CA.ocCMASS' , 'CA.oc' , 'OCCMASS' ,
27712787
'CA.ocEXTTAU' , 'CA.oc' , 'OCEXTTAU' ,
27722788
'CA.ocSCATAU' , 'CA.oc' , 'OCSCATAU' ,
27732789
'CA.ocANGSTR' , 'CA.oc' , 'OCANGSTR' ,
2774-
'CA.ocFLUXU' , 'CA.oc' , 'OCFLUXU' ,
2775-
'CA.ocFLUXV' , 'CA.oc' , 'OCFLUXV' ,
2790+
27762791
# Nitrate
27772792
'HNO3SMASS' , 'NI' ,
27782793
'NH3SMASS' , 'NI' ,
@@ -2789,8 +2804,7 @@ COLLECTIONS: 'inst3_3d_asm_Np-'
27892804
'NIEXTTAU' , 'NI' ,
27902805
'NISCATAU' , 'NI' ,
27912806
'NIANGSTR' , 'NI' ,
2792-
'NIFLUXU' , 'NI' ,
2793-
'NIFLUXV' , 'NI' ,
2807+
27942808
# Combined Aerosols
27952809
'TOTEXTTAU' , 'GOCART2G' ,
27962810
'TOTSCATAU' , 'GOCART2G' ,

0 commit comments

Comments
 (0)