fix for new variable names

Author: seunghoeku

xgc_reader.py

@@ -343,14 +343,14 @@ class databfm(object):
         def __init__(self):
             with adios2.open("xgc.bfieldm.bp","rra") as self.f:
                 self.vars=self.f.available_variables()
-                if(hasattr(self.vars,'rmajor' )):
+                if('rmajor' in self.vars):
                     v='rmajor'
                 else:
                     v='/bfield/rvec' 
                 ct=self.vars[v].get("Shape")
                 c=int(ct)
                 self.rmid=self.f.read(v,start=[0],count=[c],step_start=0, step_count=1)
-                if(hasattr(self.vars,'psi_n')):
+                if('psi_n' in self.vars):
                     v='psi_n'
                 else:
                     v='/bfield/psi_eq_x_psi'

xgc_utils.py

@@ -10,6 +10,24 @@ def load_prf(filename):
     var = var[0:-1]
     return(psi,var)
 
+def load_prf2(filename):
+    with open(filename, 'r') as file:
+        #read dimensions
+        [n] = map(int, file.readline().strip().split())
+        #allocate array
+        psi=np.zeros(n)
+        var=np.zeros(n)
+
+        for l in range(n):
+            [psi[l], var[l]]=map(float, file.readline().strip().split() )
+
+        #read end flag
+        [end_flag]=map(int, file.readline().strip().split())
+        if(end_flag!=-1):
+            print('Error: end flag is not -1. end_flag= %d'%end_flag)
+        return(psi,var)
+
+
 def save_prf(x, y, fname):
     with open(fname, "w") as f:
         sz=np.size(x)