[cig-commits] r16059 - in cs/portal/trunk/northridge: SeismoWebPortal SeismoWebPortal/templates/registration backend

[leif at geodynamics.org]

Author: leif
Date: 2009-11-30 15:43:20 -0800 (Mon, 30 Nov 2009)
New Revision: 16059

Modified:
   cs/portal/trunk/northridge/SeismoWebPortal/templates/registration/pwreset_email.txt
   cs/portal/trunk/northridge/SeismoWebPortal/views.py
   cs/portal/trunk/northridge/backend/specfem3D.py
Log:
Changed 'crust' URLs to point to main CIG server.  (There are also
redirects on Crust.)

Added a quick-and-dirty fix for "hero" problem: the "hero" queue
rejects small jobs, so now the "specfem3D.py" sends a job there only
if it exceeds 512 processors.


Modified: cs/portal/trunk/northridge/SeismoWebPortal/templates/registration/pwreset_email.txt
===================================================================
--- cs/portal/trunk/northridge/SeismoWebPortal/templates/registration/pwreset_email.txt	2009-11-30 20:14:51 UTC (rev 16058)
+++ cs/portal/trunk/northridge/SeismoWebPortal/templates/registration/pwreset_email.txt	2009-11-30 23:43:20 UTC (rev 16059)
@@ -5,7 +5,7 @@
 
 Feel free to change this password by going to this page:
 
-https://crust.geodynamics.org/portals/seismo/registration/password/
+https://geodynamics.org/portals/seismo/registration/password/
 
 You will be prompted to login using your new password, if you haven't
 already. Your username, in case you've forgotten: {{ user.username }}

Modified: cs/portal/trunk/northridge/SeismoWebPortal/views.py
===================================================================
--- cs/portal/trunk/northridge/SeismoWebPortal/views.py	2009-11-30 20:14:51 UTC (rev 16058)
+++ cs/portal/trunk/northridge/SeismoWebPortal/views.py	2009-11-30 23:43:20 UTC (rev 16059)
@@ -704,7 +704,7 @@
         message.extend([
             """NOTE: Before this new user can run simulations, you must approve them by selecting the "approved" checkbox on the following page:""",
             "",
-            "https://crust.geodynamics.org/admin/SeismoWebPortal/userinfo/%d/" % userInfo._get_pk_val(),
+            "https://geodynamics.org/portals/admin/SeismoWebPortal/userinfo/%d/" % userInfo._get_pk_val(),
             "",
             ])
     message.extend([

Modified: cs/portal/trunk/northridge/backend/specfem3D.py
===================================================================
--- cs/portal/trunk/northridge/backend/specfem3D.py	2009-11-30 20:14:51 UTC (rev 16058)
+++ cs/portal/trunk/northridge/backend/specfem3D.py	2009-11-30 23:43:20 UTC (rev 16059)
@@ -221,6 +221,9 @@
         job.executable = sys.executable
         job.arguments = [__file__] + argv + ["--context=launcher", "--nodes=%d" % self.nodes]
 
+        if self.nodes > 512:
+            job.queue = "hero"
+
         # schedule
         self.scheduler.schedule(job)