[cig-commits] r15809 - in cs/portal/trunk/northridge: . SeismoWebPortal SeismoWebPortal/templates/SeismoWebPortal

[leif at geodynamics.org]

Author: leif
Date: 2009-10-14 15:28:11 -0700 (Wed, 14 Oct 2009)
New Revision: 15809

Modified:
   cs/portal/trunk/northridge/SeismoWebPortal/mezzanine.py
   cs/portal/trunk/northridge/SeismoWebPortal/models.py
   cs/portal/trunk/northridge/SeismoWebPortal/templates/SeismoWebPortal/pluggable.html
   cs/portal/trunk/northridge/SeismoWebPortal/templates/SeismoWebPortal/splash.html
   cs/portal/trunk/northridge/setup.py
Log:
Allow users to create their own global meshes with up to 1014
processors.


Modified: cs/portal/trunk/northridge/SeismoWebPortal/mezzanine.py
===================================================================
--- cs/portal/trunk/northridge/SeismoWebPortal/mezzanine.py	2009-10-14 18:26:26 UTC (rev 15808)
+++ cs/portal/trunk/northridge/SeismoWebPortal/mezzanine.py	2009-10-14 22:28:11 UTC (rev 15809)
@@ -809,7 +809,7 @@
             nchunks = int(nchunks)
         except ValueError:
             raise Http404
-        if nchunks == 6:
+        if False and nchunks == 6:
             # Allowed global meshes are built-in; the user should have
             # no reason to create them.
             raise PermissionDenied
@@ -821,7 +821,7 @@
             )
 
     def duplicate(self, request):
-        if self.obj.nchunks == 6:
+        if False and self.obj.nchunks == 6:
             # see the comment in create()
             raise PermissionDenied
         return super(Specfem3DGlobeMesh, self).duplicate(request)

Modified: cs/portal/trunk/northridge/SeismoWebPortal/models.py
===================================================================
--- cs/portal/trunk/northridge/SeismoWebPortal/models.py	2009-10-14 18:26:26 UTC (rev 15808)
+++ cs/portal/trunk/northridge/SeismoWebPortal/models.py	2009-10-14 22:28:11 UTC (rev 15809)
@@ -388,7 +388,7 @@
     (6, 'global (6 chunks)'),
 )
 
-oneThruNine = tuple([(i, str(i)) for i in xrange(1, 10)])
+oneThruNine = tuple([(i, str(i)) for i in xrange(1, 14)])
 NPROC_CHOICES = oneThruNine
 NEX_C_CHOICES = oneThruNine
 

Modified: cs/portal/trunk/northridge/SeismoWebPortal/templates/SeismoWebPortal/pluggable.html
===================================================================
--- cs/portal/trunk/northridge/SeismoWebPortal/templates/SeismoWebPortal/pluggable.html	2009-10-14 18:26:26 UTC (rev 15808)
+++ cs/portal/trunk/northridge/SeismoWebPortal/templates/SeismoWebPortal/pluggable.html	2009-10-14 22:28:11 UTC (rev 15809)
@@ -100,7 +100,7 @@
                                     <li><a href="{{root}}/?class={{klass}}&action=new&nchunks=1">1-chunk regional mesh</a></li>
                                     <li><a href="{{root}}/?class={{klass}}&action=new&nchunks=2">2-chunk regional mesh</a></li>
                                     <li><a href="{{root}}/?class={{klass}}&action=new&nchunks=3">3-chunk regional mesh</a></li>
-                                    <!--<li><a href="{{root}}/?class={{klass}}&action=new&nchunks=6">global mesh</a></li>-->
+                                    <li><a href="{{root}}/?class={{klass}}&action=new&nchunks=6">global mesh</a></li>
                                 </ul>
                             </dd>
                         </dl>

Modified: cs/portal/trunk/northridge/SeismoWebPortal/templates/SeismoWebPortal/splash.html
===================================================================
--- cs/portal/trunk/northridge/SeismoWebPortal/templates/SeismoWebPortal/splash.html	2009-10-14 18:26:26 UTC (rev 15808)
+++ cs/portal/trunk/northridge/SeismoWebPortal/templates/SeismoWebPortal/splash.html	2009-10-14 22:28:11 UTC (rev 15809)
@@ -7,7 +7,7 @@
 
     <h1><img src="{{root}}/images/cig.gif"> <img src="{{root}}/images/seismogram.gif"><br>CIG Seismology Web Portal</h1>
 
-    <p>Version 3.3.1</p>
+    <p>Version 3.3.2</p>
 
     <hr>
 

Modified: cs/portal/trunk/northridge/setup.py
===================================================================
--- cs/portal/trunk/northridge/setup.py	2009-10-14 18:26:26 UTC (rev 15808)
+++ cs/portal/trunk/northridge/setup.py	2009-10-14 22:28:11 UTC (rev 15809)
@@ -3,7 +3,7 @@
 
 setup(
     name = 'SeismoWebPortal', 
-    version = '3.3.1',
+    version = '3.3.2',
     url = 'http://www.geodynamics.org/',
     author = 'Leif Strand',
     author_email = 'leif at geodynamics.org',