Merge pull request #229 from olyson/master

Updates to land diag package
NCAR · Dec 8, 2023 · 6870642 · 6870642
2 parents 8f9cb75 + a0068b0
commit 6870642
Show file tree

Hide file tree

Showing 33 changed files with 2,386 additions and 233 deletions.
diff --git a/Config/config_timeseries.xml b/Config/config_timeseries.xml
@@ -207,6 +207,14 @@
         <tseries_filecat_tper>years</tseries_filecat_tper>
         <tseries_filecat_n>10</tseries_filecat_n>
       </file_extension>
+      <file_extension suffix=".h9.[0-9]">
+        <subdir>hist</subdir>
+        <tseries_create>FALSE</tseries_create>
+        <tseries_output_format>netcdf4c</tseries_output_format>
+        <tseries_tper>day_1</tseries_tper>
+        <tseries_filecat_tper>years</tseries_filecat_tper>
+        <tseries_filecat_n>50</tseries_filecat_n>
+      </file_extension>
     </files>
     <tseries_time_variant_variables>
       <variable>date_written</variable>

diff --git a/Tools/copy_html b/Tools/copy_html
@@ -214,7 +214,7 @@ def create_top_level(env, comp):
 
     # make sure top level remote directory exists
     try:
-        pipe = subprocess.Popen( ["ssh {0}@{1} 'mkdir -p {2}/{3}'".format(env['GLOBAL_WEBLOGIN'],env['GLOBAL_WEBHOST'],env['GLOBAL_REMOTE_WEBDIR'],comp)], shell=True)
+        pipe = subprocess.Popen( ["ssh {0}@{1} 'mkdir -p -m u=rwx,g=rwx,o=rx {2}/{3}'".format(env['GLOBAL_WEBLOGIN'],env['GLOBAL_WEBHOST'],env['GLOBAL_REMOTE_WEBDIR'],comp)], shell=True)
         pipe.wait()
     except Exception as e:
         print('ERROR: unable to create remote directory {0}@{1}:{2}/{3}'.format(env['GLOBAL_WEBLOGIN'],env['GLOBAL_WEBHOST'],env['GLOBAL_REMOTE_WEBDIR'],comp))

diff --git a/lnd_diag/inputFiles/set1_c13.txt b/lnd_diag/inputFiles/set1_c13.txt
@@ -27,6 +27,7 @@ globalTotlNat   C13_DEADCROOTC
 globalTotlNat   C13_CPOOL
 globalTotlNat   C13_TOTVEGC
 globalTotlNat   C13_CWDC
+globalTotlNat   C13_CWD_C
 globalTotlNat   C13_TOTLITC
 globalTotlNat   C13_TOTSOMC
 globalTotlNat   C13_TOTECOSYSC
@@ -63,6 +64,7 @@ globalTotlNat   C14_DEADCROOTC
 globalTotlNat   C14_CPOOL
 globalTotlNat   C14_TOTVEGC
 globalTotlNat   C14_CWDC
+globalTotlNat   C14_CWD_C
 globalTotlNat   C14_TOTLITC
 globalTotlNat   C14_TOTSOMC
 globalTotlNat   C14_TOTECOSYSC

diff --git a/lnd_diag/inputFiles/set1_clm.txt b/lnd_diag/inputFiles/set1_clm.txt
@@ -43,3 +43,33 @@ globalTotlAnn   DSTDEP
 globalTotlAnn   DSTFLXT
 globalTotlAnn   OCDEP
 globalTotlAnn   BCDEP
