Skip to content

Commit

Permalink
Merge pull request #208 from olyson/master
Browse files Browse the repository at this point in the history 
Add runoff variables for sets 10 and 11
  • Loading branch information
@bertinia
bertinia authored Jun 27, 2019
2 parents bca7696 + 938a0de commit d874a06
Show file tree
Hide file tree
Showing 4 changed files with 562 additions and 2 deletions.
15 changes: 15 additions & 0 deletions lnd_diag/inputFiles/set10_clm.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,19 @@ globalMeanDay1 PREC
globalMeanNat0 ASA
globalMeanNat0 RNET
globalMeanNat1 LHEAT
globalMeanDay0 TOTRUNOFF
globalMeanDay0 QOVER
globalMeanDay0 QRGWL
globalMeanDay0 QRUNOFF_RAIN_TO_SNOW_CONVERSION
globalMeanDay0 QDRAI
globalMeanDay0 QFLX_LIQ_DYNBAL
globalMeanDay0 QFLX_ICE_DYNBAL
globalMeanDay0 QRUNOFF_ICE
globalMeanNat0 SNOWDP
globalMeanNat0 FSH
globalMeanNat0 FSH_TO_COUPLER
globalMeanNat0 FSH_PRECIP_CONVERSION
globalMeanNat0 FSH_RUNOFF_ICE_TO_LIQ
globalMeanNat0 TV
globalMeanNat0 TG
globalMeanNat0 FSA
Expand All @@ -21,12 +32,16 @@ globalMeanDay0 QSNOFRZ
globalMeanDay0 QSNOFRZ_ICE
globalMeanDay0 QSOIL
globalMeanDay0 QSOIL_ICE
globalMeanDay0 QICE_FRZ
globalMeanDay0 QICE_MELT
globalMeanDay0 QICE
globalMeanNat0 FSNO
globalMeanNat0 SNOWDP
globalMeanDay0 RAIN
globalMeanDay0 SNOW
globalMeanDay0 RAIN_REPARTITIONED
globalMeanDay0 SNOW_REPARTITIONED
globalMeanDay0 P-E
globalMeanNat0 WIND
globalMeanNat0 FLDS
globalMeanNat0 FSDS
Expand Down
15 changes: 15 additions & 0 deletions lnd_diag/inputFiles/set11_clm.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,19 @@ globalMeanDay1 PREC
globalMeanNat0 ASA
globalMeanNat0 RNET
globalMeanNat1 LHEAT
globalMeanDay0 TOTRUNOFF
globalMeanDay0 QOVER
globalMeanDay0 QRGWL
globalMeanDay0 QRUNOFF_RAIN_TO_SNOW_CONVERSION
globalMeanDay0 QDRAI
globalMeanDay0 QFLX_LIQ_DYNBAL
globalMeanDay0 QFLX_ICE_DYNBAL
globalMeanDay0 QRUNOFF_ICE
globalMeanNat0 SNOWDP
globalMeanNat0 FSH
globalMeanNat0 FSH_TO_COUPLER
globalMeanNat0 FSH_PRECIP_CONVERSION
globalMeanNat0 FSH_RUNOFF_ICE_TO_LIQ
globalMeanNat0 TV
globalMeanNat0 TG
globalMeanNat0 FSA
Expand All @@ -21,12 +32,16 @@ globalMeanDay0 QSNOFRZ
globalMeanDay0 QSNOFRZ_ICE
globalMeanDay0 QSOIL
globalMeanDay0 QSOIL_ICE
globalMeanDay0 QICE_FRZ
globalMeanDay0 QICE_MELT
globalMeanDay0 QICE
globalMeanNat0 FSNO
globalMeanNat0 SNOWDP
globalMeanDay0 RAIN
globalMeanDay0 SNOW
globalMeanDay0 RAIN_REPARTITIONED
globalMeanDay0 SNOW_REPARTITIONED
globalMeanDay0 P-E
globalMeanNat0 WIND
globalMeanNat0 FLDS
globalMeanNat0 FSDS
Expand Down
267 changes: 266 additions & 1 deletion lnd_diag/inputFiles/variable_master4.3.ncl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7594,7 +7594,7 @@ if (varName .eq. "LITTERC_HR") then

