[Swift-commit] r7121 - SwiftApps/Swift-MapRed/psims

[ketan at ci.uchicago.edu]

Author: ketan
Date: 2013-10-02 14:17:54 -0500 (Wed, 02 Oct 2013)
New Revision: 7121

Modified:
   SwiftApps/Swift-MapRed/psims/cf
   SwiftApps/Swift-MapRed/psims/gridList.txt
   SwiftApps/Swift-MapRed/psims/midway.xml
   SwiftApps/Swift-MapRed/psims/swiftcommand.sh
Log:
 

Modified: SwiftApps/Swift-MapRed/psims/cf
===================================================================
--- SwiftApps/Swift-MapRed/psims/cf	2013-10-02 17:09:31 UTC (rev 7120)
+++ SwiftApps/Swift-MapRed/psims/cf	2013-10-02 19:17:54 UTC (rev 7121)
@@ -4,8 +4,6 @@
 execution.retries=0
 lazy.errors=true
 status.mode=provider
-use.provider.staging=false
+use.provider.staging=true
 provider.staging.pin.swiftfiles=false
 foreach.max.threads=2000
-
-#app bash=/bin/bash

Modified: SwiftApps/Swift-MapRed/psims/gridList.txt
===================================================================
--- SwiftApps/Swift-MapRed/psims/gridList.txt	2013-10-02 17:09:31 UTC (rev 7120)
+++ SwiftApps/Swift-MapRed/psims/gridList.txt	2013-10-02 19:17:54 UTC (rev 7121)
@@ -1 +1,10 @@
 104/114
+104/115
+104/116
+104/117
+104/118
+104/119
+104/120
+104/121
+104/122
+104/123

Modified: SwiftApps/Swift-MapRed/psims/midway.xml
===================================================================
--- SwiftApps/Swift-MapRed/psims/midway.xml	2013-10-02 17:09:31 UTC (rev 7120)
+++ SwiftApps/Swift-MapRed/psims/midway.xml	2013-10-02 19:17:54 UTC (rev 7121)
@@ -1,4 +1,5 @@
-<config>
+<?xml version="1.0" encoding="UTF-8"?>
+ <config xmlns="http://www.ci.uchicago.edu/swift/SwiftSites">
   <pool handle="midway">
     <execution provider="coaster" jobmanager="local:slurm"/>
     <profile namespace="globus" key="jobsPerNode">16</profile>        <!-- Maximum number of RunpSIMS.sh tasks per node -->
@@ -14,6 +15,6 @@
     <profile namespace="globus" key="slurm.exclusive">false</profile> <!-- When set to false, it's easier to get nodes, but things may run slower -->
     <profile namespace="karajan" key="initialScore">10000</profile>
     <filesystem provider="local"/>
-    <workdirectory>/scratch/midway/maheshwari/psims/run003/swiftwork</workdirectory>
+    <workdirectory>/scratch/midway/maheshwari/swiftwork</workdirectory>
   </pool>
 </config>

Modified: SwiftApps/Swift-MapRed/psims/swiftcommand.sh
===================================================================
--- SwiftApps/Swift-MapRed/psims/swiftcommand.sh	2013-10-02 17:09:31 UTC (rev 7120)
+++ SwiftApps/Swift-MapRed/psims/swiftcommand.sh	2013-10-02 19:17:54 UTC (rev 7121)
@@ -1,3 +1,15 @@
-#time swift -tc.file tc.data -sites.file $site.xml -config cf RunpSIMS.swift -model=$model -scenarios=$scenarios -weather=$weather -refdata=$refdata -bindata=$bindata -bintransfer=$bintransfer -executable=$executable -outtypes=$outtypes -postprocess=$postprocess
 
