Aerosol_concs not passed as reference to tilt function

Author: MennoVeerman

include_tilt/tilt_utils.h

@@ -45,35 +45,35 @@ void post_process_output(const std::vector<ColumnResult>& col_results,
         const bool switch_liq_cloud_optics,
         const bool switch_ice_cloud_optics);
 
-void restore_bkg_profile(const int n_x, const int n_y, 
+void restore_bkg_profile(const int n_x, const int n_y,
                       const int n_full,
-                      const int n_tilt, 
-                      const int bkg_start, 
+                      const int n_tilt,
+                      const int bkg_start,
                       std::vector<Float>& var,
                       std::vector<Float>& var_w_bkg);
 
-void restore_bkg_profile_bundle(const int n_col_x, const int n_col_y, 
-    const int n_lay, const int n_lev, 
-    const int n_lay_tot, const int n_lev_tot, 
+void restore_bkg_profile_bundle(const int n_col_x, const int n_col_y,
+    const int n_lay, const int n_lev,
+    const int n_lay_tot, const int n_lev_tot,
     const int n_z_in, const int n_zh_in,
-    const int bkg_start_z, const int bkg_start_zh, 
-    Array<Float,2>* p_lay_copy, Array<Float,2>* t_lay_copy, Array<Float,2>* p_lev_copy, Array<Float,2>* t_lev_copy, 
-    Array<Float,2>* lwp_copy, Array<Float,2>* iwp_copy, Array<Float,2>* rel_copy, Array<Float,2>* dei_copy, Array<Float,2>* rh_copy, 
+    const int bkg_start_z, const int bkg_start_zh,
+    Array<Float,2>* p_lay_copy, Array<Float,2>* t_lay_copy, Array<Float,2>* p_lev_copy, Array<Float,2>* t_lev_copy,
+    Array<Float,2>* lwp_copy, Array<Float,2>* iwp_copy, Array<Float,2>* rel_copy, Array<Float,2>* dei_copy, Array<Float,2>* rh_copy,
     Gas_concs& gas_concs_copy, Aerosol_concs& aerosol_concs_copy,
-    Array<Float,2>* p_lay, Array<Float,2>* t_lay, Array<Float,2>* p_lev, Array<Float,2>* t_lev, 
-    Array<Float,2>* lwp, Array<Float,2>* iwp, Array<Float,2>* rel, Array<Float,2>* dei, Array<Float,2>* rh, 
-    Gas_concs& gas_concs, Aerosol_concs& aerosol_concs, 
+    Array<Float,2>* p_lay, Array<Float,2>* t_lay, Array<Float,2>* p_lev, Array<Float,2>* t_lev,
+    Array<Float,2>* lwp, Array<Float,2>* iwp, Array<Float,2>* rel, Array<Float,2>* dei, Array<Float,2>* rh,
+    Gas_concs& gas_concs, Aerosol_concs& aerosol_concs,
     std::vector<std::string> gas_names, std::vector<std::string> aerosol_names,
     bool switch_liq_cloud_optics, bool switch_ice_cloud_optics, bool switch_aerosol_optics
     );
 
-void compress_columns_weighted_avg(const int n_x, const int n_y,  
-                      const int n_out, 
+void compress_columns_weighted_avg(const int n_x, const int n_y,
+                      const int n_out,
                       const int n_tilt,
                       const int compress_lay_start_idx,
                       std::vector<Float>& var, std::vector<Float>& var_weighting);
 
-void compress_columns_p_or_t(const int n_x, const int n_y, 
+void compress_columns_p_or_t(const int n_x, const int n_y,
                       const int n_out_lay,  const int n_tilt,
                       const int compress_lay_start_idx,
                       std::vector<Float>& var_lev, std::vector<Float>& var_lay);
@@ -82,16 +82,16 @@ void tilt_fields(const int n_z_in, const int n_zh_in, const int n_col_x, const i
     const int n_z_tilt, const int n_zh_tilt, const int n_col,
     const Array<Float,1> zh, const Array<Float,1> z,
     const Array<Float,1> zh_tilt, const Array<ijk,1> path,
-    Array<Float,2>* p_lay_copy, Array<Float,2>* t_lay_copy, Array<Float,2>* p_lev_copy, Array<Float,2>* t_lev_copy, 
-    Array<Float,2>* rh_copy, 
+    Array<Float,2>* p_lay_copy, Array<Float,2>* t_lay_copy, Array<Float,2>* p_lev_copy, Array<Float,2>* t_lev_copy,
+    Array<Float,2>* rh_copy,
     Gas_concs& gas_concs_copy, const std::vector<std::string> gas_names,
     Aerosol_concs& aerosol_concs_copy, const std::vector<std::string> aerosol_names, const bool switch_aerosol_optics
     );
 
 void compress_fields(const int compress_lay_start_idx, const int n_col_x, const int n_col_y,
     const int n_z_in, const int n_zh_in,  const int n_z_tilt,
-    Array<Float,2>* p_lay_copy, Array<Float,2>* t_lay_copy, Array<Float,2>* p_lev_copy, Array<Float,2>* t_lev_copy, 
-    Array<Float,2>* rh_copy, 
+    Array<Float,2>* p_lay_copy, Array<Float,2>* t_lay_copy, Array<Float,2>* p_lev_copy, Array<Float,2>* t_lev_copy,
+    Array<Float,2>* rh_copy,
     Gas_concs& gas_concs_copy, std::vector<std::string> gas_names,
     Aerosol_concs& aerosol_concs_copy, std::vector<std::string> aerosol_names, const bool switch_aerosol_optics);
 
@@ -114,11 +114,11 @@ void tica_tilt(const Float sza, const Float azi,
     const int n_col_x, const int n_col_y, const int n_col,
     const int n_lay, const int n_lev, const int n_z_in, const int n_zh_in ,
     Array<Float,1> xh, Array<Float,1> yh, Array<Float,1> zh, Array<Float,1> z,
-    Array<Float,2> p_lay, Array<Float,2> t_lay, Array<Float,2> p_lev, Array<Float,2> t_lev, 
-    Array<Float,2> lwp, Array<Float,2> iwp, Array<Float,2> rel, Array<Float,2> dei, Array<Float,2> rh, 
+    Array<Float,2> p_lay, Array<Float,2> t_lay, Array<Float,2> p_lev, Array<Float,2> t_lev,
+    Array<Float,2> lwp, Array<Float,2> iwp, Array<Float,2> rel, Array<Float,2> dei, Array<Float,2> rh,
     Gas_concs gas_concs, Aerosol_concs aerosol_concs,
-    Array<Float,2>& p_lay_out, Array<Float,2>& t_lay_out, Array<Float,2>& p_lev_out, Array<Float,2>& t_lev_out, 
-    Array<Float,2>& lwp_out, Array<Float,2>& iwp_out, Array<Float,2>& rel_out, Array<Float,2>& dei_out, Array<Float,2>& rh_out, 
-    Gas_concs& gas_concs_out, Aerosol_concs aerosol_concs_out,
+    Array<Float,2>& p_lay_out, Array<Float,2>& t_lay_out, Array<Float,2>& p_lev_out, Array<Float,2>& t_lev_out,
+    Array<Float,2>& lwp_out, Array<Float,2>& iwp_out, Array<Float,2>& rel_out, Array<Float,2>& dei_out, Array<Float,2>& rh_out,
+    Gas_concs& gas_concs_out, Aerosol_concs& aerosol_concs_out,
     std::vector<std::string> gas_names, std::vector<std::string> aerosol_names,
     bool switch_cloud_optics, bool switch_liq_cloud_optics, bool switch_ice_cloud_optics, bool switch_aerosol_optics);

src_test/test_rte_rrtmgp_rt.cu

@@ -545,12 +545,18 @@ void solve_radiation(int argc, char** argv)
         iwp = iwp_out;
         dei = dei_out;
 
+        if (switch_aerosol_optics)
+        {
+            rh_out.expand_dims({n_col, n_lay});
+            rh  = rh_out;
+            aerosol_concs = aerosol_concs_out;
+        }
+
         p_lay = p_lay_out;
         p_lev = p_lev_out;
         t_lay = t_lay_out;
         t_lev = t_lev_out;
         gas_concs = gas_concs_out;
-        aerosol_concs = aerosol_concs_out;
 
     }
 
@@ -963,7 +969,7 @@ void solve_radiation(int argc, char** argv)
                     lwp_gpu, iwp_gpu,
                     rel_gpu, dei_gpu,
                     rh,
-                    aerosol_concs,
+                    aerosol_concs_gpu,
                     sw_tot_tau, sw_tot_ssa,
                     sw_cld_tau, sw_cld_ssa, sw_cld_asy,
                     sw_aer_tau, sw_aer_ssa, sw_aer_asy,

src_tilt/tilt_utils.cpp

@@ -380,6 +380,7 @@ void compress_columns_weighted_avg(const int n_x, const int n_y,
     #pragma omp parallel for
     for (int ilay = compress_lay_start_idx; ilay < n_out; ++ilay)
     {
+
         const int in_offset = ilay - compress_lay_start_idx;
         const int i_lay_in = (compress_lay_start_idx + 2 * in_offset);
         int num_inputs;
@@ -815,7 +816,7 @@ void tica_tilt(
     Gas_concs gas_concs, Aerosol_concs aerosol_concs,
     Array<Float,2>& p_lay_out, Array<Float,2>& t_lay_out, Array<Float,2>& p_lev_out, Array<Float,2>& t_lev_out,
     Array<Float,2>& lwp_out, Array<Float,2>& iwp_out, Array<Float,2>& rel_out, Array<Float,2>& dei_out, Array<Float,2>& rh_out,
-    Gas_concs& gas_concs_out, Aerosol_concs aerosol_concs_out,
+    Gas_concs& gas_concs_out, Aerosol_concs& aerosol_concs_out,
     std::vector<std::string> gas_names, std::vector<std::string> aerosol_names,
     bool switch_cloud_optics, bool switch_liq_cloud_optics, bool switch_ice_cloud_optics, bool switch_aerosol_optics
 )