[Swift-commit] r5659 - in SwiftApps/Cybershake: etc swiftscripts
ketan at ci.uchicago.edu
ketan at ci.uchicago.edu
Mon Feb 20 16:07:28 CST 2012
Author: ketan
Date: 2012-02-20 16:07:28 -0600 (Mon, 20 Feb 2012)
New Revision: 5659
Modified:
SwiftApps/Cybershake/etc/cf.ps
SwiftApps/Cybershake/etc/fs.data
SwiftApps/Cybershake/etc/sites.grid-ps.xml
SwiftApps/Cybershake/etc/tc-provider-staging
SwiftApps/Cybershake/swiftscripts/postproc.swift
Log:
Modified: SwiftApps/Cybershake/etc/cf.ps
===================================================================
--- SwiftApps/Cybershake/etc/cf.ps 2012-02-20 20:04:48 UTC (rev 5658)
+++ SwiftApps/Cybershake/etc/cf.ps 2012-02-20 22:07:28 UTC (rev 5659)
@@ -1,8 +1,8 @@
wrapperlog.always.transfer=false
sitedir.keep=true
-execution.retries=0
+execution.retries=3
lazy.errors=true
status.mode=provider
use.provider.staging=true
provider.staging.pin.swiftfiles=false
-foreach.max.threads=40
+foreach.max.threads=200
Modified: SwiftApps/Cybershake/etc/fs.data
===================================================================
--- SwiftApps/Cybershake/etc/fs.data 2012-02-20 20:04:48 UTC (rev 5658)
+++ SwiftApps/Cybershake/etc/fs.data 2012-02-20 22:07:28 UTC (rev 5659)
@@ -1,6 +1,4 @@
rule .*TEST_f[x|y]_644.sgt DIRECT /
-#rule TEST_fx_644.sgt DIRECT /
-#rule TEST_fy_644.sgt DIRECT /
rule .*LGU_f[x|y]_664.sgt DIRECT /
#rule .*LGU.*subf[x|y].sgt DIRECT /
#rule .*[0-9]+/[0-9]+/.*.txt.variation.* DIRECT /
Modified: SwiftApps/Cybershake/etc/sites.grid-ps.xml
===================================================================
--- SwiftApps/Cybershake/etc/sites.grid-ps.xml 2012-02-20 20:04:48 UTC (rev 5658)
+++ SwiftApps/Cybershake/etc/sites.grid-ps.xml 2012-02-20 22:07:28 UTC (rev 5659)
@@ -1,36 +1,25 @@
<config>
- <!-- <pool handle="grid">
+ <pool handle="grid">
<execution provider="coaster-persistent" url="http://localhost:50000" jobmanager="local:local"/>
<profile namespace="globus" key="workerManager">passive</profile>
<profile namespace="globus" key="jobsPerNode">1</profile>
- <profile key="jobThrottle" namespace="karajan">.04</profile>
+ <profile key="jobThrottle" namespace="karajan">0.09</profile>
<profile namespace="karajan" key="initialScore">10000</profile>
- <profile namespace="swift" key="stagingMethod">proxy</profile>
- <profile namespace="globus" key="workerLoggingLevel">DEBUG</profile>
- <workdirectory>/tmp/ketan</workdirectory>
- </pool> -->
-
- <pool handle="mcs">
- <execution provider="coaster-persistent" url="http://localhost:50000" jobmanager="local:local"/>
- <profile namespace="globus" key="workerManager">passive</profile>
- <profile namespace="globus" key="jobsPerNode">4</profile>
- <profile key="jobThrottle" namespace="karajan">1.99</profile>
- <profile namespace="karajan" key="initialScore">10000</profile>
<!-- <filesystem provider="local" url="none" /> -->
<profile namespace="swift" key="stagingMethod">proxy</profile>
<profile namespace="globus" key="workerLoggingLevel">DEBUG</profile>
- <workdirectory>/home/ketan/swift.workdir</workdirectory>
+ <workdirectory>/var/tmp/ketan</workdirectory>
</pool>
<pool handle="localhost">
<execution provider="coaster-persistent" url="http://localhost:1984" jobmanager="local:local"/>
<profile namespace="globus" key="workerManager">passive</profile>
<profile namespace="globus" key="jobsPerNode">1</profile>
- <profile key="jobThrottle" namespace="karajan">.08</profile>
+ <profile key="jobThrottle" namespace="karajan">0.08</profile>
<profile namespace="karajan" key="initialScore">10000</profile>
<filesystem provider="local" url="none" />
<profile namespace="globus" key="workerLoggingLevel">DEBUG</profile>
<profile namespace="swift" key="stagingMethod">proxy</profile>
- <workdirectory>/scratch/local/ketan/swift.workdir</workdirectory>
+ <workdirectory>/gpfs/pads/swift/ketan/swift.workdir</workdirectory>
</pool>
</config>
Modified: SwiftApps/Cybershake/etc/tc-provider-staging
===================================================================
--- SwiftApps/Cybershake/etc/tc-provider-staging 2012-02-20 20:04:48 UTC (rev 5658)
+++ SwiftApps/Cybershake/etc/tc-provider-staging 2012-02-20 22:07:28 UTC (rev 5659)
@@ -1,13 +1,12 @@
# Utility apps
#
-#localhost cat /bin/cat null null null
-mcs cat /bin/cat null null null
-localhost getsite /scratch/local/ketan/cybershake/getsite.rb null null null
-localhost getrupture /scratch/local/ketan/cybershake/getrupture.rb null null null
-localhost variation_mapper /scratch/local/ketan/cybershake/variation_mapper.rb null null null
-localhost mkoffset /scratch/local/ketan/cybershake/offset.rb null null null
-localhost extract /scratch/local/ketan/cybershake/apps/JBSim3d/bin/jbsim3d null null null
-localhost seispeak_local /scratch/local/ketan/cybershake/seispeak.sh null null null
+localhost cat /bin/cat null null null
+localhost getsite /home/ketan/osg-tg-effort/cybershake/getsite.rb
+localhost getrupture /home/ketan/osg-tg-effort/cybershake/getrupture.rb
+localhost variation_mapper /home/ketan/osg-tg-effort/cybershake/variation_mapper.rb
+localhost mkoffset /home/ketan/osg-tg-effort/cybershake/offset.rb
+localhost extract /home/ketan/osg-tg-effort/cybershake/apps/JBSim3d/bin/jbsim3d
+localhost seispeak_local /home/ketan/osg-tg-effort/cybershake/seispeak.sh
#localhost getsite /home/aespinosa/workflows/cybershake/getsite.rb INSTALLED INTEL32::LINUX null
#localhost getrupture /home/aespinosa/workflows/cybershake/getrupture.rb INSTALLED INTEL32::LINUX null
@@ -16,14 +15,8 @@
#localhost extract /home/ketan/osg-tg-effort/cybershake/apps/JBSim3d/bin/jbsim3d INSTALLED INTEL32::LINUX null
#localhost seispeak_local /home/ketan/osg-tg-effort/cybershake/seispeak.sh INSTALLED INTEL32::LINUX null
-grid seismogram JBSim3d/bin/jbsim3d null null null
-grid surfeis_rspectra SpectralAcceleration/p2utils/surfseis_rspectra null null null
-grid seispeak seispeak.sh null null null
-grid seispeak_agg agg_seispeak.sh null null null
+grid seismogram JBSim3d/bin/jbsim3d INSTALLED INTEL32::LINUX GLOBUS::maxwalltime="00:05:00"
+grid surfeis_rspectra SpectralAcceleration/p2utils/surfseis_rspectra INSTALLED INTEL32::LINUX GLOBUS::maxwalltime="00:05:00"
+grid seispeak seispeak.sh INSTALLED INTEL32::LINUX GLOBUS::maxwalltime="00:10:00"
+grid seispeak_agg agg_seispeak.sh INSTALLED INTEL32::LINUX GLOBUS::maxwalltime="04:00:00"
-
-mcs seismogram /home/ketan/cybershake/post/JBSim3d/bin/jbsim3d null null null
-mcs surfeis_rspectra /home/ketan/cybershake/post/SpectralAcceleration/p2utils/surfseis_rspectra null null null
-mcs seispeak /home/ketan/cybershake/post/seispeak.sh null null null
-mcs seispeak_agg /home/ketan/cybershake/post/agg_seispeak.sh null null null
-
Modified: SwiftApps/Cybershake/swiftscripts/postproc.swift
===================================================================
--- SwiftApps/Cybershake/swiftscripts/postproc.swift 2012-02-20 20:04:48 UTC (rev 5658)
+++ SwiftApps/Cybershake/swiftscripts/postproc.swift 2012-02-20 22:07:28 UTC (rev 5659)
@@ -168,15 +168,13 @@
/* Main program */
int run_id = 644;
//int run_id = 664;
- int agg_size = 60;
+ int agg_size = 30;
int loc_size = 20;
- //string datadir = "/gpfs/pads/swift/ketan/science/cybershake/Results";
- string datadir = "/scratch/local/ketan/cybershake/Results";
+ string datadir = "/gpfs/pads/swift/ketan/science/cybershake/Results";
Station site = get_site(run_id);
Sgt sgt_var <ext; exec="getsgtvar.rb", r=run_id, s=site.name, l="/gpfs/pads/swift/aespinosa/science/cybershake/SgtFiles">;
- //Sgt sgt_var <ext; exec="getsgtvar.rb", r=run_id, s=site.name, l="/home/ketan/cybershake/SgtFiles">;
Rupture rups[] = get_ruptures(run_id, site);
@@ -190,7 +188,8 @@
Variation vars[] <array_mapper; files=var_str>;
sub = extract(sgt_var, site, vars[rup.size-1]);
-
+
+ /*
string seis_str[];
string peak_str[];
seis_str[-1] = "";
@@ -215,7 +214,6 @@
if(rup.size <= agg_size) {
(seis, peak) = seispeak_agg(sub, vars, site, rup.size);
}
-
else {
offset offs[] = mkoffset(rup.size, agg_size);
@@ -242,6 +240,6 @@
(seis_off, peak_off) = seispeak_agg(sub,var_offset, site, i.size);
}
}
+ }*/
}
- }
More information about the Swift-commit
mailing list