Menu
▾
▴
[Jmol-commits] SF.net SVN: jmol:[18025] trunk/Jmol-FAH
|
From: <ni...@us...> - 2013-03-31 05:29:22
|
Revision: 18025
http://sourceforge.net/p/jmol/code/18025
Author: nicove
Date: 2013-03-31 05:29:19 +0000 (Sun, 31 Mar 2013)
Log Message:
-----------
Folding@Home
Modified Paths:
--------------
trunk/Jmol-FAH/src/org/jmol/fah/CoreType.java
trunk/Jmol-FAH/src/org/jmol/fah/ProjectInformation.java
Added Paths:
-----------
trunk/Jmol-FAH/projects/p6871.xyz.gz
trunk/Jmol-FAH/projects/p6896.xyz.gz
trunk/Jmol-FAH/projects/p6897.xyz.gz
Added: trunk/Jmol-FAH/projects/p6871.xyz.gz
===================================================================
(Binary files differ)
Index: trunk/Jmol-FAH/projects/p6871.xyz.gz
===================================================================
--- trunk/Jmol-FAH/projects/p6871.xyz.gz 2013-03-31 04:33:51 UTC (rev 18024)
+++ trunk/Jmol-FAH/projects/p6871.xyz.gz 2013-03-31 05:29:19 UTC (rev 18025)
Property changes on: trunk/Jmol-FAH/projects/p6871.xyz.gz
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: trunk/Jmol-FAH/projects/p6896.xyz.gz
===================================================================
(Binary files differ)
Index: trunk/Jmol-FAH/projects/p6896.xyz.gz
===================================================================
--- trunk/Jmol-FAH/projects/p6896.xyz.gz 2013-03-31 04:33:51 UTC (rev 18024)
+++ trunk/Jmol-FAH/projects/p6896.xyz.gz 2013-03-31 05:29:19 UTC (rev 18025)
Property changes on: trunk/Jmol-FAH/projects/p6896.xyz.gz
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: trunk/Jmol-FAH/projects/p6897.xyz.gz
===================================================================
(Binary files differ)
Index: trunk/Jmol-FAH/projects/p6897.xyz.gz
===================================================================
--- trunk/Jmol-FAH/projects/p6897.xyz.gz 2013-03-31 04:33:51 UTC (rev 18024)
+++ trunk/Jmol-FAH/projects/p6897.xyz.gz 2013-03-31 05:29:19 UTC (rev 18025)
Property changes on: trunk/Jmol-FAH/projects/p6897.xyz.gz
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Modified: trunk/Jmol-FAH/src/org/jmol/fah/CoreType.java
===================================================================
--- trunk/Jmol-FAH/src/org/jmol/fah/CoreType.java 2013-03-31 04:33:51 UTC (rev 18024)
+++ trunk/Jmol-FAH/src/org/jmol/fah/CoreType.java 2013-03-31 05:29:19 UTC (rev 18025)
@@ -26,7 +26,7 @@
package org.jmol.fah;
/**
- * Typesafe enum class for core types
+ * Type safe enum class for core types
*/
public class CoreType {
@@ -140,13 +140,16 @@
if (name.equalsIgnoreCase(A0GROMACS._name)) {
return A0GROMACS;
}
- if (name.equalsIgnoreCase(A3GROMACS._name)) {
+ if (name.equalsIgnoreCase(A3GROMACS._name) ||
+ name.equalsIgnoreCase(A3GROMACS._name2)) {
return A3GROMACS;
}
- if (name.equalsIgnoreCase(A4GROMACS._name)) {
+ if (name.equalsIgnoreCase(A4GROMACS._name) ||
+ name.equalsIgnoreCase(A4GROMACS._name2)) {
return A4GROMACS;
}
- if (name.equalsIgnoreCase(A5GROMACS._name)) {
+ if (name.equalsIgnoreCase(A5GROMACS._name) ||
+ name.equalsIgnoreCase(A5GROMACS._name2)) {
return A5GROMACS;
}
if (name.equalsIgnoreCase(A6GROMACS._name)) {
@@ -252,9 +255,9 @@
// Cores
static public final CoreType UNKNOWN = new CoreType(null, null, true);
static public final CoreType A0GROMACS = new CoreType("Gromacs33", "A0", true); //$NON-NLS-1$ //$NON-NLS-2$
- static public final CoreType A3GROMACS = new CoreType("GRO-A3", "A3", false); //$NON-NLS-1$ //$NON-NLS-2$
- static public final CoreType A4GROMACS = new CoreType("GRO-A4", "A4", false); //$NON-NLS-1$ //$NON-NLS-2$
- static public final CoreType A5GROMACS = new CoreType("GRO-A5", "A5", false); //$NON-NLS-1$ //$NON-NLS-2$
+ static public final CoreType A3GROMACS = new CoreType("GRO-A3", "GRO_A3", "A3", false); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ static public final CoreType A4GROMACS = new CoreType("GRO-A4", "GRO_A4", "A4", false); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ static public final CoreType A5GROMACS = new CoreType("GRO-A5", "GRO_A5", "A5", false); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
static public final CoreType A6GROMACS = new CoreType("GRO-A6", "A6", false); //$NON-NLS-1$ //$NON-NLS-2$
static public final CoreType AMBER = new CoreType("Amber", "A", true); //$NON-NLS-1$ //$NON-NLS-2$
static public final CoreType ATI_DEV = new CoreType("ATI-DEV", "AD", false); //$NON-NLS-1$ //$NON-NLS-2$
@@ -274,7 +277,7 @@
static public final CoreType NVIDIA_DEV = new CoreType("NVIDIA-DEV", "ND", false); //$NON-NLS-1$ //$NON-NLS-2$
static public final CoreType OPEN_MM_CL = new CoreType("OpenMM_OpenCL", "OC", true); //$NON-NLS-1$ //$NON-NLS-2$
static public final CoreType OPEN_MM_FERMI= new CoreType("OpenMMFermi", "OF", true); //$NON-NLS-1$ //$NON-NLS-2$
- static public final CoreType OPEN_MM_GPU = new CoreType("OpenMMGPU", "OG", true); //$NON-NLS-1$ //$NON-NLS-2$
+ static public final CoreType OPEN_MM_GPU = new CoreType("OpenMMGPU", "GPU", "OG", true); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
static public final CoreType PROTO_MOL = new CoreType("ProtoMol", "PM", true); //$NON-NLS-1$ //$NON-NLS-2$
static public final CoreType QMD = new CoreType("QMD", "Q", true); //$NON-NLS-1$ //$NON-NLS-2$
static public final CoreType SHARPEN = new CoreType("Sharpen", "SP", true); //$NON-NLS-1$//$NON-NLS-2$
@@ -283,6 +286,7 @@
// Attributes
private final String _name;
+ private final String _name2;
private final String _code;
private final boolean _hasFile;
@@ -294,7 +298,20 @@
* @param hasFile Flag indicating the present of a current.xyz file
*/
private CoreType(String name, String code, boolean hasFile) {
+ this(name, null, code, hasFile);
+ }
+
+ /**
+ * Constructor for CoreType
+ *
+ * @param name Name of core
+ * @param name2 Second name of core
+ * @param code Letter code of core
+ * @param hasFile Flag indicating the present of a current.xyz file
+ */
+ private CoreType(String name, String name2, String code, boolean hasFile) {
this._name = name;
+ this._name2 = name2;
this._code = code;
this._hasFile = hasFile;
}
Modified: trunk/Jmol-FAH/src/org/jmol/fah/ProjectInformation.java
===================================================================
--- trunk/Jmol-FAH/src/org/jmol/fah/ProjectInformation.java 2013-03-31 04:33:51 UTC (rev 18024)
+++ trunk/Jmol-FAH/src/org/jmol/fah/ProjectInformation.java 2013-03-31 05:29:19 UTC (rev 18025)
@@ -731,11 +731,14 @@
info._fciCore = CoreType.A0GROMACS;
} else if ("GROMACS-SMP".equalsIgnoreCase(core)) {
info._fciCore = CoreType.GROMACS_SMP;
- } else if ("GRO-A3".equalsIgnoreCase(core)) {
+ } else if ("GRO-A3".equalsIgnoreCase(core) ||
+ "GRO_A3".equalsIgnoreCase(core)) {
info._fciCore = CoreType.A3GROMACS;
- } else if ("GRO-A4".equalsIgnoreCase(core)) {
+ } else if ("GRO-A4".equalsIgnoreCase(core) ||
+ "GRO_A4".equalsIgnoreCase(core)) {
info._fciCore = CoreType.A4GROMACS;
- } else if ("GRO-A5".equalsIgnoreCase(core)) {
+ } else if ("GRO-A5".equalsIgnoreCase(core) ||
+ "GRO_A5".equalsIgnoreCase(core)) {
info._fciCore = CoreType.A5GROMACS;
} else if ("GRO-A6".equalsIgnoreCase(core)) {
info._fciCore = CoreType.A6GROMACS;
@@ -751,7 +754,8 @@
info._fciCore = CoreType.NVIDIA_DEV;
} else if ("OPENMMFERMI".equalsIgnoreCase(core)) {
info._fciCore = CoreType.OPEN_MM_FERMI;
- } else if ("OPENMMGPU".equalsIgnoreCase(core)) {
+ } else if ("OPENMMGPU".equalsIgnoreCase(core) ||
+ "GPU".equalsIgnoreCase(core)) {
info._fciCore = CoreType.OPEN_MM_GPU;
} else if ("OPENMM_OPENCL".equalsIgnoreCase(core)) {
info._fciCore = CoreType.OPEN_MM_CL;
@@ -1679,9 +1683,6 @@
return;
}
- outputText("Differences for project "); //$NON-NLS-1$
- outputTextLn(Integer.toString(projectNumber));
-
// Check for unknown project
if ((info._staticAtoms == null) &&
(info._staticContact == null) &&
@@ -1775,6 +1776,9 @@
return;
}
+ outputText("Differences for project "); //$NON-NLS-1$
+ outputTextLn(Integer.toString(projectNumber));
+
//Print names difference
boolean nameDifferent = false;
if (info._psName != null) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|