Skip to content

Commit c550314

Browse files
sdrabenhsdrabenh
committed
Merge remote-tracking branch 'origin/feature/wmputman/LM_v12rc19_WMP' into feature/sdrabenh/gcm_v12
2 parents be565c6 + 04f6789 commit c550314

File tree

2 files changed

+149
-4
lines changed

2 files changed

+149
-4
lines changed

‎AGCM.rc.tmpl‎

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -129,9 +129,10 @@ CLOSURE_CONGESTUS: 3
129129
NCAR_NRDG: @NCAR_NRDG
130130
###########################################################
131131

132-
@HIST_GOCART###########################################################
133-
@HIST_GOCART# Enable wet scavenging diagnostics
134-
@HIST_GOCART# NOTE: this section should be commented out when running gocart.data
132+
###########################################################
133+
# Enable wet scavenging diagnostics
134+
# NOTE: this section should be commented out when running gocart.data
135+
# 2D mass weighted vertical integrated moist scavenging increments
135136
@HIST_GOCARTMCHEMTRI_increments::
136137
@HIST_GOCARTDU::DU default
137138
@HIST_GOCARTSS::SS default
@@ -142,7 +143,18 @@ NCAR_NRDG: @NCAR_NRDG
142143
@HIST_GOCARTNI::NO3an1 "NI::NO3an2,NI::NO3an3"
143144
@HIST_GOCARTPCHEM::OX default
144145
@HIST_GOCART::
145-
@HIST_GOCART###########################################################
146+
# 3D moist scavenging increments
147+
@HIST_GOCARTMTRI_increments::
148+
@HIST_GOCARTDU::DU default
149+
@HIST_GOCARTSS::SS default
150+
@HIST_GOCARTSU::SO4 default
151+
@HIST_GOCARTCA.bc::CA.bcphilic default
152+
@HIST_GOCARTCA.br::CA.brphilic default
153+
@HIST_GOCARTCA.oc::CA.ocphilic default
154+
@HIST_GOCARTNI::NO3an1 "NI::NO3an2,NI::NO3an3"
155+
@HIST_GOCARTPCHEM::OX default
156+
@HIST_GOCART::
157+
###########################################################
146158

147159
###########################################################
148160
# Ocean Model Configuration Parameters

‎HISTORY.AGCM.rc.tmpl‎

Lines changed: 133 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,8 @@ COLLECTIONS: 'geosgcm_prog'
3333
# 'geosgcm_radar'
3434
# 'geosgcm_isccp'
3535
# 'geosgcm_misr'
36+
# 'tavg1_2d_flx_Nx'
37+
# 'inst1_2d_asm_Nx'
3638
::
3739

3840
##################################################
@@ -1378,3 +1380,134 @@ PC@HIST_IMx@HIST_JM-DC.LM: @AGCM_LM
13781380
::
13791381

13801382

