[cig-commits] commit: Add model_name and change model to backend

[Mercurial]

changeset:   27:4d9a7b15173f
user:        Walter Landry <wlandry at caltech.edu>
date:        Wed Jun 29 23:22:24 2011 -0700
files:       SeismoWebPortal/models.py SeismoWebPortal/templates/SeismoWebPortal/par_file.txt SeismoWebPortal/templates/SeismoWebPortal/specfem3dglobeparameters_detail.html SeismoWebPortal/templates/SeismoWebPortal/specfem3dglobeparameters_form.html SeismoWebPortal/templates/SeismoWebPortal/specfem3dglobeparameters_list.html
description:
Add model_name and change model to backend


diff -r 806a5910ec20 -r 4d9a7b15173f SeismoWebPortal/models.py
--- a/SeismoWebPortal/models.py	Wed Jun 29 23:20:53 2011 -0700
+++ b/SeismoWebPortal/models.py	Wed Jun 29 23:22:24 2011 -0700
@@ -498,6 +498,22 @@ class Specfem3DGlobeParameters(Model, Ed
 
     name = models.CharField(maxlength=100)
     
+    MODEL_CHOICES = (
+        ('transversely_isotropic_prem_plus_3D_crust_2.0', 'transversely_isotropic_prem_plus_3D_crust_2.0'),
+        ('s20rts', 's20rts'),
+        ('s40rts', 's40rts'),
+        ('s362ani', 's362ani'),
+        ('s362wmani', 's362wmani'),
+        ('s362ani_prem', 's362ani_prem'),
+        ('s29ea', 's29ea'),
+        ('3D_anisotropic', '3D_anisotropic'),
+        ('3D_attenuation', '3D_attenuation'),
+        ('PPM', 'PPM'),
+    )
+
+
+    model_name = models.CharField(maxlength=100, choices=MODEL_CHOICES)
+
     mesh = models.ForeignKey(Specfem3DGlobeMesh)
     model = models.ForeignKey(Specfem3DGlobeModel)
     oceans = models.BooleanField(core=True, default=True)
diff -r 806a5910ec20 -r 4d9a7b15173f SeismoWebPortal/templates/SeismoWebPortal/par_file.txt
--- a/SeismoWebPortal/templates/SeismoWebPortal/par_file.txt	Wed Jun 29 23:20:53 2011 -0700
+++ b/SeismoWebPortal/templates/SeismoWebPortal/par_file.txt	Wed Jun 29 23:22:24 2011 -0700
@@ -23,7 +23,7 @@ NPROC_XI                        = {{ par
 NPROC_XI                        = {{ parameters.mesh.nproc_xi }}
 NPROC_ETA                       = {{ parameters.mesh.nproc_eta }}
 
-MODEL                           = {{ parameters.model }}{% if parameter.crust3D %} {% else %}_1Dcrust{% endif %}
+MODEL                           = {{ parameters.model_name }}{% if parameter.crust3D %} {% else %}_1Dcrust{% endif %}
 
 # parameters describing the Earth model
 OCEANS                          = .{{ parameters.oceans }}.
diff -r 806a5910ec20 -r 4d9a7b15173f SeismoWebPortal/templates/SeismoWebPortal/specfem3dglobeparameters_detail.html
--- a/SeismoWebPortal/templates/SeismoWebPortal/specfem3dglobeparameters_detail.html	Wed Jun 29 23:20:53 2011 -0700
+++ b/SeismoWebPortal/templates/SeismoWebPortal/specfem3dglobeparameters_detail.html	Wed Jun 29 23:22:24 2011 -0700
@@ -3,7 +3,8 @@
 
 <dl class=parameters>
     <dt>mesh</dt><dd><a href="{{root}}/?class=Specfem3DGlobeMesh&object={{object.mesh.id}}">{{ object.mesh }}</a></dd>
-    <dt>model</dt><dd><a href="{{root}}/?class=Specfem3DGlobeModel&object={{object.model.id}}">{{ object.model }}</a></dd>
+    <dt>model</dt><dd>{{ object.model_name }}</dd>
+    <dt>backend</dt><dd><a href="{{root}}/?class=Specfem3DGlobeModel&object={{object.model.id}}">{{ object.model }}</a></dd>
     <dt>oceans</dt><dd>{{ object.oceans }}</dd>
     <dt>gravity</dt><dd>{{ object.gravity }}</dd>
     <dt>attenuation</dt><dd>{{ object.attenuation }}</dd>
diff -r 806a5910ec20 -r 4d9a7b15173f SeismoWebPortal/templates/SeismoWebPortal/specfem3dglobeparameters_form.html
--- a/SeismoWebPortal/templates/SeismoWebPortal/specfem3dglobeparameters_form.html	Wed Jun 29 23:20:53 2011 -0700
+++ b/SeismoWebPortal/templates/SeismoWebPortal/specfem3dglobeparameters_form.html	Wed Jun 29 23:22:24 2011 -0700
@@ -46,7 +46,12 @@
     </div>
 
     <div>
-        <label for="id_model" class=before>model</label>
+        <label for="id_model_name" class=before>model name</label>
+        {{ form.model_name }}
+    </div>
+
+    <div>
+        <label for="id_model" class=before>backend</label>
         {{ form.model }} | <a href="{{root}}?class=Specfem3DGlobeModel&action=upload">Upload</a>
         {% if form.model.errors %}<span class=error>{{ form.model.errors|join:", " }}</span>{% endif %}
 
diff -r 806a5910ec20 -r 4d9a7b15173f SeismoWebPortal/templates/SeismoWebPortal/specfem3dglobeparameters_list.html
--- a/SeismoWebPortal/templates/SeismoWebPortal/specfem3dglobeparameters_list.html	Wed Jun 29 23:20:53 2011 -0700
+++ b/SeismoWebPortal/templates/SeismoWebPortal/specfem3dglobeparameters_list.html	Wed Jun 29 23:22:24 2011 -0700
@@ -7,7 +7,8 @@
         <tr>
             <th>name</th>
             <th>mesh</th>
-            <th>model</th>
+            <th>model_name</th>
+            <th>backend</th>
             <th>oceans</th>
             <th>gravity</th>
             <th>attenuation</th>