PythonicDISORT 1.0.1__tar.gz → 1.0.2__tar.gz

{pythonicdisort-1.0.1/src/PythonicDISORT.egg-info → pythonicdisort-1.0.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: PythonicDISORT
-Version: 1.0.1
+Version: 1.0.2
 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

{pythonicdisort-1.0.1 → pythonicdisort-1.0.2}/pyproject.toml

@@ -8,7 +8,7 @@ dependencies = [
   "scipy>=1.8.0",
 ]
 name = "PythonicDISORT"
-version = "1.0.1"
+version = "1.0.2"
 authors = [
   { name="Dion HO Jia Xu", email="dh3065@columbia.edu" },
 ]

{pythonicdisort-1.0.1 → pythonicdisort-1.0.2}/src/PythonicDISORT/_solve_for_coeffs.py

@@ -98,13 +98,19 @@ def _solve_for_coeffs(
         # Just for this part, refer to section 3.4.2 of the Comprehensive Documentation 
         # --------------------------------------------------------------------------------------------------------------------------
         if there_is_BDRF_mode:
-            mathscr_D_neg = (1 + m_equals_0 * 1) * BDRF_Fourier_modes[m](mu_arr_pos, mu_arr_pos)
-            R = mathscr_D_neg * mu_arr_pos_times_W[None, :]
-
-            if there_is_beam_source:
-                mathscr_X_pos = (mu0 * I0 / pi) * BDRF_Fourier_modes[m](
-                    mu_arr_pos, np.array([mu0])
-                )[:, 0]
+            BDRF_Fourier_modes_m = BDRF_Fourier_modes[m]
+            if np.isscalar(BDRF_Fourier_modes_m):
+                mathscr_D_neg = (1 + m_equals_0 * 1) * BDRF_Fourier_modes_m
+                R = mathscr_D_neg * mu_arr_pos_times_W[None, :]
+                if there_is_beam_source:
+                    mathscr_X_pos = (mu0 * I0 / pi) * BDRF_Fourier_modes_m
+            else:
+                mathscr_D_neg = (1 + m_equals_0 * 1) * BDRF_Fourier_modes_m(mu_arr_pos, mu_arr_pos)
+                R = mathscr_D_neg * mu_arr_pos_times_W[None, :]
+                if there_is_beam_source:
+                    mathscr_X_pos = (mu0 * I0 / pi) * BDRF_Fourier_modes_m(
+                        mu_arr_pos, np.array([mu0])
+                    )[:, 0]
         # --------------------------------------------------------------------------------------------------------------------------
     
         # Assemble RHS

{pythonicdisort-1.0.1 → pythonicdisort-1.0.2}/src/PythonicDISORT/pydisort.py

@@ -76,8 +76,8 @@ def pydisort(
     NT_cor : optional, bool
         Perform Nakajima-Tanaka intensity corrections?
     BDRF_Fourier_modes : optional, list of functions
-        BDRF Fourier modes, each a function with arguments ``mu, -mu_p`` of type array
-        and which output has the same dimensions as the outer product of the two arrays.
+        BDRF Fourier modes, each a scalar, or a function with arguments ``mu, -mu_p`` of type array
+        which output has the same dimensions as the outer product of the two arrays.
     s_poly_coeffs : optional, array
         Polynomial coefficients of isotropic internal sources.
         Each row pertains to an atmospheric layer (from top to bottom).

{pythonicdisort-1.0.1 → pythonicdisort-1.0.2}/src/PythonicDISORT/subroutines.py

@@ -458,29 +458,41 @@ def cache_BDRF_Fourier_modes(N, mu0, BDRF_Fourier_modes):
     mu0 : float
         Cosine of polar angle of the incident beam.
     BDRF_Fourier_modes : list of functions
-        BDRF Fourier modes, each a function with arguments ``mu, -mu_p`` of type array
-        and which output has the same dimensions as the outer product of the two arrays.
+        BDRF Fourier modes, each a scalar, or a function with arguments ``mu, -mu_p`` of type array
+        which output has the same dimensions as the outer product of the two arrays.
 
     Returns
     -------
     cached_BDRF_Fourier_modes : list of functions
         Cached BDRF Fourier modes, each a function with arguments ``mu, -mu_p`` of type array
-        and which output has the same dimensions as the outer product of the two arrays.
+        and which output is a scalar (if the Fourier mode was a scalar) 
+        or has the same dimensions as the outer product of the two arrays.
     """
     NBDRF = len(BDRF_Fourier_modes)
     mu_arr_pos = Gauss_Legendre_quad(N)[0]
 
-    BDRF_Fourier_modes_evaluated = [
-        BDRF_Fourier_modes[m](mu_arr_pos, np.append(mu_arr_pos, mu0)) for m in range(NBDRF)
+    [
+        (
+            None
+            if np.isscalar(BDRF_Fourier_modes[m])
+            else BDRF_Fourier_modes[m](mu_arr_pos, np.append(mu_arr_pos, mu0))
+        )
+        for m in range(NBDRF)
     ]
+
     cached_BDRF_Fourier_modes = [
         (
-            lambda mu, neg_mup, m=m: BDRF_Fourier_modes_evaluated[m][:, [-1]]
-            if len(neg_mup) == 1
-            else BDRF_Fourier_modes_evaluated[m][:, :-1]
+            lambda mu, neg_mup, m=m: BDRF_Fourier_modes[m]
+            if np.isscalar(BDRF_Fourier_modes[m])
+            else (
+                BDRF_Fourier_modes_evaluated[m][:, [-1]]
+                if len(neg_mup) == 1
+                else BDRF_Fourier_modes_evaluated[m][:, :-1]
+            )
         )
         for m in range(NBDRF)
     ]
+
     return cached_BDRF_Fourier_modes
 
 

{pythonicdisort-1.0.1 → pythonicdisort-1.0.2/src/PythonicDISORT.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: PythonicDISORT
-Version: 1.0.1
+Version: 1.0.2
 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