1383+
tavg1_2d_flx_Nx.format: 'CFIO' ,
1384+
tavg1_2d_flx_Nx.grid_label: PC@HIST_IMx@HIST_JM-DC ,
1385+
tavg1_2d_flx_Nx.template: '%y4%m2%d2_%h2%n2z.nc4' ,
1386+
tavg1_2d_flx_Nx.mode: 'time-averaged' ,
1387+
tavg1_2d_flx_Nx.frequency: 010000 ,
1388+
tavg1_2d_flx_Nx.duration: 010000 ,
1389+
tavg1_2d_flx_Nx.deflate: 1,
1390+
tavg1_2d_flx_Nx.regrid_method: 'BILINEAR',
1391+
tavg1_2d_flx_Nx.fields: 'CN_PRCP' , 'MOIST' , 'PRECCON' ,
1392+
'LS_PRCP' , 'MOIST' , 'PRECLSC' ,
1393+
'TPREC' , 'MOIST' , 'PRECTOT' ,
1394+
'KUCHERA_RATIO' , 'MOIST' ,
1395+
'SNOWTOTAL' , 'MOIST' , 'SNOWACCUM', 'ACCUMULATE'
1396+
'PRECTOTAL' , 'MOIST' , 'PRECACCUM', 'ACCUMULATE'
1397+
'SNO' , 'MOIST' , 'SNOW' ,
1398+
'ICE' , 'MOIST' , 'ICE' ,
1399+
'FRZR' , 'MOIST' , 'FRZR' ,
1400+
'RAIN' , 'MOIST' , 'RAIN' ,
1401+
'SLP' , 'DYN' ,
1402+
'DBZ_MAX' , 'MOIST' , 'DBZMAX' , 'MAX' ,
1403+
'DBZ_TOP' , 'MOIST' , 'DBZTOP' , 'MAX' ,
1404+
'DBZ_1KM' , 'MOIST' , 'DBZ1KM' , 'MAX' ,
1405+
'DBZ_M10C' , 'MOIST' , 'DBZM10C' , 'MAX' ,
1406+
'UH25' , 'DYN' , 'UH25MX' , 'MAX' ,
1407+
'UH03' , 'DYN' , 'UH03MX' , 'MAX' ,
1408+
'SRH25' , 'DYN' , 'SRH25MX' , 'MAX' ,
1409+
'SRH03' , 'DYN' , 'SRH03MX' , 'MAX' ,
1410+
'SRH01' , 'DYN' , 'SRH01MX' , 'MAX' ,
1411+
'SPEED' , 'DYN' , 'SPEEDMX' , 'MAX' ,
1412+
'SFCEM' , 'IRRAD' , 'LWGEM' ,
1413+
'LWS' , 'IRRAD' , 'LWGAB' ,
1414+
'LCS' , 'IRRAD' , 'LWGABCLR' ,
1415+
'LAS' , 'IRRAD' , 'LWGABCLRCLN' ,
1416+
'FLNS' , 'IRRAD' , 'LWGNT' ,
1417+
'FLNSC' , 'IRRAD' , 'LWGNTCLR' ,
1418+
'FLNSA' , 'IRRAD' , 'LWGNTCLRCLN' ,
1419+
'OLR' , 'IRRAD' , 'LWTUP' ,
1420+
'OLC' , 'IRRAD' , 'LWTUPCLR' ,
1421+
'OLA' , 'IRRAD' , 'LWTUPCLRCLN' ,
1422+
'SLRTP' , 'SOLAR' , 'SWTDN' ,
1423+
'SLRSF' , 'SOLAR' , 'SWGDN' ,
1424+
'SLRSFC' , 'SOLAR' , 'SWGDNCLR' ,
1425+
'RSRS' , 'SOLAR' , 'SWGNT' ,
1426+
'RSCS' , 'SOLAR' , 'SWGNTCLR' ,
1427+
'RSRSNA' , 'SOLAR' , 'SWGNTCLN' ,
1428+
'RSCSNA' , 'SOLAR' , 'SWGNTCLRCLN' ,
1429+
'RSR' , 'SOLAR' , 'SWTNT' ,
1430+
'RSC' , 'SOLAR' , 'SWTNTCLR' ,
1431+
'RSRNA' , 'SOLAR' , 'SWTNTCLN' ,
1432+
'RSCNA' , 'SOLAR' , 'SWTNTCLRCLN' ,
1433+
'CLDTMP' , 'SOLAR' , 'SWCLDTMP' ,
1434+
'CLDPRS' , 'SOLAR' , 'SWCLDPRS' ,
1435+
'PHIS' , 'AGCM' ,
1436+
::
1437+
1438+
inst1_2d_asm_Nx.format: 'CFIO' ,
1439+
inst1_2d_asm_Nx.grid_label: PC@HIST_IMx@HIST_JM-DC ,
1440+
inst1_2d_asm_Nx.template: '%y4%m2%d2_%h2%n2z.nc4' ,
1441+
inst1_2d_asm_Nx.mode: 'instantaneous' ,
1442+
inst1_2d_asm_Nx.frequency: 003000 ,
1443+
inst1_2d_asm_Nx.duration: 003000 ,
1444+
inst1_2d_asm_Nx.deflate: 1,
1445+
inst1_2d_asm_Nx.regrid_method: 'BILINEAR',
1446+
inst1_2d_asm_Nx.fields: 'SLP' , 'DYN' ,
1447+
'SLRTP' , 'SOLAR' , 'SWTDN' ,
1448+
'ISRB08RG' , 'SOLAR' ,
1449+
'ISRB09RG' , 'SOLAR' ,
1450+
'ISRB10RG' , 'SOLAR' ,
1451+
'OSRB08RG' , 'SOLAR' ,
1452+
'OSRB09RG' , 'SOLAR' ,
1453+
'OSRB10RG' , 'SOLAR' ,
1454+
'OSRB11RG' , 'SOLAR' ,
1455+
'TBRB05RG' , 'IRRAD' ,
1456+
'TBRB06RG' , 'IRRAD' ,
1457+
'TBRB07RG' , 'IRRAD' ,
1458+
'TBRB08RG' , 'IRRAD' ,
1459+
'TBRB09RG' , 'IRRAD' ,
1460+
'TBRB10RG' , 'IRRAD' ,
1461+
'TBRB11RG' , 'IRRAD' ,
1462+
'TBRB15RG' , 'IRRAD' ,
1463+
'TBISCCP' , 'SATSIM' ,
1464+
'CAPE' , 'MOIST' ,
1465+
'DBZ_MAX' , 'MOIST' ,
1466+
'DBZ_TOP' , 'MOIST' ,
1467+
'DBZ_1KM' , 'MOIST' ,
1468+
'DBZ_M10C' , 'MOIST' ,
1469+
'UH25' , 'DYN' ,
1470+
'UH03' , 'DYN' ,
1471+
'SRH25' , 'DYN' ,
1472+
'SRH03' , 'DYN' ,
1473+
'SRH01' , 'DYN' ,
1474+
'SPEED' , 'DYN' ,
1475+
'U10M;V10M' , 'SURFACE' ,
1476+
'T2M' , 'SURFACE' ,
1477+
'T2MDEW' , 'SURFACE' ,
1478+
'H1000' , 'DYN' ,
1479+
'H500' , 'DYN' ,
1480+
'TQV' , 'AGCM' ,
1481+
'SNO' , 'MOIST' , 'SNOW' ,
1482+
'ICE' , 'MOIST' , 'ICE' ,
1483+
'RAIN' , 'MOIST' , 'RAIN' ,
1484+
'PTYPE' , 'MOIST' ,
1485+
'CN_PRCP' , 'MOIST' , 'PRECCON' ,
1486+
'LS_PRCP' , 'MOIST' , 'PRECLSC' ,
1487+
'U850;V850' , 'DYN' ,
1488+
'U250;V250' , 'DYN' ,
1489+
'VORT200' , 'DYN' ,
1490+
'VORT500' , 'DYN' ,
1491+
'VORT700' , 'DYN' ,
1492+
'VORT850' , 'DYN' ,
1493+
'DIVG200' , 'DYN' ,
1494+
'DIVG500' , 'DYN' ,
1495+
'DIVG700' , 'DYN' ,
1496+
'DIVG850' , 'DYN' ,
1497+
'RSR' , 'SOLAR' , 'SWTNT' ,
1498+
'OSR' , 'SOLAR' , 'SWTUP' ,
1499+
'OLR' , 'IRRAD' , 'LWTUP' ,
1500+
'CWP' , 'MOIST' ,
1501+
'LWP' , 'MOIST' ,
1502+
'IWP' , 'MOIST' ,
1503+
'DUEXTTAU' , 'DU' ,
1504+
'SSEXTTAU' , 'SS' ,
1505+
'CA.brEXTTAU' , 'CA.br' , 'BREXTTAU' ,
1506+
'CA.bcEXTTAU' , 'CA.bc' , 'BCEXTTAU' ,
1507+
'CA.ocEXTTAU' , 'CA.oc' , 'OCEXTTAU' ,
1508+
'SUEXTTAU' , 'SU' ,
1509+
'NIEXTTAU' , 'NI' ,
1510+
'FRACI' , 'SURFACE' , 'frseaice' ,
1511+
'SNOMAS' , 'SURFACE' ,
1512+
::
1513+

0 commit comments

Comments
 (0)