[Swift-commit] r6872 - in SwiftTutorials/CIC_2013-08-09: doc part08
wilde at ci.uchicago.edu
wilde at ci.uchicago.edu
Thu Aug 15 12:30:06 CDT 2013
Author: wilde
Date: 2013-08-15 12:30:06 -0500 (Thu, 15 Aug 2013)
New Revision: 6872
Added:
SwiftTutorials/CIC_2013-08-09/part08/app
Removed:
SwiftTutorials/CIC_2013-08-09/part08/simulate.sh
SwiftTutorials/CIC_2013-08-09/part08/stats.sh
Modified:
SwiftTutorials/CIC_2013-08-09/doc/README
SwiftTutorials/CIC_2013-08-09/part08/p8.swift
Log:
for cic
Modified: SwiftTutorials/CIC_2013-08-09/doc/README
===================================================================
--- SwiftTutorials/CIC_2013-08-09/doc/README 2013-08-15 16:40:46 UTC (rev 6871)
+++ SwiftTutorials/CIC_2013-08-09/doc/README 2013-08-15 17:30:06 UTC (rev 6872)
@@ -10,10 +10,10 @@
command:
-----
-$ svn co https://svn.ci.uchicago.edu/svn/vdl2/SwiftTutorials/TUTORIAL-NAME
+$ svn co https://svn.ci.uchicago.edu/svn/vdl2/SwiftTutorials/CIC_2013-08-09 tutorial
-----
-This will create a directory called TUTORIAL-NAME which contains all of the
+This will create a directory called "tutorial" which contains all of the
scripts mentioned in this document.
Run setup
@@ -22,22 +22,22 @@
the initial setup.
-----
-$ cd TUTORIAL-NAME # change to the newly created TUTORIAL-NAME directory
-$ source setup.sh <SITE> # sets swift config files in $HOME/.swift and selects
- # a site from the following: ( cloud, uc3, midway )
+$ cd tutorial # change to the newly created tutorial directory
+$ source setup.sh <SITE> # sets swift config files in $HOME/.swift
+$ java -version # verify that you have Oracle JAVA (prefered; 1.6 or later)
$ swift -version # verify that Swift 0.94 is in your $PATH and functional
-----
-NOTE: If you disconnect from the machine, you will need to re-run source setup.sh.
+NOTE: If you re-login, you will need to re-run source setup.sh.
-Mock "science applications" for the workflow tutorial
------------------------------------------------------
+Simple "science applications" for the workflow tutorial
+-------------------------------------------------------
There are two shell scripts included that serve a very simple stand-ins for science application:
simulation.sh and stats.sh
simulation.sh
~~~~~~~~~~~~~
-The simulation.sh script is a simple substitute for a scientific simulation application. It generates and prints a set of one or more random integers in the range 0-29,999 as controlled by its optional arguments, which are:
+The simulation.sh script serves as a trivial substitute for a complex scientific simulation application. It generates and prints a set of one or more random integers in the range [0-2^32) as controlled by its optional arguments, which are:
.simulation.sh arguments
[width="80%",cols="^2,10",options="header"]
@@ -51,7 +51,7 @@
|5 |count: number of values to generate in the simulation
|=======================
-With no arguments, simulate.sh prints 1 number in the range of 1-100. Otherwise it generates n numbers of the form R * scale + bias.
+With no arguments, simulate.sh prints 1 number in the range of 1-100. Otherwise it generates n numbers of the form (R*scale)+bias where R is a random integer.
-----
$ ./simulate.sh
@@ -536,21 +536,21 @@
.run-dets.sh
----
-include::part11-swift-py-r/code/run-dets.sh.txt[]
+ include::part11-swift-py-r/code/run-dets.sh.txt[]
----
As a reference, an equivalent plain Python code is provided:
.dets.py
----
-include::part11-swift-py-r/code/dets.py[]
+ include::part11-swift-py-r/code/dets.py[]
----
The Swift script is:
.dets.swift
----
-include::part11-swift-py-r/code/dets.swift[]
+ include::part11-swift-py-r/code/dets.swift[]
----
==== Analysis
Added: SwiftTutorials/CIC_2013-08-09/part08/app
===================================================================
--- SwiftTutorials/CIC_2013-08-09/part08/app (rev 0)
+++ SwiftTutorials/CIC_2013-08-09/part08/app 2013-08-15 17:30:06 UTC (rev 6872)
@@ -0,0 +1 @@
+link ../app/
\ No newline at end of file
Property changes on: SwiftTutorials/CIC_2013-08-09/part08/app
___________________________________________________________________
Added: svn:special
+ *
Modified: SwiftTutorials/CIC_2013-08-09/part08/p8.swift
===================================================================
--- SwiftTutorials/CIC_2013-08-09/part08/p8.swift 2013-08-15 16:40:46 UTC (rev 6871)
+++ SwiftTutorials/CIC_2013-08-09/part08/p8.swift 2013-08-15 17:30:06 UTC (rev 6872)
@@ -2,19 +2,19 @@
# Applications to be called by this script
-file simulation_script <"simulate.sh">;
-file analysis_script <"stats.sh">;
+file simulation_prog <"app/simulate.sh">;
+file analysis_prog <"app/stats.sh">;
# app() functions for application programs to be called:
-app (file out) simulation (file script, int timesteps, int sim_range, file bias_file, int scale, int sim_count)
+app (file out) simulation (file prog, int timesteps, int sim_range, file bias_file, int scale, int sim_count)
{
- sh @filename(script) timesteps sim_range @filename(bias_file) scale sim_count stdout=@filename(out);
+ sh @filename(prog) timesteps sim_range @filename(bias_file) scale sim_count stdout=@filename(out);
}
-app (file out) analyze (file script, file s[])
+app (file out) analyze (file prog, file s[])
{
- sh @script @filenames(s) stdout=@filename(out);
+ sh @filename(prog) @filenames(s) stdout=@filename(out);
}
# Command line params to this script:
@@ -33,9 +33,9 @@
# 1 line: scale offset ( N = n*scale + offset)
foreach i in [0:nsim-1] {
file simout <single_file_mapper; file=@strcat("output/sim_",i,".out")>;
- simout = simulation(simulation_script, steps, range, bias, 100000, count);
+ simout = simulation(simulation_prog, steps, range, bias, 100000, count);
sims[i] = simout;
}
file stats<"output/stats.out">; # Final output file: average of all "simulations"
-stats = analyze(analysis_script,sims);
+stats = analyze(analysis_prog,sims);
Deleted: SwiftTutorials/CIC_2013-08-09/part08/simulate.sh
===================================================================
--- SwiftTutorials/CIC_2013-08-09/part08/simulate.sh 2013-08-15 16:40:46 UTC (rev 6871)
+++ SwiftTutorials/CIC_2013-08-09/part08/simulate.sh 2013-08-15 17:30:06 UTC (rev 6872)
@@ -1 +0,0 @@
-link ../simulate.sh
\ No newline at end of file
Deleted: SwiftTutorials/CIC_2013-08-09/part08/stats.sh
===================================================================
--- SwiftTutorials/CIC_2013-08-09/part08/stats.sh 2013-08-15 16:40:46 UTC (rev 6871)
+++ SwiftTutorials/CIC_2013-08-09/part08/stats.sh 2013-08-15 17:30:06 UTC (rev 6872)
@@ -1 +0,0 @@
-link ../stats.sh
\ No newline at end of file
More information about the Swift-commit
mailing list