Fix parsing of CHEASE gEQDSK files (#9)

* fix parsing of CHEASE gEQDSK files

* bump version number to 1.0.0

Author: orso82

Project.toml

@@ -1,7 +1,7 @@
 name = "EFIT"
 uuid = "cda752c5-6b03-55a3-9e33-132a441b0c17"
 author = ["Luke Stagner <[email protected]>"]
-version = "0.2.0"
+version = "1.0.0"
 
 [deps]
 IMASDD = "06b86afa-9f21-11ec-2ef8-e51b8960cfc5"

src/io.jl

@@ -53,15 +53,31 @@ end
 function read_array(t,n)
     data = zeros(n)
     for i=1:n
-        data[i] = take!(t)
+        try
+            data[i] = take!(t)
+        catch e
+            if isa(e, InvalidStateException)
+                # InvalidStateException when Channel is closed
+            else
+                rethrow(e)
+            end
+        end
     end
     return data
 end
 
 function read_array2d(t,n,m)
     data = zeros(n,m)
     for i=1:n, j=1:m
-        data[i,j] = take!(t)
+        try
+            data[i,j] = take!(t)
+        catch e
+            if isa(e, InvalidStateException)
+                # InvalidStateException when Channel is closed
+            else
+                rethrow(e)
+            end
+        end
     end
     return data'
 end
@@ -114,7 +130,7 @@ function readg(gfile; set_time=nothing)
     f = open(gfile)
 
     desc = readline(f)
-    idum, time, nw, nh = parse_gfile_header(desc, set_time=set_time)
+    idum, time, nw, nh = parse_gfile_header(desc; set_time)
 
     token = file_numbers(f)