From 4ccbe81e934ccf082c3fa229ca2fb86e0fd477f4 Mon Sep 17 00:00:00 2001
From: sjplimp <sjplimp@f3b2605a-c512-4ea7-a41b-209d697bcdaa>
Date: Tue, 13 Apr 2010 14:37:44 +0000
Subject: [PATCH] git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@3982
 f3b2605a-c512-4ea7-a41b-209d697bcdaa

---
 tools/matlab/readdump_all.m | 17 +++++++++-----
 tools/matlab/readdump_one.m | 47 +++++++++++++++++++++++--------------
 2 files changed, 40 insertions(+), 24 deletions(-)

diff --git a/tools/matlab/readdump_all.m b/tools/matlab/readdump_all.m
index 1cb184c3a6..1187beeb73 100644
--- a/tools/matlab/readdump_all.m
+++ b/tools/matlab/readdump_all.m
@@ -29,21 +29,26 @@ end
 i=1;
 while feof(dump) == 0
     id = fgetl(dump);
-    switch id
-        case 'ITEM: TIMESTEP'
+     if (strcmpi(id,'ITEM: TIMESTEP'))
             timestep(i) = str2num(fgetl(dump));
-        case 'ITEM: NUMBER OF ATOMS'
+    else
+     if (strcmpi(id,'ITEM: NUMBER OF ATOMS'))
             Natoms(i) = str2num(fgetl(dump));
-        case 'ITEM: BOX BOUNDS'
+     else
+      if (strcmpi(id,'ITEM: BOX BOUNDS'))
             x_bound(i,:) = str2num(fgetl(dump));
             y_bound(i,:) = str2num(fgetl(dump));
             z_bound(i,:) = str2num(fgetl(dump));
-        case 'ITEM: ATOMS'
+      else
+       if (strcmpi(id(1:11),'ITEM: ATOMS'))
             for j = 1 : 1: Natoms
                 atom_data(j,:,i) = str2num(fgetl(dump));
             end
             i=i+1;
-    end
+       end
+      end 
+     end
+   end
 end
 %----------Outputs-------------
 %OUTPUTS IN SAME VARIABLE STRUCTURE
diff --git a/tools/matlab/readdump_one.m b/tools/matlab/readdump_one.m
index e681c0d32e..fabefec909 100644
--- a/tools/matlab/readdump_one.m
+++ b/tools/matlab/readdump_one.m
@@ -46,25 +46,30 @@ else
 end
 while done == 0 & last_status == 0
     id = fgetl(dump);
-    switch id
-        case 'ITEM: TIMESTEP'
+    if (strcmpi(id,'ITEM: TIMESTEP'))
             if t == 0
                 timestep(i) = str2num(fgetl(dump));
                 t=1;
             end
-        case 'ITEM: NUMBER OF ATOMS'
+    else
+     if (strcmpi(id,'ITEM: NUMBER OF ATOMS'))
             Natoms = str2num(fgetl(dump));
-        case 'ITEM: BOX BOUNDS'
+     else
+      if (strcmpi(id,'ITEM: BOX BOUNDS'))
             x_bound(1,:) = str2num(fgetl(dump));
             y_bound(1,:) = str2num(fgetl(dump));
             z_bound(1,:) = str2num(fgetl(dump));
-        case 'ITEM: ATOMS'
+      else
+       if (strcmpi(id(1:11),'ITEM: ATOMS'))
             atom_data = zeros(Natoms,ncol);%Allocate memory for atom data
             for j = 1 : 1: Natoms
                 atom_data(j,:) = str2num(fgetl(dump));
             end
             done = 1;
             p = ftell(dump);
+       end
+      end 
+     end
     end
 end
 
@@ -88,20 +93,26 @@ if last_status == 1
     
     while ~feof(dump)
         id = fgetl(dump);
-        switch id
-            case 'ITEM: NUMBER OF ATOMS'
-                Natoms = str2num(fgetl(dump));
-            case 'ITEM: BOX BOUNDS'
-                x_bound(1,:) = str2num(fgetl(dump));
-                y_bound(1,:) = str2num(fgetl(dump));
-                z_bound(1,:) = str2num(fgetl(dump));
-            case 'ITEM: ATOMS'
-                atom_data = zeros(Natoms,ncol);%Allocate memory for atom data
-                for j = 1 : 1: Natoms
-                    atom_data(j,:) = str2num(fgetl(dump));
-                end
-        end
+     if (strcmpi(id,'ITEM: NUMBER OF ATOMS'))
+            Natoms = str2num(fgetl(dump));
+     else
+      if (strcmpi(id,'ITEM: BOX BOUNDS'))
+            x_bound(1,:) = str2num(fgetl(dump));
+            y_bound(1,:) = str2num(fgetl(dump));
+            z_bound(1,:) = str2num(fgetl(dump));
+      else
+       if (strcmpi(id(1:11),'ITEM: ATOMS'))
+            atom_data = zeros(Natoms,ncol);%Allocate memory for atom data
+            for j = 1 : 1: Natoms
+                atom_data(j,:) = str2num(fgetl(dump));
+            end
+       end
+      end 
+     end
     end
+  
+
+        
 end
 
 %----------Outputs-------------