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

[leif at geodynamics.org]

Author: leif
Date: 2007-09-28 17:00:34 -0700 (Fri, 28 Sep 2007)
New Revision: 8060

Modified:
   cs/portal/trunk/daemon.py
Log:
Run SPECFEM as the CIG portal user from the TG community area.


Modified: cs/portal/trunk/daemon.py
===================================================================
--- cs/portal/trunk/daemon.py	2007-09-28 23:36:15 UTC (rev 8059)
+++ cs/portal/trunk/daemon.py	2007-09-29 00:00:34 UTC (rev 8060)
@@ -13,9 +13,12 @@
     def __init__(self, value):
         self.value = value
 
+TG_CLUSTER_SCRATCH = "/work/teragrid/tg459131"
+TG_COMMUNITY = "/projects/tg"
+SPECFEM_3D_GLOBE = TG_COMMUNITY + "/CIG/sf3dgp"
 
 # 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"))"""
+TACC_ENVIRONMENT = """(environment=(TG_CLUSTER_SCRATCH "%s") (TG_COMMUNITY "%s") (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/tg459131/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"))""" % (TG_CLUSTER_SCRATCH, TG_COMMUNITY)
 
 
 
@@ -183,7 +186,7 @@
     def resSpec(self, job, gassServer):
         resSpec = {}
         resSpec.update(job.resSpec)
-        resSpec["scratch_dir"] = "/work/teragrid/tg456271"
+        resSpec["scratch_dir"] = TG_CLUSTER_SCRATCH
         resSpec["directory"] = RSLUnquoted("$(SCRATCH_DIRECTORY)")
         
         file_stage_in = []
@@ -364,12 +367,12 @@
         return not self.status in self.deadCodes
 
     def newBuildJob(self):
-        self.buildDir = "/work/teragrid/tg456271/portal/%d" % self.id
+        self.buildDir = "%s/runs/%05d" % (TG_CLUSTER_SCRATCH, self.id)
         job = Job(
             "build",
             jobType = "single",
             count = 1,
-            executable = "/work/teragrid/tg456271/sf3dgp/xspecfem3D",
+            executable = SPECFEM_3D_GLOBE + "/xspecfem3D",
             arguments = [self.simulation.parameters, "--scheduler.dry", "--output-dir=" + self.buildDir],
             )
         job.inputFileURLs = self.inputFileURLs
@@ -378,16 +381,14 @@
     def newRunJob(self):
         from os.path import join
         
-        sf = "/work/teragrid/tg456271/sf3dgp"
         pythonPath = ':'.join([
-            sf + "/merlin-1.3.egg",
-            sf,
-            sf + "/python/pythia-0.8.1.4-py2.4.egg",
-            sf + "/python/Cheetah-2.0rc8-py2.4-linux-x86_64.egg",
+            SPECFEM_3D_GLOBE + "/merlin-1.3.egg",
+            SPECFEM_3D_GLOBE,
+            SPECFEM_3D_GLOBE + "/python/pythia-0.8.1.4-py2.4.egg",
+            SPECFEM_3D_GLOBE + "/python/Cheetah-2.0rc8-py2.4-linux-x86_64.egg",
             ])
 
         simDir = "." # Globus scratch dir
-        #simDir = "/work/teragrid/tg456271/portal/%d" % self.id
         
         pyreArgs = [
             self.simulation.parameters,