work in progress updating the backward tracing

Author: Menno Veerman

include_rt/Raytracer_bw.h

@@ -20,33 +20,50 @@ class Raytracer_bw
 
         void trace_rays(
                 const Int photons_to_shoot,
-                const int n_col_x, const int n_col_y, const int n_z, const int n_lay,
+                const int n_col_x, const int n_col_y, const int n_lay,
                 const Float dx_grid, const Float dy_grid, const Float dz_grid,
                 const Array_gpu<Float,1>& z_lev,
                 const Optical_props_2str_rt& optical_props,
                 const Optical_props_2str_rt& cloud_optical_props,
                 const Array_gpu<Float,2>& surface_albedo,
                 const Float zenith_angle,
                 const Float azimuth_angle,
-                const Array_gpu<Float,1>& toa_src,
+                const Float tod_inc_direct,
+                const Float tod_inc_diffuse.
                 const Float toa_factor,
                 const Float rayleigh,
                 const Array_gpu<Float,2>& col_dry,
                 const Array_gpu<Float,2>& vmr_h2o,
                 const Array_gpu<Float,1>& cam_data,
                 Array_gpu<Float,2>& flux_camera);
 
+        void trace_rays_bb(
+                const Int photons_to_shoot,
+                const int ncol_x, const int ncol_y, const int nz, const int nlay,
+                const Float dx_grid, const Float dy_grid, const Float dz_grid,
+                const Array_gpu<Float,2>& tau_gas,
+                const Array_gpu<Float,2>& ssa_gas,
+                const Array_gpu<Float,2>& asy_gas,
+                const Array_gpu<Float,2>& tau_cloud,
+                const Array_gpu<Float,2>& surface_albedo,
+                const Float zenith_angle,
+                const Float azimuth_angle,
+                const Float tod_inc_direct,
+                const Float tod_inc_diffuse,
+                const Array_gpu<Float,1>& cam_data,
+                Array_gpu<Float,2>& flux_camera);
+
         void add_xyz_camera(
                 const int cam_nx, const int cam_ny,
                 const Array_gpu<Float,1>& xyz_factor,
                 const Array_gpu<Float,2>& flux_camera,
                 Array_gpu<Float,3>& XYZ);
-        
+
         void normalize_xyz_camera(
                 const int cam_nx, const int cam_ny,
                 const Float total_source,
                 Array_gpu<Float,3>& XYZ);
-                
+
     private:
 
 };

include_rt/raytracer_kernels_bw.h

@@ -8,15 +8,16 @@
 #ifdef RTE_RRTMGP_SINGLE_PRECISION
 //using Float = float;
 constexpr int block_size= 512;
-constexpr int grid_size = 512;
+constexpr int grid_size = 1024;
 #else
 //using Float = double;
 constexpr int block_size = 512;
 constexpr int grid_size = 256;
 #endif
 using Int = unsigned long long;
-constexpr int ngrid_h = 30;
-constexpr int ngrid_v = 71;
+constexpr int ngrid_x = 20;
+constexpr int ngrid_y = 20;
+constexpr int ngrid_z = 35;
 constexpr Float k_null_gas_min = Float(1.e-3);
 
 
@@ -48,12 +49,12 @@ void ray_tracer_kernel_bw(
         int* __restrict__ counter,
         const int cam_nx, const int cam_ny, const Float* __restrict__ cam_data,
         const Optics_ext* __restrict__ k_ext, const Optics_scat* __restrict__ ssa_asy,
-        const Optics_ext* __restrict__ k_ext_bg, const Optics_scat* __restrict__ ssa_asy_bg,
-        const Float* __restrict__ z_lev_bg,
         const Float* __restrict__ surface_albedo,
         const Float mu,
+        const Float bg_trans,
+        const Float tod_frac_diffuse,
         const Float x_size, const Float y_size, const Float z_size,
         const Float dx_grid, const Float dy_grid, const Float dz_grid,
         const Float dir_x, const Float dir_y, const Float dir_z,
-        const int itot, const int jtot, const int ktot, const int kbg);
+        const int itot, const int jtot, const int ktot);
 #endif

include_test/Radiation_solver_bw.h

@@ -83,7 +83,7 @@ class Radiation_solver_longwave
 
         int get_n_gpt_gpu() const { return this->kdist_gpu->get_ngpt(); };
         int get_n_bnd_gpu() const { return this->kdist_gpu->get_nband(); };
-        
+
         Array<int,2> get_band_lims_gpoint_gpu() const
         { return this->kdist_gpu->get_band_lims_gpoint(); }
 
@@ -159,11 +159,29 @@ class Radiation_solver_shortwave
                 const Array_gpu<Float,1>& cam_data,
                 Array_gpu<Float,3>& XYZ);
 
+        #ifdef __CUDACC__
+        void solve_gpu_bb(
+                const bool switch_cloud_optics,
+                const bool switch_output_bnd_fluxes,
+                const Int ray_count,
+                const Gas_concs_gpu& gas_concs,
+                const Array_gpu<Float,2>& p_lay, const Array_gpu<Float,2>& p_lev,
+                const Array_gpu<Float,2>& t_lay, const Array_gpu<Float,2>& t_lev,
+                const Array_gpu<Float,1>& z_lev,
+                const Array_gpu<Float,1>& grid_dims,
+                Array_gpu<Float,2>& col_dry,
+                const Array_gpu<Float,2>& sfc_alb_dir, const Array_gpu<Float,2>& sfc_alb_dif,
+                const Array_gpu<Float,1>& tsi_scaling, const Array_gpu<Float,1>& mu0,
+                const Array_gpu<Float,2>& lwp, const Array_gpu<Float,2>& iwp,
+                const Array_gpu<Float,2>& rel, const Array_gpu<Float,2>& rei,
+                const Array_gpu<Float,1>& cam_data,
+                Array_gpu<Float,2>& radiance);
+
         int get_n_gpt_gpu() const { return this->kdist_gpu->get_ngpt(); };
         int get_n_bnd_gpu() const { return this->kdist_gpu->get_nband(); };
 
         Float get_tsi_gpu() const { return this->kdist_gpu->get_tsi(); };
-        
+
         Array<int,2> get_band_lims_gpoint_gpu() const
         { return this->kdist_gpu->get_band_lims_gpoint(); }