Update optics.py

Author: fengzydy

cloud_rad_scheme/optics.py

@@ -35,18 +35,19 @@ def __init__(self, r, s, v, ext, sca, ssa, asy, rau, wavenum=None, band_limit=No
         self.ssa = ssa # single-scattering albedo unitless
         self.asy = asy # asymmetry factor unitless
 
-    def load(self,file_in):
-        with nc.Dataset(file_in, mode='r', format='NETCDF4_CLASSIC') as ncfile:
-            self.wavenum = ncfile.wavenum
-            self.r = ncfile.r
-            self.v = ncfile.v
-            self.v = ncfile.v
-            self.s = ncfile.s
-            self.rau = ncfile.rau
-            self.ext = ncfile.ext
-            self.ssa = ncfile.ssa
-            self.asy = ncfile.asy
-            self.sca = self.ssa * self.ext
+    def load_from_nc(file_in):
+        ncfile = nc.Dataset(file_in,'r')
+        wavenum = ncfile.variables['wavenum'][:]
+        r = ncfile.variables['re'][:]
+        v = ncfile.variables['v'][:]
+        s = ncfile.variables['s'][:]
+        rau = ncfile.variables['rau'][:]
+        ext = ncfile.variables['ext'][:,:]
+        ssa = ncfile.variables['ssa'][:,:]
+        asy = ncfile.variables['asy'][:,:]
+        sca = ssa * ext
+        result = optics_var(r, s, v, ext, sca, ssa, asy, rau, wavenum=wavenum)
+        return result
 
     def write_lut_spectralpoints(self,file_out):
         """generate piecewise-linear fit coefficients and write to a given path
@@ -78,7 +79,6 @@ def write_lut_spectralpoints(self,file_out):
             asy.units = 'unitless'
             rau = ncfile.createVariable('rau', np.float32, ('Constant'))
             rau.units = 'g/m**3'
-
             wavenum[:] = self.wavenum
             freq[:] = cm_to_um/wavenum[:]
             re[:] = self.r
@@ -389,4 +389,4 @@ def pade(x, p1, p2, p3, q1, q2, q3):
 
 def lognormpdf(x,mu,sigma):
     y = 1.0/x/sigma/math.sqrt(2*math.pi) * np.exp(-1.0/2.0*(np.log(x/mu)/sigma)**2)
-    return y
+    return y