Merge pull request #82 from olyson/master

land diagnostics - Add variables to sets and fix bugs
NCAR · May 15, 2017 · 1d14b03 · 1d14b03
2 parents 39777b6 + 3896500
commit 1d14b03
Show file tree

Hide file tree

Showing 20 changed files with 1,598 additions and 176 deletions.
diff --git a/diagnostics/diagnostics/lnd/model_vs_model.py b/diagnostics/diagnostics/lnd/model_vs_model.py
@@ -204,6 +204,14 @@ def run_diagnostics(self, env, scomm):
             shutil.copy2(env['POSTPROCESS_PATH']+'/lnd_diag/inputFiles/'+env['VAR_MASTER'],web_dir+'/variable_master.ncl')
 
             if n == '9':
+                # copy the set9_*_statsOut.txt files to the set9 subdir
+                glob_string = web_dir+'/set9'+'_*'+'.txt'
+                imgs = glob.glob(glob_string)
+                if len(imgs) > 0:
+                    for img in imgs:
+                       new_fn = set_dir + '/' + os.path.basename(img)
+                       os.rename(img,new_fn)
+
                 web_script = env['POSTPROCESS_PATH']+'/lnd_diag/shared/lnd_statTable.pl'
                 rc2, err_msg = cesmEnvLib.checkFile(web_script,'read')
                 if rc2:

diff --git a/lnd_diag/inputFiles/set1_clm.txt b/lnd_diag/inputFiles/set1_clm.txt
@@ -12,6 +12,7 @@ globalMeanNat   LAISHA
 globalMeanNat   BTRAN
 globalMeanDay   QINFL
 globalMeanDay   QOVER
+globalMeanDay   QIRRIG
 globalMeanDay   QRGWL
 globalMeanDay   QDRAI
 globalMeanDay   QINTR
@@ -22,6 +23,8 @@ globalMeanNat   SOILICE
 globalMeanNat   SOILPSI
 globalMeanNat   SNOWLIQ
 globalMeanNat   SNOWICE
+globalMeanNat   FSNO
+globalMeanNat   H2OSNO
 globalMeanNat   TOTSOILLIQ
 globalMeanNat   TOTSOILICE
 globalMeanNat   WA

diff --git a/lnd_diag/inputFiles/set1_cn.txt b/lnd_diag/inputFiles/set1_cn.txt
@@ -1,6 +1,9 @@
 globalTotlAnn   NEE
 globalTotlAnn   NEP
+globalTotlAnn   NBP
 globalTotlAnn   GPP
+globalMeanNat   CUE
+globalMeanNat   BTRAN2
 globalTotlAnn   PSNSUN_TO_CPOOL
 globalTotlAnn   PSNSHADE_TO_CPOOL
 globalTotlAnn   NPP
@@ -58,6 +61,8 @@ globalMeanNat   FPG
 globalMeanNat   FPI
 globalTotlNat   TOTECOSYSN
 globalTotlAnn   NDEP_TO_SMINN
+globalTotlAnn   FERT
+globalTotlAnn   FERT_TO_SMINN
 globalTotlAnn   NFIX_TO_SMINN
 globalTotlAnn   NACTIVE
 globalTotlAnn   NAM
@@ -108,3 +113,16 @@ globalTotlAnn   SOILC_LOSS
 globalTotlNat   WOODC
 globalTotlAnn   WOODC_ALLOC
 globalTotlAnn   WOODC_LOSS
+globalTotlAnn   WOOD_HARVESTC
+globalTotlAnn   WOOD_HARVESTN
+globalTotlAnn   TOT_WOODPRODC_LOSS
+globalTotlAnn   TOT_WOODPRODN_LOSS
+globalTotlAnn   PROD10C_LOSS
+globalTotlAnn   PROD10N_LOSS
+globalTotlAnn   PROD100C_LOSS
+globalTotlAnn   PROD100N_LOSS
+globalTotlAnn   DWT_PROD10C_GAIN
+globalTotlAnn   DWT_PROD10N_GAIN
+globalTotlAnn   DWT_PROD100C_GAIN
+globalTotlAnn   DWT_PROD100N_GAIN
+globalTotlAnn   DWT_CONV_CFLUX
diff --git a/lnd_diag/inputFiles/set2_cn.txt b/lnd_diag/inputFiles/set2_cn.txt
@@ -1,6 +1,9 @@
 globalMeanDay0  NEE
 globalMeanDay0  NEP
+globalMeanDay0  NBP
 globalMeanDay0  GPP
+globalMeanNat0  CUE
+globalMeanNat0  BTRAN2
 globalMeanDay0  PSNSUN_TO_CPOOL
 globalMeanDay0  PSNSHADE_TO_CPOOL
 globalMeanDay0  NPP
@@ -55,6 +58,8 @@ globalMeanNat0  TOTCOLC
 globalMeanNat0  FPG
 globalMeanNat0  FPI
 globalMeanAnn0  NDEP_TO_SMINN
+globalMeanAnn0  FERT
+globalMeanAnn0  FERT_TO_SMINN
 globalMeanAnn0  POTENTIAL_IMMOB
 globalMeanAnn0  ACTUAL_IMMOB
 globalMeanAnn0  GROSS_NMIN

diff --git a/lnd_diag/inputFiles/set5_clm.txt b/lnd_diag/inputFiles/set5_clm.txt
@@ -25,8 +25,10 @@ globalMeanNat   TLAI
 globalMeanNat   TSAI
 globalMeanNat   LAISUN
 globalMeanNat   LAISHA
+globalTotlAnn   FPSN
 globalMeanDay   ET
 globalMeanDay   QOVER
+globalMeanDay   QIRRIG
 globalMeanDay   QDRAI
 globalMeanDay   QRGWL
 globalMeanNat   WA

diff --git a/lnd_diag/inputFiles/set5_cn.txt b/lnd_diag/inputFiles/set5_cn.txt
@@ -1,6 +1,8 @@
 globalTotlAnn   NEE
 globalTotlAnn   NEP
+globalTotlAnn   NBP
 globalTotlAnn   GPP
+globalMeanNat   CUE
 globalTotlAnn   PSNSUN_TO_CPOOL
 globalTotlAnn   PSNSHADE_TO_CPOOL
 globalTotlAnn   NPP
@@ -51,6 +53,8 @@ globalTotlNat   TOTCOLC
 globalMeanNat   FPG
 globalMeanNat   FPI
 globalTotlAnn   NDEP_TO_SMINN
+globalTotlAnn   FERT
+globalTotlAnn   FERT_TO_SMINN
 globalTotlAnn   POTENTIAL_IMMOB
 globalTotlAnn   ACTUAL_IMMOB
 globalTotlAnn   GROSS_NMIN

diff --git a/lnd_diag/inputFiles/set6_cnFlx.txt b/lnd_diag/inputFiles/set6_cnFlx.txt
@@ -5,6 +5,6 @@ globalMeanDay   AR
 globalMeanDay   HR
 globalMeanDay   ER
 globalMeanDay   FCH4
-globalMeanDay   SMINN_LEACHED
+globalMeanNat   CUE
 globalMeanDay   SMIN_NO3_LEACHED
 globalMeanDay   SMIN_NO3_RUNOFF
diff --git a/lnd_diag/inputFiles/set6_radFlx.txt b/lnd_diag/inputFiles/set6_radFlx.txt
@@ -5,3 +5,4 @@ globalMeanNat   FLDS
 globalMeanNat   FIRE
 globalMeanNat   FIRA
 globalMeanNat   RNET
+globalMeanNat   FSNO