Skip to content

Commit d874a06

Browse files
bertiniabertinia
authored
Merge pull request #208 from olyson/master
Add runoff variables for sets 10 and 11
2 parents bca7696 + 938a0de commit d874a06

File tree

4 files changed

+562
-2
lines changed

4 files changed

+562
-2
lines changed

‎lnd_diag/inputFiles/set10_clm.txt‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,19 @@ globalMeanDay1 PREC
33
globalMeanNat0 ASA
44
globalMeanNat0 RNET
55
globalMeanNat1 LHEAT
6+
globalMeanDay0 TOTRUNOFF
7+
globalMeanDay0 QOVER
8+
globalMeanDay0 QRGWL
9+
globalMeanDay0 QRUNOFF_RAIN_TO_SNOW_CONVERSION
10+
globalMeanDay0 QDRAI
11+
globalMeanDay0 QFLX_LIQ_DYNBAL
12+
globalMeanDay0 QFLX_ICE_DYNBAL
13+
globalMeanDay0 QRUNOFF_ICE
614
globalMeanNat0 SNOWDP
715
globalMeanNat0 FSH
16+
globalMeanNat0 FSH_TO_COUPLER
17+
globalMeanNat0 FSH_PRECIP_CONVERSION
18+
globalMeanNat0 FSH_RUNOFF_ICE_TO_LIQ
819
globalMeanNat0 TV
920
globalMeanNat0 TG
1021
globalMeanNat0 FSA
@@ -21,12 +32,16 @@ globalMeanDay0 QSNOFRZ
2132
globalMeanDay0 QSNOFRZ_ICE
2233
globalMeanDay0 QSOIL
2334
globalMeanDay0 QSOIL_ICE
35+
globalMeanDay0 QICE_FRZ
36+
globalMeanDay0 QICE_MELT
37+
globalMeanDay0 QICE
2438
globalMeanNat0 FSNO
2539
globalMeanNat0 SNOWDP
2640
globalMeanDay0 RAIN
2741
globalMeanDay0 SNOW
2842
globalMeanDay0 RAIN_REPARTITIONED
2943
globalMeanDay0 SNOW_REPARTITIONED
44+
globalMeanDay0 P-E
3045
globalMeanNat0 WIND
3146
globalMeanNat0 FLDS
3247
globalMeanNat0 FSDS

‎lnd_diag/inputFiles/set11_clm.txt‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,19 @@ globalMeanDay1 PREC
33
globalMeanNat0 ASA
44
globalMeanNat0 RNET
55
globalMeanNat1 LHEAT
6+
globalMeanDay0 TOTRUNOFF
7+
globalMeanDay0 QOVER
8+
globalMeanDay0 QRGWL
9+
globalMeanDay0 QRUNOFF_RAIN_TO_SNOW_CONVERSION
10+
globalMeanDay0 QDRAI
11+
globalMeanDay0 QFLX_LIQ_DYNBAL
12+
globalMeanDay0 QFLX_ICE_DYNBAL
13+
globalMeanDay0 QRUNOFF_ICE
614
globalMeanNat0 SNOWDP
715
globalMeanNat0 FSH
16+
globalMeanNat0 FSH_TO_COUPLER
17+
globalMeanNat0 FSH_PRECIP_CONVERSION
18+
globalMeanNat0 FSH_RUNOFF_ICE_TO_LIQ
819
globalMeanNat0 TV
920
globalMeanNat0 TG
1021
globalMeanNat0 FSA
@@ -21,12 +32,16 @@ globalMeanDay0 QSNOFRZ
2132
globalMeanDay0 QSNOFRZ_ICE
2233
globalMeanDay0 QSOIL
2334
globalMeanDay0 QSOIL_ICE
35+
globalMeanDay0 QICE_FRZ
36+
globalMeanDay0 QICE_MELT
37+
globalMeanDay0 QICE
2438
globalMeanNat0 FSNO
2539
globalMeanNat0 SNOWDP
2640
globalMeanDay0 RAIN
2741
globalMeanDay0 SNOW
2842
globalMeanDay0 RAIN_REPARTITIONED
2943
globalMeanDay0 SNOW_REPARTITIONED
44+
globalMeanDay0 P-E
3045
globalMeanNat0 WIND
3146
globalMeanNat0 FLDS
3247
globalMeanNat0 FSDS

‎lnd_diag/inputFiles/variable_master4.3.ncl‎

Lines changed: 266 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7594,7 +7594,7 @@ if (varName .eq. "LITTERC_HR") then
75947594

