[Cbench-sf-devel] SF.net SVN: cbench: [320] trunk/cbench

[<son...@us...>]

Revision: 320
          http://cbench.svn.sourceforge.net/cbench/?rev=320&view=rev
Author:   sonicsoft70
Date:     2008-04-30 15:39:02 -0700 (Wed, 30 Apr 2008)

Log Message:
-----------
added the lj.scaled lammps job

Modified Paths:
--------------
    trunk/cbench/tools/cbench_gen_jobs.pl

Added Paths:
-----------
    trunk/cbench/templates/lammps_lj.scaled.in

Added: trunk/cbench/templates/lammps_lj.scaled.in
===================================================================
--- trunk/cbench/templates/lammps_lj.scaled.in	                        (rev 0)
+++ trunk/cbench/templates/lammps_lj.scaled.in	2008-04-30 22:39:02 UTC (rev 320)
@@ -0,0 +1,12 @@
+# lammps_lj.scaled job template
+# Uses LAMMPS benchmark code LJ
+# README says that LJ in scaled mode needs a
+# scale factor of 20
+#
+# NOTE: bash syntax is used here
+
+CMD="JOBLAUNCH_CMD_HERE CBENCHTEST_BIN_HERE/lmp_cbench SCALING_PARAMS_HERE"
+STDIN_FILE="$CBENCHTEST/lammps/bench/in.lj"
+
+cbench_run_cmd $CMD
+

Modified: trunk/cbench/tools/cbench_gen_jobs.pl
===================================================================
--- trunk/cbench/tools/cbench_gen_jobs.pl	2008-04-30 20:30:04 UTC (rev 319)
+++ trunk/cbench/tools/cbench_gen_jobs.pl	2008-04-30 22:39:02 UTC (rev 320)
@@ -669,7 +669,7 @@
     my $ppn = shift;
     my $numprocs = shift;
 
-    my @scaled_joblist = qw(rhodo.scaled chain.scaled);
+    my @scaled_joblist = qw(rhodo.scaled chain.scaled lj.scaled);
     my @normal_joblist = qw(rhodo chain lj); #this is only a temporary list; LAMMPS has many more codes use 
     debug_print(3, "DEBUG: entering lammps_gen_joblist($ppn,$numprocs)\n");
 
@@ -734,8 +734,12 @@
 
 	#set up the scaling parameters based on this jobsize
     if ( $jobname =~ /scaled/ ) {
-        $scaling_params = lammps_get_scaling_params($numprocs, $scale_factor);
-		debug_print(2,"DEBUG:lammps_gen_innerloop() scaling_params=$scaling_params");
+		my $scale_factor;
+		($job =~ /lj\.scaled|eam.scaled/) and $scale_factor = '20 20 20';
+		($job !~ /lj\.scaled/) and $scale_factor = '1 1 1';
+
+        my $scaling_params = lammps_get_scaling_params($numprocs, $scale_factor);
+		debug_print(2,"DEBUG:lammps_gen_innerloop($job) scaling_params=$scaling_params");
         $$outbuf =~ s/SCALING_PARAMS_HERE/$scaling_params/gs;
     }
 	else {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.