[cig-commits] commit: Use new custom Earth model format
Mercurial
hg at geodynamics.org
Sun Jul 3 20:05:11 PDT 2011
changeset: 31:13e1990eab66
user: Walter Landry <wlandry at caltech.edu>
date: Sun Jul 03 11:15:22 2011 -0700
files: MANIFEST.in SeismoWebPortal/fformats.py SeismoWebPortal/static/samples/chino-1.1.0.tgz SeismoWebPortal/templates/SeismoWebPortal/pluggable.html SeismoWebPortal/templates/SeismoWebPortal/run_detail.html SeismoWebPortal/templates/SeismoWebPortal/specfem3dglobemodel_link.html SeismoWebPortal/templates/SeismoWebPortal/specfem3dglobemodel_list.html SeismoWebPortal/templates/SeismoWebPortal/specfem3dglobemodel_upload.html SeismoWebPortal/templates/SeismoWebPortal/specfem3dglobeparameters_form.html setup.py
description:
Use new custom Earth model format
diff -r b4907683cb1b -r 13e1990eab66 MANIFEST.in
--- a/MANIFEST.in Sat Jul 02 20:25:50 2011 -0700
+++ b/MANIFEST.in Sun Jul 03 11:15:22 2011 -0700
@@ -10,6 +10,7 @@ include SeismoWebPortal/static/images/*.
include SeismoWebPortal/static/images/*.jpg
include SeismoWebPortal/static/samples/STATIONS.txt
include SeismoWebPortal/static/samples/UTILS.tar.gz
+include SeismoWebPortal/static/samples/chino-1.1.0.tgz
include SeismoWebPortal/static/doc/*.pdf
include SeismoWebPortal/static/script.js
include SeismoWebPortal/templates/SeismoWebPortal/*.html
diff -r b4907683cb1b -r 13e1990eab66 SeismoWebPortal/fformats.py
--- a/SeismoWebPortal/fformats.py Sat Jul 02 20:25:50 2011 -0700
+++ b/SeismoWebPortal/fformats.py Sun Jul 03 11:15:22 2011 -0700
@@ -142,9 +142,9 @@ class Specfem3DGlobeModelFormat:
for tarinfo in tgz:
if tarinfo.isreg():
name = tarinfo.name
- if name.endswith("/description.html"):
+ if name=="/description.html":
descHtml = tgz.extractfile(tarinfo).read()
- elif name.endswith("/description.txt"):
+ elif name=="description.txt":
descText = tgz.extractfile(tarinfo).read()
if not descHtml and descText:
diff -r b4907683cb1b -r 13e1990eab66 SeismoWebPortal/static/samples/chino-1.1.0.tgz
Binary file SeismoWebPortal/static/samples/chino-1.1.0.tgz has changed
diff -r b4907683cb1b -r 13e1990eab66 SeismoWebPortal/templates/SeismoWebPortal/pluggable.html
--- a/SeismoWebPortal/templates/SeismoWebPortal/pluggable.html Sat Jul 02 20:25:50 2011 -0700
+++ b/SeismoWebPortal/templates/SeismoWebPortal/pluggable.html Sun Jul 03 11:15:22 2011 -0700
@@ -57,7 +57,7 @@
</td>
<td class="Specfem3DGlobe{% ifequal klass 'Specfem3DGlobeModel' %} selected{% endifequal %}" align=center>
<a href="{{root}}/?class=Specfem3DGlobeModel"><img src="{{root}}/images/s20rts.gif" width=32 height=32><br>
- 3D Models</a>
+ Custom Earth Models</a>
</td>
</tr>
</tbody>
diff -r b4907683cb1b -r 13e1990eab66 SeismoWebPortal/templates/SeismoWebPortal/run_detail.html
--- a/SeismoWebPortal/templates/SeismoWebPortal/run_detail.html Sat Jul 02 20:25:50 2011 -0700
+++ b/SeismoWebPortal/templates/SeismoWebPortal/run_detail.html Sun Jul 03 11:15:22 2011 -0700
@@ -43,8 +43,7 @@
{% if not object.cluster %}
<p class="error">All supercomputing clusters are currently
- unavailable. The site administrators have been notified of
- this problem. This run will start as soon as a cluster becomes
+ unavailable. This run will start as soon as a cluster becomes
available.</p>
{% endif %}
@@ -112,8 +111,12 @@
{% else %}
<dt>cost</dt>
<dd>
- <p>SUs: {% if object.cost %}{{ object.cost }}{% else %}unknown{% endif %}</p>
- <p>Estimated run time: {% if object.estimatedRunTime %}{{ object.estimatedRunTime }}{% else %}unknown{% endif %}</p>
+ {% ifequal object.status 'done' %}
+ <p>SUs: {% if object.cost %}{{ object.cost }}{% else %}unknown{% endif %}</p>
+ {% else %}
+ <p>Estimated SUs: {% if object.cost %}{{ object.cost }}{% else %}unknown{% endif %}</p>
+ <p>Estimated run time: {% if object.estimatedRunTime %}{{ object.estimatedRunTime }}{% else %}unknown{% endif %}</p>
+ {% endifequal %}
</dd>
{% endif %}
diff -r b4907683cb1b -r 13e1990eab66 SeismoWebPortal/templates/SeismoWebPortal/specfem3dglobemodel_link.html
--- a/SeismoWebPortal/templates/SeismoWebPortal/specfem3dglobemodel_link.html Sat Jul 02 20:25:50 2011 -0700
+++ b/SeismoWebPortal/templates/SeismoWebPortal/specfem3dglobemodel_link.html Sun Jul 03 11:15:22 2011 -0700
@@ -1,5 +1,5 @@
-<h2><img src="{{root}}/images/s20rts.gif" width=32 height=32> Link to Specfem 3D Globe Model</h2>
+<h2><img src="{{root}}/images/s20rts.gif" width=32 height=32> Link to Custom Earth Model</h2>
{% if form.has_errors %}
<p><span class=error>Please correct the following error{{ form.error_dict|pluralize }}.</span>
diff -r b4907683cb1b -r 13e1990eab66 SeismoWebPortal/templates/SeismoWebPortal/specfem3dglobemodel_list.html
--- a/SeismoWebPortal/templates/SeismoWebPortal/specfem3dglobemodel_list.html Sat Jul 02 20:25:50 2011 -0700
+++ b/SeismoWebPortal/templates/SeismoWebPortal/specfem3dglobemodel_list.html Sun Jul 03 11:15:22 2011 -0700
@@ -1,5 +1,5 @@
-<h2><img src="{{root}}/images/s20rts.gif" width=32 height=32> 3D Models</h2>
+<h2><img src="{{root}}/images/s20rts.gif" width=32 height=32> Custom Earth Models</h2>
{% if object_list %}
diff -r b4907683cb1b -r 13e1990eab66 SeismoWebPortal/templates/SeismoWebPortal/specfem3dglobemodel_upload.html
--- a/SeismoWebPortal/templates/SeismoWebPortal/specfem3dglobemodel_upload.html Sat Jul 02 20:25:50 2011 -0700
+++ b/SeismoWebPortal/templates/SeismoWebPortal/specfem3dglobemodel_upload.html Sun Jul 03 11:15:22 2011 -0700
@@ -1,5 +1,7 @@
-<h2><img src="{{root}}/images/s20rts.gif" width=32 height=32> Upload Specfem 3D Globe Model</h2>
+<h2><img src="{{root}}/images/s20rts.gif" width=32 height=32> Upload Custom Earth Model</h2>
+
+ <p>You can replace the existing Earth model in Specfem 3D Globe with your own. You do this by creating a file with modified versions of, for example, the s20rts model. Then, when setting up your new run, you set the model name to "s20rts" but use your custom backend. The easiest way to do this is to download the <a href="{{root}}/samples/chino-1.1.0.tgz">Chino</a> utility.</p>
<form action="{{action}}" method="POST" enctype="multipart/form-data">
<input type="hidden" name="class" value="Specfem3DGlobeModel">
@@ -27,33 +29,3 @@
</form>
-<h3>Chino</h3>
-
-<p><a href="{{root}}/samples/chino-1.0.1.tar.gz">Download
-Chino</a>. Chino is a utility which will help you create and debug an
-Earth model plug-in. To run Chino:</p>
-
-<blockquote><pre>
-tar xzf chino-1.0.1.tar.gz
-./chino-1.0.1/chino
-</pre></blockquote>
-
-<h3>Examples</h3>
-<ul>
- <li><a href="{{root}}/samples/s20rts.tgz">s20rts.tgz</a></li>
- <li><a href="{{root}}/samples/s362ani.tgz">s362ani.tgz</a></li>
- <li><a href="{{root}}/samples/transversely_isotropic_prem_plus_3D_crust_2.0.tgz">transversely_isotropic_prem_plus_3D_crust_2.0.tgz</a></li>
- <li><a href="{{root}}/samples/citcoms_isotropic_no_crust.tgz">citcoms_isotropic_no_crust.tgz</a>: This code enables you to use the output from a CitcomS run as a Specfem Earth model.</li>
-</ul>
-
-<h3>Code for 1D Reference Models</h3>
-
-<p>You may incorporate any one of these into your Earth model.</p>
-
-<ul>
- <li><a href="{{root}}/samples/ref.tgz">ref.tgz</a></li>
- <li><a href="{{root}}/samples/prem.tgz">prem.tgz</a></li>
- <li><a href="{{root}}/samples/iasp91.tgz">iasp91.tgz</a></li>
- <li><a href="{{root}}/samples/ak135.tgz">ak135.tgz</a></li>
- <li><a href="{{root}}/samples/1066a.tgz">1066a.tgz</a></li>
-</ul>
diff -r b4907683cb1b -r 13e1990eab66 SeismoWebPortal/templates/SeismoWebPortal/specfem3dglobeparameters_form.html
--- a/SeismoWebPortal/templates/SeismoWebPortal/specfem3dglobeparameters_form.html Sat Jul 02 20:25:50 2011 -0700
+++ b/SeismoWebPortal/templates/SeismoWebPortal/specfem3dglobeparameters_form.html Sun Jul 03 11:15:22 2011 -0700
@@ -48,6 +48,36 @@
<div>
<label for="id_model_name" class=before>model name</label>
{{ form.model_name }}
+
+ <dl class="help inline collapsible collapsedOnLoad"><dt class="collapsibleHeader"><img src="{{root}}/images/help-small.gif"></dt>
+ <dd class="collapsibleContent">
+ <dl>
+
+ <dt>transversely_isotropic_prem_plus_3D_crust_2.0</dt><dd>This model has CRUST2.0 [Bassin et al.,
+ 2000] on top of a transversely isotropic PREM. We first extrapolate PREM mantle velocity up to the
+ surface, then overwrite the model with CRUST2.0</dd>
+<dt>s20rts</dt><dd> A global 3D mantle model [Ritsema et al., 1999] and 3D crustal model
+ Crust2.0 [Bassin et al., 2000]. Note that S20RTS uses transversely isotropic PREM as a background
+ model, and that we use the PREM radial attenuation model when ATTENUATION is incorporated. See
+ Chapter 10 for a discussion on how to change 3D models.</dd>
+<dt>s40rts</dt><dd> A global 3D mantle model [Ritsema et al., 2010] succeeding S20RTS with a higher resolution.
+ S40RTS uses transversely isotropic PREM as a background model and the 3D crustal model Crust2.0
+ [Bassin et al., 2000]. We use the PREM radial attenuation model when ATTENUATION is incorporated.</dd>
+<dt>s362ani</dt><dd> A global shear-wave speed model developed by Kustowski et al. [2006]. In this model, radial
+ anisotropy is confined to the uppermost mantle. The model (and the corresponding mesh) incorporate
+ tomography on the 650~km and 410~km discontinuities in the 1D reference model REF.</dd>
+<dt>s362wmani</dt><dd> A version of S362ANI with anisotropy allowed throughout the mantle.</dd>
+<dt>s362ani_prem</dt><dd> A version of S362ANI calculated using PREM as the 1D reference model.</dd>
+<dt>s29ea</dt><dd> A global model with higher resolution in the upper mantle beneath Eurasia calculated using REF as the
+ 1D reference model.</dd>
+<dt>3D_anisotropic</dt><dd> A 3-D anisotropic model [Montagner, 2002]</dd>
+<dt>3D_attenuation</dt><dd> A 3-D attenuation model QRFSI12 [Dalton et al., 2008].</dd>
+<dt>PPM</dt><dd> A user-specified 3D model (Point-Profile-Model) given as ASCII-table, specifying Vs-perturbations
+ with respect to PREM. You will have to upload a custom backend for this to work.</dd>
+
+ </dl>
+ </dd>
+ </dl>
</div>
<div>
diff -r b4907683cb1b -r 13e1990eab66 setup.py
--- a/setup.py Sat Jul 02 20:25:50 2011 -0700
+++ b/setup.py Sun Jul 03 11:15:22 2011 -0700
@@ -18,6 +18,7 @@ setup(
'static/images/*.jpg',
'static/samples/STATIONS.txt',
'static/samples/UTILS.tar.gz',
+ 'static/samples/chino-1.1.0.tgz',
'static/doc/*.pdf',
'static/script.js',
'templates/SeismoWebPortal/*.html',
More information about the CIG-COMMITS
mailing list