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

[wei at geodynamics.org]

Author: wei
Date: 2007-08-10 22:22:12 -0700 (Fri, 10 Aug 2007)
New Revision: 7809

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/TG07GT4.java
   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/SimpleRunGT2.java
Log:
Minor edits in comments.

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-11 03:05:59 UTC (rev 7808)
+++ cs/cigtg/trunk/cigtg-dev/CigPortal/cigportal/src/org/cig/portal/TG07.java	2007-08-11 05:22:12 UTC (rev 7809)
@@ -27,7 +27,7 @@
 		String testhome = System.getenv("HOME")+"/cigtg"+"/CigPortal/test2";
 		String dataset = System.getenv("HOME")+"/cigtg"+"/CigPortal/cigportal/webapp/storage/samples/sample";
 		System.out.println("-----------------------------------------------------");
-		System.out.println("SimpleGrid java application workflow for DMS analysis");
+		System.out.println("SimpleGrid java application workflow for MAG analysis");
 		System.out.println("-----------------------------------------------------");
 		System.out.println("Anytime, press Ctrol+C to stop the workflow\n");
 		// 0. load our configuration
@@ -52,7 +52,7 @@
 		System.out.println("\nStep 2: transfer dataset to "+site);
 		System.out.println("dataset: " + dataset);
 		SimpleTransfer ft = new SimpleTransfer(proxy, myconfig.get("grid.gridftp."+site), 2811);
-		ft.local2remote(dataset, myconfig.get("grid.sites.dmsdir."+site)+"/datasets/sample2");
+		ft.local2remote(dataset, myconfig.get("grid.sites.magdir."+site)+"/datasets/sample2");
 
 		// 3. submit job : GT2 method
 		System.out.println("\nStep 3: submit job to "+site);

Modified: cs/cigtg/trunk/cigtg-dev/CigPortal/cigportal/src/org/cig/portal/TG07GT4.java
===================================================================
--- cs/cigtg/trunk/cigtg-dev/CigPortal/cigportal/src/org/cig/portal/TG07GT4.java	2007-08-11 03:05:59 UTC (rev 7808)
+++ cs/cigtg/trunk/cigtg-dev/CigPortal/cigportal/src/org/cig/portal/TG07GT4.java	2007-08-11 05:22:12 UTC (rev 7809)
@@ -27,7 +27,7 @@
 		String testhome = System.getenv("HOME")+"/cigtg"+"/CigPortal/test2";
 		String dataset = System.getenv("HOME")+"/cigtg"+"/CigPortal/cigportal/webapp/storage/samples/sample";
 		System.out.println("-----------------------------------------------------");
-		System.out.println("SimpleGrid java application workflow for DMS analysis");
+		System.out.println("SimpleGrid java application workflow for MAG ");
 		System.out.println("-----------------------------------------------------");
 		System.out.println("Anytime, press Ctrol+C to stop the workflow\n");
 		// 0. load our configuration
@@ -52,7 +52,7 @@
 		System.out.println("\nStep 2: transfer dataset to "+site);
 		System.out.println("dataset: " + dataset);
 		SimpleTransfer ft = new SimpleTransfer(proxy, myconfig.get("grid.gridftp."+site), 2811);
-		ft.local2remote(dataset, myconfig.get("grid.sites.dmsdir."+site)+"/datasets/sample2");
+		ft.local2remote(dataset, myconfig.get("grid.sites.magdir."+site)+"/datasets/sample2");
 
 		// 3. submit job : GT4 method
 		System.out.println("\nStep 3: submit job to "+site);

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-11 03:05:59 UTC (rev 7808)
+++ cs/cigtg/trunk/cigtg-dev/CigPortal/cigportal/src/org/cig/portal/grid/job/SimpleRSL.java	2007-08-11 05:22:12 UTC (rev 7809)
@@ -9,14 +9,14 @@
 import java.io.File;
 
 /**
- * A simple globus RSL composer for the tutorial application
+ * A simple globus RSL composer for the MAG application
  * @author liuyan
  * @author wei modified for CIG portal
  */
 public class SimpleRSL {
 	public static String getRSL_GT2(Config myconfig, String site, int resolution, int k, String dataset, String jobid) {
 		String project = myconfig.get("grid.projectname");
-		String appdir = myconfig.get("grid.sites.dmsdir."+site);
+		String appdir = myconfig.get("grid.sites.magdir."+site);
 		
 		// GT2 rsl doesn't need to include resource manager element
 		//return "& (resourceManagerContact=\"tg-login1.sdsc.teragrid.org:2120/jobmanager-pbs\")" + "\n"
@@ -24,7 +24,7 @@
         + "        (count=1)" + "\n"
         + "        (host_count=\"1"+(site.equals("UC")?":ia64-compute":"")+"\")" + "\n"
         + (project==null?"":"        (project=\""+project+"\")" + "\n")
-        + "        (executable=\""+appdir+"/release/process.pl"+"\")" + "\n"
+        + "        (executable=\""+appdir+"/release/runMag.sh"+"\")" + "\n"
         + "        (arguments=\""+resolution+"\" \""+resolution+"\" \""+k+"\" \""
         			+appdir+"/datasets/"+dataset+"\" \""
         			+appdir+"/results/"+jobid+"."+k+".dat\""+")" + "\n"

Modified: cs/cigtg/trunk/cigtg-dev/CigPortal/cigportal/src/org/cig/portal/grid/job/SimpleRunGT2.java
===================================================================
--- cs/cigtg/trunk/cigtg-dev/CigPortal/cigportal/src/org/cig/portal/grid/job/SimpleRunGT2.java	2007-08-11 03:05:59 UTC (rev 7808)
+++ cs/cigtg/trunk/cigtg-dev/CigPortal/cigportal/src/org/cig/portal/grid/job/SimpleRunGT2.java	2007-08-11 05:22:12 UTC (rev 7809)
@@ -86,7 +86,7 @@
 	}
 	public String getStatus(String jobId) {
 		GramJob rJob = this.probeJob(jobId);
-		// Note: if status is "Error fetching status", it means job is dequed,
+		// Note: if status is "Error fetching status", it means job is dequeued,
 		//       either finished or failed
 		return (rJob==null)?"Error fetching status":GramJob.getStatusAsString(rJob.getStatus());
 	}