-swift -tc.file tc.data -sites.file midway.xml, -config cf RunpSIMS.swift -model=dssat45 -campaign=/scratch/midway/maheshwari/psims/campaigns/pdssat/ggcmi.maize -soils=/scratch/midway/maheshwari/psims/data/soils/hwsd200.wrld.30min -weather=/scratch/midway/maheshwari/psims/data/clim/agmerra -refdata=/scratch/midway/maheshwari/psims/campaigns/pdssat/common.isimip -bintransfer=/scratch/midway/maheshwari/psims/bin/DSCSM045.EXE,/scratch/midway/maheshwari/psims/tapps/pdssat/psims2WTH.py,/scratch/midway/maheshwari/psims/tapps/pdssat/OUT2psims.py,/scratch/midway/maheshwari/psims/bin/camp2json.py,/scratch/midway/maheshwari/psims/tapps/pdssat/jsons2dssat.py -tappwth=psims2WTH.py:-o:GENERIC1.WTH:-v:tasmin,tasmax,rsdsr,wind -tappcamp=camp2json.py:-c:Campaign.nc4:-e:exp_template.json:-o:experiment.json -tappinp=jsons2dssat.py:-x:X1234567.MZX:-s:soil.json:-e:experiment.json:-S:SOIL.SOL -executable=DSCSM045.EXE:A:X1234567.MZX -outtypes=.WTH,.MZX,.SOL,.OUT,.json -postprocess=./OUT2psims.py:-
 i:Summary.OUT:-v:PDAT,ADAT,MDAT,CWAM,HWAM,IRCM,PRCM,ETCM:--delta:30:-s:4:-y:31:--ref_year:1980 -NCconcat=../bin/append.sh:PDAT,ADAT,MDAT,CWAM,HWAM,IRCM,PRCM,ETCM:PlantDate,AnthesisDate,MaturityDate,TotalBiomass,Yield,IrrigationApplied,GrowingSeasonPrecip,GrowingSeasonET:DOY,DOY,DOY,kg/ha,kg/ha,mm,mm,mm:720:360:30:31:4:1980:./parts:out.psims.dssat45.agmerra.maize.nc4
+swift -tc.file tc.data -sites.file midway.xml -config cf RunpSIMS.swift \
+-model=dssat45 -campaign=/scratch/midway/maheshwari/psims/campaigns/pdssat/ggcmi.maize \
+-soils=/scratch/midway/maheshwari/psims/data/soils/hwsd200.wrld.30min \
+-weather=/scratch/midway/maheshwari/psims/data/clim/agmerra \
+-refdata=/scratch/midway/maheshwari/psims/campaigns/pdssat/common.isimip \
+-bintransfer=/scratch/midway/maheshwari/psims/bin/DSCSM045.EXE,/scratch/midway/maheshwari/psims/tapps/pdssat/psims2WTH.py,/scratch/midway/maheshwari/psims/tapps/pdssat/OUT2psims.py,/scratch/midway/maheshwari/psims/bin/camp2json.py,/scratch/midway/maheshwari/psims/tapps/pdssat/jsons2dssat.py \
+-tappwth=psims2WTH.py:-o:GENERIC1.WTH:-v:tasmin,tasmax,rsdsr,wind \
+-tappcamp=camp2json.py:-c:Campaign.nc4:-e:exp_template.json:-o:experiment.json \
+-tappinp=jsons2dssat.py:-x:X1234567.MZX:-s:soil.json:-e:experiment.json:-S:SOIL.SOL \
+-executable=DSCSM045.EXE:A:X1234567.MZX \
+-outtypes=.WTH,.MZX,.SOL,.OUT,.json \
+-postprocess=./OUT2psims.py:-i:Summary.OUT:-v:PDAT,ADAT,MDAT,CWAM,HWAM,IRCM,PRCM,ETCM:--delta:30:-s:4:-y:31:--ref_year:1980 \
+-NCconcat=./bin/append.sh:PDAT,ADAT,MDAT,CWAM,HWAM,IRCM,PRCM,ETCM:PlantDate,AnthesisDate,MaturityDate,TotalBiomass,Yield,IrrigationApplied,GrowingSeasonPrecip,GrowingSeasonET:DOY,DOY,DOY,kg/ha,kg/ha,mm,mm,mm:720:360:30:31:4:1980:./parts:out.psims.dssat45.agmerra.maize.nc4
+