Console Output
+ diff --exclude=.git --exclude=version_clubb_core.txt --exclude=version_silhs.txt -r clubb clubb_release
Only in clubb/postprocessing/pyplotgen/config: VariableGroupBaseBudgetsLumpedBuoy.py
diff '--exclude=.git' '--exclude=version_clubb_core.txt' '--exclude=version_silhs.txt' -r clubb/postprocessing/pyplotgen/pyplotgen.py clubb_release/postprocessing/pyplotgen/pyplotgen.py
48c48
< plot_budgets=False, bu_morr=False, lumped_buoy_budgets=False, diff=None, show_alphabetic_id=False,
---
> plot_budgets=False, bu_morr=False, diff=None, show_alphabetic_id=False,
88d87
< :param lumped_buoy_budgets: Lump together wpxp_bp and wpxp_pr3 terms in CLUBB's budgets
113d111
< self.lumped_buoy_budgets = lumped_buoy_budgets
420c418
< plot_subcolumns=self.plot_subcolumns, lumped_buoy_budgets=self.lumped_buoy_budgets,
---
> plot_subcolumns=self.plot_subcolumns,
644,645d641
< parser.add_argument("--lumped-buoy-budgets", help="Lump together wpxp_bp and wpxp_pr3 terms in CLUBB's budgets.",
< action="store_true")
799,800c795,796
< no_legends=args.no_legends, plot_budgets=args.plot_budgets, bu_morr=args.bu_morr,
< lumped_buoy_budgets=args.lumped_buoy_budgets, diff=args.diff, show_alphabetic_id=args.show_alphabetic_id,
---
> no_legends=args.no_legends, plot_budgets=args.plot_budgets,
> bu_morr=args.bu_morr, diff=args.diff, show_alphabetic_id=args.show_alphabetic_id,
diff '--exclude=.git' '--exclude=version_clubb_core.txt' '--exclude=version_silhs.txt' -r clubb/postprocessing/pyplotgen/README.md clubb_release/postprocessing/pyplotgen/README.md
52d51
< | --lumped-buoy-budgets | Lump together wpxp_bp and wpxp_pr3 terms in CLUBB's budgets |
diff '--exclude=.git' '--exclude=version_clubb_core.txt' '--exclude=version_silhs.txt' -r clubb/postprocessing/pyplotgen/src/CaseGallerySetup.py clubb_release/postprocessing/pyplotgen/src/CaseGallerySetup.py
11d10
< from config.VariableGroupBaseBudgetsLumpedBuoy import VariableGroupBaseBudgetsLumpedBuoy
33,35c32,34
< plot_les=False, plot_budgets=False, lumped_buoy_budgets=False, plot_r408=False, plot_hoc=False,
< e3sm_folders=[], cam_folders=[], time_height=False, animation=None, samstyle=False,
< plot_subcolumns=False, image_extension=".png", total_panels_to_plot=0, priority_vars=False):
---
> plot_les=False, plot_budgets=False, plot_r408=False, plot_hoc=False, e3sm_folders=[], cam_folders=[],
> time_height=False, animation=None, samstyle=False, plot_subcolumns=False, image_extension=".png",
> total_panels_to_plot=0, priority_vars=False):
49d47
< :param lumped_buoy_budgets: If True and if plot_budgets in true, wpxp_bp and wpxp_pr3 will be lumped into one budget term
68d65
< self.lumped_buoy_budgets = lumped_buoy_budgets
96d92
< self.lumped_buoy_budgets = False
164,169c160,161
< if not self.lumped_buoy_budgets:
< budget_variables = VariableGroupBaseBudgets(self, priority_vars=self.priority_vars,
< clubb_datasets={folder_name:self.clubb_datasets[input_folder]})
< else:
< budget_variables = VariableGroupBaseBudgetsLumpedBuoy(self, priority_vars=self.priority_vars,
< clubb_datasets={folder_name:self.clubb_datasets[input_folder]})
---
> budget_variables = VariableGroupBaseBudgets(self, priority_vars=self.priority_vars,
> clubb_datasets={folder_name:self.clubb_datasets[input_folder]})
diff '--exclude=.git' '--exclude=version_clubb_core.txt' '--exclude=version_silhs.txt' -r clubb/postprocessing/pyplotgen/src/Panel.py clubb_release/postprocessing/pyplotgen/src/Panel.py
34,35c34,35
< def __init__(self, plots, bkgrnd_rcm_tavg, altitude_bkgrnd_rcm, start_alt_idx, end_alt_idx,
< panel_type="profile", title="Unnamed panel", dependent_title="dependent variable", sci_scale = None, centered = False):
---
> def __init__(self, plots, panel_type="profile", title="Unnamed panel", dependent_title="dependent variable",
> sci_scale = None, centered = False):
40,43d39
< :param bkgrnd_rcm_tavg: Time-average vertical profile of rcm that can be displayed in the background of plots.
< :param altitude_bkgrnd_rcm: Heights corresponding with the background rcm profile.
< :param start_alt_idx: Index of bkgrnd_rcm_tavg that corresponds with bottom of the plot.
< :param end_alt_idx: Index of bkgrnd_rcm_tavg that corresponds with top of the plot.
54,57d49
< self.bkgrnd_rcm_tavg = bkgrnd_rcm_tavg
< self.altitude_bkgrnd_rcm = altitude_bkgrnd_rcm
< self.start_alt_idx = start_alt_idx
< self.end_alt_idx = end_alt_idx
233,234c225
< #ax.legend(loc='center left', bbox_to_anchor=(1, 0.5))
< ax.legend(loc='upper right', bbox_to_anchor=(1, 1))
---
> ax.legend(loc='center left', bbox_to_anchor=(1, 0.5))
248,262d238
<
< # Background rcm contour plot
< num_points = self.end_alt_idx - self.start_alt_idx + 1
< bkgrnd_rcm_tavg_contours = np.eye( num_points )
< for i in range(num_points):
< for j in range(num_points):
< bkgrnd_rcm_tavg_contours[i,j] = self.bkgrnd_rcm_tavg[self.start_alt_idx+i]
< x_vector_contour = np.zeros( num_points )
< x_diff = xlim[1] - xlim[0]
< x_interval = x_diff / ( num_points - 1 )
< for k in range(num_points):
< x_vector_contour[k] = xlim[0] + float(k) * x_interval
< plt.contourf( x_vector_contour, self.altitude_bkgrnd_rcm[self.start_alt_idx:self.end_alt_idx+1], bkgrnd_rcm_tavg_contours,
< cmap=plt.set_cmap("cool") )
< plt.colorbar( label="rcm [kg/kg]", orientation="vertical" )
diff '--exclude=.git' '--exclude=version_clubb_core.txt' '--exclude=version_silhs.txt' -r clubb/postprocessing/pyplotgen/src/VariableGroup.py clubb_release/postprocessing/pyplotgen/src/VariableGroup.py
94,111d93
< if self.clubb_datasets is not None and len(self.clubb_datasets) != 0:
< bkgrnd_rcm = np.squeeze( self.clubb_datasets[self.casename]['zt'].variables['rcm'] )
< self.altitude_bkgrnd_rcm = np.squeeze( self.clubb_datasets[self.casename]['zt'].variables['altitude'] )
< time_bkgrnd_rcm = np.squeeze( self.clubb_datasets[self.casename]['zt'].variables['time'] )
< start_time_seconds = 60.0 * self.start_time # self.start_time is in minutes, while time_bkgrnd_rcm is in seconds.
< end_time_seconds = 60.0 * self.end_time # self.end_time is in minutes, while time_bkgrnd_rcm is in seconds.
< start_time_idx, end_time_idx = DataReader.__getStartEndIndex__(time_bkgrnd_rcm, start_time_seconds, end_time_seconds)
< self.start_alt_idx, self.end_alt_idx = DataReader.__getStartEndIndex__(self.altitude_bkgrnd_rcm, self.height_min_value, self.height_max_value)
< nzt = np.shape(bkgrnd_rcm)[1]
< self.bkgrnd_rcm_tavg = np.zeros(nzt)
< for z_indx in range(nzt):
< lev_sum = 0
< count = 0
< for t_indx in range(start_time_idx, end_time_idx):
< lev_sum = lev_sum + bkgrnd_rcm[t_indx,z_indx]
< count = count + 1
< self.bkgrnd_rcm_tavg[z_indx] = lev_sum / float(count)
<
412,413c394,395
< panel = Panel(plotset, self.bkgrnd_rcm_tavg, self.altitude_bkgrnd_rcm, self.start_alt_idx, self.end_alt_idx,
< title=title, dependent_title=axis_label, panel_type=panel_type, sci_scale=sci_scale, centered=centered)
---
> panel = Panel(plotset, title=title, dependent_title=axis_label, panel_type=panel_type,
> sci_scale=sci_scale, centered=centered)
diff '--exclude=.git' '--exclude=version_clubb_core.txt' '--exclude=version_silhs.txt' -r clubb/src/CLUBB_core/advance_clubb_core_module.F90 clubb_release/src/CLUBB_core/advance_clubb_core_module.F90
986c986
< !$acc brunt_vaisala_freq_sqd_splat, &
---
> !$acc brunt_vaisala_freq_sqd_plus, brunt_vaisala_freq_sqd_splat, &
1552d1551
< invrs_tau_wp3_zm(i,k) = invrs_tau_zm(i,k)
2903c2902
< !$acc brunt_vaisala_freq_sqd_splat, &
---
> !$acc brunt_vaisala_freq_sqd_plus, brunt_vaisala_freq_sqd_splat, &
diff '--exclude=.git' '--exclude=version_clubb_core.txt' '--exclude=version_silhs.txt' -r clubb/src/CLUBB_core/advance_helper_module.F90 clubb_release/src/CLUBB_core/advance_helper_module.F90
335c335
< !$acc lambda0_stability, Lscale_zm )
---
> !$acc brunt_vaisala_freq_sqd_plus, lambda0_stability, Lscale_zm )
900,901c900,901
< !$acc Richardson_num, Cx_fnc_interp, Ri_zm, &
< !$acc ddzt_um, ddzt_vm, shear_sqd, turb_freq_sqd, Lscale_zm, &
---
> !$acc brunt_vaisala_freq_sqd_plus, Richardson_num, Cx_fnc_interp, &
> !$acc Ri_zm, ddzt_um, ddzt_vm, shear_sqd, turb_freq_sqd, Lscale_zm, &
diff '--exclude=.git' '--exclude=version_clubb_core.txt' '--exclude=version_silhs.txt' -r clubb/src/CLUBB_core/mixing_length.F90 clubb_release/src/CLUBB_core/mixing_length.F90
1586c1586
< brunt_vaisala_freq_sqd_smth = zm2zt2zm( nz,ngrdcol,gr, brunt_vaisala_freq_sqd_mixed )
---
> brunt_vaisala_freq_sqd_smth = zm2zt2zm( nz,ngrdcol,gr, brunt_vaisala_freq_sqd )
1595c1595
< tmp_calc(i,k) = 1.e8_core_rknd * abs(brunt_vaisala_freq_sqd_mixed(i,k))**3
---
> tmp_calc(i,k) = 1.e8_core_rknd * abs(brunt_vaisala_freq_sqd(i,k))**3
1601c1601
< brunt_vaisala_freq_sqd_mixed, &
---
> brunt_vaisala_freq_sqd, &
1612,1613c1612,1613
< brunt_vaisala_freq_clipped(i,k) = min( brunt_vaisala_freq_sqd_mixed(i,k), &
< 1.e8_core_rknd * abs(brunt_vaisala_freq_sqd_mixed(i,k))**3)
---
> brunt_vaisala_freq_clipped(i,k) = min( brunt_vaisala_freq_sqd(i,k), &
> 1.e8_core_rknd * abs(brunt_vaisala_freq_sqd(i,k))**3)
1844c1844
< invrs_tau_xp2_zm(i,k) = invrs_tau_bkgnd(i,k) + invrs_tau_sfc(i,k) &
---
> invrs_tau_xp2_zm(i,k) = 0.1_core_rknd * invrs_tau_bkgnd(i,k) + invrs_tau_sfc(i,k) &
1852,1861c1852,1861
< ! !$acc parallel loop gang vector collapse(2) default(present)
< ! do k = 1, nz
< ! do i = 1, ngrdcol
< ! if ( ice_supersat_frac_zm(i,k) <= 0.01_core_rknd &
< ! .and. invrs_tau_xp2_zm(i,k) >= 0.003_core_rknd ) then
< ! invrs_tau_xp2_zm(i,k) = 0.003_core_rknd
< ! end if
< ! end do
< ! end do
< ! !$acc end parallel loop
---
> !$acc parallel loop gang vector collapse(2) default(present)
> do k = 1, nz
> do i = 1, ngrdcol
> if ( ice_supersat_frac_zm(i,k) <= 0.01_core_rknd &
> .and. invrs_tau_xp2_zm(i,k) >= 0.003_core_rknd ) then
> invrs_tau_xp2_zm(i,k) = 0.003_core_rknd
> end if
> end do
> end do
> !$acc end parallel loop
diff '--exclude=.git' '--exclude=version_clubb_core.txt' '--exclude=version_silhs.txt' -r clubb/src/error.F90 clubb_release/src/error.F90
111c111
< character(len=20), dimension(:), allocatable, private :: &
---
> character(len=10), dimension(:), allocatable, private :: &
290c290
< character(len=20), dimension(max_variables) :: &
---
> character(len=10), dimension(max_variables) :: &
376c376
< t_variables(1:max_variables) = " "
---
> t_variables(1:max_variables) = " "
423c423
< if (t_variables(i) == " ") exit
---
> if (t_variables(i) == " ") exit
![[Jenkins]](/jenkins/static/57c8a776/images/svgs/logo.svg){kind=logo}
