[Swift-commit] r7804 - in demo/xsede.2014.0425: app src/md

[wilde at ci.uchicago.edu]

Author: wilde
Date: 2014-04-26 13:18:37 -0500 (Sat, 26 Apr 2014)
New Revision: 7804

Modified:
   demo/xsede.2014.0425/app/mdviz
   demo/xsede.2014.0425/src/md/Makefile
   demo/xsede.2014.0425/src/md/md.c
Log:
Add viz wrapper script. Minor fixes to makefile and md.c

Modified: demo/xsede.2014.0425/app/mdviz
===================================================================
--- demo/xsede.2014.0425/app/mdviz	2014-04-25 21:11:25 UTC (rev 7803)
+++ demo/xsede.2014.0425/app/mdviz	2014-04-26 18:18:37 UTC (rev 7804)
@@ -4,26 +4,16 @@
 vzout=$2
 shift 2
 
-md $* >& md.out     # Run the MD command
+md "$@" >& md.out     # Run the MD command
 
 cat <<EOF >c-ray-cmds
-# spheres
-#	position		radius	color			shininess	reflectivity
-#s	-0.5 -0.3 -1	0.05	1.0 0.2 0.05		50.0	0.1
-#s	0.5 -0.4 0		0.05	0.1 0.85 1.0		50.0	0.1
-
-
 # walls
 s	0 -1000 2		99		0.2 0.2 0.2			0.0	0.0
 
-# bouncing ball
-#s	0 0 2			1		1.0 0.5 0.1			60.0	0.7
-
-# lights...
+# lights
 l	-50 100 -50
-#l	40 40 150
 
-# camera (there can be only one!)
+# camera
 #	position	FOV		target
 c	0 6 -17		45		0 -1 0
 EOF

Modified: demo/xsede.2014.0425/src/md/Makefile
===================================================================
--- demo/xsede.2014.0425/src/md/Makefile	2014-04-25 21:11:25 UTC (rev 7803)
+++ demo/xsede.2014.0425/src/md/Makefile	2014-04-26 18:18:37 UTC (rev 7804)
@@ -1,9 +1,10 @@
 bin = md
+src = md.c
 
 CC = gcc
 #CFLAGS = -O3 -ffast-math
 
-$(bin): $(obj)
+$(bin): $(src)
 	$(CC) -o $@ $(bin).c -lm
 
 .PHONY: clean

Modified: demo/xsede.2014.0425/src/md/md.c
===================================================================
--- demo/xsede.2014.0425/src/md/md.c	2014-04-25 21:11:25 UTC (rev 7803)
+++ demo/xsede.2014.0425/src/md/md.c	2014-04-26 18:18:37 UTC (rev 7804)
@@ -171,12 +171,14 @@
   Report.
 */
   printf ( "\n" );
+  printf ( "  MD: Argument count: %d\n", argc );
   printf ( "  ND, the spatial dimension, is %d\n", nd );
   printf ( "  NP, the number of particles in the simulation, is %d\n", np );
   printf ( "  STEP_NUM, the number of time steps, is %d\n", step_num );
   printf ( "  STEP_PRINT_NUM, the number of snapshots to print, is %d\n", step_print_num );
   printf ( "  DT, the size of each time step, is %f\n", dt );
   printf ( "  MASS, the particle mass, is %f\n", mass );
+  printf ( "  PRINTINFO, the pass-through info to c-ray, is %s\n", printinfo );
   printf ( "  SCALE_FACTOR, the particle position scaling factor, is %f\n", scale_factor );
   printf ( "  SCALE_OFFSET, the particle position scaling offset, is %f\n", scale_offset );
 /*