clean-up reformat scripts

ESMValGroup · Feb 16, 2017 · 7265ff2 · 7265ff2
1 parent ea3f09b
commit 7265ff2
Show file tree

Hide file tree

Showing 10 changed files with 22 additions and 21 deletions.
diff --git a/config_private.xml b/config_private.xml
@@ -32,6 +32,11 @@
 			<description>root directory of observational data</description>
 		</usrpath>
 
+                <usrpath category="observation" type="input" id="OBSPATH2">
+                        <path>/path/to/data/obsdata2/</path>
+                        <description>alternative root directory of observational data</description>
+                </usrpath>
+
 		<usrpath category="observation" type="input" id="RAWOBSPATH">
 			<path>/path/to/data/rawobsdata/</path>
 			<description>root directory of raw observational data (for reformat_obs scripts)</description>

diff --git a/nml/namelist_lauer17rse.xml b/nml/namelist_lauer17rse.xml
@@ -2192,7 +2192,7 @@ This namelist is part of the ESMValTool
    <model> CMIP5_ETHZ GISS-E2-R      Amon historical r1i1p2 1960 2010 @{MODELPATH}/ETHZ_CMIP5/ </model>
    <model> CMIP5_ETHZ GISS-E2-R      Amon historical r1i1p3 1960 2010 @{MODELPATH}/ETHZ_CMIP5/ </model>
    <model> CMIP5_ETHZ MIROC-ESM-CHEM Amon historical r1i1p1 1960 2010 @{MODELPATH}/ETHZ_CMIP5/ </model>
-   <model> O3_Cionni IGAG/SPARC      1    historical        1960 2009 /export/pa_data01/ESMVal/forcings/ozonedatabase2011/ </model>
+   <model> O3_Cionni IGAG/SPARC      1    historical        1960 2009 @{OBSPATH2}/forcings/ozonedatabase2011/ </model>
    <model> OBS ESACCI-OZONE               sat        L3     1997 2010 @{OBSPATH}/Tier2/ESACCI-OZONE/ </model>
    <model> OBS NIWA                       reanaly    1      1980 2010 @{OBSPATH}/Tier3/NIWA/ </model> 
    </diag>

diff --git a/nml/test_suites/dlr/namelist_lauer17rse.xml b/nml/test_suites/dlr/namelist_lauer17rse.xml
@@ -728,7 +728,7 @@ This namelist is part of the ESMValTool
    <diag_script_cfg_dir> ./nml/cfg_lauer17rse/  </diag_script_cfg_dir>
    <diag_script cfg="cfg_eyring13jgr_fig02.ncl"> eyring13jgr_fig02.ncl </diag_script>
    <model> CMIP5_ETHZ MIROC-ESM-CHEM Amon historical r1i1p1 2003 2005 @{MODELPATH}/ETHZ_CMIP5/ </model>
-   <model> O3_Cionni IGAG/SPARC      1    historical        2003 2005 /export/pa_data01/ESMVal/forcings/ozonedatabase2011/ </model>
+   <model> O3_Cionni IGAG/SPARC      1    historical        2003 2005 @{OBSPATH2}/forcings/ozonedatabase2011/ </model>
    <model> OBS ESACCI-OZONE               sat        L3     2003 2005 @{OBSPATH}/Tier2/ESACCI-OZONE/ </model>
    <model> OBS NIWA                       reanaly    1      2003 2005 @{OBSPATH}/Tier3/NIWA/ </model> 
    </diag>

diff --git a/reformat_scripts/fixes/CMIP5_HadGEM2-ES_fix.ncl b/reformat_scripts/fixes/CMIP5_HadGEM2-ES_fix.ncl
@@ -45,7 +45,7 @@ begin
         ;var&plev = z(:,0,0)
         ;delete([/b,orog,i,k,j/])
 
-        ;fils1 = systemfunc("ls /export/pa_data02/ESMVal/model/ETHZ_CMIP5/historical/Amon/zg/HadGEM2-ES/r1i1p1/zg_Amon_HadGEM2-ES_historical_r1i1p1_*.nc")
+        ;fils1 = systemfunc("ls /data/ESMValTool/model/ETHZ_CMIP5/historical/Amon/zg/HadGEM2-ES/r1i1p1/zg_Amon_HadGEM2-ES_historical_r1i1p1_*.nc")
         ;tmp1 = addfiles(fils1, "cat")
         ;zg   = tmp1[:]->zg
 

diff --git a/reformat_scripts/obs/reformat_obs_BDBP.ncl b/reformat_scripts/obs/reformat_obs_BDBP.ncl
@@ -30,11 +30,12 @@ begin
     TIER = 3
 
     ;; Input dir (raw data)
-    INDIR = "/export/pa_data01/ESMVal/obs/RAW/Tier" + \
+    INDIR = getenv("ESMValTool_RAWOBSPATH") + "/Tier" + \
         TIER + "/" + OBSNAME + "/"
 
     ;; Output dir (CMOR-ized data)