75957595
if (varName .eq. "QRGWL") then
75967596
info@flux=True
7597-
info@longName="surface runoff at glaciers, wetlands, lakes"
7597+
info@longName="surface runoff at glaciers (liquid only), wetlands, lakes; also includes melted ice runoff from QSNWCPICE"
75987598
info@nativeUnits = "mm/s"
75997599
; -- global Total
76007600
info@globalTotal__units = "NA"
@@ -7651,6 +7651,126 @@ if (varName .eq. "LITTERC_HR") then
76517651
return(info)
76527652
end if
76537653

7654+
if (varName .eq. "QRUNOFF_RAIN_TO_SNOW_CONVERSION") then
7655+
info@flux=True
7656+
info@longName="liquid runoff from rain-to-snow conversion when this conversion leads to immediate runoff"
7657+
info@nativeUnits = "mm/s"
7658+
; -- global Total
7659+
info@globalTotal__units = "NA"
7660+
info@globalTotal__SF = -999.
7661+
info@globalTotal_Annual__units = "mm/y"
7662+
info@globalTotal_Annual__SF = secondsInYear
7663+
; -- global Mean
7664+
info@globalMean__units = "mm/s"
7665+
info@globalMean__SF = 1.0
7666+
info@globalMean_Annual__units = "mm/y"
7667+
info@globalMean_Annual__SF = secondsInYear
7668+
info@globalMean_Daily__units = "mm/d"
7669+
info@globalMean_Daily__SF = secondsInDay
7670+
; -- Origin
7671+
info@model = "CN"
7672+
info@derivedVariable = False
7673+
info@clampVariable = False
7674+
; -- contour intervals
7675+
info@cn_Explicit = True
7676+
info@cn_Min = -999
7677+
info@cn_Max = -999
7678+
info@cn_Levels = (/0.,1.,2.,3.,4.,5.,6.,7.,8./)
7679+
info@cn_LevelsDiff = (/-4.,-2.,-1.,-0.5,-0.25,0.,0.25,0.5,1.,2.,4./)
7680+
info@cn_LevelsDiffObs = (/-10., -8., -6., -4., -2., 0., 2, 4, 6, 8, 10./)
7681+
return(info)
7682+
end if
7683+
7684+
if (varName .eq. "QFLX_LIQ_DYNBAL") then
7685+
info@flux=True
7686+
info@longName="liq dynamic land cover change conversion runoff flux"
7687+
info@nativeUnits = "mm/s"
7688+
; -- global Total
7689+
info@globalTotal__units = "NA"
7690+
info@globalTotal__SF = -999.
7691+
info@globalTotal_Annual__units = "mm/y"
7692+
info@globalTotal_Annual__SF = secondsInYear
7693+
; -- global Mean
7694+
info@globalMean__units = "mm/s"
7695+
info@globalMean__SF = 1.0
7696+
info@globalMean_Annual__units = "mm/y"
7697+
info@globalMean_Annual__SF = secondsInYear
7698+
info@globalMean_Daily__units = "mm/d"
7699+
info@globalMean_Daily__SF = secondsInDay
7700+
; -- Origin
7701+
info@model = "CN"
7702+
info@derivedVariable = False
7703+
info@clampVariable = False
7704+
; -- contour intervals
7705+
info@cn_Explicit = True
7706+
info@cn_Min = -999
7707+
info@cn_Max = -999
7708+
info@cn_Levels = (/0.,1.,2.,3.,4.,5.,6.,7.,8./)
7709+
info@cn_LevelsDiff = (/-4.,-2.,-1.,-0.5,-0.25,0.,0.25,0.5,1.,2.,4./)
7710+
info@cn_LevelsDiffObs = (/-10., -8., -6., -4., -2., 0., 2, 4, 6, 8, 10./)
7711+
return(info)
7712+
end if
7713+
7714+
if (varName .eq. "QFLX_ICE_DYNBAL") then
7715+
info@flux=True
7716+
info@longName="ice dynamic land cover change conversion runoff flux"
7717+
info@nativeUnits = "mm/s"
7718+
; -- global Total
7719+
info@globalTotal__units = "NA"
7720+
info@globalTotal__SF = -999.
7721+
info@globalTotal_Annual__units = "mm/y"
7722+
info@globalTotal_Annual__SF = secondsInYear
7723+
; -- global Mean
7724+
info@globalMean__units = "mm/s"
7725+
info@globalMean__SF = 1.0
7726+
info@globalMean_Annual__units = "mm/y"
7727+
info@globalMean_Annual__SF = secondsInYear
7728+
info@globalMean_Daily__units = "mm/d"
7729+
info@globalMean_Daily__SF = secondsInDay
7730+
; -- Origin
7731+
info@model = "CN"
7732+
info@derivedVariable = False
7733+
info@clampVariable = False
7734+
; -- contour intervals
7735+
info@cn_Explicit = True
7736+
info@cn_Min = -999
7737+
info@cn_Max = -999
7738+
info@cn_Levels = (/0.,1.,2.,3.,4.,5.,6.,7.,8./)
7739+
info@cn_LevelsDiff = (/-4.,-2.,-1.,-0.5,-0.25,0.,0.25,0.5,1.,2.,4./)
7740+
info@cn_LevelsDiffObs = (/-10., -8., -6., -4., -2., 0., 2, 4, 6, 8, 10./)
7741+
return(info)
7742+
end if
7743+
7744+
if (varName .eq. "QRUNOFF_ICE") then
7745+
info@flux=True
7746+
info@longName="total liquid runoff not incl correction for LULCC (ice landunits only)"
7747+
info@nativeUnits = "mm/s"
7748+
; -- global Total
7749+
info@globalTotal__units = "NA"
7750+
info@globalTotal__SF = -999.
7751+
info@globalTotal_Annual__units = "mm/y"
7752+
info@globalTotal_Annual__SF = secondsInYear
7753+
; -- global Mean
7754+
info@globalMean__units = "mm/s"
7755+
info@globalMean__SF = 1.0
7756+
info@globalMean_Annual__units = "mm/y"
7757+
info@globalMean_Annual__SF = secondsInYear
7758+
info@globalMean_Daily__units = "mm/d"
7759+
info@globalMean_Daily__SF = secondsInDay
7760+
; -- Origin
7761+
info@model = "CN"
7762+
info@derivedVariable = False
7763+
info@clampVariable = False
7764+
; -- contour intervals
7765+
info@cn_Explicit = True
7766+
info@cn_Min = -999
7767+
info@cn_Max = -999
7768+
info@cn_Levels = (/0.,1.,2.,3.,4.,5.,6.,7.,8./)
7769+
info@cn_LevelsDiff = (/-4.,-2.,-1.,-0.5,-0.25,0.,0.25,0.5,1.,2.,4./)
7770+
info@cn_LevelsDiffObs = (/-10., -8., -6., -4., -2., 0., 2, 4, 6, 8, 10./)
7771+
return(info)
7772+
end if
7773+
76547774
if (varName .eq. "DRAINAGE") then
76557775
info@flux=True
76567776
info@longName="Subsurface Drainage"
@@ -7857,6 +7977,151 @@ if (varName .eq. "LITTERC_HR") then
78577977
return(info)
78587978
end if
78597979

