Revision: 20117
http://sourceforge.net/p/jmol/code/20117
Author: hansonr
Date: 2014-11-21 12:44:49 +0000 (Fri, 21 Nov 2014)
Log Message:
-----------
Jmol.___JmolVersion="14.3.9_2014.11.21"
bug fix: VASP CHGCAR reader not recognized for primitive cell
bug fix: Euler ZYZ and ZXZ for quaternion({0 0 1},theta) where theta < 0 in
error
Modified Paths:
--------------
branches/v14_2/Jmol/src/org/jmol/io/JmolUtil.java
branches/v14_2/Jmol/src/org/jmol/viewer/Jmol.properties
trunk/Jmol/src/org/jmol/io/JmolUtil.java
trunk/Jmol/src/org/jmol/viewer/Jmol.properties
Modified: branches/v14_2/Jmol/src/org/jmol/io/JmolUtil.java
===================================================================
--- branches/v14_2/Jmol/src/org/jmol/io/JmolUtil.java 2014-11-20 16:55:13 UTC
(rev 20116)
+++ branches/v14_2/Jmol/src/org/jmol/io/JmolUtil.java 2014-11-21 12:44:49 UTC
(rev 20117)
@@ -366,9 +366,10 @@
int nAtoms = PT.parseInt(line3);
if (nAtoms == Integer.MIN_VALUE)
return (line3.indexOf("+") == 0 ? "Jvxl+" : null);
+ if (line3.indexOf(".") > 0)
+ return (line3.length() >= 60 || PT.getTokens(line3).length != 3 ? null :
"VaspChgcar"); // M40 files are > 60 char
if (nAtoms >= 0)
- return (line3.length() >= 60 ? null
- : line3.indexOf(".") > 0 ? "VaspChgcar" : "Cube"); //Can't be a Jvxl
file; M40 files are > 60 char
+ return "Cube"; //Can't be a Jvxl file;
nAtoms = -nAtoms;
for (int i = 4 + nAtoms; --i >= 0;)
if ((line = br.readLineWithNewline()) == null)
Modified: branches/v14_2/Jmol/src/org/jmol/viewer/Jmol.properties
===================================================================
--- branches/v14_2/Jmol/src/org/jmol/viewer/Jmol.properties 2014-11-20
16:55:13 UTC (rev 20116)
+++ branches/v14_2/Jmol/src/org/jmol/viewer/Jmol.properties 2014-11-21
12:44:49 UTC (rev 20117)
@@ -5,11 +5,11 @@
# THIS IS THE RELEASE BRANCH
# BUG FIXES ONLY, PLEASE
-Jmol.___JmolVersion="14.2.9_2014.11.19"
+Jmol.___JmolVersion="14.2.9_2014.11.21"
+bug fix: VASP CHGCAR reader not recognized for primitive cell
bug fix: Euler ZYZ and ZXZ for quaternion({0 0 1},theta) where theta < 0 in
error
-
JmolVersion="14.2.9_2014.11.17"
released as Jmol 14.3.9 and Jmol 14.2.9
Modified: trunk/Jmol/src/org/jmol/io/JmolUtil.java
===================================================================
--- trunk/Jmol/src/org/jmol/io/JmolUtil.java 2014-11-20 16:55:13 UTC (rev
20116)
+++ trunk/Jmol/src/org/jmol/io/JmolUtil.java 2014-11-21 12:44:49 UTC (rev
20117)
@@ -366,9 +366,10 @@
int nAtoms = PT.parseInt(line3);
if (nAtoms == Integer.MIN_VALUE)
return (line3.indexOf("+") == 0 ? "Jvxl+" : null);
+ if (line3.indexOf(".") > 0)
+ return (line3.length() >= 60 || PT.getTokens(line3).length != 3 ? null :
"VaspChgcar"); // M40 files are > 60 char
if (nAtoms >= 0)
- return (line3.length() >= 60 ? null
- : line3.indexOf(".") > 0 ? "VaspChgcar" : "Cube"); //Can't be a Jvxl
file; M40 files are > 60 char
+ return "Cube"; //Can't be a Jvxl file;
nAtoms = -nAtoms;
for (int i = 4 + nAtoms; --i >= 0;)
if ((line = br.readLineWithNewline()) == null)
Modified: trunk/Jmol/src/org/jmol/viewer/Jmol.properties
===================================================================
--- trunk/Jmol/src/org/jmol/viewer/Jmol.properties 2014-11-20 16:55:13 UTC
(rev 20116)
+++ trunk/Jmol/src/org/jmol/viewer/Jmol.properties 2014-11-21 12:44:49 UTC
(rev 20117)
@@ -15,8 +15,9 @@
TODO: design and implement sidechain mutation -- MUTATE command ?
TODO: remove HTML5 dependency on synchronous file loading (check SCRIPT
command for problems)
-Jmol.___JmolVersion="14.3.9_2014.11.19"
+Jmol.___JmolVersion="14.3.9_2014.11.21"
+bug fix: VASP CHGCAR reader not recognized for primitive cell
bug fix: Euler ZYZ and ZXZ for quaternion({0 0 1},theta) where theta < 0 in
error
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Download BIRT iHub F-Type - The Free Enterprise-Grade BIRT Server
from Actuate! Instantly Supercharge Your Business Reports and Dashboards
with Interactivity, Sharing, Native Excel Exports, App Integration & more
Get technology previously reserved for billion-dollar corporations, FREE
http://pubads.g.doubleclick.net/gampad/clk?id=157005751&iu=/4140/ostg.clktrk
_______________________________________________
Jmol-commits mailing list
Jmol-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/jmol-commits
