[cig-commits] r8964 -
cs/portal/trunk/magportal/MagWebPortal/templates/MagWebPortal
wei at geodynamics.org
wei at geodynamics.org
Thu Dec 20 18:02:48 PST 2007
Author: wei
Date: 2007-12-20 18:02:48 -0800 (Thu, 20 Dec 2007)
New Revision: 8964
Removed:
cs/portal/trunk/magportal/MagWebPortal/templates/MagWebPortal/cig-logo_small-initials.ico
Modified:
cs/portal/trunk/magportal/MagWebPortal/templates/MagWebPortal/inputdatafile_form.html
cs/portal/trunk/magportal/MagWebPortal/templates/MagWebPortal/inputdatafile_upload.html
cs/portal/trunk/magportal/MagWebPortal/templates/MagWebPortal/settings.html
cs/portal/trunk/magportal/MagWebPortal/templates/MagWebPortal/simulation_detail.html
cs/portal/trunk/magportal/MagWebPortal/templates/MagWebPortal/simulation_form.html
cs/portal/trunk/magportal/MagWebPortal/templates/MagWebPortal/simulation_list.html
cs/portal/trunk/magportal/MagWebPortal/templates/MagWebPortal/simulation_list.py
cs/portal/trunk/magportal/MagWebPortal/templates/MagWebPortal/simulation_list.txt
cs/portal/trunk/magportal/MagWebPortal/templates/MagWebPortal/splash.html
Log:
Templates changes.
Deleted: cs/portal/trunk/magportal/MagWebPortal/templates/MagWebPortal/cig-logo_small-initials.ico
===================================================================
(Binary files differ)
Modified: cs/portal/trunk/magportal/MagWebPortal/templates/MagWebPortal/inputdatafile_form.html
===================================================================
--- cs/portal/trunk/magportal/MagWebPortal/templates/MagWebPortal/inputdatafile_form.html 2007-12-20 20:30:13 UTC (rev 8963)
+++ cs/portal/trunk/magportal/MagWebPortal/templates/MagWebPortal/inputdatafile_form.html 2007-12-21 02:02:48 UTC (rev 8964)
@@ -49,20 +49,20 @@
{% if form.name.errors %}<span class=error>{{ form.name.errors|join:", " }}</span>{% endif %}
</div>
- <fieldset><legend>Parameter for MAG Run</legend>
+ <fieldset><legend>MAG Run Parameters</legend>
{% block mag_run_params %}
<div>
<label for="id_outfile" class=before>outfile</span></label>
{{ form.outfile }}
{% if form.outfile.errors %}<span class=error>{{ form.outfile.errors|join:", " }}</span>{% endif %}
- {% if help_visible %}<span class=help>Name of output files(prefixes d.,g., l., ls., me., ma,. mm,. are added).</span>{% endif %}
+ {% if help_visible %}<span class=help>Name of output files(prefixes d.,g., l., ls., me., ma,. mm,. are added. Please double quote the outfile name, i.e. "bench1".</span>{% endif %}
</div>
<div>
<label for="id_init" class=before>Initial Condition</label>
{{ form.init}}
{% if form.init.errors %}<span class=error>{{ form.init.errors|join:", " }}</span>{% endif %}
- {% if help_visible %}<span class=help>set 1 to start from scratch (random noise initial condition)
+ {% if help_visible %}<span class=help>Set 1 to start from scratch (random noise initial condition)
set 0 to start from a previous result obtained on the same
grid and has been written into a file named d[0-9].<name>
set to a value >= 100 to start from an initial temperature
@@ -72,10 +72,16 @@
is imposed.</span>{% endif %}
</div>
<div>
+ <label for="id_treset" class=before>treset</label>
+ {{ form.treset }}
+ {% if form.treset.errors %}<span class=error>{{ form.treset.errors|join:", " }}</span>{% endif %}
+ {% if help_visible %}<span class=help>If ture(checked), reset time and step counter to zero when starting from a storedd dataset. The default is: False.</span>{% endif %}
+ </div>
+ <div>
<label for="id_runid" class=before>runid</label>
{{ form.runid }}
{% if form.runid.errors %}<span class=error>{{ form.runid.errors|join:", " }}</span>{% endif %}
- {% if help_visible %}<span class=help>arbitrary text of up to 64 characters to describe the model.</span>{% endif %}
+ {% if help_visible %}<span class=help>Arbitrary text of up to 64 characters to describe the model. Please double quote your runid, i.e. "benchmark case 1 with Ra=1.0E5 Ek=1E-3 Els=0 Pr=1 Pm=5".</span>{% endif %}
</div>
<div>
<label for="id_samp" class=before>samp</label>
@@ -87,14 +93,14 @@
<label for="id_nstep" class=before>nstep</label>
{{ form.nstep }}
{% if form.center_longitude.errors %}<span class=error>{{ form.center_longitude.errors|join:", " }}</span>{% endif %}
- {% if help_visible %}<span class=help>do one block of nstep time step before producing a summary
+ {% if help_visible %}<span class=help>Do one block of nstep time step before producing a summary
printout of some diagnostics standard output. nstep should be even.</span>{% endif %}
</div>
<div>
<label for="id_nprnt" class=before>nprnt</label>
{{ form.nprnt }}
{% if form.mprnt.errors %}<span class=error>{{ form.nprnt.errors|join:", " }}</span>{% endif %}
- {% if help_visible %}<span class=help>do one 'superblock' consisting of nprnt blocks of nstep time
+ {% if help_visible %}<span class=help>Do one 'superblock' consisting of nprnt blocks of nstep time
steps each, before saving all data in file 'd[0-9].name'. If
nstor=1 there is no number added after the 'd', if nstor>1 the
number is incremented by one for each new superblock, starting
@@ -112,7 +118,7 @@
<label for="id_nplog" class=before>nplog</label>
{{ form.nplog }}
{% if form.nplog.errors %}<span class=error>{{ form.nplog.errors|join:", " }}</span>{% endif %}
- {% if help_visible %}<span class=help>if >0 write velocity values at specific points of the grid on
+ {% if help_visible %}<span class=help>If >0 write velocity values at specific points of the grid on
separate logfile (prefix "lp.") after every nplog steps (see for
arrays vrpoint, vppoint, vtpoint in subroutine amhd for details).</span>{% endif %}
</div>
@@ -120,7 +126,7 @@
<label for="id_nlogstep" class=before>nlogstep</label>
{{ form.nlogstep }}
{% if form.nlogstep.errors %}<span class=error>{{ form.nlogstep.errors|join:", " }}</span>{% endif %}
- {% if help_visible %}<span class=help>write data on logfile (prefix l.) after each nlogstep steps.</span>{% endif %}
+ {% if help_visible %}<span class=help>Write data on logfile (prefix l.) after each nlogstep steps.</span>{% endif %}
</div>
<div>
<label for="id_ngform" class=before>ngform</label>
@@ -152,6 +158,12 @@
{% if form.nglon.errors %}<span class=error>{{ form.nglon.errors|join:", " }}</span>{% endif %}
{% if help_visible %}<span class=help>Output on graphics file every nglon'th point in longitude.</span>{% endif %}
</div>
+ <div>
+ <label for="id_ifbfrz" class=before>ifbfrz</label>
+ {{ form.ifbfrz }}
+ {% if form.ifbfrz.errors %}<span class=error>{{ form.ifbfrz.errors|join:", " }}</span>{% endif %}
+ {% if help_visible %}<span class=help>If ture(checked), do not update magnetic filed during iteration. The default is: False.</span>{% endif %}
+ </div>
{% endblock %}
@@ -173,14 +185,14 @@
<label for="id_courfac" class=before>courfac</label>
{{ form.courfac }}
{% if form.courfac.errors %}<span class=error>{{ form.courfac.errors|join:", " }}</span>{% endif %}
- {% if help_visible %}<span class=help>controls the contribution of the fluid velocity to the Courant
+ {% if help_visible %}<span class=help>Controls the contribution of the fluid velocity to the Courant
time step limit (a larger value leads to smaller dt).</span>{% endif %}
</div>
<div>
<label for="id_alffac" class=before>alffac</label>
{{ form.alffac }}
{% if form.alffac.errors %}<span class=error>{{ form.alffac.errors|join:", " }}</span>{% endif %}
- {% if help_visible %}<span class=help>controls the contribution of the (modified) Alfven velocity
+ {% if help_visible %}<span class=help>Controls the contribution of the (modified) Alfven velocity
to the Courant time step limit (a larger value leads to smaller dt)</span>{% endif %}
</div>
@@ -209,7 +221,7 @@
<label for="id_ek" class=before>Ekman Number</label>
{{ form.ek }}
{% if form.ek.errors %}<span class=error>{{ form.ek.errors|join:", " }}</span>{% endif %}
- {% if help_visible %}<span class=help> Ekman Number.</span>{% endif %}
+ {% if help_visible %}<span class=help>Ekman Number.</span>{% endif %}
</div>
<div>
<label for="id_pr" class=before>Prandtl Number</label>
@@ -227,7 +239,7 @@
<label for="id_bpeak" class=before> Bpeak</label>
{{ form.bpeak }}
{% if form.bpeak.errors %}<span class=error>{{ form.bpeak.errors|join:", " }}</span>{% endif %}
- {% if help_visible %}<span class=help> peak value of magnetic field imposed by bound. cond. at ICB
+ {% if help_visible %}<span class=help> Peak value of magnetic field imposed by bound. cond. at ICB
(also when imagcon=0, bpeak controls the initial magnetic
field: toroidal when bpeak>0, poloidal dipole when bpeak<0!).</span>{% endif %}
</div>
@@ -244,7 +256,7 @@
- <fieldset><legend>Boudary Conditions at inner and outer Radii</legend>
+ <fieldset><legend>Boundary Conditions at inner and outer Radii</legend>
{% block boundar_conditions_script %}
@@ -261,34 +273,34 @@
<label for="id_ktops" class=before>ktops</label>
{{ form.ktops }}
{% if form.ktops.errors %}<span class=error>{{ form.ktops.errors|join:", " }}</span>{% endif %}
- {% if help_visible %}<span class=help> thermal boundary condition at CMB. 1-fixed temp, 2-fixed radial
+ {% if help_visible %}<span class=help> Thermal boundary condition at CMB. 1-fixed temp, 2-fixed radial
heat flow. (ktops=2 not tested !).</span>{% endif %}
</div>
<div>
<label for="id_kbots" class=before>kbots</label>
{{ form.kbots}}
{% if form.kbots.errors %}<span class=error>{{ form.kbots.errors|join:", " }}</span>{% endif %}
- {% if help_visible %}<span class=help> thermal boundary condition at ICB.1-fixed temp, 2-fixed radial
+ {% if help_visible %}<span class=help> Thermal boundary condition at ICB.1-fixed temp, 2-fixed radial
heat flow. (ktops=2 not tested !).</span>{% endif %}
</div>
<div>
<label for="id_ktopv" class=before>ktopv</label>
{{ form.ktopv }}
{% if form.ktopv.errors %}<span class=error>{{ form.ktopv.errors|join:", " }}</span>{% endif %}
- {% if help_visible %}<span class=help> velocity condition at CMB. 1-free, 2-rigid.</span>{% endif %}
+ {% if help_visible %}<span class=help> Velocity condition at CMB. 1-free, 2-rigid.</span>{% endif %}
</div>
<div>
<label for="id_kbotv" class=before>kbotv</label>
{{ form.kbotv }}
{% if form.kbotv.errors %}<span class=error>{{ form.kbotv.errors|join:", " }}</span>{% endif %}
- {% if help_visible %}<span class=help> velocity condition at ICB. 1-free, 2-rigid.</span>{% endif %}
+ {% if help_visible %}<span class=help> Velocity condition at ICB. 1-free, 2-rigid.</span>{% endif %}
</div>
{% endblock %}
</fieldset>
- <fieldset><legend> PARAMETERS FOR GENERATING MOVIE FILES </legend>
+ <fieldset><legend> Parameters for Generating Movie Files </legend>
{% block movie_script %}
@@ -296,7 +308,7 @@
<label for="id_imovopt" class=before>imovopt</label>
{{ form.imovopt }}
{% if form.imovopt.errors %}<span class=error>{{ form.imovopt.errors|join:", " }}</span>{% endif %}
- {% if help_visible %}<span class=help> three-digit integer number, options for generating movie files
+ {% if help_visible %}<span class=help> Three-digit integer number, options for generating movie files
Last digit>0 - write B_z, W_z (vorticity) and T in the equatorial
plane on file with prefix "me."
2nd last digit>0 - write longitudinally averaged B_phi, j_phi and
@@ -312,19 +324,19 @@
<label for="id_iframes" class=before>iframes</label>
{{ form.iframes }}
{% if form.iframes.errors %}<span class=error>{{ form.iframes.errors|join:", " }}</span>{% endif %}
- {% if help_visible %}<span class=help> write altogether iframes frames on the movie files.</span>{% endif %}
+ {% if help_visible %}<span class=help> Write altogether iframes frames on the movie files.</span>{% endif %}
</div>
<div>
<label for="id_tmovstart" class=before>tmovstart</label>
{{ form.tmovstart}}
{% if form.tmovstart.errors %}<span class=error>{{ form.tmovstart.errors|join:", " }}</span>{% endif %}
- {% if help_visible %}<span class=help> time at which to start writing movie-frames.</span>{% endif %}
+ {% if help_visible %}<span class=help> Time at which to start writing movie-frames.</span>{% endif %}
</div>
<div>
<label for="id_tmovstep" class=before>tmovstep</label>
{{ form.tmovstep }}
{% if form.tmovstep.errors %}<span class=error>{{ form.tmovstep.errors|join:", " }}</span>{% endif %}
- {% if help_visible %}<span class=help> time increments for writing movie-frames.</span>{% endif %}
+ {% if help_visible %}<span class=help> Time increments for writing movie-frames.</span>{% endif %}
</div>
{% endblock %}
Modified: cs/portal/trunk/magportal/MagWebPortal/templates/MagWebPortal/inputdatafile_upload.html
===================================================================
--- cs/portal/trunk/magportal/MagWebPortal/templates/MagWebPortal/inputdatafile_upload.html 2007-12-20 20:30:13 UTC (rev 8963)
+++ cs/portal/trunk/magportal/MagWebPortal/templates/MagWebPortal/inputdatafile_upload.html 2007-12-21 02:02:48 UTC (rev 8964)
@@ -36,7 +36,7 @@
{% if form.parfile.errors %}<span class=error>{{ form.parfile.errors|join:", " }}</span>{% endif %}
</div>
- <p>Uploaded files must be in <code>Mag Input File</code> format.
+ <p>Uploaded files must be in MAG <code>Input File</code> format.
<div><input class=submit type="submit" value="Upload"></div>
@@ -48,18 +48,8 @@
<div class=help>
-<h3><code>Mag input</code> file format</h3>
+<p> Need help with the MAG <code>input file</code> format?</p>
-<p>Need Help -- useful in the
-<code>INPUT FILES</code> file, which looks like this:</p>
-
-<div class=illustration id=inputparams>
- <img src="/magwebportal/images/earth.jpg" width=200 height=200>
- <p class=caption>Sample <code>INPUT FILES</code> file.</p>
-</div>
-
-<p> Need Help</p>
-
<p><a href="/magwebportal/samples/par.bnch1.txt">Click here</a> to
download a sample <code>Input File</code> file.</p>
Modified: cs/portal/trunk/magportal/MagWebPortal/templates/MagWebPortal/settings.html
===================================================================
--- cs/portal/trunk/magportal/MagWebPortal/templates/MagWebPortal/settings.html 2007-12-20 20:30:13 UTC (rev 8963)
+++ cs/portal/trunk/magportal/MagWebPortal/templates/MagWebPortal/settings.html 2007-12-21 02:02:48 UTC (rev 8964)
@@ -8,7 +8,6 @@
<li class=first><a href="/magwebportal/">home</a>
<li><a href="/magwebportal/simulations/">simulations</a>
<li><a href="/magwebportal/inputdatafiles/">input files</a>
- <li><a href="/magwebportal/inputparams/">another input files</a>
<li class=selected><a href="/webmagportal/registration/">profile</a>
</ul>
</div>
Modified: cs/portal/trunk/magportal/MagWebPortal/templates/MagWebPortal/simulation_detail.html
===================================================================
--- cs/portal/trunk/magportal/MagWebPortal/templates/MagWebPortal/simulation_detail.html 2007-12-20 20:30:13 UTC (rev 8963)
+++ cs/portal/trunk/magportal/MagWebPortal/templates/MagWebPortal/simulation_detail.html 2007-12-21 02:02:48 UTC (rev 8964)
@@ -5,6 +5,10 @@
<h2 class=titlebar>{{ object.name }}</h2>
+{% if not user.userinfo.approved %}
+ <p><span class=error>You can not run simulation. Please wailt till you are approved by the portal administrator. You will receive notification in the email.</span>
+{% endif %}
+
<div class=toolbar>
<form action="edit/" method="get"><input type="submit" value="Edit..." /></form>
Modified: cs/portal/trunk/magportal/MagWebPortal/templates/MagWebPortal/simulation_form.html
===================================================================
--- cs/portal/trunk/magportal/MagWebPortal/templates/MagWebPortal/simulation_form.html 2007-12-20 20:30:13 UTC (rev 8963)
+++ cs/portal/trunk/magportal/MagWebPortal/templates/MagWebPortal/simulation_form.html 2007-12-21 02:02:48 UTC (rev 8964)
@@ -5,6 +5,10 @@
<h2 class=titlebar>{% if object %}edit{% else %}new{% endif %} simulation</h2>
+{% if not user.userinfo.approved %}
+ <p><span class=error>You can not run simulation. Please wailt till you are approved by the portal administrator. You will receive notification in the email.</span>
+{% endif %}
+
<div class=toolbar>
<form method="post" action="/magwebportal/help/toggle/">
<input type="hidden" name="post_toggle_redirect" value="{{ action }}">
@@ -51,14 +55,14 @@
</div>
{% if help_visible %}
- <dl class=help><dt>This is the name of the simulation.</dt><dd> <code></code></dd></dl>
+ <dl class=help><dt>Please enter the name for this simulation.</dt><dd> <code></code></dd></dl>
{% endif %}
- <fieldset><legend>Longitudinal Symmetry</legend>
+ <fieldset><legend>longitudinal Symmetry</legend>
{% block sim_logisym %}
<div>
- <label for="id_logisym" class=before>Logitudinal Symmetry</label>
+ <label for="id_logisym" class=before>longitudinal Symmetry</label>
{{ form.logisym }}
{% if form.logisym.errors %}<span class=error>{{ form.logisym.errors|join:", " }}</span>{% endif %}
{% if help_visible %}<span class=help>Imposed #-fold symmetry in longitude.</span>{% endif %}
@@ -84,12 +88,13 @@
- <fieldset><legend>Input Parameter File</legend>
+ <fieldset><legend>Input File</legend>
<div>
- <label for="id_InputdataFile"class=before>parameter file</label>
+ <label for="id_InputdataFile"class=before>Input file</label>
{{ form.InputdataFile }}
{% if form.InputdataFile.errors %}<span class=error>{{ form.InputdataFile.errors|join:", " }}</span>{% endif %}
+ {% if help_visible %}<span class=help>If you have no input file listed, please click on the "input files" tab on top of this page to create or upload your input file.</span>{% endif %}
</div>
</fieldset> <!-- parameter file -->
Modified: cs/portal/trunk/magportal/MagWebPortal/templates/MagWebPortal/simulation_list.html
===================================================================
--- cs/portal/trunk/magportal/MagWebPortal/templates/MagWebPortal/simulation_list.html 2007-12-20 20:30:13 UTC (rev 8963)
+++ cs/portal/trunk/magportal/MagWebPortal/templates/MagWebPortal/simulation_list.html 2007-12-21 02:02:48 UTC (rev 8964)
@@ -13,7 +13,7 @@
<colgroup><col class=odd><col class=even><col class=odd><col class=even><col class=odd><col class=even><col class=odd></colgroup>
<thead>
- <tr><th>name</th><th>status</th><th>Logitudinal Symmetry</th><th>Spherical Truncation Order</th><th>Input Parameter Files</th></tr>
+ <tr><th>name</th><th>status</th><th>Longitudinal Symmetry</th><th>Spherical Truncation Order</th><th>Input Parameter Files</th></tr>
</thead>
<tbody>
Modified: cs/portal/trunk/magportal/MagWebPortal/templates/MagWebPortal/simulation_list.py
===================================================================
--- cs/portal/trunk/magportal/MagWebPortal/templates/MagWebPortal/simulation_list.py 2007-12-20 20:30:13 UTC (rev 8963)
+++ cs/portal/trunk/magportal/MagWebPortal/templates/MagWebPortal/simulation_list.py 2007-12-21 02:02:48 UTC (rev 8964)
@@ -1,5 +1,5 @@
(
{% for object in object_list %}
- { 'id': {{ object.id }}, 'status': '{{ object.status }}', 'nodes': {{ object.nodes }} },
+ { 'id': {{ object.id }}, 'status': '{{ object.status }}' },
{% endfor %}
)
Modified: cs/portal/trunk/magportal/MagWebPortal/templates/MagWebPortal/simulation_list.txt
===================================================================
--- cs/portal/trunk/magportal/MagWebPortal/templates/MagWebPortal/simulation_list.txt 2007-12-20 20:30:13 UTC (rev 8963)
+++ cs/portal/trunk/magportal/MagWebPortal/templates/MagWebPortal/simulation_list.txt 2007-12-21 02:02:48 UTC (rev 8964)
@@ -1,2 +1,2 @@
{% for object in object_list %}
-{{ object.id }} {{ object.status }} {{ object.nodes }}{% endfor %}
+{{ object.id }} {{ object.status }}{% endfor %}
Modified: cs/portal/trunk/magportal/MagWebPortal/templates/MagWebPortal/splash.html
===================================================================
--- cs/portal/trunk/magportal/MagWebPortal/templates/MagWebPortal/splash.html 2007-12-20 20:30:13 UTC (rev 8963)
+++ cs/portal/trunk/magportal/MagWebPortal/templates/MagWebPortal/splash.html 2007-12-21 02:02:48 UTC (rev 8964)
@@ -9,7 +9,6 @@
<p id=presented>Presented by:</p>
<ul class=producers>
<li><a href="http://www.geodynamics.org/">Computational Infrastructure for Geodynamics</a>
- <li><a href="http://www.caltech.edu/">California Institute of Technology</a>
</ul>
<h1>MAG</h1>
<h2>Web Portal</h2>
@@ -35,7 +34,6 @@
<p id=sponsored>Sponsored by:</p>
<ul class=sponsors>
<li><a href="http://www.geodynamics.org/"><img src="/magwebportal/static/images/cig-logo_small-initials.gif"></a>
- <li><a href="http://www.caltech.edu/"><img src="/magwebportal/static/images/citlogo.gif"></a>
<li><a href="http://www.nsf.gov/"><img src="/magwebportal/static/images/nsf_logo.jpg"></a>
<li><a href="http://www.teragrid.org/"><img src="/magwebportal/static/images/tg_logo.gif"></a>
</ul>
More information about the cig-commits
mailing list