Merge pull request #205 from olyson/master

Add NPUTAKE_FRACTION, fix C13,C14 units, revise C13,C14 calculation
NCAR · Jun 7, 2019 · 0d93eed · 0d93eed
2 parents eb4bc49 + e5cf298
commit 0d93eed
Show file tree

Hide file tree

Showing 25 changed files with 806 additions and 351 deletions.
diff --git a/lnd_diag/inputFiles/set1_c13.txt b/lnd_diag/inputFiles/set1_c13.txt
@@ -1,4 +1,5 @@
 globalTotlAnn   C13_NEE
+globalTotlAnn   C13_NBP
 globalTotlAnn   C13_NEP
 globalTotlAnn   C13_GPP
 globalTotlAnn   C13_PSNSUN_TO_CPOOL
@@ -34,6 +35,7 @@ globalTotlNat   C13_PFT_CTRUNC
 globalTotlAnn   C13_COL_FIRE_CLOSS
 globalTotlAnn   C13_PFT_FIRE_CLOSS
 globalTotlAnn   C14_NEE
+globalTotlAnn   C14_NBP
 globalTotlAnn   C14_NEP
 globalTotlAnn   C14_GPP
 globalTotlAnn   C14_PSNSUN_TO_CPOOL

diff --git a/lnd_diag/inputFiles/set1_cn.txt b/lnd_diag/inputFiles/set1_cn.txt
@@ -70,6 +70,7 @@ globalTotlAnn   NECM
 globalTotlAnn   NFIX
 globalTotlAnn   NRETRANS
 globalTotlAnn   NPP_NUPTAKE
+globalMeanNat   NUPTAKE_FRACTION
 globalTotlAnn   FFIX_TO_SMINN
 globalTotlAnn   NPP_NFIX
 globalTotlAnn   NPP_NACTIVE

diff --git a/lnd_diag/inputFiles/set2_c13.txt b/lnd_diag/inputFiles/set2_c13.txt
@@ -1,4 +1,5 @@
 globalMeanDay0  C13_NEE
+globalMeanDay0  C13_NBP
 globalMeanDay0  C13_NEP
 globalMeanDay0  C13_GPP
 globalMeanDay0  C13_PSNSUN_TO_CPOOL
@@ -32,6 +33,7 @@ globalMeanNat0  C13_TOTECOSYSC
 globalMeanAnn0  C13_COL_FIRE_CLOSS
 globalMeanAnn0  C13_PFT_FIRE_CLOSS
 globalMeanDay0  C14_NEE
+globalMeanDay0  C14_NBP
 globalMeanDay0  C14_NEP
 globalMeanDay0  C14_GPP
 globalMeanDay0  C14_PSNSUN_TO_CPOOL

diff --git a/lnd_diag/inputFiles/set2_cn.txt b/lnd_diag/inputFiles/set2_cn.txt
@@ -81,6 +81,7 @@ globalMeanAnn0  NECM
 globalMeanAnn0  NFIX
 globalMeanAnn0  NRETRANS
 globalMeanAnn0  NPP_NUPTAKE
+globalMeanNat0  NUPTAKE_FRACTION
 globalMeanAnn0  FFIX_TO_SMINN
 globalMeanAnn0  NPP_NFIX
 globalMeanAnn0  NPP_NACTIVE

diff --git a/lnd_diag/inputFiles/set5_c13.txt b/lnd_diag/inputFiles/set5_c13.txt
@@ -1,4 +1,5 @@
 globalTotlAnn   C13_NEE
+globalTotlAnn   C13_NBP
 globalTotlAnn   C13_NEP
 globalTotlAnn   C13_GPP
 globalTotlAnn   C13_PSNSUN_TO_CPOOL
@@ -34,6 +35,7 @@ globalTotlNat   C13_PFT_CTRUNC
 globalTotlAnn   C13_COL_FIRE_CLOSS
 globalTotlAnn   C13_PFT_FIRE_CLOSS
 globalTotlAnn   C14_NEE
+globalTotlAnn   C14_NBP
 globalTotlAnn   C14_NEP
 globalTotlAnn   C14_GPP
 globalTotlAnn   C14_PSNSUN_TO_CPOOL

diff --git a/lnd_diag/inputFiles/set5_cn.txt b/lnd_diag/inputFiles/set5_cn.txt
@@ -72,6 +72,7 @@ globalTotlAnn   NECM
 globalTotlAnn   NFIX
 globalTotlAnn   NRETRANS
 globalTotlAnn   NPP_NUPTAKE
+globalMeanNat   NUPTAKE_FRACTION
 globalTotlAnn   FFIX_TO_SMINN
 globalTotlAnn   NPP_NFIX
 globalTotlAnn   NPP_NACTIVE

diff --git a/lnd_diag/inputFiles/set6_cnFlx.txt b/lnd_diag/inputFiles/set6_cnFlx.txt
@@ -7,4 +7,4 @@ globalMeanDay   ER
 globalMeanDay   FCH4
 globalMeanNat   CUE
 globalMeanDay   SMIN_NO3_LEACHED
-globalMeanDay   SMIN_NO3_RUNOFF
+globalMeanNat   NUPTAKE_FRACTION