+globalMeanNat   FSDSND
+globalMeanNat   FSDSVD
+globalMeanNat   FSDSNI
+globalMeanNat   FSDSVI
+globalMeanDay   RAIN_FROM_ATM
+globalMeanDay   SNOW_FROM_ATM
+globalMeanNat   FLDS_NOT_DOWNSCALED
+globalMeanNat   ZBOT
+globalMeanNat   Tair_from_atm
+globalMeanNat   Thair_from_atm
+globalMeanNat   QBOT_NOT_DOWNSCALED
+globalMeanNat   PBOT_NOT_DOWNSCALED
+globalMeanNat   Rho_from_atm
+globalMeanNat   UWIND
+globalMeanNat   VWIND
+globalTotlAnn   BCPHIDRY
+globalTotlAnn   BCPHODRY
+globalTotlAnn   BCPHIWET
+globalTotlAnn   OCPHIDRY
+globalTotlAnn   OCPHODRY
+globalTotlAnn   OCPHIWET
+globalTotlAnn   DSTWET1
+globalTotlAnn   DSTDRY1
+globalTotlAnn   DSTWET2
+globalTotlAnn   DSTDRY2
+globalTotlAnn   DSTWET3
+globalTotlAnn   DSTDRY3
+globalTotlAnn   DSTWET4
+globalTotlAnn   DSTDRY4
+globalMeanNat   ATM_TOPO
diff --git a/lnd_diag/inputFiles/set1_cn.txt b/lnd_diag/inputFiles/set1_cn.txt
@@ -45,6 +45,7 @@ globalTotlNat   TOTVEGC
 globalTotlNat   TOTVEGN
 globalMeanNat   TOTVEGCN
 globalTotlNat   CWDC
+globalTotlNat   CWD_C
 globalTotlNat   TOTLITC
 globalTotlNat   TOTLITC_1m
 globalTotlNat   TOTLITN

diff --git a/lnd_diag/inputFiles/set2_c13.txt b/lnd_diag/inputFiles/set2_c13.txt
@@ -27,6 +27,7 @@ globalMeanNat0  C13_DEADCROOTC
 globalMeanNat0  C13_CPOOL
 globalMeanNat0  C13_TOTVEGC
 globalMeanNat0  C13_CWDC
+globalMeanNat0  C13_CWD_C
 globalMeanNat0  C13_TOTLITC
 globalMeanNat0  C13_TOTSOMC
 globalMeanNat0  C13_TOTECOSYSC
@@ -61,6 +62,7 @@ globalMeanNat0  C14_DEADCROOTC
 globalMeanNat0  C14_CPOOL
 globalMeanNat0  C14_TOTVEGC
 globalMeanNat0  C14_CWDC
+globalMeanNat0  C14_CWD_C
 globalMeanNat0  C14_TOTLITC
 globalMeanNat0  C14_TOTSOMC
 globalMeanNat0  C14_TOTECOSYSC

diff --git a/lnd_diag/inputFiles/set2_clm.txt b/lnd_diag/inputFiles/set2_clm.txt
@@ -1,11 +1,11 @@
-globalMeanNat1  TSA
-globalMeanDay1  PREC
+globalMeanNat0  TSA
+globalMeanDay0  PREC
 globalMeanNat0  ASA
 globalMeanNat0  RNET
-globalMeanNat1  LHEAT
+globalMeanNat0  LHEAT
 globalMeanDay0  TOTRUNOFF
 globalMeanNat0  SNOWDP
-globalMeanDay1  FPSN
+globalMeanDay0  FPSN
 globalMeanNat0  FSH
 globalMeanNat0  FSH_V
 globalMeanNat0  FSH_G
@@ -109,3 +109,29 @@ globalMeanNat0  PCT_TREE_PFT
 globalMeanNat0  PCT_GRASS_PFT
 globalMeanNat0  PCT_SHRUB_PFT
 globalMeanNat0  PCT_CROP_PFT
