[Swift-commit] r8166 - SwiftTutorials/ATPESC_2014-08-14/swift-k/part07
wilde at ci.uchicago.edu
wilde at ci.uchicago.edu
Wed Aug 13 18:39:59 CDT 2014
Author: wilde
Date: 2014-08-13 18:39:59 -0500 (Wed, 13 Aug 2014)
New Revision: 8166
Added:
SwiftTutorials/ATPESC_2014-08-14/swift-k/part07/p7.swift
Removed:
SwiftTutorials/ATPESC_2014-08-14/swift-k/part07/p4.swift
SwiftTutorials/ATPESC_2014-08-14/swift-k/part07/p4b.swift
Modified:
SwiftTutorials/ATPESC_2014-08-14/swift-k/part07/swift.properties
Log:
Rename p4 to p7.
Deleted: SwiftTutorials/ATPESC_2014-08-14/swift-k/part07/p4.swift
===================================================================
--- SwiftTutorials/ATPESC_2014-08-14/swift-k/part07/p4.swift 2014-08-13 23:34:36 UTC (rev 8165)
+++ SwiftTutorials/ATPESC_2014-08-14/swift-k/part07/p4.swift 2014-08-13 23:39:59 UTC (rev 8166)
@@ -1,43 +0,0 @@
-type file;
-
-(int result) randomInt ()
-{
- float range = 9999999.0;
- float rand = java("java.lang.Math","random");
- string s[] = strsplit(toString(range*rand),"\\.");
- result = toInt(s[0]);
-}
-
-app (file out, file traj) simulation (string npart, string steps, string mass)
-{
-# mdviz @out @traj 3 npart steps 50 ".0001" mass "0.1 1.0 0.2 0.05 50.0 0.1" 2.5 2.0 randomInt();
- md 3 npart steps 10 ".0001" mass "0.1 1.0 0.2 0.05 50.0 0.1" 2.5 2.0 randomInt() @out @traj;
-}
-
-app (file o) analyze (file s[])
-{
- mdstats filenames(s) stdout=filename(o);
-}
-
-app (file o) convert (file s[])
-{
- convert filenames(s) filename(o);
-}
-
-int nsim = toInt(arg("nsim","10"));
-string npart = arg("npart","50");
-string steps = arg("steps","1000");
-string mass = arg("mass",".005");
-
-file sim[] <simple_mapper; prefix="output/sim_", suffix=".out">;
-file trj[] <simple_mapper; prefix="output/sim_", suffix=".trj.tgz">;
-
-foreach i in [0:nsim-1] {
- (sim[i],trj[i]) = simulation(npart,steps,mass);
-}
-
-file stats_out<"output/average.out">;
-stats_out = analyze(sim);
-
-#file viz_all<"output/all.gif">;
-#viz_all = convert(gifs);
Deleted: SwiftTutorials/ATPESC_2014-08-14/swift-k/part07/p4b.swift
===================================================================
--- SwiftTutorials/ATPESC_2014-08-14/swift-k/part07/p4b.swift 2014-08-13 23:34:36 UTC (rev 8165)
+++ SwiftTutorials/ATPESC_2014-08-14/swift-k/part07/p4b.swift 2014-08-13 23:39:59 UTC (rev 8166)
@@ -1,78 +0,0 @@
-type file;
-
-type kineticInfo {
- int sim;
- float energy;
-}
-
-(int result) randomInt ()
-{
- float range = 9999999.0;
- float rand = java("java.lang.Math","random");
- string s[] = strsplit(toString(range*rand),"\\.");
- result = toInt(s[0]);
-}
-
-app (file out, file traj) simulation (int npart, int steps, int trsnaps, float mass)
-{
-# mdviz @out @traj 3 npart steps 50 ".0001" mass "0.1 1.0 0.2 0.05 50.0 0.1" 2.5 2.0 randomInt();
- md 3 npart steps trsnaps ".0001" mass "0.1 1.0 0.2 0.05 50.0 0.1" 2.5 2.0 randomInt() @out @traj;
-}
-
-app (file o) analyze (file s[])
-{
- mdstats filenames(s) stdout=filename(o);
-}
-
-app (file o) kinetic (file s[])
-{
- mdmaxk 9999 filenames(s) stdout=filename(o);
-}
-
-app (file o) render (file traj, int frame)
-{
- renderframe filename(traj) filename(o) frame;
-}
-
-app (file o) convert (file s[])
-{
- convert "-delay" 20 filenames(s) filename(o);
-}
-
-int nsim = toInt(arg("nsim","10"));
-int npart = toInt(arg("npart","50"));
-int steps = toInt(arg("steps","1000"));
-int trsnaps = 10;
-float mass = toFloat(arg("mass",".005"));
-
-file sim[] <simple_mapper; prefix="output/sim_", suffix=".out">;
-file trj[] <simple_mapper; prefix="output/sim_", suffix=".trj">;
-
-foreach i in [0:nsim-1] {
- (sim[i],trj[i]) = simulation(npart,steps,trsnaps,mass);
-}
-
-file stats_out<"output/average.out">;
-stats_out = analyze(sim);
-
-file ke_out<"output/kinetic.out">;
-ke_out = kinetic(sim);
-
-kineticInfo kd[] = readData(ke_out);
-
-tracef("min eK simulation: %i eK: %f\n", kd[0].sim, kd[0].energy);
-tracef("max eK simulation: %i eK: %f\n", kd[nsim-1].sim, kd[nsim-1].energy);
-
-file mink[] <simple_mapper; prefix="output/mink/frame_", suffix=".png">;
-file maxk[] <simple_mapper; prefix="output/maxk/frame_", suffix=".png">;
-
-foreach i in [0:trsnaps-1] {
- mink[i] = render(trj[kd[0].sim], i);
- maxk[i] = render(trj[kd[nsim-1].sim], i);
-}
-
-file minkmovie <"output/mink.gif">;
-file maxkmovie <"output/maxk.gif">;
-
-minkmovie = convert(mink);
-maxkmovie = convert(maxk);
Copied: SwiftTutorials/ATPESC_2014-08-14/swift-k/part07/p7.swift (from rev 8165, SwiftTutorials/ATPESC_2014-08-14/swift-k/part07/p4b.swift)
===================================================================
--- SwiftTutorials/ATPESC_2014-08-14/swift-k/part07/p7.swift (rev 0)
+++ SwiftTutorials/ATPESC_2014-08-14/swift-k/part07/p7.swift 2014-08-13 23:39:59 UTC (rev 8166)
@@ -0,0 +1,78 @@
+type file;
+
+type kineticInfo {
+ int sim;
+ float energy;
+}
+
+(int result) randomInt ()
+{
+ float range = 9999999.0;
+ float rand = java("java.lang.Math","random");
+ string s[] = strsplit(toString(range*rand),"\\.");
+ result = toInt(s[0]);
+}
+
+app (file out, file traj) simulation (int npart, int steps, int trsnaps, float mass)
+{
+# mdviz @out @traj 3 npart steps 50 ".0001" mass "0.1 1.0 0.2 0.05 50.0 0.1" 2.5 2.0 randomInt();
+ md 3 npart steps trsnaps ".0001" mass "0.1 1.0 0.2 0.05 50.0 0.1" 2.5 2.0 randomInt() @out @traj;
+}
+
+app (file o) analyze (file s[])
+{
+ mdstats filenames(s) stdout=filename(o);
+}
+
+app (file o) kinetic (file s[])
+{
+ mdmaxk 9999 filenames(s) stdout=filename(o);
+}
+
+app (file o) render (file traj, int frame)
+{
+ renderframe filename(traj) filename(o) frame;
+}
+
+app (file o) convert (file s[])
+{
+ convert "-delay" 20 filenames(s) filename(o);
+}
+
+int nsim = toInt(arg("nsim","10"));
+int npart = toInt(arg("npart","50"));
+int steps = toInt(arg("steps","1000"));
+int trsnaps = 10;
+float mass = toFloat(arg("mass",".005"));
+
+file sim[] <simple_mapper; prefix="output/sim_", suffix=".out">;
+file trj[] <simple_mapper; prefix="output/sim_", suffix=".trj">;
+
+foreach i in [0:nsim-1] {
+ (sim[i],trj[i]) = simulation(npart,steps,trsnaps,mass);
+}
+
+file stats_out<"output/average.out">;
+stats_out = analyze(sim);
+
+file ke_out<"output/kinetic.out">;
+ke_out = kinetic(sim);
+
+kineticInfo kd[] = readData(ke_out);
+
+tracef("min eK simulation: %i eK: %f\n", kd[0].sim, kd[0].energy);
+tracef("max eK simulation: %i eK: %f\n", kd[nsim-1].sim, kd[nsim-1].energy);
+
+file mink[] <simple_mapper; prefix="output/mink/frame_", suffix=".png">;
+file maxk[] <simple_mapper; prefix="output/maxk/frame_", suffix=".png">;
+
+foreach i in [0:trsnaps-1] {
+ mink[i] = render(trj[kd[0].sim], i);
+ maxk[i] = render(trj[kd[nsim-1].sim], i);
+}
+
+file minkmovie <"output/mink.gif">;
+file maxkmovie <"output/maxk.gif">;
+
+minkmovie = convert(mink);
+maxkmovie = convert(maxk);
Modified: SwiftTutorials/ATPESC_2014-08-14/swift-k/part07/swift.properties
===================================================================
--- SwiftTutorials/ATPESC_2014-08-14/swift-k/part07/swift.properties 2014-08-13 23:34:36 UTC (rev 8165)
+++ SwiftTutorials/ATPESC_2014-08-14/swift-k/part07/swift.properties 2014-08-13 23:39:59 UTC (rev 8166)
@@ -1,2 +1,22 @@
-site=midway-sandyb
+site=tukey
+
+site.tukey {
+ jobmanager=localhost:cobalt
+ taskWalltime=00:15:00
+ workdir=/home/$USER/swiftwork
+ filesystem=local
+ maxJobs=10
+ tasksPerWorker=8
+ taskThrottle=300
+ initialscore=10000
+}
+
+app.tukey.md=$PWD/../app/md
+app.tukey.mdstats=$PWD/../app/mdstats
+app.tukey.mdmaxk=$PWD/../app/mdmaxk
+app.tukey.renderframe=$PWD/../app/renderframe
+app.tukey.convert=/usr/bin/convert
+
+# site=midway-sandyb
+
site.midway-sandyb.slurm.exclusive=false
More information about the Swift-commit
mailing list