[cig-commits] r7858 - in cs/cigtg/trunk/cigtg-dev/CigPortal/cigportal/src/org/cig/portal: . grid/job

[wei at geodynamics.org]

Author: wei
Date: 2007-08-21 14:56:07 -0700 (Tue, 21 Aug 2007)
New Revision: 7858

Modified:
   cs/cigtg/trunk/cigtg-dev/CigPortal/cigportal/src/org/cig/portal/TG07.java
   cs/cigtg/trunk/cigtg-dev/CigPortal/cigportal/src/org/cig/portal/grid/job/SimpleRSL.java
Log:
Modified test scripts.

Modified: cs/cigtg/trunk/cigtg-dev/CigPortal/cigportal/src/org/cig/portal/TG07.java
===================================================================
--- cs/cigtg/trunk/cigtg-dev/CigPortal/cigportal/src/org/cig/portal/TG07.java	2007-08-21 20:28:12 UTC (rev 7857)
+++ cs/cigtg/trunk/cigtg-dev/CigPortal/cigportal/src/org/cig/portal/TG07.java	2007-08-21 21:56:07 UTC (rev 7858)
@@ -70,10 +70,10 @@
 	    } while (!(status.equalsIgnoreCase("Error fetching status") || status.equalsIgnoreCase("DONE")));
 
 	    // 4. transfer results back
-	    System.out.println("\nStep 4: transfer result from "+site);
-	    String remotefile = myconfig.get("grid.sites.magdir."+site)+"/results/*.sample";
-		System.out.println("result file: " + remotefile);
-	    ft.remote2local(remotefile, testhome+"/.");
+	    //System.out.println("\nStep 4: transfer result from "+site);
+	    //String remotefile = myconfig.get("grid.sites.magdir."+site)+"/results/*.sample";
+		//System.out.println("result file: " + remotefile);
+	    //ft.remote2local(remotefile, testhome+"/.");
 
 		// 5. visualize results 
 		//String s1 = cigportalhome+"/cigportal/webapp/storage/";

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-08-21 20:28:12 UTC (rev 7857)
+++ cs/cigtg/trunk/cigtg-dev/CigPortal/cigportal/src/org/cig/portal/grid/job/SimpleRSL.java	2007-08-21 21:56:07 UTC (rev 7858)
@@ -33,8 +33,9 @@
         //			+appdir+"/datasets/"+dataset+"\" \""
         //			+appdir+"/results/"+jobid+"."+k+".dat\""+")" + "\n"
         //+ "        (directory=\""+appdir+"/release"+"\")" + "\n"
-        + "        (stdout=\""+appdir+"/results/stdout."+jobid+"."+k+"\")" + "\n"
-        + "        (stderr=\""+appdir+"/results/stderr."+jobid+"."+k+"\")" + "\n"
+        + "        (stdout=\""+appdir+"/results/stdout."+jobid+"\")" + "\n"
+        + "        (stderr=\""+appdir+"/results/stderr."+jobid+"\")" + "\n"
+        + "        (maxWallTime=\""+"100"+"\")" + "\n"
         + "" + "\n";
 	}
 	public static String getRSL_GT4(Config myconfig, String site, int shtruncationdegree, int k, String dataset, String output) {
@@ -69,8 +70,9 @@
         //+ "    <argument>"+k+"</argument>" + "\n"
         //+ "    <argument>"+appdir+"/datasets/"+dataset+"</argument>" + "\n"
         //+ "    <argument>"+appdir+"/results/"+jobid+"."+k+".dat</argument>" + "\n"
-        + "    <stdout>"+appdir+"/results/stdout."+jobid+"."+k+"</stdout>" + "\n"
-        + "    <stderr>"+appdir+"/results/stderr."+jobid+"."+k+"</stderr>" + "\n"
+        + "    <stdout>"+appdir+"/results/stdout."+jobid+"</stdout>" + "\n"
+        + "    <stderr>"+appdir+"/results/stderr."+jobid+"</stderr>" + "\n"
+        + "    <maxWallTime>"+"100"+"</maxWallTime>" + "\n"
         + "</job>" + "\n";
 	}
 	public static void main(String[] args) throws Exception {