switch scaling so two stream gets it too

Author: magpowell

include_rt/Raytracer.h

@@ -24,8 +24,6 @@ class Raytracer
         void trace_rays(
                 const int qrng_gpt_offset,
                 const bool switch_independent_column,
-                const bool switch_attenuate_path,
-                const Float attenuate_scale_factor,
                 const Int photons_per_pixel,
                 const Raytracer_definitions::Vector<int> grid_cells,
                 const Raytracer_definitions::Vector<Float> grid_d,

src_cuda_rt/Raytracer.cu

@@ -164,35 +164,6 @@ namespace
         }
     }
 
-
-    __global__
-    void scale_kext_kernel(const Vector<int> grid_cells, Float* __restrict__ k_ext, Float scale_factor) {
-        const int icol_x = blockIdx.x*blockDim.x + threadIdx.x;
-        const int icol_y = blockIdx.y*blockDim.y + threadIdx.y;
-        const int iz = blockIdx.z*blockDim.z + threadIdx.z;
-
-        if ( (icol_x < grid_cells.x) && (icol_y < grid_cells.y) && (iz < (grid_cells.z)) )
-        {
-            const int idx = icol_x + icol_y*grid_cells.x + iz*grid_cells.y*grid_cells.x;
-            k_ext[idx] = k_ext[idx] * scale_factor;
-        }
-    } 
-
-    __global__
-    void scale_k_sca_kernel(const Vector<int> grid_cells, Optics_scat* __restrict__ scat_asy, Float scale_factor) {
-        const int icol_x = blockIdx.x*blockDim.x + threadIdx.x;
-        const int icol_y = blockIdx.y*blockDim.y + threadIdx.y;
-        const int iz = blockIdx.z*blockDim.z + threadIdx.z;
-
-        if ( (icol_x < grid_cells.x) && (icol_y < grid_cells.y) && (iz < (grid_cells.z)) )
-        {
-            const int idx = icol_x + icol_y*grid_cells.x + iz*grid_cells.y*grid_cells.x;
-            scat_asy[idx].k_sca_gas *= scale_factor;
-            scat_asy[idx].k_sca_cld *= scale_factor;
-            scat_asy[idx].k_sca_aer *= scale_factor;
-        }
-    } 
-
     __global__
     void count_to_flux_2d(
             const Vector<int> grid_cells, const Float photons_per_col, const Float toa_src,
@@ -259,8 +230,6 @@ Raytracer::Raytracer()
 void Raytracer::trace_rays(
         const int igpt,
         const bool switch_independent_column,
-        const bool switch_attenuate_path,
-        const Float attenuate_scale_factor,
         const Int photons_per_pixel,
         const Vector<int> grid_cells,
         const Vector<Float> grid_d,
@@ -325,10 +294,6 @@ void Raytracer::trace_rays(
             tau_aeros.ptr(), ssa_aeros.ptr(), asy_aeros.ptr(),
             k_ext.ptr(), scat_asy.ptr());
 
-    if (switch_attenuate_path){
-        scale_kext_kernel<<<grid_3d, block_3d>>>(grid_cells, k_ext.ptr(), attenuate_scale_factor);
-        scale_k_sca_kernel<<<grid_3d, block_3d>>>(grid_cells, scat_asy.ptr(), attenuate_scale_factor);
-    }
 
     // create k_null_grid
     const int block_kn_x = 8;

src_test/Radiation_solver_rt.cu

@@ -42,6 +42,29 @@
 
 namespace
 {
+        __global__
+        void scale_tau_kernel(Float* tau, const int ncol, const int nlay, Float scale_factor) {
+                const int icol = blockIdx.x*blockDim.x + threadIdx.x;
+                const int ilay = blockIdx.y*blockDim.y + threadIdx.y;
+
+                if ( (icol < ncol) && (ilay < nlay) )
+                {
+                const int idx = icol + ilay*ncol;
+                tau[idx] = tau[idx] * scale_factor;
+                }
+        }    
+
+        void scale_tau(Float* tau, const int ncol, const int nlay, Float scale_factor) {
+                const int block_col = 64;
+                const int block_lay = 1;
+                const int grid_col  = ncol/block_col + (ncol%block_col > 0);
+                const int grid_lay  = nlay/block_lay + (nlay%block_lay > 0);
+
+                dim3 grid_gpu(grid_col, grid_lay);
+                dim3 block_gpu(block_col, block_lay);
+                scale_tau_kernel<<<grid_gpu, block_gpu>>>(tau, ncol, nlay, scale_factor);
+        }
+
     std::vector<std::string> get_variable_string(
             const std::string& var_name,
             std::vector<int> i_count,
@@ -714,6 +737,11 @@ void Radiation_solver_shortwave::solve_gpu(
 
         toa_src.fill(toa_src_temp({1}) * tsi_scaling({1}));
 
+        if (switch_attenuate_tica)
+        {
+                scale_tau(dynamic_cast<Optical_props_2str_rt&>(*optical_props).get_tau().ptr(), n_col, n_lay, attenuate_scale_factor);
+        }
+
         if (switch_aerosol_optics)
         {
             if (band > previous_band)
@@ -726,6 +754,10 @@ void Radiation_solver_shortwave::solve_gpu(
                         *aerosol_optical_props);
                 if (switch_delta_aerosol)
                     aerosol_optical_props->delta_scale();
+                if (switch_attenuate_tica)
+                {
+                        scale_tau(dynamic_cast<Optical_props_2str_rt&>(*aerosol_optical_props).get_tau().ptr(), n_col, n_lay, attenuate_scale_factor);
+                }
             }
 
             // Add the cloud optical props to the gas optical properties.
@@ -754,6 +786,10 @@ void Radiation_solver_shortwave::solve_gpu(
 
                 if (switch_delta_cloud)
                     cloud_optical_props->delta_scale();
+                if (switch_attenuate_tica)
+                {
+                        scale_tau(dynamic_cast<Optical_props_2str_rt&>(*cloud_optical_props).get_tau().ptr(), n_col, n_lay, attenuate_scale_factor);
+                }
             }
             // Add the cloud optical props to the gas optical properties.
             add_to(
@@ -815,8 +851,6 @@ void Radiation_solver_shortwave::solve_gpu(
                 raytracer.trace_rays(
                         igpt,
                         switch_independent_column,
-                        switch_attenuate_tica,
-                        attenuate_scale_factor,
                         ray_count,
                         grid_cells,
                         grid_d,

src_test/test_rt_lite.cu

@@ -411,13 +411,9 @@ void solve_radiation(int argc, char** argv)
 
             cudaEventRecord(start, 0);
             // do something.
-            const bool switch_attenuate_path = false;
-            const Float attenuate_scale_factor = 0;
 	        raytracer.trace_rays(
                    0,
                    switch_independent_column,
-                   switch_attenuate_path,
-                   attenuate_scale_factor,
                    photons_per_pixel,
                    grid_cells,
                    grid_d,