Menu
▾
▴
[Vlab-commit] SF.net SVN: vlab:[1197] trunk/vlab/commons
|
From: <das...@us...> - 2008-10-31 18:43:41
|
Revision: 1197
http://vlab.svn.sourceforge.net/vlab/?rev=1197&view=rev
Author: dasil014
Date: 2008-10-31 18:43:30 +0000 (Fri, 31 Oct 2008)
Log Message:
-----------
Backup of the new code
Modified Paths:
--------------
trunk/vlab/commons/pwscf-input-beans/src/main/java/org/vlab/AtomicSpecies.java
trunk/vlab/commons/pwscf-input-beans/src/main/java/org/vlab/ElasPwscfBean.java
trunk/vlab/commons/pwscf-input-beans/src/main/java/org/vlab/PwscfBean.java
trunk/vlab/commons/service-stubs/project-executor-stub/src/main/resources/ProjectExecutorManager.wsdl
trunk/vlab/commons/service-stubs/pwscf-input-splitter-stub/src/main/resources/PwscfInputSplitter.wsdl
trunk/vlab/commons/service-stubs/task-executor-stub/src/main/resources/TaskExecutor.wsdl
trunk/vlab/commons/vlab-base/src/main/java/org/vlab/HighTemp/HighTemp.java
trunk/vlab/commons/vlab-base/src/main/java/org/vlab/MonitorInterface/Monitor.java
trunk/vlab/commons/vlab-base/src/main/java/org/vlab/ProjectManager/Manager.java
trunk/vlab/commons/vlab-base/src/main/resources/resource.properties
trunk/vlab/commons/vlab-db/src/main/resources/dbresource.properties
Added Paths:
-----------
trunk/vlab/commons/vlab-base/src/main/java/org/vlab/PlotView/
trunk/vlab/commons/vlab-base/src/main/java/org/vlab/PlotView/MyPlot.java
trunk/vlab/commons/vlab-base/src/main/java/org/vlab/PlotView/PlotData.java
trunk/vlab/commons/vlab-base/src/main/java/org/vlab/PlotView/PreparePlot.java
trunk/vlab/commons/vlab-common/src/main/java/org/vlab/services/GenericSample.java
trunk/vlab/commons/vlab-common/src/main/java/org/vlab/services/Param1.java
trunk/vlab/commons/vlab-common/src/main/java/org/vlab/services/ParamVal.java
trunk/vlab/commons/vlab-common/src/main/java/org/vlab/services/ProjectInput.java
trunk/vlab/commons/vlab-common/src/main/java/org/vlab/services/PwCard.java
trunk/vlab/commons/vlab-common/src/main/java/org/vlab/services/PwNameList.java
trunk/vlab/commons/vlab-common/src/main/java/org/vlab/services/VectType.java
Modified: trunk/vlab/commons/pwscf-input-beans/src/main/java/org/vlab/AtomicSpecies.java
===================================================================
--- trunk/vlab/commons/pwscf-input-beans/src/main/java/org/vlab/AtomicSpecies.java 2008-10-30 22:30:16 UTC (rev 1196)
+++ trunk/vlab/commons/pwscf-input-beans/src/main/java/org/vlab/AtomicSpecies.java 2008-10-31 18:43:30 UTC (rev 1197)
@@ -7,9 +7,11 @@
public class AtomicSpecies implements java.io.Serializable {
// Data members
- private String symbol;
- private Double mass;
- private String pseudoPotential;
+ private String symbol;
+ private Double mass;
+ private String pseudoPotential;
+ private String magnetization;
+ private Boolean ldau;
//private UploadedFile file;
// Default Constructor
@@ -23,9 +25,11 @@
}
// Getters
- public String getSymbol() { return symbol; }
- public Double getMass() { return mass; }
- public String getPseudoPotential() { return pseudoPotential; }
+ public String getSymbol() { return symbol; }
+ public Double getMass() { return mass; }
+ public String getPseudoPotential() { return pseudoPotential; }
+ public String getMagnetization() { return magnetization; }
+ public Boolean getLdau() { return ldau; }
/*
public UploadedFile getFile() {
System.out.println( "getting File" );
@@ -51,6 +55,12 @@
public void setPseudoPotential( String newPseudoPotential ) {
pseudoPotential = newPseudoPotential;
}
+ public void setMagnetization(String newMagnetization){
+ magnetization = newMagnetization;
+ }
+ public void setLdau(Boolean newLdau){
+ ldau = newLdau;
+ }
/*
public void setFile( UploadedFile newFile ) {
System.out.println( "setting file" );
Modified: trunk/vlab/commons/pwscf-input-beans/src/main/java/org/vlab/ElasPwscfBean.java
===================================================================
--- trunk/vlab/commons/pwscf-input-beans/src/main/java/org/vlab/ElasPwscfBean.java 2008-10-30 22:30:16 UTC (rev 1196)
+++ trunk/vlab/commons/pwscf-input-beans/src/main/java/org/vlab/ElasPwscfBean.java 2008-10-31 18:43:30 UTC (rev 1197)
@@ -60,8 +60,8 @@
private String hubbardU0;
private String hubbarddU;
private String magnetizationSpecies;
- private Boolean nspin;
- private Boolean ldaPlusU;
+ //private Boolean nspin;
+ //private Boolean ldaPlusU;
// K Points
private String KPoints;
@@ -119,6 +119,7 @@
private Double y2z3;
private Boolean strain;
+ private Boolean spinpolarized;
// Electrons
private String convThr; // adv
@@ -152,6 +153,8 @@
setXy1(new Integer(0));
//setXy2(new Double(0.01));
+ //setSpinpolarized(new Boolean(false));
+
setHtX(4);
setHtY(4);
setHtZ(4);
@@ -214,11 +217,13 @@
setMeshY(new Integer(6));
setMeshZ(new Integer(6));
- setNspin( new Boolean(false));
- setLdaPlusU(new Boolean(false));
+ //setNspin( new Boolean(false));
+ //setLdaPlusU(new Boolean(false));
//setNspin(new Boolean(true));
//setLdaPlusU(new Boolean(true));
-
+ //setSpinpolarized(new Boolean(false));
+
+
setMagnetizationSpecies(new String("0.535"));
//setHubbardU0(new String("5.5963"));
//setHubbarddU(new String("-0.001"));
@@ -295,10 +300,11 @@
}
//Getters
- public Boolean getNspin() { return nspin; }
+ //public Boolean getNspin() { return nspin; }
- public Boolean getLdaPlusU(){ return ldaPlusU; }
-
+ //public Boolean getLdaPlusU(){ return ldaPlusU; }
+ public Boolean getSpinpolarized(){ return spinpolarized; }
+
public Boolean getStrain(){ return strain; }
public Integer getXx1(){ return xx1; }
@@ -701,9 +707,11 @@
public void setStartcount(int newStartcount){ this.startcount=newStartcount; }
- public void setLdaPlusU(Boolean newLdaPlusU){ this.ldaPlusU=newLdaPlusU; }
+ public void setSpinpolarized(Boolean newSpinpolarized) { this.spinpolarized = newSpinpolarized; }
+
+ //public void setLdaPlusU(Boolean newLdaPlusU){ this.ldaPlusU=newLdaPlusU; }
- public void setNspin( Boolean newNspin) { this.nspin = newNspin; }
+ //public void setNspin( Boolean newNspin) { this.nspin = newNspin; }
public void setStrain(Boolean newStrain){ this.strain=newStrain; }
Modified: trunk/vlab/commons/pwscf-input-beans/src/main/java/org/vlab/PwscfBean.java
===================================================================
--- trunk/vlab/commons/pwscf-input-beans/src/main/java/org/vlab/PwscfBean.java 2008-10-30 22:30:16 UTC (rev 1196)
+++ trunk/vlab/commons/pwscf-input-beans/src/main/java/org/vlab/PwscfBean.java 2008-10-31 18:43:30 UTC (rev 1197)
@@ -58,6 +58,7 @@
private boolean ldaPlusU;
private Integer ldaSpecies;
private List hubbard;
+ private boolean spinpolarized;
// Electrons
private String convThr; // adv
@@ -287,6 +288,7 @@
public String getInput() { return input; }
public String getUniqueStamp() { return uniqueStamp; }
public List getHubbard() { return hubbard; }
+ public Boolean getSpinpolarized() { return spinpolarized; }
public Integer getMagnetizationSpecies() { return magnetizationSpecies; }
public List getStartingMagnetization() { return startingMagnetization; }
@@ -326,6 +328,7 @@
public void setLdaPlusU ( Boolean newLdaPlusU ) { ldaPlusU = newLdaPlusU; }
public void setLdaSpecies ( Integer newLdaSpecies ) { ldaSpecies = newLdaSpecies; }
public void setHubbard ( List newHubbard ) { hubbard = newHubbard; }
+ public void setSpinpolarized ( Boolean newSpinpolarized ) { spinpolarized = newSpinpolarized; }
// Electrons
public void setConvThr ( String newConvThr ) { convThr = newConvThr; }
public void setDiagonalization( String newDiagonalization) { diagonalization = newDiagonalization; }
Modified: trunk/vlab/commons/service-stubs/project-executor-stub/src/main/resources/ProjectExecutorManager.wsdl
===================================================================
--- trunk/vlab/commons/service-stubs/project-executor-stub/src/main/resources/ProjectExecutorManager.wsdl 2008-10-30 22:30:16 UTC (rev 1196)
+++ trunk/vlab/commons/service-stubs/project-executor-stub/src/main/resources/ProjectExecutorManager.wsdl 2008-10-31 18:43:30 UTC (rev 1197)
@@ -83,10 +83,6 @@
</wsdl:message>
- <wsdl:message name="preparedListUrlResponse">
-
- </wsdl:message>
-
<wsdl:message name="setProjectTypeResponse">
</wsdl:message>
@@ -107,11 +103,11 @@
</wsdl:message>
- <wsdl:message name="convertToVisualizationResponse">
+ <wsdl:message name="getProjectTypeRequest">
</wsdl:message>
- <wsdl:message name="getProjectTypeRequest">
+ <wsdl:message name="getMemorySizeRequest">
</wsdl:message>
@@ -119,10 +115,6 @@
</wsdl:message>
- <wsdl:message name="getMemorySizeRequest">
-
- </wsdl:message>
-
<wsdl:message name="setNewInputEditedRequest">
<wsdl:part name="newNewInputEdited" type="xsd:string"/>
@@ -223,7 +215,7 @@
</wsdl:message>
- <wsdl:message name="copyToDownloadResponse">
+ <wsdl:message name="saveNewInputEditedRequest">
</wsdl:message>
@@ -231,10 +223,6 @@
</wsdl:message>
- <wsdl:message name="saveNewInputEditedRequest">
-
- </wsdl:message>
-
<wsdl:message name="setProjectNameRequest">
<wsdl:part name="newProjectName" type="xsd:string"/>
@@ -267,26 +255,22 @@
</wsdl:message>
- <wsdl:message name="convertToVisualizationRequest">
-
- </wsdl:message>
-
<wsdl:message name="getFiletodbResponse">
<wsdl:part name="getFiletodbReturn" type="xsd:string"/>
</wsdl:message>
- <wsdl:message name="loadPropertiesRequest">
-
- </wsdl:message>
-
<wsdl:message name="getStringResultFitResponse">
<wsdl:part name="getStringResultFitReturn" type="xsd:string"/>
</wsdl:message>
+ <wsdl:message name="loadPropertiesRequest">
+
+ </wsdl:message>
+
<wsdl:message name="getStringResultFitRequest">
</wsdl:message>
@@ -341,10 +325,6 @@
</wsdl:message>
- <wsdl:message name="copyToDownloadRequest">
-
- </wsdl:message>
-
<wsdl:message name="getUrlListofFilesRequest">
</wsdl:message>
@@ -389,16 +369,16 @@
</wsdl:message>
+ <wsdl:message name="setProjectUserNameResponse">
+
+ </wsdl:message>
+
<wsdl:message name="setProjectIdRequest">
<wsdl:part name="newProjectId" type="xsd:string"/>
</wsdl:message>
- <wsdl:message name="setProjectUserNameResponse">
-
- </wsdl:message>
-
<wsdl:message name="setFullpathprojectRequest">
<wsdl:part name="newFullpathproject" type="xsd:string"/>
@@ -423,10 +403,6 @@
</wsdl:message>
- <wsdl:message name="preparedListUrlRequest">
-
- </wsdl:message>
-
<wsdl:message name="getCompoundRequest">
</wsdl:message>
@@ -463,6 +439,22 @@
<wsdl:portType name="ProjectExecutorManager">
+ <wsdl:operation name="execute">
+
+ <wsdl:input message="impl:executeRequest" name="executeRequest"/>
+
+ <wsdl:output message="impl:executeResponse" name="executeResponse"/>
+
+ </wsdl:operation>
+
+ <wsdl:operation name="loadProperties">
+
+ <wsdl:input message="impl:loadPropertiesRequest" name="loadPropertiesRequest"/>
+
+ <wsdl:output message="impl:loadPropertiesResponse" name="loadPropertiesResponse"/>
+
+ </wsdl:operation>
+
<wsdl:operation name="setProjectName" parameterOrder="newProjectName">
<wsdl:input message="impl:setProjectNameRequest" name="setProjectNameRequest"/>
@@ -791,68 +783,64 @@
</wsdl:operation>
- <wsdl:operation name="copyToDownload">
+ <wsdl:operation name="createZipFile">
- <wsdl:input message="impl:copyToDownloadRequest" name="copyToDownloadRequest"/>
+ <wsdl:input message="impl:createZipFileRequest" name="createZipFileRequest"/>
- <wsdl:output message="impl:copyToDownloadResponse" name="copyToDownloadResponse"/>
+ <wsdl:output message="impl:createZipFileResponse" name="createZipFileResponse"/>
</wsdl:operation>
- <wsdl:operation name="convertToVisualization">
+ <wsdl:operation name="getDownloadFile">
- <wsdl:input message="impl:convertToVisualizationRequest" name="convertToVisualizationRequest"/>
+ <wsdl:input message="impl:getDownloadFileRequest" name="getDownloadFileRequest"/>
- <wsdl:output message="impl:convertToVisualizationResponse" name="convertToVisualizationResponse"/>
+ <wsdl:output message="impl:getDownloadFileResponse" name="getDownloadFileResponse"/>
</wsdl:operation>
- <wsdl:operation name="preparedListUrl">
+ </wsdl:portType>
- <wsdl:input message="impl:preparedListUrlRequest" name="preparedListUrlRequest"/>
+ <wsdl:binding name="ProjectExecutorManagerSoapBinding" type="impl:ProjectExecutorManager">
- <wsdl:output message="impl:preparedListUrlResponse" name="preparedListUrlResponse"/>
+ <wsdlsoap:binding style="rpc" transport="http://schemas.xmlsoap.org/soap/http"/>
- </wsdl:operation>
+ <wsdl:operation name="execute">
- <wsdl:operation name="createZipFile">
+ <wsdlsoap:operation soapAction=""/>
- <wsdl:input message="impl:createZipFileRequest" name="createZipFileRequest"/>
+ <wsdl:input name="executeRequest">
- <wsdl:output message="impl:createZipFileResponse" name="createZipFileResponse"/>
+ <wsdlsoap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="http://services.vlab.org" use="encoded"/>
- </wsdl:operation>
+ </wsdl:input>
- <wsdl:operation name="getDownloadFile">
+ <wsdl:output name="executeResponse">
- <wsdl:input message="impl:getDownloadFileRequest" name="getDownloadFileRequest"/>
+ <wsdlsoap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="http://services.vlab.org" use="encoded"/>
- <wsdl:output message="impl:getDownloadFileResponse" name="getDownloadFileResponse"/>
+ </wsdl:output>
</wsdl:operation>
<wsdl:operation name="loadProperties">
- <wsdl:input message="impl:loadPropertiesRequest" name="loadPropertiesRequest"/>
+ <wsdlsoap:operation soapAction=""/>
- <wsdl:output message="impl:loadPropertiesResponse" name="loadPropertiesResponse"/>
+ <wsdl:input name="loadPropertiesRequest">
- </wsdl:operation>
+ <wsdlsoap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="http://services.vlab.org" use="encoded"/>
- <wsdl:operation name="execute">
+ </wsdl:input>
- <wsdl:input message="impl:executeRequest" name="executeRequest"/>
+ <wsdl:output name="loadPropertiesResponse">
- <wsdl:output message="impl:executeResponse" name="executeResponse"/>
+ <wsdlsoap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="http://services.vlab.org" use="encoded"/>
+ </wsdl:output>
+
</wsdl:operation>
- </wsdl:portType>
-
- <wsdl:binding name="ProjectExecutorManagerSoapBinding" type="impl:ProjectExecutorManager">
-
- <wsdlsoap:binding style="rpc" transport="http://schemas.xmlsoap.org/soap/http"/>
-
<wsdl:operation name="setProjectName">
<wsdlsoap:operation soapAction=""/>
@@ -1591,60 +1579,6 @@
</wsdl:operation>
- <wsdl:operation name="copyToDownload">
-
- <wsdlsoap:operation soapAction=""/>
-
- <wsdl:input name="copyToDownloadRequest">
-
- <wsdlsoap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="http://services.vlab.org" use="encoded"/>
-
- </wsdl:input>
-
- <wsdl:output name="copyToDownloadResponse">
-
- <wsdlsoap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="http://services.vlab.org" use="encoded"/>
-
- </wsdl:output>
-
- </wsdl:operation>
-
- <wsdl:operation name="convertToVisualization">
-
- <wsdlsoap:operation soapAction=""/>
-
- <wsdl:input name="convertToVisualizationRequest">
-
- <wsdlsoap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="http://services.vlab.org" use="encoded"/>
-
- </wsdl:input>
-
- <wsdl:output name="convertToVisualizationResponse">
-
- <wsdlsoap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="http://services.vlab.org" use="encoded"/>
-
- </wsdl:output>
-
- </wsdl:operation>
-
- <wsdl:operation name="preparedListUrl">
-
- <wsdlsoap:operation soapAction=""/>
-
- <wsdl:input name="preparedListUrlRequest">
-
- <wsdlsoap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="http://services.vlab.org" use="encoded"/>
-
- </wsdl:input>
-
- <wsdl:output name="preparedListUrlResponse">
-
- <wsdlsoap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="http://services.vlab.org" use="encoded"/>
-
- </wsdl:output>
-
- </wsdl:operation>
-
<wsdl:operation name="createZipFile">
<wsdlsoap:operation soapAction=""/>
@@ -1681,49 +1615,13 @@
</wsdl:operation>
- <wsdl:operation name="loadProperties">
-
- <wsdlsoap:operation soapAction=""/>
-
- <wsdl:input name="loadPropertiesRequest">
-
- <wsdlsoap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="http://services.vlab.org" use="encoded"/>
-
- </wsdl:input>
-
- <wsdl:output name="loadPropertiesResponse">
-
- <wsdlsoap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="http://services.vlab.org" use="encoded"/>
-
- </wsdl:output>
-
- </wsdl:operation>
-
- <wsdl:operation name="execute">
-
- <wsdlsoap:operation soapAction=""/>
-
- <wsdl:input name="executeRequest">
-
- <wsdlsoap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="http://services.vlab.org" use="encoded"/>
-
- </wsdl:input>
-
- <wsdl:output name="executeResponse">
-
- <wsdlsoap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="http://services.vlab.org" use="encoded"/>
-
- </wsdl:output>
-
- </wsdl:operation>
-
</wsdl:binding>
<wsdl:service name="ProjectExecutorManagerService">
<wsdl:port binding="impl:ProjectExecutorManagerSoapBinding" name="ProjectExecutorManager">
- <wsdlsoap:address location="http://localhost:8180/project-executor/services/ProjectExecutorManager"/>
+ <wsdlsoap:address location="http://dasilveira.msi.umn.edu:8180/project-executor/services/ProjectExecutorManager"/>
</wsdl:port>
Modified: trunk/vlab/commons/service-stubs/pwscf-input-splitter-stub/src/main/resources/PwscfInputSplitter.wsdl
===================================================================
--- trunk/vlab/commons/service-stubs/pwscf-input-splitter-stub/src/main/resources/PwscfInputSplitter.wsdl 2008-10-30 22:30:16 UTC (rev 1196)
+++ trunk/vlab/commons/service-stubs/pwscf-input-splitter-stub/src/main/resources/PwscfInputSplitter.wsdl 2008-10-31 18:43:30 UTC (rev 1197)
@@ -22,18 +22,10 @@
</wsdl:message>
- <wsdl:message name="writeInputForBreakRequest">
-
- </wsdl:message>
-
<wsdl:message name="setAproxeqstExecutableResponse">
</wsdl:message>
- <wsdl:message name="CheckArgmentsRequest">
-
- </wsdl:message>
-
<wsdl:message name="getTarBallResponse">
<wsdl:part name="getTarBallReturn" type="xsd:string"/>
@@ -50,146 +42,186 @@
</wsdl:message>
- <wsdl:message name="setBuildFileRequest">
+ <wsdl:message name="CreateDirParentResponse">
- <wsdl:part name="buildXmlLocation" type="xsd:string"/>
+ <wsdl:part name="CreateDirParentReturn" type="xsd:boolean"/>
</wsdl:message>
- <wsdl:message name="generateTimestampResponse">
+ <wsdl:message name="getStatusRequest">
- <wsdl:part name="generateTimestampReturn" type="xsd:string"/>
-
</wsdl:message>
- <wsdl:message name="getTarBallSizeRequest">
+ <wsdl:message name="getTarBallSizeResponse">
+ <wsdl:part name="getTarBallSizeReturn" type="xsd:int"/>
+
</wsdl:message>
- <wsdl:message name="CreateTarBallResponse">
+ <wsdl:message name="stopResponse">
</wsdl:message>
- <wsdl:message name="CreateDirParentResponse">
+ <wsdl:message name="setFilesRequest">
- <wsdl:part name="CreateDirParentReturn" type="xsd:boolean"/>
+ <wsdl:part name="get_path_files" type="xsd:string"/>
</wsdl:message>
- <wsdl:message name="runRequest">
+ <wsdl:message name="getFilesResponse">
+ <wsdl:part name="getFilesReturn" type="tns1:ArrayOf_soapenc_string"/>
+
</wsdl:message>
- <wsdl:message name="setInputFileResponse">
+ <wsdl:message name="CreateDirParentRequest">
+ <wsdl:part name="newdir" type="xsd:string"/>
+
</wsdl:message>
- <wsdl:message name="CheckArgmentsResponse">
+ <wsdl:message name="readFileResponse">
- <wsdl:part name="CheckArgmentsReturn" type="xsd:string"/>
+ <wsdl:part name="readFileReturn" type="xsd:string"/>
</wsdl:message>
- <wsdl:message name="getStatusRequest">
+ <wsdl:message name="getTarBallRequest">
</wsdl:message>
- <wsdl:message name="writeInputForBreakResponse">
+ <wsdl:message name="setDataZipResponse">
- <wsdl:part name="writeInputForBreakReturn" type="xsd:string"/>
+ </wsdl:message>
+ <wsdl:message name="getStatusResponse">
+
+ <wsdl:part name="getStatusReturn" type="xsd:string"/>
+
</wsdl:message>
- <wsdl:message name="getTarBallSizeResponse">
+ <wsdl:message name="CheckArgmentsRequest">
- <wsdl:part name="getTarBallSizeReturn" type="xsd:int"/>
+ </wsdl:message>
+ <wsdl:message name="writeInputForBreakRequest">
+
</wsdl:message>
- <wsdl:message name="setAproxeqstExecutableRequest">
+ <wsdl:message name="setBuildFileRequest">
- <wsdl:part name="aproxeqstLocation" type="xsd:string"/>
+ <wsdl:part name="buildXmlLocation" type="xsd:string"/>
</wsdl:message>
- <wsdl:message name="stopResponse">
+ <wsdl:message name="startReadRequest">
</wsdl:message>
- <wsdl:message name="setInputFileRequest">
+ <wsdl:message name="generateTimestampResponse">
- <wsdl:part name="newInputFile" type="xsd:string"/>
+ <wsdl:part name="generateTimestampReturn" type="xsd:string"/>
</wsdl:message>
- <wsdl:message name="getArgsResponse">
+ <wsdl:message name="byteReadRequest">
- <wsdl:part name="getArgsReturn" type="tns1:ArrayOf_soapenc_string"/>
+ </wsdl:message>
+ <wsdl:message name="getTarBallSizeRequest">
+
</wsdl:message>
- <wsdl:message name="setFilesResponse">
+ <wsdl:message name="CreateTarBallResponse">
</wsdl:message>
- <wsdl:message name="generateTimestampRequest">
+ <wsdl:message name="runRequest">
</wsdl:message>
- <wsdl:message name="setSizeZipFileResponse">
+ <wsdl:message name="CheckArgmentsResponse">
+ <wsdl:part name="CheckArgmentsReturn" type="xsd:string"/>
+
</wsdl:message>
- <wsdl:message name="getCreateBuilXmlFileRequest">
+ <wsdl:message name="setInputFileResponse">
</wsdl:message>
- <wsdl:message name="AddDirToZiPResponse">
+ <wsdl:message name="writeInputForBreakResponse">
+ <wsdl:part name="writeInputForBreakReturn" type="xsd:string"/>
+
</wsdl:message>
- <wsdl:message name="getFilesRequest">
+ <wsdl:message name="setAproxeqstExecutableRequest">
+ <wsdl:part name="aproxeqstLocation" type="xsd:string"/>
+
</wsdl:message>
- <wsdl:message name="setFilesRequest">
+ <wsdl:message name="startReadResponse">
- <wsdl:part name="get_path_files" type="xsd:string"/>
+ </wsdl:message>
+ <wsdl:message name="setFilesResponse">
+
</wsdl:message>
- <wsdl:message name="setArgsRequest">
+ <wsdl:message name="getArgsResponse">
- <wsdl:part name="_args" type="tns1:ArrayOf_soapenc_string"/>
+ <wsdl:part name="getArgsReturn" type="tns1:ArrayOf_soapenc_string"/>
</wsdl:message>
- <wsdl:message name="getFilesResponse">
+ <wsdl:message name="setInputFileRequest">
- <wsdl:part name="getFilesReturn" type="tns1:ArrayOf_soapenc_string"/>
+ <wsdl:part name="newInputFile" type="xsd:string"/>
</wsdl:message>
- <wsdl:message name="CreateDirParentRequest">
+ <wsdl:message name="generateTimestampRequest">
- <wsdl:part name="newdir" type="xsd:string"/>
+ </wsdl:message>
+ <wsdl:message name="setSizeZipFileResponse">
+
</wsdl:message>
- <wsdl:message name="setBuildFileResponse">
+ <wsdl:message name="getFilesRequest">
</wsdl:message>
- <wsdl:message name="setArgsResponse">
+ <wsdl:message name="byteReadResponse">
+ <wsdl:part name="byteReadReturn" type="xsd:int"/>
+
</wsdl:message>
- <wsdl:message name="getCreateBuilXmlFileResponse">
+ <wsdl:message name="AddDirToZiPResponse">
- <wsdl:part name="getCreateBuilXmlFileReturn" type="xsd:string"/>
+ </wsdl:message>
+ <wsdl:message name="getCreateBuilXmlFileRequest">
+
</wsdl:message>
+ <wsdl:message name="setArgsRequest">
+
+ <wsdl:part name="_args" type="tns1:ArrayOf_soapenc_string"/>
+
+ </wsdl:message>
+
+ <wsdl:message name="setBuildFileResponse">
+
+ </wsdl:message>
+
+ <wsdl:message name="setArgsResponse">
+
+ </wsdl:message>
+
<wsdl:message name="AddDirToZiPRequest">
<wsdl:part name="CurrentFileToZip" type="tns1:ArrayOf_soapenc_string"/>
@@ -198,23 +230,25 @@
</wsdl:message>
- <wsdl:message name="getArgsRequest">
+ <wsdl:message name="getCreateBuilXmlFileResponse">
+ <wsdl:part name="getCreateBuilXmlFileReturn" type="xsd:string"/>
+
</wsdl:message>
- <wsdl:message name="runResponse">
+ <wsdl:message name="getArgsRequest">
</wsdl:message>
- <wsdl:message name="stopRequest">
+ <wsdl:message name="readFileRequest">
</wsdl:message>
- <wsdl:message name="getTarBallRequest">
+ <wsdl:message name="runResponse">
</wsdl:message>
- <wsdl:message name="setDataZipResponse">
+ <wsdl:message name="stopRequest">
</wsdl:message>
@@ -224,12 +258,6 @@
</wsdl:message>
- <wsdl:message name="getStatusResponse">
-
- <wsdl:part name="getStatusReturn" type="xsd:string"/>
-
- </wsdl:message>
-
<wsdl:message name="setRefineStyleResponse">
</wsdl:message>
@@ -340,6 +368,30 @@
</wsdl:operation>
+ <wsdl:operation name="startRead">
+
+ <wsdl:input message="impl:startReadRequest" name="startReadRequest"/>
+
+ <wsdl:output message="impl:startReadResponse" name="startReadResponse"/>
+
+ </wsdl:operation>
+
+ <wsdl:operation name="byteRead">
+
+ <wsdl:input message="impl:byteReadRequest" name="byteReadRequest"/>
+
+ <wsdl:output message="impl:byteReadResponse" name="byteReadResponse"/>
+
+ </wsdl:operation>
+
+ <wsdl:operation name="readFile">
+
+ <wsdl:input message="impl:readFileRequest" name="readFileRequest"/>
+
+ <wsdl:output message="impl:readFileResponse" name="readFileResponse"/>
+
+ </wsdl:operation>
+
<wsdl:operation name="setInputFile" parameterOrder="newInputFile">
<wsdl:input message="impl:setInputFileRequest" name="setInputFileRequest"/>
@@ -652,6 +704,60 @@
</wsdl:operation>
+ <wsdl:operation name="startRead">
+
+ <wsdlsoap:operation soapAction=""/>
+
+ <wsdl:input name="startReadRequest">
+
+ <wsdlsoap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="http://services.vlab.org" use="encoded"/>
+
+ </wsdl:input>
+
+ <wsdl:output name="startReadResponse">
+
+ <wsdlsoap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="http://services.vlab.org" use="encoded"/>
+
+ </wsdl:output>
+
+ </wsdl:operation>
+
+ <wsdl:operation name="byteRead">
+
+ <wsdlsoap:operation soapAction=""/>
+
+ <wsdl:input name="byteReadRequest">
+
+ <wsdlsoap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="http://services.vlab.org" use="encoded"/>
+
+ </wsdl:input>
+
+ <wsdl:output name="byteReadResponse">
+
+ <wsdlsoap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="http://services.vlab.org" use="encoded"/>
+
+ </wsdl:output>
+
+ </wsdl:operation>
+
+ <wsdl:operation name="readFile">
+
+ <wsdlsoap:operation soapAction=""/>
+
+ <wsdl:input name="readFileRequest">
+
+ <wsdlsoap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="http://services.vlab.org" use="encoded"/>
+
+ </wsdl:input>
+
+ <wsdl:output name="readFileResponse">
+
+ <wsdlsoap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="http://services.vlab.org" use="encoded"/>
+
+ </wsdl:output>
+
+ </wsdl:operation>
+
<wsdl:operation name="setInputFile">
<wsdlsoap:operation soapAction=""/>
@@ -820,7 +926,7 @@
<wsdl:port binding="impl:PwscfInputSplitterSoapBinding" name="PwscfInputSplitter">
- <wsdlsoap:address location="http://localhost:8080/pwscf-input-splitter-service/services/PwscfInputSplitter"/>
+ <wsdlsoap:address location="http://localhost:8480/pwscf-input-splitter-service/services/PwscfInputSplitter"/>
</wsdl:port>
Modified: trunk/vlab/commons/service-stubs/task-executor-stub/src/main/resources/TaskExecutor.wsdl
===================================================================
--- trunk/vlab/commons/service-stubs/task-executor-stub/src/main/resources/TaskExecutor.wsdl 2008-10-30 22:30:16 UTC (rev 1196)
+++ trunk/vlab/commons/service-stubs/task-executor-stub/src/main/resources/TaskExecutor.wsdl 2008-10-31 18:43:30 UTC (rev 1197)
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<wsdl:definitions targetNamespace="http://services.vlab.org" xmlns:apachesoap="http://xml.apache.org/xml-soap" xmlns:impl="http://services.vlab.org" xmlns:intf="http://services.vlab.org" xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:wsdlsoap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-<!--WSDL created by Apache Axis version: 1.3
-Built on Oct 05, 2005 (05:23:37 EDT)-->
+<!--WSDL created by Apache Axis version: 1.4
+Built on Apr 22, 2006 (06:55:48 PDT)-->
<wsdl:message name="setStringOutPutMatdynRequest">
@@ -15,6 +15,12 @@
</wsdl:message>
+ <wsdl:message name="getTeraGridJobOutputResponse">
+
+ <wsdl:part name="getTeraGridJobOutputReturn" type="xsd:string"/>
+
+ </wsdl:message>
+
<wsdl:message name="getNewInputEditedRequest">
</wsdl:message>
@@ -141,6 +147,14 @@
</wsdl:message>
+ <wsdl:message name="getTeraGridJobOutputRequest">
+
+ <wsdl:part name="clusterId" type="xsd:int"/>
+
+ <wsdl:part name="jobId" type="xsd:int"/>
+
+ </wsdl:message>
+
<wsdl:message name="setFileIndexResponse">
</wsdl:message>
@@ -217,6 +231,12 @@
</wsdl:message>
+ <wsdl:message name="setRunTeraGridResourceResponse">
+
+ <wsdl:part name="setRunTeraGridResourceReturn" type="xsd:string"/>
+
+ </wsdl:message>
+
<wsdl:message name="saveNewInputRequest">
</wsdl:message>
@@ -231,6 +251,12 @@
</wsdl:message>
+ <wsdl:message name="getTeraGridJobStatusResponse">
+
+ <wsdl:part name="getTeraGridJobStatusReturn" type="xsd:string"/>
+
+ </wsdl:message>
+
<wsdl:message name="setFileSentResponse">
</wsdl:message>
@@ -417,6 +443,16 @@
</wsdl:message>
+ <wsdl:message name="setRunTeraGridResourceRequest">
+
+ <wsdl:part name="tgGramHostName" type="xsd:string"/>
+
+ <wsdl:part name="batch_sys" type="xsd:string"/>
+
+ <wsdl:part name="gtVersion" type="xsd:string"/>
+
+ </wsdl:message>
+
<wsdl:message name="getOutputPhononRequest">
</wsdl:message>
@@ -425,6 +461,14 @@
</wsdl:message>
+ <wsdl:message name="getTeraGridJobStatusRequest">
+
+ <wsdl:part name="clusterId" type="xsd:int"/>
+
+ <wsdl:part name="jobId" type="xsd:int"/>
+
+ </wsdl:message>
+
<wsdl:message name="setFullPathPackageResponse">
</wsdl:message>
@@ -1405,6 +1449,30 @@
</wsdl:operation>
+ <wsdl:operation name="setRunTeraGridResource" parameterOrder="tgGramHostName batch_sys gtVersion">
+
+ <wsdl:input message="impl:setRunTeraGridResourceRequest" name="setRunTeraGridResourceRequest"/>
+
+ <wsdl:output message="impl:setRunTeraGridResourceResponse" name="setRunTeraGridResourceResponse"/>
+
+ </wsdl:operation>
+
+ <wsdl:operation name="getTeraGridJobStatus" parameterOrder="clusterId jobId">
+
+ <wsdl:input message="impl:getTeraGridJobStatusRequest" name="getTeraGridJobStatusRequest"/>
+
+ <wsdl:output message="impl:getTeraGridJobStatusResponse" name="getTeraGridJobStatusResponse"/>
+
+ </wsdl:operation>
+
+ <wsdl:operation name="getTeraGridJobOutput" parameterOrder="clusterId jobId">
+
+ <wsdl:input message="impl:getTeraGridJobOutputRequest" name="getTeraGridJobOutputRequest"/>
+
+ <wsdl:output message="impl:getTeraGridJobOutputResponse" name="getTeraGridJobOutputResponse"/>
+
+ </wsdl:operation>
+
<wsdl:operation name="readFile">
<wsdl:input message="impl:readFileRequest" name="readFileRequest"/>
@@ -2841,6 +2909,60 @@
</wsdl:operation>
+ <wsdl:operation name="setRunTeraGridResource">
+
+ <wsdlsoap:operation soapAction=""/>
+
+ <wsdl:input name="setRunTeraGridResourceRequest">
+
+ <wsdlsoap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="http://services.vlab.org" use="encoded"/>
+
+ </wsdl:input>
+
+ <wsdl:output name="setRunTeraGridResourceResponse">
+
+ <wsdlsoap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="http://services.vlab.org" use="encoded"/>
+
+ </wsdl:output>
+
+ </wsdl:operation>
+
+ <wsdl:operation name="getTeraGridJobStatus">
+
+ <wsdlsoap:operation soapAction=""/>
+
+ <wsdl:input name="getTeraGridJobStatusRequest">
+
+ <wsdlsoap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="http://services.vlab.org" use="encoded"/>
+
+ </wsdl:input>
+
+ <wsdl:output name="getTeraGridJobStatusResponse">
+
+ <wsdlsoap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="http://services.vlab.org" use="encoded"/>
+
+ </wsdl:output>
+
+ </wsdl:operation>
+
+ <wsdl:operation name="getTeraGridJobOutput">
+
+ <wsdlsoap:operation soapAction=""/>
+
+ <wsdl:input name="getTeraGridJobOutputRequest">
+
+ <wsdlsoap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="http://services.vlab.org" use="encoded"/>
+
+ </wsdl:input>
+
+ <wsdl:output name="getTeraGridJobOutputResponse">
+
+ <wsdlsoap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="http://services.vlab.org" use="encoded"/>
+
+ </wsdl:output>
+
+ </wsdl:operation>
+
<wsdl:operation name="readFile">
<wsdlsoap:operation soapAction=""/>
Modified: trunk/vlab/commons/vlab-base/src/main/java/org/vlab/HighTemp/HighTemp.java
===================================================================
--- trunk/vlab/commons/vlab-base/src/main/java/org/vlab/HighTemp/HighTemp.java 2008-10-30 22:30:16 UTC (rev 1196)
+++ trunk/vlab/commons/vlab-base/src/main/java/org/vlab/HighTemp/HighTemp.java 2008-10-31 18:43:30 UTC (rev 1197)
@@ -8,6 +8,12 @@
import org.vlab.*;
import java.sql.*;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipFile;
+import java.util.Enumeration;
+import org.apache.axis.encoding.Base64;
+
+
public class HighTemp {
private String projectId;
@@ -19,7 +25,11 @@
private String urlListofFiles;
private String htParmsContent;
private String downlodFileString;
- public String getUrlListofFiles(){
+
+ static final int BUFFER = 1024;
+
+
+ public String getUrlListofFiles(){
return urlListofFiles;
}
@@ -177,9 +187,9 @@
projexecManager.setExtractPhonon();
projexecManager.copyPhonon();
projexecManager.setRunThermo();
- projexecManager.copyToDownload();
- projexecManager.convertToVisualization();
- projexecManager.preparedListUrl();
+ //projexecManager.copyToDownload();
+ //projexecManager.convertToVisualization();
+ //projexecManager.preparedListUrl();
projexecManager.createZipFile();
downlodFileString = projexecManager.getDownloadFile();
@@ -195,21 +205,66 @@
ae.printStackTrace();
}
}
+
+ public void saveData(){
-/*
- private void runScriptExtractPhonon(){
+ byte[] DataToFile = null;
+
+ try{
+ DataToFile = Base64.decode(downlodFileString);
+ int sizeZipFile = (int) DataToFile.length;
+
+ File zipFile = new File("/tmp/vlab/hitempfiles/" + "hightempfile.zip");
+ System.out.println("[ProjectExecutor.java] File Size: " + downlodFileString.length());
+
+ OutputStream srcDest = new FileOutputStream(zipFile);
+ srcDest.write(DataToFile, 0, sizeZipFile);
+ srcDest.close();
+
+ }catch(Exception ae){
+ System.err.println("Error saving the hightempo file"+ae.getMessage());
+ ae.printStackTrace();
+ }
+ }
- System.out.println("Start the executiont to run the script r_filter_direct_final");
-
- try{
- projexecManager.setExtractPhonon();
-
- } catch (Exception ae){
- System.err.println("[HighTemp::setUpData] => Error Preparing the data"+ae.getMessage());
- ae.printStackTrace();
- }
-
- }*/
-
-
+ public String UnCompressHighTempFile(){
+
+ /* Starting the process to UnZip the file */
+ int count;
+ byte data[] = null;
+
+ try {
+ BufferedOutputStream dest = null;
+ BufferedInputStream is = null;
+ ZipEntry entry;
+ ZipFile zipfile = new ZipFile("/tmp/vlab/hitempfiles/" + "hightempfile.zip");
+ Enumeration e = zipfile.entries();
+
+ while(e.hasMoreElements()) {
+ entry = (ZipEntry) e.nextElement();
+ System.out.println("Extracting hightempfile.zip : " + entry);
+ is = new BufferedInputStream (zipfile.getInputStream(entry));
+
+ data = new byte[BUFFER];
+ FileOutputStream fos = new FileOutputStream("/tmp/vlab/hitempfiles/" + entry.getName());
+ dest = new BufferedOutputStream(fos, BUFFER);
+ while ((count = is.read(data, 0, BUFFER)) != -1) {
+ dest.write(data, 0, count);
+ }
+ dest.flush();
+ dest.close();
+ is.close();
+ }
+ } catch(Exception e) {
+ System.err.println("[HighTemp] In UnCompressHighTempFile() " + e.getMessage());
+ e.printStackTrace();
+ //System.exit(-1);
+ }
+ return "sucessfully Uncompress of hightempfile.zip";
+ }
+
+
+
+
+
}
Modified: trunk/vlab/commons/vlab-base/src/main/java/org/vlab/MonitorInterface/Monitor.java
===================================================================
--- trunk/vlab/commons/vlab-base/src/main/java/org/vlab/MonitorInterface/Monitor.java 2008-10-30 22:30:16 UTC (rev 1196)
+++ trunk/vlab/commons/vlab-base/src/main/java/org/vlab/MonitorInterface/Monitor.java 2008-10-31 18:43:30 UTC (rev 1197)
@@ -303,6 +303,8 @@
Connection dbCon = null;
ResultSet rs = null;
Statement s = null;
+
+
int numColumns ;
String queryString =
@@ -404,11 +406,13 @@
List ListContent = null;
Bdata Content = null;
+
+
startTime = new String[ListTask.size()];
serverSide = new String[ListTask.size()];
status = new String[ListTask.size()];
- packageName = new String[ListTask.size()];
+ packageName = new String[ListTask.size()];
endTime = new String[ListTask.size()];
setTaskSize(ListTask.size());
Added: trunk/vlab/commons/vlab-base/src/main/java/org/vlab/PlotView/MyPlot.java
===================================================================
--- trunk/vlab/commons/vlab-base/src/main/java/org/vlab/PlotView/MyPlot.java (rev 0)
+++ trunk/vlab/commons/vlab-base/src/main/java/org/vlab/PlotView/MyPlot.java 2008-10-31 18:43:30 UTC (rev 1197)
@@ -0,0 +1,365 @@
+package org.vlab.PlotView;
+
+
+public class MyPlot{
+
+ //public StringBuffer[] PlotMetaD = new StringBuffer[20];
+ //public StringBuffer[] PlotConnector = new StringBuffer[20];
+ //public StringBuffer[] PlotMetaDValu = new StringBuffer[20];
+ //public StringBuffer PlotColumnLables = new StringBuffer();
+
+ public PlotData[] plotdata;
+
+ public MyPlot() {
+
+ plotdata = new PlotData[19];
+
+ int i;
+ StringBuffer sa = new StringBuffer("");
+ StringBuffer sb = new StringBuffer("-");
+ StringBuffer sc = new StringBuffer("");
+ StringBuffer sd = new StringBuffer("");
+
+ for (i=0;i<plotdata.length;i++) {
+ plotdata[i] = new PlotData();
+ plotdata[i].PlotMetaD = new StringBuffer(sa);
+ plotdata[i].PlotMetaDValu = new StringBuffer(sd);
+ plotdata[i].PlotConnector = new StringBuffer(sb);
+ }
+
+
+ plotdata[0].PlotMetaD.append("Title");
+
+ //Label for X
+ sa = sc;
+ sa.append("Lx");
+ plotdata[1].PlotMetaD = sa;
+
+ //Label for Y
+ sa = new StringBuffer("");
+ sa.append("Ly");
+ plotdata[2].PlotMetaD = sa;
+
+ //X Range
+ sa = new StringBuffer("");
+ sa.append("Range_x");
+ plotdata[3].PlotMetaD = sa;
+
+ //Y Range - Not used yet.
+ sa = new StringBuffer("");
+ sa.append("Range_y");
+ plotdata[4].PlotMetaD = sa;
+
+ sa = new StringBuffer("");
+ sa.append("border_linewidth");
+ plotdata[5].PlotMetaD = sa;
+
+ //Tick of the whole graphic
+ sa = new StringBuffer("");
+ sa.append("Tick_scale");
+ plotdata[6].PlotMetaD = sa;
+
+ //sa = new StringBuffer("");
+ //sa.append("Ticks_y");
+ //plotdata[7].PlotMetaD = sa;
+
+ sa = new StringBuffer("");
+ sa.append("size");
+ plotdata[7].PlotMetaD = sa;
+
+ sa = new StringBuffer("");
+ sa.append("format_file");
+ plotdata[8].PlotMetaD = sa;
+
+ //Font default Times-Roman
+ sa = new StringBuffer("");
+ sa.append("Font");
+ plotdata[9].PlotMetaD = sa;
+
+ sa = new StringBuffer("");
+ sa.append("font_size");
+ plotdata[10].PlotMetaD = sa;
+
+ sa = new StringBuffer("");
+ sa.append("PosLegend");
+ plotdata[11].PlotMetaD = sa;
+
+ sa = new StringBuffer("");
+ sa.append("ncol_nlin");
+ plotdata[12].PlotMetaD = sa;
+
+ sa = new StringBuffer("");
+ sa.append("iabcissa");
+ plotdata[13].PlotMetaD = sa;
+
+ sa = new StringBuffer("");
+ sa.append("output_file");
+ plotdata[14].PlotMetaD = sa;
+
+ sa = new StringBuffer("");
+ sa.append("input_file");
+ plotdata[15].PlotMetaD = sa;
+
+ sa = new StringBuffer("");
+ sa.append("ncplot");
+ plotdata[16].PlotMetaD = sa;
+
+ sa = new StringBuffer("");
+ sa.append("columns_plot");
+ plotdata[17].PlotMetaD = sa;
+
+ sa = new StringBuffer("");
+ sa.append("script_name");
+ plotdata[18].PlotMetaD = sa;
+
+ }
+
+
+ public void setparm (StringBuffer a, StringBuffer b) {
+ int i,n;
+ StringBuffer sa,sb;
+ String sc;
+
+ sc = a.toString();
+
+ for (i=0;i<plotdata.length;i++){
+ sb = plotdata[i].PlotMetaD;
+ n = sb.lastIndexOf(sc);
+
+ if (n>(-1)) {
+
+ System.out.println("I = "+i+"\n");
+ sa = new StringBuffer("=");
+ plotdata[i].PlotConnector = sa;
+ plotdata[i].PlotMetaDValu = b;
+ }
+ }
+ }
+
+ public void setparm (StringBuffer a, int x) {
+ int i,n;
+ StringBuffer sa,sb,se;
+ String sc,sd;
+
+
+ sc = a.toString();
+ sd = " " + Integer.toString(x);
+
+ for (i=0;i<plotdata.length;i++){
+ sb = plotdata[i].PlotMetaD;
+ n = sb.lastIndexOf(sc);
+
+ if (n>(-1)) {
+ sa = new StringBuffer("=");
+ plotdata[i].PlotConnector = sa;
+ se = new StringBuffer("");
+ se.append(sd);
+ plotdata[i].PlotMetaDValu = se;
+ }
+ }
+ }
+
+ public void setparm (StringBuffer a, int x, int y) {
+ int i,n;
+ StringBuffer sa,sb,se;
+ String sc,sd;
+
+ sc = a.toString();
+ sd = " " + Integer.toString(x)+"; "+Integer.toString(y);
+
+ for (i=0;i<plotdata.length;i++){
+ sb = plotdata[i].PlotMetaD;
+ n = sb.lastIndexOf(sc);
+
+ if (n>(-1)) {
+ sa = new StringBuffer("=");
+ plotdata[i].PlotConnector = sa;
+ se = new StringBuffer("");
+ se.append(sd);
+ plotdata[i].PlotMetaDValu = se;
+ }
+ }
+ }
+
+ public void setparm (StringBuffer a, int nnn, int x[]) {
+ int i,n;
+ StringBuffer sa,sb,se;
+ String sc,sd;
+
+
+ sc = a.toString();
+ sd = "";
+ for (i=0;i<nnn;i++) {
+ sd = " " + Integer.toString(x[i]);
+ }
+
+ for (i=0;i<plotdata.length;i++){
+ sb = plotdata[i].PlotMetaD;
+ n = sb.lastIndexOf(sc);
+
+ if (n>(-1)) {
+ sa = new StringBuffer("=");
+ plotdata[i].PlotConnector = sa;
+ se = new StringBuffer("");
+ se.append(sd);
+ plotdata[i].PlotMetaDValu = se;
+ }
+ }
+ }
+
+ public void setparm (StringBuffer a, double x, double y) {
+ int i,n;
+ StringBuffer sa,sb,se;
+ String sc,sd;
+
+
+ sc = a.toString();
+ sd = " " + Double.toString(x)+"; "+Double.toString(y);
+
+ for (i=0;i<plotdata.length;i++){
+ sb = plotdata[i].PlotMetaD;
+ n = sb.lastIndexOf(sc);
+
+ if (n>(-1)) {
+ sa = new StringBuffer("=");
+ plotdata[i].PlotConnector = sa;
+ se = new StringBuffer("");
+ se.append(sd);
+ plotdata[i].PlotMetaDValu = se;
+ }
+ }
+ }
+
+ public void setparm (StringBuffer a, double x, double y, double z) {
+ int i,n;
+ StringBuffer sa,sb,se;
+ String sc,sd;
+
+
+ sc = a.toString();
+ sd = " "+Double.toString(x)+"; "+Double.toString(y)+"; "
+ +Double.toString(z);
+
+ for (i=0;i<plotdata.length;i++){
+ sb = plotdata[i].PlotMetaD;
+ n = sb.lastIndexOf(sc);
+
+ if (n>(-1)) {
+ sa = new StringBuffer("=");
+ plotdata[i].PlotConnector = sa;
+ se = new StringBuffer("");
+ se.append(sd);
+ plotdata[i].PlotMetaDValu = se;
+ }
+ }
+ }
+
+ public void setparm (StringBuffer a, double x, double y, double z, double w) {
+ int i,n;
+ StringBuffer sa,sb,se;
+ String sc,sd;
+
+
+ sc = a.toString();
+ sd = " "+Double.toString(x)+"; "+Double.toString(y)+"; "
+ +Double.toString(z)+"; "+Double.toString(w);
+
+ for (i=0;i<plotdata.length;i++){
+ sb = plotdata[i].PlotMetaD;
+ n = sb.lastIndexOf(sc);
+
+ if (n>(-1)) {
+ sa = new StringBuffer("=");
+ plotdata[i].PlotConnector = sa;
+ se = new StringBuffer("");
+ se.append(sd);
+ plotdata[i].PlotMetaDValu = se;
+ }
+ }
+ }
+
+
+
+ public void pprint () {
+ int i;
+ StringBuffer sa = new StringBuffer("");
+ StringBuffer sb = new StringBuffer("-");
+ StringBuffer sc = new StringBuffer("");
+
+
+ for (i=0;i<plotdata.length;i++) {
+ sa = new StringBuffer("");
+ sa.append(plotdata[i].PlotMetaD);
+ sa.append(plotdata[i].PlotConnector);
+ sa.append(plotdata[i].PlotMetaDValu);
+ System.out.println(sa);
+ }
+ }
+
+
+ public static void main (String[] args) {
+ MyPlot x = new MyPlot();
+ StringBuffer sa, sb;
+ String ss;
+ double xx,yy;
+
+ xx=1.23;
+ yy=2.13;
+
+
+ String firstline = "1; Pressure; C11; C44; C12; K Hill; dK Hill; G Hill; dG Hill; Vol";
+
+ ss = Double.toString(xx) + " " + Double.toString(yy);
+ System.out.println(ss);
+
+
+ sa = new StringBuffer("Lx");
+ sb = new StringBuffer("Pressure");
+
+ x.setparm(sa,sb);
+
+ sa = new StringBuffer("Ly");
+ sb = new StringBuffer("Data");
+
+ sa = new StringBuffer("Title");
+ sb = new StringBuffer("Initial Title");
+
+ x.setparm(sa,sb);
+
+ sa = new StringBuffer("Range_x");
+ x.setparm(sa,5,10);
+
+ sa = new StringBuffer("Range_y");
+ x.setparm(sa, 0, 1600);
+
+ sa = new StringBuffer("border_linewidth");
+ x.setparm(sa, 5);
+
+ sa = new StringBuffer("Tick_scale");
+ x.setparm(sa, 5);
+
+ sa = new StringBuffer("size");
+ x.setparm(sa, 3.0, 3.0);
+
+ sa = new StringBuffer("Font");
+ sb = new StringBuffer("Times-Roman");
+ x.setparm(sa, sb);
+
+ sa = new StringBuffer("format_file");
+ sb = new StringBuffer("eps");
+ x.setparm(sa, sb);
+
+ sa = new StringBuffer("input_file");
+ sb = new StringBuffer("elasticdata");
+ x.setparm(sa, sb);
+
+ sa = new StringBuffer("font_size");
+ x.setparm(sa, 80);
+
+ sa = new StringBuffer("ncplot");
+ sb = new StringBuffer("1; Pressure; C11; C44; C12; K Hill; dK Hill; G Hill; dG Hill; Vol");
+ x.setparm(sa, sb);
+
+ x.pprint();
+ }
+ }
Added: trunk/vlab/commons/vlab-base/src/main/java/org/vlab/PlotView/PlotData.java
===================================================================
--- trunk/vlab/commons/vlab-base/src/main/java/org/vlab/PlotView/PlotData.java (rev 0)
+++ trunk/vlab/commons/vlab-base/src/main/java/org/vlab/PlotView/PlotData.java 2008-10-31 18:43:30 UTC (rev 1197)
@@ -0,0 +1,15 @@
+package org.vlab.PlotView;
+
+public class PlotData {
+
+
+ public StringBuffer PlotMetaD;
+
+ public StringBuffer PlotConnector;
+
+ public StringBuffer PlotMetaDValu;
+
+ public StringBuffer PlotColumnLables;
+
+
+}
Added: trunk/vlab/commons/vlab-base/src/main/java/org/vlab/PlotView/PreparePlot.java
===================================================================
--- trunk/vlab/commons/vlab-base/src/main/java/org/vlab/PlotView/PreparePlot.java (rev 0)
+++ trunk/vlab/commons/vlab-base/src/main/java/org/vlab/PlotView/PreparePlot.java 2008-10-31 18:43:30 UTC (rev 1197)
@@ -0,0 +1,437 @@
+package org.vlab.PlotView;
+
+import java.io.*;
+
+public class PreparePlot {
+
+ public String criteria;
+
+ private MyPlot[] myplot;
+
+ private String tempDir;
+
+ public PreparePlot(){
+ System.out.println("Here I just started");
+ }
+
+ public void setMyPlot(MyPlot[] newMyPlot){
+ this.myplot = newMyPlot;
+ }
+
+ public void setGenerateScriptFiles(){
+
+ tempDir = "/tmp/vlab/cijdata/";
+
+
+ String header1 = "";
+ String columnsAvail = "";
+ String columnstoPlot = "";
+ String input_file_name = "";
+
+ try{
+ for(int i=0; i<myplot.length;i++){
+
+ for(int j=0; j < myplot[i].plotdata.length; j++){
+
+ System.out.println("Here I go in the loop:i"+i+" j:"+j );
+
+ if (myplot[i].plotdata[j].PlotMetaD.toString().equals("Title"))
+ header1 += "set title \""+ myplot[i].plotdata[j].PlotMetaDValu.toString() +"\"\n";
+
+ if (myplot[i].plotdata[j].PlotMetaD.toString().equals("Lx"))
+ header1 += "set xlabel \"" + myplot[i].plotdata[j].PlotMetaDValu.toString() + "\"\n"; //Mudar essa parte do codigo pra ser dinamico
+
+ if (myplot[i].plotdata[j].PlotMetaD.toString().equals("Ly"))
+ header1 += "set ylabel \"" + myplot[i].plotdata[j].PlotMetaDValu.toString() + "\"\n";
+
+ if (myplot[i].plotdata[j].PlotMetaD.toString().equals("Range_x")){
+ String range_x[] = myplot[i].plotdata[j].PlotMetaDValu.toString().split(";");
+ header1 += "set xrange [" + range_x[0].trim() + ":" + range_x[1].trim() + "]\n";
+ }
+
+ if (myplot[i].plotdata[j].PlotMetaD.toString().equals("Range_y")){
+ String range_y[] = myplot[i].plotdata[j].PlotMetaDValu.toString().split(";");
+ header1 += "set yrange [" + range_y[0].trim() + ":" + range_y[1].trim() + "]\n";
+ }
+
+ if (myplot[i].plotdata[j].PlotMetaD.toString().equals("border_linewidth")){
+ header1 += "set border linewidth "+ myplot[i].plotdata[j].PlotMetaDValu.toString().trim() + "\n";
+ }
+
+ if (myplot[i].plotdata[j].PlotMetaD.toString().equals("Tick_scale")){
+ header1 += "set tics scale "+ myplot[i].plotdata[j].PlotMetaDValu.toString() + "\n";
+ }
+
+ if (myplot[i].plotdata[j].PlotMetaD.toString().equals("size")){
+ String size[] = myplot[i].plotdata[j].PlotMetaDValu.toString().split(";");
+ header1 += "set size " + size[0].trim() + "," + size[1].trim() + "\n";
+ }
+
+ if (myplot[i].plotdata[j].PlotMetaD.toString().equals("format_file")){
+ header1 += "set terminal postscript "+ myplot[i].plotdata[j].PlotMetaDValu.toString() + " solid enhanced color";
+ }
+
+ if (myplot[i].plotdata[j].PlotMetaD.toString().equals("Font")){
+ header1 += " \""+ myplot[i].plotdata[j].PlotMetaDValu.toString();
+ }
+
+ if (myplot[i].plotdata[j].PlotMetaD.toString().equals("font_size")){
+ header1 += "\" "+ myplot[i].plotdata[j].PlotMetaDValu.toString() +"\n";
+ }
+
+ if (myplot[i].plotdata[j].PlotMetaD.toString().equals("output_file")){
+ header1 += "set output \""+ myplot[i].plotdata[j].PlotMetaDValu.toString() + ".eps\"\n";
+ }
+
+ if (myplot[i].plotdata[j].PlotMetaD.toString().equals("input_file")){
+ header1 += "plot ";
+ input_file_name = myplot[i].plotdata[j].PlotMetaDValu.toString();
+ }
+
+ if (myplot[i].plotdata[j].PlotMetaD.toString().equals("ncplot")){
+ columnsAvail = myplot[i].plotdata[j].PlotMetaDValu.toString();
+ }
+
+ if (myplot[i].plotdata[j].PlotMetaD.toString().equals("columns_plot")){
+ columnstoPlot = myplot[i].plotdata[j].PlotMetaDValu.toString();
+ header1 += insertColumnsData(columnsAvail, columnstoPlot, input_file_name, 11);
+ }
+
+ if (myplot[i].plotdata[j].PlotMetaD.toString().equals("script_name")){
+ saveScript("/tmp/vlab/cijdata/", header1, myplot[i].plotdata[j].PlotMetaDValu.toString());
+ runScriptGnuPlot( myplot[i].plotdata[j].PlotMetaDValu.toString(), "/tmp/vlab/cijdata/");
+ }
+
+ System.out.println("Header File #"+i +header1);
+
+ }
+
+ header1 = "";
+ }
+ }catch(Exception ae){
+ System.err.println("Error defining the script files: "+ae.getMessage());
+ }
+ //String listofFiles[] = null;
+ //String defaultcontentScriptFile = "";
+ //String header1 = "set title \"expansivity\"\n";
+ //header1 += "set xlabel \"Pressure [GPa]\"\n"; //Mudar essa parte do codigo pra ser dinamico
+ //String header2 = "set ylabel \""; //Mudar essa parte do codigo para ser dinamico
+ //String header3 = "[10^{-5}/K]\"\n set xrange [0:150]\n";
+ //header3 += "set border linewidth 5\n";
+ //header3 += "set tics scale 5\n";
+ //header3 += "set size 3.0, 3.0; set terminal postscript eps solid enhanced color \"Times-Roman\" 80\n";
+ criteria = ".*.dat";
+ //listofFiles = listFiles("/tmp/vlab/hitempfiles/");
+ //for(int i=0; i < listofFiles.length; i++){
+ //defaultcontentScriptFile = header1 + header2 + listofFiles[i].substring(0, listofFiles[i].length()-4) + header3;
+ /*
+ Bs = GPa
+ Bt = GPa
+ Cp =
+ Cv =
+ SSS =
+ alpha =
+ enthalpy =
+ gamma =
+ helmholtz =
+ vol
+ */
+ //defaultcontentScriptFile += "set output \"" + listofFiles[i].substring(0, listofFiles[i].length()-4) + ".eps\"\n";
+ //defaultcontentScriptFile += "plot \"" + listofFiles[i] + "\" using 1:4 title \"T= 300\" linewidth 15 with line, \"" + listofFiles[i];
+ //defaultcontentScriptFile += "\" using 1:11 title \"T=1000\" linewidth 15 with line, \"" + listofFiles[i]+"\" using 1:21 title \"T=2000\" linewidth 15 with line, \"";
+ //defaultcontentScriptFile += listofFiles[i]+"\" using 1:31 title \"T=3000\" linewidth 15 with line";
+
+ //saveScript("/tmp/vlab/cijdata/",defaultcontentScriptFile, listofFiles[i].substring(0, listofFiles[i].length()-4));
+
+
+ //runScriptGnuPlot(listofFiles[i].substring(0, listofFiles[i].length()-4), "/tmp/vlab/cijdata/");
+ //defaultcontentScriptFile = "";
+ //}
+ criteria = ".*.jpg";
+ String[] listofJPgFiles = listFiles("/tmp/vlab/cijdata/");
+
+ if (listofJPgFiles.length > 0){
+
+ for(int i=0; i < listofJPgFiles.length; i++){
+ System.out.println("/tmp/vlab/cijdata/"+listofJPgFiles[i]);
+ }
+
+ }
+ else
+ System.out.println("none jpg file were found");
+
+ deleteold("rmdelete2.sh");
+ copynew();
+ deleteold("rmdelete.sh");
+
+ }
+
+
+ public static String insertColumnsData(String columnsAvail, String columnsToPlot, String input_file_name, int lineamount){
+
+
+ String[] avail = columnsAvail.split(";");
+
+ String scriptAccumulate = "";
+ for(int i=1; i < avail.length; i++){
+
+ //System.out.println(columnsToPlot.substring(i-1, i));
+ if (columnsToPlot.substring(i-1, i).equals("1"))
+ scriptAccumulate += "\""+ input_file_name + "\" using 1:"+ (i+1) + " title \"" + avail[i].trim() + "\" linewidth "+ lineamount + " with line," ;
+
+ }
+
+ scriptAccumulate = scriptAccumulate.substring(0,scriptAccumulate.length()-1);
+ return scriptAccumulate;
+
+ }
+
+ /*
+ public static void main(String[] args){
+
+ PreparePlot prep = new PreparePlot();
+
+ String num1 = "Pressure; C11; C44; C12; K Hill; dK Hill; G Hill; dG Hill; Vol";
+ String num2 = "11011101";
+
+ System.out.println("Result:" + prep.insertColumnsData(num1, num2, "filetoDb", 11));
+
+ }
+ */
+
+ /*For Cij Visualization*/
+ public void setGenerateScriptFilesCij(){
+
+ String listofFiles[] = null;
+ String defaultcontentScriptFile = "set title \"Cij Data\"\n";
+ defaultcontentScriptFile += "set xlabel \"Pressure [GPa]\"\n";
+ defaultcontentScriptFile += "set ylabel \"Cij [GPa]\"\n";
+ defaultcontentScriptFile += "set xrange [-10:150]\n";
+ defaultcontentScriptFile += "set border linewidth 5\n";
+ defaultcontentScriptFile += "set tics scale 5\n";
+ defaultcontentScriptFile += "set size 3.0, 3.0\n";
+ defaultcontentScriptFile += "set terminal postscript eps solid enhanced color \"Times-Roman\" 80\n";
+ defaultcontentScriptFile += "set output \"cubic.eps\"\n";
+ defaultcontentScriptFile += "plot \"elasticdata\" using 1:2 title \"C11\" linewidth 11 with line, \"elasticdata\" using 1:3 title \"C44\" linewidth 11 ";
+ defaultcontentScriptFile += "with line, \"elasticdata\" using 1:4 title \"C12\" linewidth 11 with line, \"elasticdata\" using 1:5 title \"CellVol\" linewidth 11 with line";
+
+ saveScript("/tmp/vlab/cijdata/",defaultcontentScriptFile, "cubic");
+
+ run...
[truncated message content] |
