Merge pull request #113 from bertinia/master

update for cam h6 and h7 timeseries defaults
NCAR · Oct 31, 2017 · 31175dc · 31175dc
2 parents 52f60de + 12e8d5a
commit 31175dc
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 44 deletions.
diff --git a/Config/config_timeseries.xml b/Config/config_timeseries.xml
@@ -90,17 +90,17 @@
 	<subdir>hist</subdir> 
 	<tseries_create>FALSE</tseries_create>
 	<tseries_output_format>netcdf4c</tseries_output_format>
-	<tseries_tper>undefined</tseries_tper>
+	<tseries_tper>day_1</tseries_tper>
         <tseries_filecat_tper>years</tseries_filecat_tper>
-        <tseries_filecat_n>10</tseries_filecat_n>
+        <tseries_filecat_n>1</tseries_filecat_n>
       </file_extension>
       <file_extension suffix=".h7.[0-9]">      
 	<subdir>hist</subdir> 
 	<tseries_create>FALSE</tseries_create>
 	<tseries_output_format>netcdf4c</tseries_output_format>
-	<tseries_tper>undefined</tseries_tper>
+	<tseries_tper>day_5</tseries_tper>
         <tseries_filecat_tper>years</tseries_filecat_tper>
-        <tseries_filecat_n>10</tseries_filecat_n>
+        <tseries_filecat_n>1</tseries_filecat_n>
       </file_extension>
       <file_extension suffix=".h8.[0-9]">      
 	<subdir>hist</subdir> 

diff --git a/Tools/link_history_files.py b/Tools/link_history_files.py
@@ -29,15 +29,24 @@
 ##        filename = '{0}.{1}-{2}-01.nc'.format(casename,year,month)
 ##        os.symlink(os.path.join(srcdir, filename), os.path.join(linkdir, filename))
 
+##for year in ['1960','1961','1962','1963','1964','1965','1966','1967','1968','1969']:
+##    for month in ['01','02','03','04','05','06','07','08','09','10','11','12']:
+
+##        srcdir = '/glade/p/cesm0005/archive/b.e20.BHIST.f09_g17.20thC.195_01/lnd/hist'
+##        linkdir = '/glade/scratch/aliceb/b.e20.BHIST.f09_g17.20thC.195_01/lnd/hist'
+
+##        if not os.path.exists(linkdir):
+##            os.makedirs(linkdir)
+
+##        casename = 'b.e20.BHIST.f09_g17.20thC.195_01.clm2.h0'
+##        filename = '{0}.{1}-{2}.nc'.format(casename,year,month)
+##        os.symlink(os.path.join(srcdir, filename), os.path.join(linkdir, filename))
+
 for year in ['0101','0102','0103','0104','0105','0106','0107','0108','0109','0110','0111','0112','0113','0114','0115','0116','0117','0118','0119','0120']:
     for month in ['01','02','03','04','05','06','07','08','09','10','11','12']:
 
         srcdir = '/glade/p/cesm0005/archive/b.e20.B1850.f09_g17.pi_control.all.197/ocn/hist'
         linkdir = '/glade/scratch/aliceb/b.e20.B1850.f09_g17.pi_control.all.197/ocn/hist'
-
-        if not os.path.exists(linkdir):
-            os.makedirs(linkdir)
-
         casename = 'b.e20.B1850.f09_g17.pi_control.all.197.pop.h'
         filename = '{0}.{1}-{2}.nc'.format(casename,year,month)
         os.symlink(os.path.join(srcdir, filename), os.path.join(linkdir, filename))
@@ -54,3 +63,4 @@
         casename = 'b.e20.B1850.f09_g17.pi_control.all.201.pop.h'
         filename = '{0}.{1}-{2}.nc'.format(casename,year,month)
         os.symlink(os.path.join(srcdir, filename), os.path.join(linkdir, filename))
+
diff --git a/ocn_diag/tool_lib/zon_avg/makefile b/ocn_diag/tool_lib/zon_avg/makefile