if (varName .eq. "QRGWL") then
info@flux=True
info@longName="surface runoff at glaciers, wetlands, lakes"
info@longName="surface runoff at glaciers (liquid only), wetlands, lakes; also includes melted ice runoff from QSNWCPICE"
info@nativeUnits = "mm/s"
; -- global Total
info@globalTotal__units = "NA"
Expand Down Expand Up @@ -7651,6 +7651,126 @@ if (varName .eq. "LITTERC_HR") then
return(info)
end if

if (varName .eq. "QRUNOFF_RAIN_TO_SNOW_CONVERSION") then
info@flux=True
info@longName="liquid runoff from rain-to-snow conversion when this conversion leads to immediate runoff"
info@nativeUnits = "mm/s"
; -- global Total
info@globalTotal__units = "NA"
info@globalTotal__SF = -999.
info@globalTotal_Annual__units = "mm/y"
info@globalTotal_Annual__SF = secondsInYear
; -- global Mean
info@globalMean__units = "mm/s"
info@globalMean__SF = 1.0
info@globalMean_Annual__units = "mm/y"
info@globalMean_Annual__SF = secondsInYear
info@globalMean_Daily__units = "mm/d"
info@globalMean_Daily__SF = secondsInDay
; -- Origin
info@model = "CN"
info@derivedVariable = False
info@clampVariable = False
; -- contour intervals
info@cn_Explicit = True
info@cn_Min = -999
info@cn_Max = -999
info@cn_Levels = (/0.,1.,2.,3.,4.,5.,6.,7.,8./)
info@cn_LevelsDiff = (/-4.,-2.,-1.,-0.5,-0.25,0.,0.25,0.5,1.,2.,4./)
info@cn_LevelsDiffObs = (/-10., -8., -6., -4., -2., 0., 2, 4, 6, 8, 10./)
return(info)
end if

if (varName .eq. "QFLX_LIQ_DYNBAL") then
info@flux=True
info@longName="liq dynamic land cover change conversion runoff flux"
info@nativeUnits = "mm/s"
; -- global Total
info@globalTotal__units = "NA"
info@globalTotal__SF = -999.
info@globalTotal_Annual__units = "mm/y"
info@globalTotal_Annual__SF = secondsInYear
; -- global Mean
info@globalMean__units = "mm/s"
info@globalMean__SF = 1.0
info@globalMean_Annual__units = "mm/y"
info@globalMean_Annual__SF = secondsInYear
info@globalMean_Daily__units = "mm/d"
info@globalMean_Daily__SF = secondsInDay
; -- Origin
info@model = "CN"
info@derivedVariable = False
info@clampVariable = False
; -- contour intervals
info@cn_Explicit = True
info@cn_Min = -999
info@cn_Max = -999
info@cn_Levels = (/0.,1.,2.,3.,4.,5.,6.,7.,8./)
info@cn_LevelsDiff = (/-4.,-2.,-1.,-0.5,-0.25,0.,0.25,0.5,1.,2.,4./)
info@cn_LevelsDiffObs = (/-10., -8., -6., -4., -2., 0., 2, 4, 6, 8, 10./)
return(info)
end if

