Merge pull request #58 from magpowell/tica_fix

TICA fixes

Author: MennoVeerman

src_test/test_rte_rrtmgp_rt.cu

@@ -300,6 +300,11 @@ void solve_radiation(int argc, char** argv)
         switch_independent_column = true;
     }
 
+    if (switch_tica && switch_aerosol_optics) {
+        std::string error = "Aerosol optics are not supported in TICA mode"; // NOTE: Aersol optics with TICA has significant errors at high SZA.
+        throw std::runtime_error(error);
+    }
+
     // Print the options to the screen.
     print_command_line_options(command_line_switches, command_line_ints);
 
@@ -544,6 +549,7 @@ void solve_radiation(int argc, char** argv)
         t_lay = t_lay_out;
         t_lev = t_lev_out;
         gas_concs = gas_concs_out;
+        aerosol_concs = aerosol_concs_out;
 
     }
 

src_tilt/tilt_utils.cpp

@@ -569,6 +569,24 @@ void tilt_fields(const int n_z_in, const int n_zh_in, const int n_col_x, const i
     t_lev_copy->expand_dims({n_col, n_zh_tilt});
     p_lay_copy->expand_dims({n_col, n_z_tilt});
     p_lev_copy->expand_dims({n_col, n_zh_tilt});
+
+    for (int ilay=0; ilay<n_zh_tilt; ++ilay) {
+        for (int iy=0; iy<n_col_y; ++iy) {
+            for (int ix=0; ix<n_col_x; ++ix) {
+                if (ilay > 0) {
+                    const int curr_idx = ix + iy*n_col_x + ilay*n_col_x*n_col_y;
+                    const int prev_idx = ix + iy*n_col_x + (ilay-1)*n_col_x*n_col_y;
+                    if (p_lev_copy->v()[curr_idx] == p_lev_copy->v()[prev_idx]) {
+                        p_lev_copy->v()[curr_idx] = p_lev_copy->v()[prev_idx] * 0.99999;
+                    } 
+                    else if (p_lev_copy->v()[curr_idx] > p_lev_copy->v()[prev_idx]) 
+                    {
+                        throw std::runtime_error("Pressure INCREASED at layer " + std::to_string(ilay));
+                    }
+                }
+            }
+        }
+    }
 }
 
 void compress_fields(const int compress_lay_start_idx, const int n_col_x, const int n_col_y,
@@ -1019,7 +1037,7 @@ void tica_tilt(
                                for (int k = 0; k < num_inputs; ++k)
                                {
                                    int in_idx = (i_lay_in + k);
-                                   avg += var_rel_out[in_idx];
+                                   avg += var_rel_tmp[in_idx];
                                }
                                var_rel_out[ilay] = avg / num_inputs;
                            }