+globalMeanNat0  ZETA
+globalMeanDay0  RAIN_FROM_ATM
+globalMeanDay0  SNOW_FROM_ATM
+globalMeanNat0  FLDS_NOT_DOWNSCALED
+globalMeanNat0  Tair_from_atm
+globalMeanNat0  Thair_from_atm
+globalMeanNat0  QBOT_NOT_DOWNSCALED
+globalMeanNat0  PBOT_NOT_DOWNSCALED
+globalMeanNat0  Rho_from_atm
+globalMeanNat0  UWIND
+globalMeanNat0  VWIND
+globalMeanDay0  BCPHIDRY
+globalMeanDay0  BCPHODRY
+globalMeanDay0  BCPHIWET
+globalMeanDay0  OCPHIDRY
+globalMeanDay0  OCPHODRY
+globalMeanDay0  OCPHIWET
+globalMeanDay0  DSTWET1
+globalMeanDay0  DSTDRY1
+globalMeanDay0  DSTWET2
+globalMeanDay0  DSTDRY2
+globalMeanDay0  DSTWET3
+globalMeanDay0  DSTDRY3
+globalMeanDay0  DSTWET4
+globalMeanDay0  DSTDRY4
+globalMeanNat0  ATM_TOPO
diff --git a/lnd_diag/inputFiles/set2_cn.txt b/lnd_diag/inputFiles/set2_cn.txt
@@ -49,6 +49,7 @@ globalMeanNat0  TOTVEGC
 globalMeanNat0  TOTVEGN
 globalMeanNat0  TOTVEGCN
 globalMeanNat0  CWDC
+globalMeanNat0  CWD_C
 globalMeanNat0  TOTLITC
 globalMeanNat0  TOTLITC_1m
 globalMeanNat0  TOTSOMC
@@ -113,3 +114,5 @@ globalMeanDay0  SOILC_LOSS
 globalMeanNat0  WOODC
 globalMeanDay0  WOODC_ALLOC
 globalMeanDay0  WOODC_LOSS
+globalMeanNat1  ALTMAX
+globalMeanDay1  LNFM
diff --git a/lnd_diag/inputFiles/set3_cn_landFlx.txt b/lnd_diag/inputFiles/set3_cn_landFlx.txt
@@ -5,3 +5,4 @@ globalMeanNat   SNOWDP
 globalMeanNat   LHEAT
 globalMeanDay   GPP
 globalMeanNat   TLAI
+globalMeanNat   TOTSOILLIQICE
diff --git a/lnd_diag/inputFiles/set3_landFlx.txt b/lnd_diag/inputFiles/set3_landFlx.txt
@@ -5,3 +5,4 @@ globalMeanNat   SNOWDP
 globalMeanNat   LHEAT
 globalMeanDay   FPSN
 globalMeanNat   TLAI
+globalMeanNat   TOTSOILLIQICE
diff --git a/lnd_diag/inputFiles/set5_c13.txt b/lnd_diag/inputFiles/set5_c13.txt
@@ -27,6 +27,7 @@ globalTotlNat   C13_DEADCROOTC
 globalTotlNat   C13_CPOOL
 globalTotlNat   C13_TOTVEGC
 globalTotlNat   C13_CWDC
+globalTotlNat   C13_CWD_C
 globalTotlNat   C13_TOTLITC
 globalTotlNat   C13_TOTSOMC
 globalTotlNat   C13_TOTECOSYSC
@@ -63,6 +64,7 @@ globalTotlNat   C14_DEADCROOTC
 globalTotlNat   C14_CPOOL
 globalTotlNat   C14_TOTVEGC
 globalTotlNat   C14_CWDC
+globalTotlNat   C14_CWD_C
 globalTotlNat   C14_TOTLITC
 globalTotlNat   C14_TOTSOMC
 globalTotlNat   C14_TOTECOSYSC

diff --git a/lnd_diag/inputFiles/set5_cn.txt b/lnd_diag/inputFiles/set5_cn.txt
@@ -40,6 +40,7 @@ globalTotlNat   DEADCROOTC
 globalTotlNat   CPOOL
 globalTotlNat   TOTVEGC
 globalTotlNat   CWDC
+globalTotlNat   CWD_C
 globalTotlNat   TOTLITC
 globalTotlNat   TOTLITC_1m
 globalTotlNat   TOTSOMC