if (varName .eq. "QFLX_ICE_DYNBAL") then
info@flux=True
info@longName="ice dynamic land cover change conversion runoff flux"
info@nativeUnits = "mm/s"
; -- global Total
info@globalTotal__units = "NA"
info@globalTotal__SF = -999.
info@globalTotal_Annual__units = "mm/y"
info@globalTotal_Annual__SF = secondsInYear
; -- global Mean
info@globalMean__units = "mm/s"
info@globalMean__SF = 1.0
info@globalMean_Annual__units = "mm/y"
info@globalMean_Annual__SF = secondsInYear
info@globalMean_Daily__units = "mm/d"
info@globalMean_Daily__SF = secondsInDay
; -- Origin
info@model = "CN"
info@derivedVariable = False
info@clampVariable = False
; -- contour intervals
info@cn_Explicit = True
info@cn_Min = -999
info@cn_Max = -999
info@cn_Levels = (/0.,1.,2.,3.,4.,5.,6.,7.,8./)
info@cn_LevelsDiff = (/-4.,-2.,-1.,-0.5,-0.25,0.,0.25,0.5,1.,2.,4./)
info@cn_LevelsDiffObs = (/-10., -8., -6., -4., -2., 0., 2, 4, 6, 8, 10./)
return(info)
end if

if (varName .eq. "QRUNOFF_ICE") then
info@flux=True
info@longName="total liquid runoff not incl correction for LULCC (ice landunits only)"
info@nativeUnits = "mm/s"
; -- global Total
info@globalTotal__units = "NA"
info@globalTotal__SF = -999.
info@globalTotal_Annual__units = "mm/y"
info@globalTotal_Annual__SF = secondsInYear
; -- global Mean
info@globalMean__units = "mm/s"
info@globalMean__SF = 1.0
info@globalMean_Annual__units = "mm/y"
info@globalMean_Annual__SF = secondsInYear
info@globalMean_Daily__units = "mm/d"
info@globalMean_Daily__SF = secondsInDay
; -- Origin
info@model = "CN"
info@derivedVariable = False
info@clampVariable = False
; -- contour intervals
info@cn_Explicit = True
info@cn_Min = -999
info@cn_Max = -999
info@cn_Levels = (/0.,1.,2.,3.,4.,5.,6.,7.,8./)
info@cn_LevelsDiff = (/-4.,-2.,-1.,-0.5,-0.25,0.,0.25,0.5,1.,2.,4./)
info@cn_LevelsDiffObs = (/-10., -8., -6., -4., -2., 0., 2, 4, 6, 8, 10./)
return(info)
end if

if (varName .eq. "DRAINAGE") then
info@flux=True
info@longName="Subsurface Drainage"
Expand Down Expand Up @@ -7857,6 +7977,151 @@ if (varName .eq. "LITTERC_HR") then
return(info)
end if

if (varName .eq. "QSNOFRZ") then
info@flux=True
info@longName="column-integrated snow freezing rate"
info@nativeUnits = "mm/s"
; -- global Total
info@globalTotal__units = "NA"
info@globalTotal__SF = -999.
info@globalTotal_Annual__units = "mm/y"
info@globalTotal_Annual__SF = secondsInYear
; -- global Mean
info@globalMean__units = "mm/s"
info@globalMean__SF = 1.0
info@globalMean_Annual__units = "mm/y"
info@globalMean_Annual__SF = secondsInYear
info@globalMean_Daily__units = "mm/d"
info@globalMean_Daily__SF = secondsInDay
; -- Origin
info@model = "CN"
info@derivedVariable = False
info@clampVariable = False
; -- contour intervals
info@cn_Explicit = True
info@cn_Min = -999
info@cn_Max = -999
info@cn_Levels = (/0.,.5,1.,1.5,2.,2.5,3.,3.5,4./)
info@cn_LevelsDiff = (/-5.,-2.5,-1.,-.5,-.1,0.,.1,.5,1.,2.5,5./)
return(info)
end if

if (varName .eq. "QSNOFRZ_ICE") then
info@flux=True
info@longName="column-integrated snow freezing rate (ice landunits only)"
info@nativeUnits = "mm/s"
; -- global Total
info@globalTotal__units = "NA"
info@globalTotal__SF = -999.
info@globalTotal_Annual__units = "mm/y"
info@globalTotal_Annual__SF = secondsInYear
; -- global Mean
info@globalMean__units = "mm/s"
info@globalMean__SF = 1.0
info@globalMean_Annual__units = "mm/y"
info@globalMean_Annual__SF = secondsInYear
info@globalMean_Daily__units = "mm/d"
info@globalMean_Daily__SF = secondsInDay
; -- Origin
info@model = "CN"
info@derivedVariable = False
info@clampVariable = False
; -- contour intervals
info@cn_Explicit = True
info@cn_Min = -999
info@cn_Max = -999
info@cn_Levels = (/0.,.5,1.,1.5,2.,2.5,3.,3.5,4./)
info@cn_LevelsDiff = (/-5.,-2.5,-1.,-.5,-.1,0.,.1,.5,1.,2.5,5./)
return(info)
end if

