[cig-commits] r7942 - cs/cigtg/trunk/cigtg-dev/CigPortal/cigportal/src/org/cig/portal/grid/job

[wei at geodynamics.org]

Author: wei
Date: 2007-09-11 11:03:49 -0700 (Tue, 11 Sep 2007)
New Revision: 7942

Modified:
   cs/cigtg/trunk/cigtg-dev/CigPortal/cigportal/src/org/cig/portal/grid/job/SimpleRSL.java
Log:
Add arguments to run script when generate RSL.

Modified: cs/cigtg/trunk/cigtg-dev/CigPortal/cigportal/src/org/cig/portal/grid/job/SimpleRSL.java
===================================================================
--- cs/cigtg/trunk/cigtg-dev/CigPortal/cigportal/src/org/cig/portal/grid/job/SimpleRSL.java	2007-09-11 18:00:02 UTC (rev 7941)
+++ cs/cigtg/trunk/cigtg-dev/CigPortal/cigportal/src/org/cig/portal/grid/job/SimpleRSL.java	2007-09-11 18:03:49 UTC (rev 7942)
@@ -29,10 +29,10 @@
         + "        (host_count=\"1"+(site.equals("UC")?":ia64-compute":"")+"\")" + "\n"
         + (project==null?"":"        (project=\""+project+"\")" + "\n")
         + "        (executable=\""+appdir+"/release/runMag32s4.sh"+"\")" + "\n"
-        //+ "        (arguments=\""+shtruncationdegree+"\" \""+shtruncationdegree+"\" \""+k+"\" \""
-        //			+appdir+"/datasets/"+dataset+"\" \""
-        //			+appdir+"/results/"+jobid+"."+k+".dat\""+")" + "\n"
-        //+ "        (directory=\""+appdir+"/release"+"\")" + "\n"
+        + "        (arguments=\""+shtruncationdegree+"\" \""+shtruncationdegree+"\" \""+k+"\" \""
+        			+appdir+"/datasets/"+dataset+"\" \""
+        			+appdir+"/results/"+jobid+"."+k+".dat\""+")" + "\n"
+        + "        (directory=\""+appdir+"/release"+"\")" + "\n"
         + "        (stdout=\""+appdir+"/results/stdout."+jobid+"\")" + "\n"
         + "        (stderr=\""+appdir+"/results/stderr."+jobid+"\")" + "\n"
         + "        (maxWallTime=\""+"100"+"\")" + "\n"
@@ -63,13 +63,13 @@
         + "    <hostCount>1</hostCount>" + "\n"
 */
         + (project==null?"":"    <project>"+project+"</project>" + "\n")
-        + "    <executable>"+appdir+"/release/runMag32s4.sh"+"</executable>" + "\n"
+        + "    <executable>"+appdir+"/release/runMag.sh"+"</executable>" + "\n"
         + "    <directory>"+appdir+"/release"+"</directory>" + "\n"
-        //+ "    <argument>"+shtruncationdegree+"</argument>" + "\n"
-        //+ "    <argument>"+shtruncationdegree+"</argument>" + "\n"
-        //+ "    <argument>"+k+"</argument>" + "\n"
-        //+ "    <argument>"+appdir+"/datasets/"+dataset+"</argument>" + "\n"
-        //+ "    <argument>"+appdir+"/results/"+jobid+"."+k+".dat</argument>" + "\n"
+        + "    <argument>"+shtruncationdegree+"</argument>" + "\n"
+        + "    <argument>"+k+"</argument>" + "\n"
+        + "    <argument>"+ jobid+"</argument>" + "\n"
+        + "    <argument>"+appdir+"/release/"+"runMag"+shtruncationdegree+"s"+k+".sh"+"</argument>" + "\n"
+        + "    <argument>"+appdir+"/results/"+jobid+"."+k+".dat</argument>" + "\n"
         + "    <stdout>"+appdir+"/results/stdout."+jobid+"</stdout>" + "\n"
         + "    <stderr>"+appdir+"/results/stderr."+jobid+"</stderr>" + "\n"
         + "    <maxWallTime>"+"100"+"</maxWallTime>" + "\n"