-    OUTDIR = "/export/pa_data02/ESMVal/obs/Tier" + TIER + "/" + OBSNAME + "/"
+    OUTDIR = getenv("ESMValTool_OBSPATH") + "/Tier" + \
+        TIER + "/" + OBSNAME + "/"
 
     ;; Period
     YEAR1 = 1979

diff --git a/reformat_scripts/obs/reformat_obs_ESACCI-GHG.csh b/reformat_scripts/obs/reformat_obs_ESACCI-GHG.csh
@@ -22,8 +22,8 @@
 ##
 ###############################################################################
 
-set inpath  = "/export/pa_data02/ESMVal/obs/Tier1/ESACCI-GHG"
-set outpath = "/export/pa_data02/ESMVal/obs/Tier1/ESACCI-GHG"
+set inpath="${ESMValTool_OBSPATH}/Tier1/ESACCI-GHG"
+set outpath="${ESMValTool_OBSPATH}/Tier1/ESACCI-GHG"
 
 if (! -d $outpath) then
     mkdir -p $outpath

diff --git a/reformat_scripts/obs/reformat_obs_ESACCI-LANDCOVER.py b/reformat_scripts/obs/reformat_obs_ESACCI-LANDCOVER.py
@@ -37,12 +37,8 @@
 ###############################################################################
 """
 
-#inpath="/Work/Reference/OBS_ESACCI_LC/"
-#outpath="/Work/Reference/OBS_ESACCI_LC/output/"
-#path2lctool="./lib/lc-user-tools-3.10/"
-
-inpath="/export/pa_data01/ESMVal/obs/RAW/Tier2/ESACCI-LANDCOVER/"
-outpath="/export/pa_data02/ESMVal/obs/Tier2/ESACCI-LANDCOVER/"
+inpath="/Work/Reference/OBS_ESACCI_LC/"
+outpath="/Work/Reference/OBS_ESACCI_LC/output/"
 path2lctool="./lib/lc-user-tools-3.10/"
 
 #these LC-classes will be processed

diff --git a/reformat_scripts/obs/reformat_obs_ESACCI-OZONE_LP.ncl b/reformat_scripts/obs/reformat_obs_ESACCI-OZONE_LP.ncl
@@ -31,11 +31,12 @@ begin
     TIER = 2
 
     ;; Input dir (raw data)
-    INDIR = "/export/pa_data01/ESMVal/obs/RAW/Tier" + \
+    INDIR = getenv("ESMValTool_RAWOBSPATH") + "/Tier" + \
         TIER + "/" + OBSNAME + "/"
 
     ;; Output dir (CMOR-ized data)
-    OUTDIR = "/export/pa_data02/ESMVal/obs/Tier" + TIER + "/" + OBSNAME + "/"
+    OUTDIR = getenv("ESMValTool_OBSPATH") + "/Tier" + \
+        TIER + "/" + OBSNAME + "/"
 
     ;; Period
     YEAR1 = 2007

diff --git a/reformat_scripts/obs/reformat_obs_ESACCI-SOILMOISTURE.ncl b/reformat_scripts/obs/reformat_obs_ESACCI-SOILMOISTURE.ncl
@@ -36,11 +36,11 @@ begin
     TIER = 2
 
     ;; Input dir (raw data)
-    INDIR = "/export/pa_data01/ESMVal/obs/RAW/Tier" + \
+    INDIR = getenv("ESMValTool_RAWOBSPATH") + "/Tier" + \
         TIER + "/" + OBSNAME + "/"
 
     ;; Output dir (CMOR-ized data)
-    OUTDIR = "/export/pa_data02/ESMVal/obs/Tier" + \
+    OUTDIR = getenv("ESMValTool_OBSPATH") + "/Tier" + \
         TIER + "/" + OBSNAME + "/"
 
     ;; Period

diff --git a/reformat_scripts/obs/reformat_obs_ESACCI-SST.ncl b/reformat_scripts/obs/reformat_obs_ESACCI-SST.ncl
@@ -31,13 +31,11 @@ begin
     TIER = 2
 
     ;; Input dir (raw data)
-;    INDIR = getenv("ESMValTool_RAWOBSPATH") + "/Tier" + \
-    INDIR = "/export/pa_data01/ESMVal/obs/RAW/Tier" + \
+    INDIR = getenv("ESMValTool_RAWOBSPATH") + "/Tier" + \
         TIER + "/" + OBSNAME + "/"
 
     ;; Output dir (CMOR-ized data)
-;    OUTDIR = getenv("ESMValTool_OBSPATH") + "/Tier" + \
-    OUTDIR = "/export/pa_data02/ESMVal/obs/Tier" + \
+    OUTDIR = getenv("ESMValTool_OBSPATH") + "/Tier" + \
         TIER + "/" + OBSNAME + "/"
 
     ;; Period