if (varName .eq. "QICE") then
info@flux=True
info@longName="ice growth/melt"
info@nativeUnits = "mm/s"
; -- global Total
info@globalTotal__units = "NA"
info@globalTotal__SF = -999.
info@globalTotal_Annual__units = "mm/y"
info@globalTotal_Annual__SF = secondsInYear
; -- global Mean
info@globalMean__units = "mm/s"
info@globalMean__SF = 1.0
info@globalMean_Annual__units = "mm/y"
info@globalMean_Annual__SF = secondsInYear
info@globalMean_Daily__units = "mm/d"
info@globalMean_Daily__SF = secondsInDay
; -- Origin
info@model = "CN"
info@derivedVariable = False
info@clampVariable = False
; -- contour intervals
info@cn_Explicit = True
info@cn_Min = -999
info@cn_Max = -999
info@cn_Levels = (/0.,.5,1.,1.5,2.,2.5,3.,3.5,4./)
info@cn_LevelsDiff = (/-5.,-2.5,-1.,-.5,-.1,0.,.1,.5,1.,2.5,5./)
return(info)
end if

if (varName .eq. "QICE_FRZ") then
info@flux=True
info@longName="ice growth"
info@nativeUnits = "mm/s"
; -- global Total
info@globalTotal__units = "NA"
info@globalTotal__SF = -999.
info@globalTotal_Annual__units = "mm/y"
info@globalTotal_Annual__SF = secondsInYear
; -- global Mean
info@globalMean__units = "mm/s"
info@globalMean__SF = 1.0
info@globalMean_Annual__units = "mm/y"
info@globalMean_Annual__SF = secondsInYear
info@globalMean_Daily__units = "mm/d"
info@globalMean_Daily__SF = secondsInDay
; -- Origin
info@model = "CN"
info@derivedVariable = False
info@clampVariable = False
; -- contour intervals
info@cn_Explicit = True
info@cn_Min = -999
info@cn_Max = -999
info@cn_Levels = (/0.,.5,1.,1.5,2.,2.5,3.,3.5,4./)
info@cn_LevelsDiff = (/-5.,-2.5,-1.,-.5,-.1,0.,.1,.5,1.,2.5,5./)
return(info)
end if

if (varName .eq. "QICE_MELT") then
info@flux=True
info@longName="ice melt"
info@nativeUnits = "mm/s"
; -- global Total
info@globalTotal__units = "NA"
info@globalTotal__SF = -999.
info@globalTotal_Annual__units = "mm/y"
info@globalTotal_Annual__SF = secondsInYear
; -- global Mean
info@globalMean__units = "mm/s"
info@globalMean__SF = 1.0
info@globalMean_Annual__units = "mm/y"
info@globalMean_Annual__SF = secondsInYear
info@globalMean_Daily__units = "mm/d"
info@globalMean_Daily__SF = secondsInDay
; -- Origin
info@model = "CN"
info@derivedVariable = False
info@clampVariable = False
; -- contour intervals
info@cn_Explicit = True
info@cn_Min = -999
info@cn_Max = -999
info@cn_Levels = (/0.,.5,1.,1.5,2.,2.5,3.,3.5,4./)
info@cn_LevelsDiff = (/-5.,-2.5,-1.,-.5,-.1,0.,.1,.5,1.,2.5,5./)
return(info)
end if

if (varName .eq. "SOIL_EVAPORATION") then
info@flux=True
info@longName="Soil Evaporation"
Expand Down
Loading

0 comments on commit d874a06

Please sign in to comment.