diff --git a/drawbicyc/include/cases/Cumulus_Congestus/plots.hpp b/drawbicyc/include/cases/Cumulus_Congestus/plots.hpp index 637a626..957128a 100644 --- a/drawbicyc/include/cases/Cumulus_Congestus/plots.hpp +++ b/drawbicyc/include/cases/Cumulus_Congestus/plots.hpp @@ -17,7 +17,15 @@ const std::vector series_Cumulus_Congestus({ //"RH_max", "cloud_top_height", "total_droplets_number", - "cloud_cover_rico", + "cl_meanr", + "cl_nc", + "cl_nr", + "nc", + "nr", + "com_mom0", + "com_mom1", + "com_mom2", + "cloud_cover_rico" //"surf_flux_latent", //"surf_flux_sensible", //"sd_conc_avg", diff --git a/drawbicyc/include/plot_series.hpp b/drawbicyc/include/plot_series.hpp index 2167e77..d6c79cb 100644 --- a/drawbicyc/include/plot_series.hpp +++ b/drawbicyc/include/plot_series.hpp @@ -1350,12 +1350,12 @@ void plot_series(Plotter_t plotter, Plots plots, std::string type) try { // cloud fraction (cloudy if N_c > 20/cm^3) - typename Plotter_t::arr_t snap(plotter.h5load_timestep("cloud_rw_mom0", at * n["outfreq"])); + typename Plotter_t::arr_t snap(plotter.h5load_timestep("actrw_rw_mom0", at * n["outfreq"])); snap *= rhod; // b4 it was specific moment snap /= 1e6; // per cm^3 snap = iscloudy(snap); // cloudiness mask - typename Plotter_t::arr_t snap_m0(plotter.h5load_timestep("cloud_rw_mom0", at * n["outfreq"])); - typename Plotter_t::arr_t snap_m1(plotter.h5load_timestep("cloud_rw_mom1", at * n["outfreq"])*1e6); // in microns + typename Plotter_t::arr_t snap_m0(plotter.h5load_timestep("actrw_rw_mom0", at * n["outfreq"])); + typename Plotter_t::arr_t snap_m1(plotter.h5load_timestep("actrw_rw_mom1", at * n["outfreq"])*1e6); // in microns snap_m0 *= snap; snap_m1 *= snap; auto tot_m0 = blitz::sum(snap_m0);