[Swift-commit] r6525 - SwiftApps/ParVis/HiRAMTools

[tmoore at ci.uchicago.edu]

Author: tmoore
Date: 2013-05-31 10:09:28 -0500 (Fri, 31 May 2013)
New Revision: 6525

Added:
   SwiftApps/ParVis/HiRAMTools/genpfrepps_180_90.sh
Modified:
   SwiftApps/ParVis/HiRAMTools/genpfrepps.sh
   SwiftApps/ParVis/HiRAMTools/pfrepps.swift
Log:
updated pfrepp.swift script to handle multiple realizations per submission.  Also, split the genpfrepps scripts to handle the 180x90 cases and 360x180 (1 deg) cases

Modified: SwiftApps/ParVis/HiRAMTools/genpfrepps.sh
===================================================================
--- SwiftApps/ParVis/HiRAMTools/genpfrepps.sh	2013-05-30 19:41:54 UTC (rev 6524)
+++ SwiftApps/ParVis/HiRAMTools/genpfrepps.sh	2013-05-31 15:09:28 UTC (rev 6525)
@@ -14,8 +14,8 @@
     -b $outdir/$realid \
     -s 1950 \
     -i /intrepid-fs0/users/lzamboni/persistent/bin/fms/pfrepp/remap_file/version1_C90_to_180x90/C90_mosaic.nc \
-    -x 180 -y 90  \
-    -r /intrepid-fs0/users/lzamboni/persistent/bin/fms/pfrepp/remap_file/version1_C90_to_180x90/C90_to_180x90.nc \
+    -x 360 -y 180  \
+    -r /intrepid-fs0/projects/SU_Climate/post/HiRAMTools/C90_to_360x180/C90_to_360x180_remap_file.nc \
     -m 12 -n 50 -q \
     -u
 

Added: SwiftApps/ParVis/HiRAMTools/genpfrepps_180_90.sh
===================================================================
--- SwiftApps/ParVis/HiRAMTools/genpfrepps_180_90.sh	                        (rev 0)
+++ SwiftApps/ParVis/HiRAMTools/genpfrepps_180_90.sh	2013-05-31 15:09:28 UTC (rev 6525)
@@ -0,0 +1,59 @@
+#! /bin/sh
+
+realid=$1
+realdir=$2
+outdir=$3
+scriptlist=$PWD/$4
+scriptfilter=$5
+
+mkdir -p $outdir/$realid/scripts
+cd       $outdir/$realid/scripts
+
+tcsh /home/wilde/LZ/HiRAMTools/pfrepp.csh  \
+    -a $realdir \
+    -b $outdir/$realid \
+    -s 1950 \
+    -i /intrepid-fs0/users/lzamboni/persistent/bin/fms/pfrepp/remap_file/version1_C90_to_180x90/C90_mosaic.nc \
+    -x 180 -y 90  \
+    -r /intrepid-fs0/users/lzamboni/persistent/bin/fms/pfrepp/remap_file/version1_C90_to_180x90/C90_to_180x90.nc \
+    -m 12 -n 50 -q \
+    -u
+
+echo $0: scriptfilter=$scriptfilter
+
+if [ "_$scriptfilter" != _ ]; then
+  echo $0: using scriptfilter
+  scripts=$(/bin/ls -1 pfrepp_script* | sh -c "$scriptfilter" )
+else
+  scripts=$(/bin/ls -1 pfrepp_script* )
+fi
+
+echo id path >$scriptlist
+for f in $scripts; do
+  echo $realid $f >>$scriptlist
+done
+
+exit
+
+#    -a /intrepid-fs0/users/lzamboni/persistent/yearly-nco/en1eo12Ic3/run001/run001/ \
+
+# datasets needed by LZ:
+
+Pfrepp-month.time_average
+Pfrepp-month.time_series
+Pfrepp-daily.time_series (4X???)
+Pfrepp-8xdaily.time_series
+Pfrepp-8xdaily_instant.time_series
+Pfrepp-4xdaily.time_series
+
+which means:
+
+pfrepp_script.atmos_month.time_average.1950*
+pfrepp_script.atmos_month.time_series.1950*
+pfrepp_script.atmos_4xdaily.time_series.1950*
+pfrepp_script.atmos_8xdaily.time_series.1950*
+pfrepp_script.atmos_8xdaily_instant.time_series.1950*
+pfrepp_script.atmos_daily.time_series.1950*
+
+pfrepp_script.ice_month.time_average.1950*
+pfrepp_script.ice_month.time_series.1950*


Property changes on: SwiftApps/ParVis/HiRAMTools/genpfrepps_180_90.sh
___________________________________________________________________
Added: svn:executable
   + *

Modified: SwiftApps/ParVis/HiRAMTools/pfrepps.swift
===================================================================
--- SwiftApps/ParVis/HiRAMTools/pfrepps.swift	2013-05-30 19:41:54 UTC (rev 6524)
+++ SwiftApps/ParVis/HiRAMTools/pfrepps.swift	2013-05-31 15:09:28 UTC (rev 6525)
@@ -44,8 +44,8 @@
     script scripts[] = readData(scriptlist);
     foreach s in scripts {
       string cmd = @strcat(outdir,"/",r.id,"/scripts/",s.path);
-      file ssofile <single_file_mapper; file=@strcat(s.path,".out")>;
-      file ssefile <single_file_mapper; file=@strcat(s.path,".err")>;
+      file ssofile <single_file_mapper; file=@strcat(s.path,".",r.id,".out")>;
+      file ssefile <single_file_mapper; file=@strcat(s.path,".",r.id,".err")>;
       if( dryrun != "true" ) {
 	(ssofile, ssefile) = sh(cmd);
       }