7980+
if (varName .eq. "QSNOFRZ") then
7981+
info@flux=True
7982+
info@longName="column-integrated snow freezing rate"
7983+
info@nativeUnits = "mm/s"
7984+
; -- global Total
7985+
info@globalTotal__units = "NA"
7986+
info@globalTotal__SF = -999.
7987+
info@globalTotal_Annual__units = "mm/y"
7988+
info@globalTotal_Annual__SF = secondsInYear
7989+
; -- global Mean
7990+
info@globalMean__units = "mm/s"
7991+
info@globalMean__SF = 1.0
7992+
info@globalMean_Annual__units = "mm/y"
7993+
info@globalMean_Annual__SF = secondsInYear
7994+
info@globalMean_Daily__units = "mm/d"
7995+
info@globalMean_Daily__SF = secondsInDay
7996+
; -- Origin
7997+
info@model = "CN"
7998+
info@derivedVariable = False
7999+
info@clampVariable = False
8000+
; -- contour intervals
8001+
info@cn_Explicit = True
8002+
info@cn_Min = -999
8003+
info@cn_Max = -999
8004+
info@cn_Levels = (/0.,.5,1.,1.5,2.,2.5,3.,3.5,4./)
8005+
info@cn_LevelsDiff = (/-5.,-2.5,-1.,-.5,-.1,0.,.1,.5,1.,2.5,5./)
8006+
return(info)
8007+
end if
8008+
8009+
if (varName .eq. "QSNOFRZ_ICE") then
8010+
info@flux=True
8011+
info@longName="column-integrated snow freezing rate (ice landunits only)"
8012+
info@nativeUnits = "mm/s"
8013+
; -- global Total
8014+
info@globalTotal__units = "NA"
8015+
info@globalTotal__SF = -999.
8016+
info@globalTotal_Annual__units = "mm/y"
8017+
info@globalTotal_Annual__SF = secondsInYear
8018+
; -- global Mean
8019+
info@globalMean__units = "mm/s"
8020+
info@globalMean__SF = 1.0
8021+
info@globalMean_Annual__units = "mm/y"
8022+
info@globalMean_Annual__SF = secondsInYear
8023+
info@globalMean_Daily__units = "mm/d"
8024+
info@globalMean_Daily__SF = secondsInDay
8025+
; -- Origin
8026+
info@model = "CN"
8027+
info@derivedVariable = False
8028+
info@clampVariable = False
8029+
; -- contour intervals
8030+
info@cn_Explicit = True
8031+
info@cn_Min = -999
8032+
info@cn_Max = -999
8033+
info@cn_Levels = (/0.,.5,1.,1.5,2.,2.5,3.,3.5,4./)
8034+
info@cn_LevelsDiff = (/-5.,-2.5,-1.,-.5,-.1,0.,.1,.5,1.,2.5,5./)
8035+
return(info)
8036+
end if
8037+
8038+
if (varName .eq. "QICE") then
8039+
info@flux=True
8040+
info@longName="ice growth/melt"
8041+
info@nativeUnits = "mm/s"
8042+
; -- global Total
8043+
info@globalTotal__units = "NA"
8044+
info@globalTotal__SF = -999.
8045+
info@globalTotal_Annual__units = "mm/y"
8046+
info@globalTotal_Annual__SF = secondsInYear
8047+
; -- global Mean
8048+
info@globalMean__units = "mm/s"
8049+
info@globalMean__SF = 1.0
8050+
info@globalMean_Annual__units = "mm/y"
8051+
info@globalMean_Annual__SF = secondsInYear
8052+
info@globalMean_Daily__units = "mm/d"
8053+
info@globalMean_Daily__SF = secondsInDay
8054+
; -- Origin
8055+
info@model = "CN"
8056+
info@derivedVariable = False
8057+
info@clampVariable = False
8058+
; -- contour intervals
8059+
info@cn_Explicit = True
8060+
info@cn_Min = -999
8061+
info@cn_Max = -999
8062+
info@cn_Levels = (/0.,.5,1.,1.5,2.,2.5,3.,3.5,4./)
8063+
info@cn_LevelsDiff = (/-5.,-2.5,-1.,-.5,-.1,0.,.1,.5,1.,2.5,5./)
8064+
return(info)
8065+
end if
8066+
8067+
if (varName .eq. "QICE_FRZ") then
8068+
info@flux=True
8069+
info@longName="ice growth"
8070+
info@nativeUnits = "mm/s"
8071+
; -- global Total
8072+
info@globalTotal__units = "NA"
8073+
info@globalTotal__SF = -999.
8074+
info@globalTotal_Annual__units = "mm/y"
8075+
info@globalTotal_Annual__SF = secondsInYear
8076+
; -- global Mean
8077+
info@globalMean__units = "mm/s"
8078+
info@globalMean__SF = 1.0
8079+
info@globalMean_Annual__units = "mm/y"
8080+
info@globalMean_Annual__SF = secondsInYear
8081+
info@globalMean_Daily__units = "mm/d"
8082+
info@globalMean_Daily__SF = secondsInDay
8083+
; -- Origin
8084+
info@model = "CN"
8085+
info@derivedVariable = False
8086+
info@clampVariable = False
8087+
; -- contour intervals
8088+
info@cn_Explicit = True
8089+
info@cn_Min = -999
8090+
info@cn_Max = -999
8091+
info@cn_Levels = (/0.,.5,1.,1.5,2.,2.5,3.,3.5,4./)
8092+
info@cn_LevelsDiff = (/-5.,-2.5,-1.,-.5,-.1,0.,.1,.5,1.,2.5,5./)
8093+
return(info)
8094+
end if
8095+
8096+
if (varName .eq. "QICE_MELT") then
8097+
info@flux=True
8098+
info@longName="ice melt"
8099+
info@nativeUnits = "mm/s"
8100+
; -- global Total
8101+
info@globalTotal__units = "NA"
8102+
info@globalTotal__SF = -999.
8103+
info@globalTotal_Annual__units = "mm/y"
8104+
info@globalTotal_Annual__SF = secondsInYear
8105+
; -- global Mean
8106+
info@globalMean__units = "mm/s"
8107+
info@globalMean__SF = 1.0
8108+
info@globalMean_Annual__units = "mm/y"
8109+
info@globalMean_Annual__SF = secondsInYear
8110+
info@globalMean_Daily__units = "mm/d"
8111+
info@globalMean_Daily__SF = secondsInDay
8112+
; -- Origin
8113+
info@model = "CN"
8114+
info@derivedVariable = False
8115+
info@clampVariable = False
8116+
; -- contour intervals
8117+
info@cn_Explicit = True
8118+
info@cn_Min = -999
8119+
info@cn_Max = -999
8120+
info@cn_Levels = (/0.,.5,1.,1.5,2.,2.5,3.,3.5,4./)
8121+
info@cn_LevelsDiff = (/-5.,-2.5,-1.,-.5,-.1,0.,.1,.5,1.,2.5,5./)
8122+
return(info)
8123+
end if
8124+
78608125
if (varName .eq. "SOIL_EVAPORATION") then
78618126
info@flux=True
78628127
info@longName="Soil Evaporation"

0 commit comments

Comments
 (0)