[cig-commits] r11848 - in cs/portal/trunk/seismo/SeismoWebPortal: . templates/SeismoWebPortal

[leif at geodynamics.org]

Author: leif
Date: 2008-04-22 13:26:48 -0700 (Tue, 22 Apr 2008)
New Revision: 11848

Modified:
   cs/portal/trunk/seismo/SeismoWebPortal/cmt.py
   cs/portal/trunk/seismo/SeismoWebPortal/templates/SeismoWebPortal/par_file.txt
   cs/portal/trunk/seismo/SeismoWebPortal/views.py
Log:
Minor changes made while getting Specfem to work.


Modified: cs/portal/trunk/seismo/SeismoWebPortal/cmt.py
===================================================================
--- cs/portal/trunk/seismo/SeismoWebPortal/cmt.py	2008-04-22 20:25:07 UTC (rev 11847)
+++ cs/portal/trunk/seismo/SeismoWebPortal/cmt.py	2008-04-22 20:26:48 UTC (rev 11848)
@@ -164,7 +164,7 @@
         return """<img class=beachball width=49 height=49 src="http://www.seismology.harvard.edu/cgi-bin/webCMTgif/form?mrr=%(mrr)s&mtt=%(mtt)s&mpp=%(mpp)s&mrt=%(mrt)s&mrp=%(mrp)s&mtp=%(mtp)s">""" % mt
 
     def __str__(self):
-        return """%(dataSource)s %(year)d %(month)2d %(day)2d %(hour)2d %(minute)2d %(_second)5.2f %(sourceLatitude)8.4f %(sourceLongitude)9.4f %(sourceDepth)5.1f %(sourceMB)3.1f %(sourceMs)3.1f %(regionName)s
+        return """%(dataSource)s %(year)04d %(month)2d %(day)2d %(hour)2d %(minute)2d %(_second)5.2f %(sourceLatitude)8.4f %(sourceLongitude)9.4f %(sourceDepth)5.1f %(sourceMB)3.1f %(sourceMs)3.1f %(regionName)s
 event name: %(eventName)11s
 time shift: %(timeShift)11.4f
 half duration: %(halfDuration)8.4f

Modified: cs/portal/trunk/seismo/SeismoWebPortal/templates/SeismoWebPortal/par_file.txt
===================================================================
--- cs/portal/trunk/seismo/SeismoWebPortal/templates/SeismoWebPortal/par_file.txt	2008-04-22 20:25:07 UTC (rev 11847)
+++ cs/portal/trunk/seismo/SeismoWebPortal/templates/SeismoWebPortal/par_file.txt	2008-04-22 20:26:48 UTC (rev 11848)
@@ -82,7 +82,7 @@
 LOCAL_PATH                      = /scratch/
 
 # interval at which we output time step info and max of norm of displacement
-NTSTEP_BETWEEN_OUTPUT_INFO      = 1000
+NTSTEP_BETWEEN_OUTPUT_INFO      = 100
 
 # interval in time steps for temporary writing of seismograms
 NTSTEP_BETWEEN_OUTPUT_SEISMOS   = 5000000

Modified: cs/portal/trunk/seismo/SeismoWebPortal/views.py
===================================================================
--- cs/portal/trunk/seismo/SeismoWebPortal/views.py	2008-04-22 20:25:07 UTC (rev 11847)
+++ cs/portal/trunk/seismo/SeismoWebPortal/views.py	2008-04-22 20:26:48 UTC (rev 11848)
@@ -772,6 +772,8 @@
     if progress >= 0.0:
         imageWidth = 154
         offset = imageWidth - int(float(imageWidth) * progress)
+        if offset < 0:
+            offset = 0
         bar = '<img src="%s/pics/progress_box.gif" style="background: white url(%s/pics/progress_bar.gif) top left no-repeat; background-position: -%dpx 0px;">' % (
             config.root, config.root, offset)
     else: