[cig-commits] commit: Add crust3D parameter

[Mercurial]

changeset:   21:a966a9ffbd24
user:        Walter Landry <wlandry at caltech.edu>
date:        Tue Jun 28 15:52:24 2011 -0700
files:       SeismoWebPortal/models.py SeismoWebPortal/templates/SeismoWebPortal/par_file.txt SeismoWebPortal/templates/SeismoWebPortal/parameters.pml SeismoWebPortal/templates/SeismoWebPortal/specfem3dglobemodel_detail.html SeismoWebPortal/templates/SeismoWebPortal/specfem3dglobeparameters_detail.html SeismoWebPortal/templates/SeismoWebPortal/specfem3dglobeparameters_form.html SeismoWebPortal/templates/SeismoWebPortal/specfem3dglobeparameters_list.html
description:
Add crust3D parameter


diff -r 4c0d4e185f29 -r a966a9ffbd24 SeismoWebPortal/models.py
--- a/SeismoWebPortal/models.py	Tue Jun 28 15:51:58 2011 -0700
+++ b/SeismoWebPortal/models.py	Tue Jun 28 15:52:24 2011 -0700
@@ -506,6 +506,7 @@ class Specfem3DGlobeParameters(Model, Ed
     topography = models.BooleanField(core=True, default=True)
     rotation = models.BooleanField(core=True, default=True)
     ellipticity = models.BooleanField(core=True, default=True)
+    crust3D=models.BooleanField(core=True, default=True)
 
     def __str__(self): return self.name
 
diff -r 4c0d4e185f29 -r a966a9ffbd24 SeismoWebPortal/templates/SeismoWebPortal/par_file.txt
--- a/SeismoWebPortal/templates/SeismoWebPortal/par_file.txt	Tue Jun 28 15:51:58 2011 -0700
+++ b/SeismoWebPortal/templates/SeismoWebPortal/par_file.txt	Tue Jun 28 15:52: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 }}
+MODEL                           = {{ parameters.model }}{% if !parameter.crust3D%}_1Dcrust{% endif %}
 
 # parameters describing the Earth model
 OCEANS                          = .{{ parameters.oceans }}.
diff -r 4c0d4e185f29 -r a966a9ffbd24 SeismoWebPortal/templates/SeismoWebPortal/parameters.pml
--- a/SeismoWebPortal/templates/SeismoWebPortal/parameters.pml	Tue Jun 28 15:51:58 2011 -0700
+++ b/SeismoWebPortal/templates/SeismoWebPortal/parameters.pml	Tue Jun 28 15:52:24 2011 -0700
@@ -33,6 +33,7 @@
             <property name="gravity">{{ parameters.gravity }}</property>
             <property name="rotation">{{ parameters.rotation }}</property>
             <property name="attenuation">{{ parameters.attenuation }}</property>
+            <property name="crust3D">{{ parameters.crust3D }}</property>
         </component>
 
     </component>
diff -r 4c0d4e185f29 -r a966a9ffbd24 SeismoWebPortal/templates/SeismoWebPortal/specfem3dglobemodel_detail.html
--- a/SeismoWebPortal/templates/SeismoWebPortal/specfem3dglobemodel_detail.html	Tue Jun 28 15:51:58 2011 -0700
+++ b/SeismoWebPortal/templates/SeismoWebPortal/specfem3dglobemodel_detail.html	Tue Jun 28 15:52:24 2011 -0700
@@ -3,6 +3,3 @@
 
 {{ object.description }}
 
-<pre>
-{{ object.list }}
-</pre>
diff -r 4c0d4e185f29 -r a966a9ffbd24 SeismoWebPortal/templates/SeismoWebPortal/specfem3dglobeparameters_detail.html
--- a/SeismoWebPortal/templates/SeismoWebPortal/specfem3dglobeparameters_detail.html	Tue Jun 28 15:51:58 2011 -0700
+++ b/SeismoWebPortal/templates/SeismoWebPortal/specfem3dglobeparameters_detail.html	Tue Jun 28 15:52:24 2011 -0700
@@ -10,6 +10,7 @@
     <dt>topography</dt><dd>{{ object.topography }}</dd>
     <dt>rotation</dt><dd>{{ object.rotation }}</dd>
     <dt>ellipticity</dt><dd>{{ object.ellipticity }}</dd>
+    <dt>3D crust</dt><dd>{{ object.crust3D }}</dd>
 </dl>
 
 <div class=shortcut>
diff -r 4c0d4e185f29 -r a966a9ffbd24 SeismoWebPortal/templates/SeismoWebPortal/specfem3dglobeparameters_form.html
--- a/SeismoWebPortal/templates/SeismoWebPortal/specfem3dglobeparameters_form.html	Tue Jun 28 15:51:58 2011 -0700
+++ b/SeismoWebPortal/templates/SeismoWebPortal/specfem3dglobeparameters_form.html	Tue Jun 28 15:52:24 2011 -0700
@@ -107,6 +107,12 @@ numerically.</dd></dl></dd></dl>
         <dl class="help inline collapsible collapsedOnLoad"><dt class="collapsibleHeader"><img src="{{root}}/images/help-small.gif"></dt><dd class="collapsibleContent"><dl><dt>ellipticity</dt><dd>If selected, the mesh will make the Earth model elliptical in shape according to Clairaut's equation [Dahlen and Tromp, 1998]. This feature adds no cost to the simulation.</dd></dl></dd></dl>
     </div>
 
+    <div class=checkbox>
+        {{ form.crust3D }}
+        <label for="id_crust3D" class=after>3D crust</label>
+        {% if form.crust3D.errors %}<span class=error>{{ form.crust3D.errors|join:", " }}</span>{% endif %}
+        <dl class="help inline collapsible collapsedOnLoad"><dt class="collapsibleHeader"><img src="{{root}}/images/help-small.gif"></dt><dd class="collapsibleContent"><dl><dt>crust3D</dt><dd>If selected, the simulations are performed together with the 3D crustal model Crust2.0.</dd></dl></dd></dl>
+    </div>
 
     <div><input class=submit type="submit" name="save" value="Save" />
     </div>
diff -r 4c0d4e185f29 -r a966a9ffbd24 SeismoWebPortal/templates/SeismoWebPortal/specfem3dglobeparameters_list.html
--- a/SeismoWebPortal/templates/SeismoWebPortal/specfem3dglobeparameters_list.html	Tue Jun 28 15:51:58 2011 -0700
+++ b/SeismoWebPortal/templates/SeismoWebPortal/specfem3dglobeparameters_list.html	Tue Jun 28 15:52:24 2011 -0700
@@ -14,6 +14,7 @@
             <th>topography</th>
             <th>rotation</th>
             <th>ellipticity</th>
+            <th>3D crust</th>
         </tr>
         </thead>
         
@@ -30,6 +31,7 @@
             <td><img src="{{root}}/images/icon-{% if object.topography %}yes{% else %}no{% endif %}.gif" alt="{{ object.topography }}"></td>
             <td><img src="{{root}}/images/icon-{% if object.rotation %}yes{% else %}no{% endif %}.gif" alt="{{ object.rotation }}"></td>
             <td><img src="{{root}}/images/icon-{% if object.ellipticity %}yes{% else %}no{% endif %}.gif" alt="{{ object.ellipticity }}"></td>
+            <td><img src="{{root}}/images/icon-{% if object.crust3D %}yes{% else %}no{% endif %}.gif" alt="{{ object.crust3D }}"></td>
         </tr>
         {% endfor %}
         </tbody>