PythonicDISORT 0.9.2__py3-none-any.whl → 0.9.4__py3-none-any.whl

PythonicDISORT/_assemble_intensity_and_fluxes.py

@@ -370,14 +370,14 @@ def _assemble_intensity_and_fluxes(
                 + (B_collect_0.T / (-scale_tau / mu0)[None, :])[:, l]
                 * np.exp(-scaled_tau / mu0)[None, :]
             )
-        if is_antiderivative_wrt_tau and not there_is_beam_source:
+        elif is_antiderivative_wrt_tau and not there_is_beam_source:
             u0 = np.einsum(
                 "tij, tj -> it",
                 GC_collect_0[l, :, :],
                 np.exp(exponent) / (scale_tau[:, None] * K_collect_0)[l, :],
                 optimize=True,
             )
-        if not is_antiderivative_wrt_tau and there_is_beam_source:
+        elif not is_antiderivative_wrt_tau and there_is_beam_source:
             u0 = np.einsum(
                 "tij, tj -> it", GC_collect_0[l, :, :], np.exp(exponent), optimize=True
             ) + B_collect_0.T[:, l] * np.exp(-scaled_tau / mu0)[None, :]
@@ -589,6 +589,6 @@ def _assemble_intensity_and_fluxes(
         # --------------------------------------------------------------------------------------------------------------------------
 
     if only_flux:
-        return flux_up, flux_down, u0, G_collect_0, K_collect_0 # TODO: Remove the temporary G_collect_0, K_collect_0
+        return flux_up, flux_down, u0, GC_collect_0, K_collect_0
     else:
         return flux_up, flux_down, u0, u

PythonicDISORT/pydisort.py

@@ -23,8 +23,8 @@ def pydisort(
     NT_cor=False,
     BDRF_Fourier_modes=[],
     s_poly_coeffs=np.array([[]]),
-    use_banded_solver_NLayers=13,
-    autograd_compatible = False,
+    use_banded_solver_NLayers=10,
+    autograd_compatible=False,
 ):
     """Solves the 1D RTE for the fluxes, and optionally intensity,
     of a multi-layer atmosphere with the specified optical properties, boundary conditions

PythonicDISORT/subroutines.py

@@ -299,14 +299,15 @@ def interpolate(u):
 
     Parameters
     ----------
-    u : function
+    u or u0 : function
         Non-interpolated intensity function as given by ``pydisort``.
 
     Returns
     -------
     u_interpol : function
-        Intensity function with arguments ``(mu, tau, phi)`` each of type array or float.
-        Returns an ndarray with axes corresponding to variation with ``mu, tau, phi`` respectively.
+        Intensity function with arguments ``(mu, tau, phi)`` (for ``u``) 
+        or ``(mu, tau)`` (for ``u0``) each of type array or float.
+        Returns an ndarray with axes corresponding to variation with each argument in the same order.
         Pass ``is_antiderivative_wrt_tau = True`` (defaults to ``False``)
         to switch to an antiderivative of the function with respect to ``tau``.
         Pass ``return_Fourier_error = True`` (defaults to ``False``) to return the 
@@ -319,38 +320,69 @@ def interpolate(u):
     
     u_pos_interpol = sc.interpolate.BarycentricInterpolator(mu_arr_pos)
     u_neg_interpol = sc.interpolate.BarycentricInterpolator(-mu_arr_pos)
-
-    def u_interpol(mu, tau, phi, is_antiderivative_wrt_tau=False, return_Fourier_error=False, return_tau_arr=False):
-        if not np.all(np.abs(mu) <= 1):
-            raise ValueError("mu values must be between -1 and 1.")
-        
-        mu = np.atleast_1d(mu)
-
-        if return_Fourier_error or return_tau_arr:
-            u_outputs = u(tau, phi, is_antiderivative_wrt_tau, return_Fourier_error, return_tau_arr)
-            u_cache = u_outputs[0]
-        else:
-            u_cache = u(tau, phi, is_antiderivative_wrt_tau)
-        
-        results = np.empty((len(mu),) + np.shape(u_cache)[1:])
-        mask_pos = mu > 0
-        mask_else = ~mask_pos
-        
-        if np.any(mask_pos):
-            u_pos_interpol.set_yi(u_cache[:N])
-            results[mask_pos] = u_pos_interpol(mu[mask_pos])
-        if np.any(mask_else):
-            u_neg_interpol.set_yi(u_cache[N:])
-            results[mask_else] = u_neg_interpol(mu[mask_else])
-        
-        if return_Fourier_error or return_tau_arr:
-            return (np.squeeze(results)[()],) + u_outputs[1:]
-        else:
-            return np.squeeze(results)[()]
-
+    
+    if u.__code__.co_argcount == 5: # Function is u instead of u0
+        def u_interpol(mu, tau, phi, is_antiderivative_wrt_tau=False, return_Fourier_error=False, return_tau_arr=False):
+            if not np.all(np.abs(mu) <= 1):
+                raise ValueError("mu values must be between -1 and 1.")
+            
+            mu = np.atleast_1d(mu)
+
+            if return_Fourier_error or return_tau_arr:
+                u_outputs = u(tau, phi, is_antiderivative_wrt_tau, return_Fourier_error, return_tau_arr)
+                u_cache = u_outputs[0]
+            else:
+                u_cache = u(tau, phi, is_antiderivative_wrt_tau)
+            
+            results = np.empty((len(mu),) + np.shape(u_cache)[1:])
+            mask_pos = mu > 0
+            mask_else = ~mask_pos
+            
+            if np.any(mask_pos):
+                u_pos_interpol.set_yi(u_cache[:N])
+                results[mask_pos] = u_pos_interpol(mu[mask_pos])
+            if np.any(mask_else):
+                u_neg_interpol.set_yi(u_cache[N:])
+                results[mask_else] = u_neg_interpol(mu[mask_else])
+            
+            if return_Fourier_error or return_tau_arr:
+                return (np.squeeze(results)[()],) + u_outputs[1:]
+            else:
+                return np.squeeze(results)[()]
+    
+    elif u.__code__.co_argcount == 4: # Function is u0 instead of u
+        def u_interpol(mu, tau, is_antiderivative_wrt_tau=False, return_Fourier_error=False, return_tau_arr=False):
+            if not np.all(np.abs(mu) <= 1):
+                raise ValueError("mu values must be between -1 and 1.")
+            
+            mu = np.atleast_1d(mu)
+
+            if return_Fourier_error or return_tau_arr:
+                u_outputs = u(tau, is_antiderivative_wrt_tau, return_Fourier_error, return_tau_arr)
+                u_cache = u_outputs[0]
+            else:
+                u_cache = u(tau, is_antiderivative_wrt_tau)
+            
+            results = np.empty((len(mu),) + np.shape(u_cache)[1:])
+            mask_pos = mu > 0
+            mask_else = ~mask_pos
+            
+            if np.any(mask_pos):
+                u_pos_interpol.set_yi(u_cache[:N])
+                results[mask_pos] = u_pos_interpol(mu[mask_pos])
+            if np.any(mask_else):
+                u_neg_interpol.set_yi(u_cache[N:])
+                results[mask_else] = u_neg_interpol(mu[mask_else])
+            
+            if return_Fourier_error or return_tau_arr:
+                return (np.squeeze(results)[()],) + u_outputs[1:]
+            else:
+                return np.squeeze(results)[()]
+    else:
+        raise ValueError("This subroutine can only interpolate u or u0")
+    
     return u_interpol
          
-         
 
 def to_diag_ordered_form(A, sym_offset):
     """

{PythonicDISORT-0.9.2.dist-info → PythonicDISORT-0.9.4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: PythonicDISORT
-Version: 0.9.2
+Version: 0.9.4
 Summary: Discrete Ordinates Solver for the (1D) Radiative Transfer Equation in a single or multi-layer atmosphere.
 Author-email: Dion HO Jia Xu <dh3065@columbia.edu>
 Project-URL: Homepage, https://github.com/LDEO-CREW/Pythonic-DISORT
@@ -28,9 +28,9 @@ On the other hand, PythonicDISORT should be easier to install, use, and modify t
 
 PythonicDISORT is based on Stamnes' FORTRAN DISORT (see References, in particular [2, 3, 8]) and has its main features: multi-layer solver, 
 delta-M scaling, Nakajima-Tanaka (NT) corrections, only flux option, direct beam source, isotropic internal source (blackbody emission), 
-Dirichlet boundary conditions (diffuse flux boundary sources), Bi-Directional Reflectance Function (BDRF) for surface reflection, 
-interpolation with respect to polar angle and more.
-In addition, we added a subroutine to calculate actinic fluxes to satisfy a user request, and integration with respect to tau was also added.
+Dirichlet boundary conditions (diffuse flux boundary sources), Bi-Directional Reflectance Function (BDRF) for surface reflection,
+and interpolation with respect to polar angle.
+In addition, we added a subroutine to compute actinic fluxes to satisfy a user request, and integration with respect to optical depth was also added.
 Further feature requests as well as feedback are welcome.
 
 You may contact me, Dion, through dh3065@columbia.edu.

PythonicDISORT-0.9.4.dist-info/RECORD

@@ -0,0 +1,11 @@
+PythonicDISORT/__init__.py,sha256=V1obNzaFgqInxqYJ5h_r6JHbZRxx4VM5VgzCIS6EEzI,84
+PythonicDISORT/_assemble_intensity_and_fluxes.py,sha256=AVDjKtUXEzKadxp1stP3ZrZFxq6W6-qA0L5lahBqpbM,29165
+PythonicDISORT/_solve_for_coeffs.py,sha256=8xnjR6fenaTiPXXzxvtXmETFZRnwOnGkHIuuOFpz7Lc,15402
+PythonicDISORT/_solve_for_gen_and_part_sols.py,sha256=1IvyEZrcqLcafAQgAFpXtJ2H6hCvIM11OgBHF3KqmGc,12960
+PythonicDISORT/pydisort.py,sha256=Y8Smva-DM7uF8vVbC67Y8Taicvr6BAfRHav7LAy5ksw,37037
+PythonicDISORT/subroutines.py,sha256=MhVwT3C5iwoDr0M51jnsvqkEFk1nfm7L_0svaQ5NOSE,22937
+PythonicDISORT-0.9.4.dist-info/LICENSE.md,sha256=q1i1QVh0OLzK0fj6kaNRNWsM_KZca66JwWgWwbuCPlA,1092
+PythonicDISORT-0.9.4.dist-info/METADATA,sha256=dEJZtjHl9h2Rh1d2T2oy3fjJSdQDkXVSvEenYIca9J8,7104
+PythonicDISORT-0.9.4.dist-info/WHEEL,sha256=P9jw-gEje8ByB7_hXoICnHtVCrEwMQh-630tKvQWehc,91
+PythonicDISORT-0.9.4.dist-info/top_level.txt,sha256=aX6kCeI1E7naZz3xfw4_mIbWh5KBh9dmF3FIvgP5m3Y,15
+PythonicDISORT-0.9.4.dist-info/RECORD,,

{PythonicDISORT-0.9.2.dist-info → PythonicDISORT-0.9.4.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (75.1.0)
+Generator: setuptools (75.3.0)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

PythonicDISORT-0.9.2.dist-info/RECORD

@@ -1,11 +0,0 @@
-PythonicDISORT/__init__.py,sha256=V1obNzaFgqInxqYJ5h_r6JHbZRxx4VM5VgzCIS6EEzI,84
-PythonicDISORT/_assemble_intensity_and_fluxes.py,sha256=ZxL5TCjgjTOoqPSfXYJJLeTBddhRdouFRQwJO1_qww0,29214
-PythonicDISORT/_solve_for_coeffs.py,sha256=8xnjR6fenaTiPXXzxvtXmETFZRnwOnGkHIuuOFpz7Lc,15402
-PythonicDISORT/_solve_for_gen_and_part_sols.py,sha256=1IvyEZrcqLcafAQgAFpXtJ2H6hCvIM11OgBHF3KqmGc,12960
-PythonicDISORT/pydisort.py,sha256=AZmhV2niPW_XK5cGi_tMSgQQemBtApQB1sKLbEQXqLY,37039
-PythonicDISORT/subroutines.py,sha256=tq9_m4iXE8zLE8hh69aWh4wNfRHyCkgZFxZI48DRNE0,21312
-PythonicDISORT-0.9.2.dist-info/LICENSE.md,sha256=q1i1QVh0OLzK0fj6kaNRNWsM_KZca66JwWgWwbuCPlA,1092
-PythonicDISORT-0.9.2.dist-info/METADATA,sha256=3vtpGDGl8fxkY-BS-nui3gOzg2UR-_dK963j5NrvcvM,7102
-PythonicDISORT-0.9.2.dist-info/WHEEL,sha256=GV9aMThwP_4oNCtvEC2ec3qUYutgWeAzklro_0m4WJQ,91
-PythonicDISORT-0.9.2.dist-info/top_level.txt,sha256=aX6kCeI1E7naZz3xfw4_mIbWh5KBh9dmF3FIvgP5m3Y,15
-PythonicDISORT-0.9.2.dist-info/RECORD,,