Menu
▾
▴
[Vlab-commit] SF.net SVN: vlab:[1193] trunk/vlab/portal/input-portlet/src/main/webapp/ pages/eularian-strain
|
From: <das...@us...> - 2008-10-29 22:41:10
|
Revision: 1193
http://vlab.svn.sourceforge.net/vlab/?rev=1193&view=rev
Author: dasil014
Date: 2008-10-29 22:41:07 +0000 (Wed, 29 Oct 2008)
Log Message:
-----------
Changed option of spin polarized and start magnetization. Now the user has an option to define spin polarized and start magnetization for every component.
Modified Paths:
--------------
trunk/vlab/portal/input-portlet/src/main/webapp/pages/eularian-strain/elasticity1.jsp
trunk/vlab/portal/input-portlet/src/main/webapp/pages/eularian-strain/elasticity2.jsp
trunk/vlab/portal/input-portlet/src/main/webapp/pages/eularian-strain/elasticity3.jsp
Modified: trunk/vlab/portal/input-portlet/src/main/webapp/pages/eularian-strain/elasticity1.jsp
===================================================================
--- trunk/vlab/portal/input-portlet/src/main/webapp/pages/eularian-strain/elasticity1.jsp 2008-10-29 22:38:31 UTC (rev 1192)
+++ trunk/vlab/portal/input-portlet/src/main/webapp/pages/eularian-strain/elasticity1.jsp 2008-10-29 22:41:07 UTC (rev 1193)
@@ -1,7 +1,6 @@
<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%>
<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%>
-
<link href="../input-portlet/css/styles.css" type="text/css" rel="stylesheet">
<script language="javascript" src="../input-portlet/js/commons.js"></script>
@@ -73,8 +72,12 @@
<h:outputText value="How many pressures?"/>
<h:inputText id="qtdPression" size="1" value="#{ElasInputManager.inputBean.qtdPression}" />
+ <h:outputText value="Spin polarized"/>
+ <h:selectBooleanCheckbox id="spinpolarized" value="#{ElasInputManager.inputBean.spinpolarized}" />
+
+
+ <h:outputText value="Good quality fitting demands at least 7 points" escape="false" />
<h:outputText value="<br>" escape="false" />
- <h:outputText value="<br>" escape="false" />
<f:facet name="footer">
<h:panelGroup>
Modified: trunk/vlab/portal/input-portlet/src/main/webapp/pages/eularian-strain/elasticity2.jsp
===================================================================
--- trunk/vlab/portal/input-portlet/src/main/webapp/pages/eularian-strain/elasticity2.jsp 2008-10-29 22:38:31 UTC (rev 1192)
+++ trunk/vlab/portal/input-portlet/src/main/webapp/pages/eularian-strain/elasticity2.jsp 2008-10-29 22:41:07 UTC (rev 1193)
@@ -1,7 +1,7 @@
<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %>
-<html>
- <head>
+<html>
+ <head>
<title>pwscf submission form</title>
<link href="../input-portlet/css/styles.css" type="text/css" rel="stylesheet">
@@ -155,6 +155,7 @@
styleClass="imperceptible container" headerClass="large_header" footerClass="right_footer">
<f:facet name="footer">
<h:panelGroup>
+ <h:outputText value="Good quality fitting demands at least 7 points" escape="false" />
<h:inputText id="qtdPression" value="#{ElasInputManager.inputBean.qtdPression}" size="1"
onchange="findParentForm(this).submit()"/>
<h:outputText value=" number of pressures" />
@@ -193,16 +194,16 @@
<h:panelGrid width="100%" columns="1"
styleClass="imperceptible container" footerClass="right_footer"
columnClasses="align_left">
-
+
+
+ <%--
<f:facet name="footer">
- <h:panelGroup>
- <h:inputText id="ntyp" value="#{ElasInputManager.inputBean.ntyp}" size="1" onchange="findParentForm(this).submit()"/>
- <h:outputText value=" atom types" />
- </h:panelGroup>
+
</f:facet>
-
+ --%>
+
<h:panelGroup>
- <h:outputText value="Select pseudo-potentials by..." styleClass="instruction"/>
+ <h:outputText value="Add pseudo-potentials to your project, either by..." styleClass="instruction"/>
<h:outputText value="<ul><li class=indented>" escape="false"/>
<h:commandButton value="searching public repository"
@@ -222,6 +223,15 @@
<h:outputText value="</ul>" escape="false"/>
</h:panelGroup>
+
+ <h:panelGrid width="100%" columns="2" columnClasses="align_right">
+ <h:panelGroup>
+ <h:inputText id="ntyp" value="#{ElasInputManager.inputBean.ntyp}" size="1" onchange="findParentForm(this).submit()" styleClass="right"/>
+ <h:outputText value=" atom types" styleClass="right"/>
+ </h:panelGroup>
+ </h:panelGrid>
+
+
<h:dataTable value="#{ElasInputManager.inputBean.species}" var="species" id="aSpecies"
width="100%" rowClasses="cell_white, cell_gray" headerClass="cell_header_gray">
<h:column>
@@ -229,7 +239,7 @@
<h:outputText value="Symbol" />
</f:facet>
- <h:inputText id="symbol" value="#{species.symbol}" />
+ <h:inputText id="symbol" size="3" value="#{species.symbol}" />
</h:column>
<h:column>
@@ -237,7 +247,7 @@
<h:outputText value="Mass (a.u.)" />
</f:facet>
- <h:inputText id="mass" value="#{species.mass}" />
+ <h:inputText id="mass" size="4" value="#{species.mass}" />
</h:column>
<h:column>
@@ -246,12 +256,43 @@
</f:facet>
<%-- <h:inputText id="pseudoPotential" value="#{species.pseudoPotential}" /> --%>
- <h:selectOneMenu id="pseudoPotential" value="#{species.pseudoPotential}">
- <f:selectItems value="#{ElasInputManager.files}" />
+ <h:selectOneMenu id="pseudoPotential" value="#{species.pseudoPotential}" >
+ <f:selectItems value="#{ElasInputManager.files}"/>
</h:selectOneMenu>
</h:column>
+
+ <h:column>
+ <f:facet name="header">
+ <h:outputText value="Start Magnetization" />
+ </f:facet>
+
+ <h:inputText id="mmagnetization" size="6" value="#{species.magnetization}" disabled="{#ElasInputManager.inputBean.spinpolarized}" />
+ </h:column>
+
+ <h:column>
+ <f:facet name="header">
+ <h:outputText value="LDA+U" />
+ </f:facet>
+
+ <h:selectBooleanCheckbox id="ldau" value="#{species.ldau}" />
+ </h:column>
+
+
</h:dataTable>
+ <f:verbatim><br></f:verbatim>
+
+ <h:panelGroup>
+
+ <h:outputText value="Hubbard_U: Uo" />
+ <h:inputText id="hubbardV0" value="#{ElasInputManager.inputBean.hubbardU0}" disabled="#{species.ldau}"/>
+
+ <h:outputText value="dU" />
+ <h:inputText id="hubbarda" value="#{ElasInputManager.inputBean.hubbarddU}" disabled="#{species.ldau}"/>
+
+ </h:panelGroup>
+
+
</h:panelGrid>
<f:verbatim><br></f:verbatim>
@@ -333,8 +374,8 @@
<h:outputText value="</div>" escape="false" />
- </h:form>
+ </h:form>
</f:view>
-
- </body>
-</html>
+
+ </body>
+</html>
Modified: trunk/vlab/portal/input-portlet/src/main/webapp/pages/eularian-strain/elasticity3.jsp
===================================================================
--- trunk/vlab/portal/input-portlet/src/main/webapp/pages/eularian-strain/elasticity3.jsp 2008-10-29 22:38:31 UTC (rev 1192)
+++ trunk/vlab/portal/input-portlet/src/main/webapp/pages/eularian-strain/elasticity3.jsp 2008-10-29 22:41:07 UTC (rev 1193)
@@ -1,7 +1,7 @@
<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %>
-<html>
+<html>
<head>
<script language="javascript" src="../input-portlet/js/commons.js"></script>
@@ -136,9 +136,9 @@
// form.elements['elasticity3:hubbardV0'].value="5.5963";
}
// End -->
- </script>
+ </script>
<title>Elasticity Pwscf</title>
- <link href="../input-portlet/css/styles.css" type="text/css" rel="stylesheet">
+ <link href="../input-portlet/css/styles.css" type="text/css" rel="stylesheet">
</head>
<f:view>
@@ -151,7 +151,7 @@
value="<body onload=\"javascript:initialize_disabled()\">"
rendered="#{! ElasInputManager.hideStrainTable}"
escape="false" />
-
+
<h:form id="elasticity3">
<h:outputText value="<div width=\"100%\" align=\"center\">" escape="false"/>
@@ -212,13 +212,13 @@
<h:outputText value="Equation of state parameters (Initial guess)"/>
</f:facet>
- <h:outputText value="Ko"/>
+ <h:outputText value="Ko (GPa)"/>
<h:inputText id="massOne" value="#{ElasInputManager.inputBean.massOne}" size="15" required="true"/>
<h:outputText value="K'"/>
<h:inputText id="massTwo" value="#{ElasInputManager.inputBean.massTwo}" size="15" required="false"/>
- <h:outputText value="Vo" />
+ <h:outputText value="Vo (a.u.)" />
<h:inputText id="massThree" value="#{ElasInputManager.inputBean.massThree}" size="15" required="false"/>
<h:selectBooleanCheckbox id="optionPhase" value="#{ElasInputManager.inputBean.optionPhase}" />
@@ -274,26 +274,22 @@
<h:panelGrid width="100%" columns="4" styleClass="container" rowClasses="cell_white, cell_gray">
<f:facet name="header">
- <h:outputText value="Initial cell vectors (Å)" escape="false"/>
+ <h:outputText value="Cell Parameters" escape="false"/>
</f:facet>
- <h:outputText value="" />
- <h:outputText value="X" />
- <h:outputText value="Y" />
- <h:outputText value="Z" />
- <h:outputText value="A" />
+ <h:outputText value="a" style="font-weight:bold"/>
<h:inputText id="vx0" value="#{ElasInputManager.inputBean.vx0}" required="false" />
<h:inputText id="vy0" value="#{ElasInputManager.inputBean.vy0}" required="false" />
<h:inputText id="vz0" value="#{ElasInputManager.inputBean.vz0}" required="false" />
- <h:outputText value="B" />
+ <h:outputText value="b" style="font-weight:bold"/>
<h:inputText id="vx1" value="#{ElasInputManager.inputBean.vx1}" required="false" />
<h:inputText id="vy1" value="#{ElasInputManager.inputBean.vy1}" required="false" />
<h:inputText id="vz1" value="#{ElasInputManager.inputBean.vz1}" required="false" />
- <h:outputText value="C" />
+ <h:outputText value="c" style="font-weight:bold"/>
<h:inputText id="vx2" value="#{ElasInputManager.inputBean.vx2}" required="false" />
<h:inputText id="vy2" value="#{ElasInputManager.inputBean.vy2}" required="false" />
<h:inputText id="vz2" value="#{ElasInputManager.inputBean.vz2}" required="false" />
@@ -483,8 +479,8 @@
--%>
<h:panelGrid width="100%" columns="1" styleClass="imperceptible container">
- <h:panelGrid width="100%" columns="6" rowClasses="cell_white, cell_gray">
- <h:selectBooleanCheckbox id="nspin" value="#{ElasInputManager.inputBean.nspin}"
+ <h:panelGrid width="100%" columns="4" rowClasses="cell_white, cell_gray">
+ <%--<h:selectBooleanCheckbox id="nspin" value="#{ElasInputManager.inputBean.nspin}"
onclick="javascript:enable_by_checkbox( this, document.forms['elasticity3'].elements['elasticity3:magnetizationSpecies'] )" />
<h:outputText value="spin polarized" />
@@ -495,13 +491,13 @@
<h:outputText value="<br>" escape="false" />
<h:selectBooleanCheckbox id="ldaPlusU" value="#{ElasInputManager.inputBean.ldaPlusU}" onclick="javascript:enable_by_checkbox( this, document.forms['elasticity3'].elements['elasticity3:hubbarda']); enable_by_checkbox( this, document.forms['elasticity3'].elements['elasticity3:hubbardV0'] )" />
- <h:outputText value="LDA + U" />
+ <h:outputText value="LDA + U" /> --%>
<h:outputText value="Hubbard_U: Uo" />
- <h:inputText id="hubbardV0" value="#{ElasInputManager.inputBean.hubbardU0}" />
+ <h:inputText id="hubbardV0" value="#{ElasInputManager.inputBean.hubbardU0}" disabled="#{species.ldau}"/>
<h:outputText value="dU" />
- <h:inputText id="hubbarda" value="#{ElasInputManager.inputBean.hubbarddU}" />
+ <h:inputText id="hubbarda" value="#{ElasInputManager.inputBean.hubbarddU}" disabled="#{species.ldau}"/>
</h:panelGrid>
@@ -538,10 +534,10 @@
</h:panelGrid>
<h:panelGrid width="100%" columns="4" columnClasses="cell_title, cell_data" rowClasses="cell_white, cell_gray">
- <h:outputText value="ecut_wfc" />
+ <h:outputText value="Ecut_wfc (Ry)" />
<h:inputText id="ecutwfc" value="#{ElasInputManager.inputBean.ecutwfc}" />
- <h:outputText value="ecut_rho" />
+ <h:outputText value="Ecut_rho (Ry)" />
<h:inputText id="ecutrho" value="#{ElasInputManager.inputBean.ecutrho}" />
<h:outputText value="# band" />
@@ -666,7 +662,7 @@
</h:form>
<h:outputText value="</body>" escape="false" />
-
+
</f:view>
-
-</html>
+
+</html>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
