[cig-commits] r7882 - cs/portal/trunk

[leif at geodynamics.org]

Author: leif
Date: 2007-08-23 16:50:18 -0700 (Thu, 23 Aug 2007)
New Revision: 7882

Modified:
   cs/portal/trunk/daemon.py
Log:
Successful run on Lonestar -- and sucessful stage-out of output files
-- owing mainly to r1710 in the other respository.


Modified: cs/portal/trunk/daemon.py
===================================================================
--- cs/portal/trunk/daemon.py	2007-08-23 22:03:43 UTC (rev 7881)
+++ cs/portal/trunk/daemon.py	2007-08-23 23:50:18 UTC (rev 7882)
@@ -14,7 +14,7 @@
         self.value = value
 
 
-# I'm not sure what to about this yet.
+# I'm not sure what to do about this yet.
 TACC_ENVIRONMENT = """(environment=(TG_CLUSTER_SCRATCH "/work/teragrid/tg456271") (PATH "/opt/lsf/bin:/opt/lsf/etc:/opt/MPI/intel9/mvapich-gen2/0.9.8/bin:/opt/apps/binutils/binutils-2.17/bin:/opt/intel/compiler9.1//idb/bin:/opt/intel/compiler9.1//cc/bin:/opt/intel/compiler9.1//fc/bin:/usr/local/first:/usr/local/bin:~/bin:.:/opt/apps/pki_apps:/opt/apps/gsi-openssh-3.9/bin:/opt/lsf/bin:/opt/lsf/etc:/sbin:/usr/sbin:/usr/local/sbin:/bin:/usr/bin:/usr/local/bin:/usr/X11R6/bin:/home/teragrid/tg456271/bin:/data/TG/srb-client-3.4.1-r1/bin:/data/TG/softenv-1.6.2-r3/bin:/data/TG/tg-policy/bin:/data/TG/gx-map-0.5.3.2-r1/bin:/data/TG/tgusage-2.9-r2/bin:/usr/java/j2sdk1.4.2_12/bin:/usr/java/j2sdk1.4.2_12/jre/bin:/data/TG/globus-4.0.1-r3/sbin:/data/TG/globus-4.0.1-r3/bin:/data/TG/tgcp-1.0.0-r2/bin:/data/TG/condor-6.7.18-r1/bin:/data/TG/condor-6.7.18-r1/sbin:/data/TG/hdf4-4.2r1-r1/bin:/opt/apps/hdf5/hdf5-1.6.5/bin:/data/TG/phdf5-1.6.5/bin") (MPICH_HOME "/opt/MPI/intel9/mvapich-gen2/0.9.8"))"""
 
 
@@ -346,11 +346,12 @@
         return not self.status in self.deadCodes
 
     def newBuildJob(self):
+        self.buildDir = "/work/teragrid/tg456271/portal/%d" % self.id
         job = Job(
             jobType = "single",
             count = 1,
             executable = "/work/teragrid/tg456271/sf3dgp/xspecfem3D",
-            arguments = [self.parameters, "--scheduler.dry", "--output-dir=/work/teragrid/tg456271"],
+            arguments = [self.parameters, "--scheduler.dry", "--output-dir=" + self.buildDir],
             stdout = "build-stdout",
             stderr = "build-stderr",
             )
@@ -368,8 +369,8 @@
             sf + "/python/Cheetah-2.0rc8-py2.4-linux-x86_64.egg",
             ])
 
-        simDir = "." # ???
-        simDir = "/work/teragrid/tg456271/portal/%d" % self.id
+        simDir = "." # Globus scratch dir
+        #simDir = "/work/teragrid/tg456271/portal/%d" % self.id
         
         pyreArgs = [
             self.parameters,
@@ -383,7 +384,7 @@
             count = self.nodes,
             max_time = 60,
             queue = "normal",
-            executable = "/work/teragrid/tg456271/mpipyspecfem3D",
+            executable = self.buildDir + "/mpipyspecfem3D",
             arguments = ["--pyre-start",
                          pythonPath,
                          "Specfem3DGlobe==4.0",