![[Jenkins]](/jenkins/static/57c8a776/images/svgs/logo.svg){kind=logo}
Started by an SCM change Obtained jenkins_tests/clubb_release_diff_test/Jenkinsfile from git https://github.com/larson-group/clubb.git [Pipeline] Start of Pipeline [Pipeline] node Running on Jenkins in /home/jenkins/workspace/clubb_release_diff_test [Pipeline] { [Pipeline] stage [Pipeline] { (Declarative: Checkout SCM) [Pipeline] checkout The recommended git tool is: git Cloning the remote Git repository Cloning repository https://github.com/larson-group/clubb.git > git init /home/jenkins/workspace/clubb_release_diff_test # timeout=10 Fetching upstream changes from https://github.com/larson-group/clubb.git > git --version # timeout=10 > git --version # 'git version 2.30.2' using GIT_ASKPASS to set credentials A token based key used by Jenkins to preform Github actions, created 6/21/2021 > git fetch --tags --force --progress -- https://github.com/larson-group/clubb.git +refs/heads/*:refs/remotes/origin/* # timeout=10 > git config remote.origin.url https://github.com/larson-group/clubb.git # timeout=10 > git config --add remote.origin.fetch +refs/heads/*:refs/remotes/origin/* # timeout=10 Avoid second fetch > git rev-parse refs/remotes/origin/master^{commit} # timeout=10 Checking out Revision e29d9d7e6d8b2857cd4f85382d189b21c31332b7 (refs/remotes/origin/master) > git config core.sparsecheckout # timeout=10 > git checkout -f e29d9d7e6d8b2857cd4f85382d189b21c31332b7 # timeout=10 Commit message: "BIT_CHANGING for lscale setup. Updated configurable_model_flags.in and model_flags.F90 - CLUBB ticket #1102 (#1108)" > git rev-list --no-walk 693a178ea4becdb7f4950d8406c89a4953bdbbcd # timeout=10 [Pipeline] } [Pipeline] // stage [Pipeline] withEnv [Pipeline] { [Pipeline] stage [Pipeline] { (Checkout Clubb and Clubb_Release) [Pipeline] sh + git clone https://github.com/larson-group/clubb.git Cloning into 'clubb'... + git clone https://github.com/larson-group/clubb_release.git Cloning into 'clubb_release'... [Pipeline] } [Pipeline] // stage [Pipeline] stage [Pipeline] { (Diff) [Pipeline] sh + diff --exclude=.git --exclude=version_clubb_core.txt --exclude=version_silhs.txt -r clubb clubb_release diff '--exclude=.git' '--exclude=version_clubb_core.txt' '--exclude=version_silhs.txt' -r clubb/input/tunable_parameters_Lscale/configurable_model_flags.in clubb_release/input/tunable_parameters_Lscale/configurable_model_flags.in 3,5c3 < ipdf_call_placement = 2 < penta_solve_method = 1 < tridiag_solve_method = 1 --- > ipdf_call_placement = 1 7,55c5,47 < < l_godunov_upwind_wpxp_ta = .false., < l_upwind_xpyp_ta = .true., < l_godunov_upwind_xpyp_ta = .false., < l_upwind_xm_ma = .true., < l_quintic_poly_interp = .false., < l_tke_aniso = .true., < l_vert_avg_closure = .false., < l_standard_term_ta = .false., < l_partial_upwind_wp3 = .false., < l_use_cloud_cover = .false., < l_rcm_supersat_adj = .true., < l_damp_wp3_Skw_squared = .true., < l_min_wp2_from_corr_wx = .true., < l_min_xp2_from_corr_wx = .true., < l_C2_cloud_frac = .false., < l_predict_upwp_vpwp = .true., < l_diag_Lscale_from_tau = .false., < l_stability_correct_tau_zm = .false., < l_damp_wp2_using_em = .true., < l_use_C7_Richardson = .true., < l_use_precip_frac = .true., < l_do_expldiff_rtm_thlm = .false., < l_use_C11_Richardson = .false., < l_use_shear_Richardson = .false., < l_prescribed_avg_deltaz = .false., < l_diffuse_rtm_and_thlm = .false., < l_stability_correct_Kh_N2_zm = .false., < l_trapezoidal_rule_zt = .false., < l_trapezoidal_rule_zm = .false., < l_call_pdf_closure_twice = .false., < l_Lscale_plume_centered = .false., < l_brunt_vaisala_freq_moist = .false., < l_use_thvm_in_bv_freq = .false., < l_lmm_stepping = .false., < l_e3sm_config = .false., < l_vary_convect_depth = .false., < l_use_tke_in_wp3_pr_turb_term = .true., < l_use_tke_in_wp2_wp3_K_dfsn = .false., < l_use_wp3_lim_with_smth_Heaviside = .false., < l_smooth_Heaviside_tau_wpxp = .false., < l_modify_limiters_for_cnvg_test = .false., < l_enable_relaxed_clipping = .false., < l_linearize_pbl_winds = .false., < l_mono_flux_lim_thlm = .true., < l_mono_flux_lim_rtm = .true., < l_mono_flux_lim_um = .true., < l_mono_flux_lim_vm = .true., < l_mono_flux_lim_spikefix = .true. --- > l_godunov_upwind_wpxp_ta = .false., > l_upwind_xpyp_ta = .true., > l_godunov_upwind_xpyp_ta = .false., > l_upwind_xm_ma = .true., > l_quintic_poly_interp = .false., > l_tke_aniso = .true., > l_vert_avg_closure = .false., > l_standard_term_ta = .false., > l_partial_upwind_wp3 = .false., > l_use_cloud_cover = .false., > l_rcm_supersat_adj = .true., > l_damp_wp3_Skw_squared = .true., > l_min_wp2_from_corr_wx = .true., > l_min_xp2_from_corr_wx = .true., > l_C2_cloud_frac = .false., > l_predict_upwp_vpwp = .true., > l_diag_Lscale_from_tau = .false., > l_stability_correct_tau_zm = .false., > l_damp_wp2_using_em = .true., > l_use_C7_Richardson = .true., > l_use_precip_frac = .true., > l_do_expldiff_rtm_thlm = .false., > l_use_C11_Richardson = .false., > l_use_shear_Richardson = .false., > l_prescribed_avg_deltaz = .false., > l_diffuse_rtm_and_thlm = .false., > l_stability_correct_Kh_N2_zm = .false., > l_trapezoidal_rule_zt = .false., > l_trapezoidal_rule_zm = .false., > l_call_pdf_closure_twice = .false., > l_Lscale_plume_centered = .false., > l_brunt_vaisala_freq_moist = .false., > l_use_thvm_in_bv_freq = .false., > l_lmm_stepping = .false., > l_e3sm_config = .false., > l_vary_convect_depth = .false., > l_use_tke_in_wp3_pr_turb_term = .false., > l_use_tke_in_wp2_wp3_K_dfsn = .false. > l_mono_flux_lim_thlm = .true., > l_mono_flux_lim_rtm = .true., > l_mono_flux_lim_um = .true., > l_mono_flux_lim_vm = .true., > l_mono_flux_lim_spikefix = .true. 72,75d63 < / < < &configurable_multi_column_nl < num_standalone_columns = 1 Only in clubb/postprocessing/pyplotgen/config: VariableGroupBaseBudgetsLumpedBuoy.py diff '--exclude=.git' '--exclude=version_clubb_core.txt' '--exclude=version_silhs.txt' -r clubb/postprocessing/pyplotgen/config/VariableGroupBaseBudgets.py clubb_release/postprocessing/pyplotgen/config/VariableGroupBaseBudgets.py 18c18 < priority_vars=False, background_rcm=False, background_rcm_folder=None): --- > priority_vars=False): 538,539c538 < priority_vars=priority_vars, background_rcm=background_rcm, < background_rcm_folder=background_rcm_folder) --- > priority_vars=priority_vars) diff '--exclude=.git' '--exclude=version_clubb_core.txt' '--exclude=version_silhs.txt' -r clubb/postprocessing/pyplotgen/config/VariableGroupBaseBudgetsSamStyle.py clubb_release/postprocessing/pyplotgen/config/VariableGroupBaseBudgetsSamStyle.py 18c18 < priority_vars=False, background_rcm=False, background_rcm_folder=None): --- > priority_vars=False): 376,377c376 < priority_vars=priority_vars, background_rcm=background_rcm, < background_rcm_folder=background_rcm_folder) --- > priority_vars=priority_vars) diff '--exclude=.git' '--exclude=version_clubb_core.txt' '--exclude=version_silhs.txt' -r clubb/postprocessing/pyplotgen/config/VariableGroupBase.py clubb_release/postprocessing/pyplotgen/config/VariableGroupBase.py 22,23c22 < e3sm_datasets=None, sam_datasets=None, wrf_datasets=None, priority_vars=False, < background_rcm=False, background_rcm_folder=None): --- > e3sm_datasets=None, sam_datasets=None, wrf_datasets=None, priority_vars=False): 685,686c684 < priority_vars=priority_vars, background_rcm=background_rcm, < background_rcm_folder=background_rcm_folder) --- > priority_vars=priority_vars) diff '--exclude=.git' '--exclude=version_clubb_core.txt' '--exclude=version_silhs.txt' -r clubb/postprocessing/pyplotgen/config/VariableGroupCorrelations.py clubb_release/postprocessing/pyplotgen/config/VariableGroupCorrelations.py 16c16 < priority_vars=False, background_rcm=False, background_rcm_folder=None): --- > priority_vars=False): 161,162c161 < priority_vars=priority_vars, background_rcm=background_rcm, < background_rcm_folder=background_rcm_folder) --- > priority_vars=priority_vars) diff '--exclude=.git' '--exclude=version_clubb_core.txt' '--exclude=version_silhs.txt' -r clubb/postprocessing/pyplotgen/config/VariableGroupIceMP.py clubb_release/postprocessing/pyplotgen/config/VariableGroupIceMP.py 14,15c14,15 < def __init__(self, case, clubb_datasets=None, sam_benchmark_dataset=None, sam_datasets=None, < coamps_benchmark_dataset=None, wrf_benchmark_dataset=None, --- > def __init__(self, case, clubb_datasets=None, sam_benchmark_dataset=None, sam_datasets=None, coamps_benchmark_dataset=None, > wrf_benchmark_dataset=None, 17,18c17 < e3sm_datasets=None, wrf_datasets=None, priority_vars=False, background_rcm=False, < background_rcm_folder=None): --- > e3sm_datasets=None, wrf_datasets=None, priority_vars=False): 151,152c150 < priority_vars=priority_vars, background_rcm=background_rcm, < background_rcm_folder=background_rcm_folder) --- > priority_vars=priority_vars) diff '--exclude=.git' '--exclude=version_clubb_core.txt' '--exclude=version_silhs.txt' -r clubb/postprocessing/pyplotgen/config/VariableGroupKKMP.py clubb_release/postprocessing/pyplotgen/config/VariableGroupKKMP.py 13,14c13,14 < def __init__(self, case, clubb_datasets=None, sam_benchmark_dataset=None, < coamps_benchmark_dataset=None, r408_dataset=None, wrf_benchmark_dataset=None, --- > def __init__(self, case, clubb_datasets=None, sam_benchmark_dataset=None, coamps_benchmark_dataset=None, r408_dataset=None, > wrf_benchmark_dataset=None, 16,17c16 < e3sm_datasets=None, sam_datasets=None, wrf_datasets=None, priority_vars=False, < background_rcm=False, background_rcm_folder=None): --- > e3sm_datasets=None, sam_datasets=None, wrf_datasets=None, priority_vars=False): 69,70c68 < priority_vars=priority_vars, background_rcm=background_rcm, < background_rcm_folder=background_rcm_folder) --- > priority_vars=priority_vars) diff '--exclude=.git' '--exclude=version_clubb_core.txt' '--exclude=version_silhs.txt' -r clubb/postprocessing/pyplotgen/config/VariableGroupLiquidMP.py clubb_release/postprocessing/pyplotgen/config/VariableGroupLiquidMP.py 16,17c16 < e3sm_datasets=None, sam_datasets=None, wrf_datasets=None,priority_vars=False, < background_rcm=False, background_rcm_folder=None): --- > e3sm_datasets=None, sam_datasets=None, wrf_datasets=None,priority_vars=False): 151,152c150 < priority_vars=priority_vars, background_rcm=background_rcm, < background_rcm_folder=background_rcm_folder) --- > priority_vars=priority_vars) diff '--exclude=.git' '--exclude=version_clubb_core.txt' '--exclude=version_silhs.txt' -r clubb/postprocessing/pyplotgen/config/VariableGroupNondimMoments.py clubb_release/postprocessing/pyplotgen/config/VariableGroupNondimMoments.py 21,22c21 < e3sm_datasets=None, sam_datasets=None, wrf_datasets=None, priority_vars=False, < background_rcm=False, background_rcm_folder=None): --- > e3sm_datasets=None, sam_datasets=None, wrf_datasets=None, priority_vars=False): 215,216c214 < priority_vars=priority_vars, background_rcm=background_rcm, < background_rcm_folder=background_rcm_folder) --- > priority_vars=priority_vars) diff '--exclude=.git' '--exclude=version_clubb_core.txt' '--exclude=version_silhs.txt' -r clubb/postprocessing/pyplotgen/config/VariableGroupNormalizedVariations.py clubb_release/postprocessing/pyplotgen/config/VariableGroupNormalizedVariations.py 17,18c17 < e3sm_datasets=None, sam_datasets=None, wrf_datasets=None, priority_vars=False, < background_rcm=False, background_rcm_folder=None): --- > e3sm_datasets=None, sam_datasets=None, wrf_datasets=None, priority_vars=False): 76,77c75 < priority_vars=priority_vars, background_rcm=background_rcm, < background_rcm_folder=background_rcm_folder) --- > priority_vars=priority_vars) diff '--exclude=.git' '--exclude=version_clubb_core.txt' '--exclude=version_silhs.txt' -r clubb/postprocessing/pyplotgen/config/VariableGroupSamBudgets.py clubb_release/postprocessing/pyplotgen/config/VariableGroupSamBudgets.py 18c18 < priority_vars=False, background_rcm=False, background_rcm_folder=None): --- > priority_vars=False): 984,985c984 < priority_vars=priority_vars, background_rcm=background_rcm, < background_rcm_folder=background_rcm_folder) --- > priority_vars=priority_vars) diff '--exclude=.git' '--exclude=version_clubb_core.txt' '--exclude=version_silhs.txt' -r clubb/postprocessing/pyplotgen/config/VariableGroupSamMultilineProfiles.py clubb_release/postprocessing/pyplotgen/config/VariableGroupSamMultilineProfiles.py 18,19c18 < e3sm_datasets=None, sam_datasets=None, wrf_datasets=None, priority_vars=False, < background_rcm=False, background_rcm_folder=None): --- > e3sm_datasets=None, sam_datasets=None, wrf_datasets=None, priority_vars=False): 451,452c450 < priority_vars=priority_vars, background_rcm=background_rcm, < background_rcm_folder=background_rcm_folder) --- > priority_vars=priority_vars) diff '--exclude=.git' '--exclude=version_clubb_core.txt' '--exclude=version_silhs.txt' -r clubb/postprocessing/pyplotgen/config/VariableGroupSamProfiles.py clubb_release/postprocessing/pyplotgen/config/VariableGroupSamProfiles.py 18,19c18 < e3sm_datasets=None, sam_datasets=None, wrf_datasets=None, priority_vars=False, < background_rcm=False, background_rcm_folder=None): --- > e3sm_datasets=None, sam_datasets=None, wrf_datasets=None, priority_vars=False): 1204,1205c1203 < priority_vars=priority_vars, background_rcm=background_rcm, < background_rcm_folder=background_rcm_folder) --- > priority_vars=priority_vars) diff '--exclude=.git' '--exclude=version_clubb_core.txt' '--exclude=version_silhs.txt' -r clubb/postprocessing/pyplotgen/config/VariableGroupScalars.py clubb_release/postprocessing/pyplotgen/config/VariableGroupScalars.py 16,17c16 < e3sm_datasets=None, sam_datasets=None, wrf_datasets=None, priority_vars=False, < background_rcm=False, background_rcm_folder=None): --- > e3sm_datasets=None, sam_datasets=None, wrf_datasets=None, priority_vars=False): 81,82c80 < priority_vars=priority_vars, background_rcm=background_rcm, < background_rcm_folder=background_rcm_folder) --- > priority_vars=priority_vars) diff '--exclude=.git' '--exclude=version_clubb_core.txt' '--exclude=version_silhs.txt' -r clubb/postprocessing/pyplotgen/config/VariableGroupSubcolumns.py clubb_release/postprocessing/pyplotgen/config/VariableGroupSubcolumns.py 16,17c16 < e3sm_datasets=None, sam_datasets=None, wrf_datasets=None, < background_rcm=False, background_rcm_folder=False): --- > e3sm_datasets=None, sam_datasets=None, wrf_datasets=None): 186,187c185 < cam_datasets=cam_datasets, sam_datasets=sam_datasets, wrf_datasets=wrf_datasets, < background_rcm=background_rcm, background_rcm_folder=background_rcm_folder) --- > cam_datasets=cam_datasets, sam_datasets=sam_datasets, wrf_datasets=wrf_datasets) diff '--exclude=.git' '--exclude=version_clubb_core.txt' '--exclude=version_silhs.txt' -r clubb/postprocessing/pyplotgen/config/VariableGroupTaus.py clubb_release/postprocessing/pyplotgen/config/VariableGroupTaus.py 16,17c16 < e3sm_datasets=None, sam_datasets=None, wrf_datasets=None, priority_vars=False, < background_rcm=False, background_rcm_folder=None): --- > e3sm_datasets=None, sam_datasets=None, wrf_datasets=None, priority_vars=False): 134,135c133 < priority_vars=priority_vars, background_rcm=background_rcm, < background_rcm_folder=background_rcm_folder) --- > priority_vars=priority_vars) diff '--exclude=.git' '--exclude=version_clubb_core.txt' '--exclude=version_silhs.txt' -r clubb/postprocessing/pyplotgen/config/VariableGroupWs.py clubb_release/postprocessing/pyplotgen/config/VariableGroupWs.py 16,17c16 < e3sm_datasets=None, sam_datasets=None, wrf_datasets=None, priority_vars=False, < background_rcm=False, background_rcm_folder=None): --- > e3sm_datasets=None, sam_datasets=None, wrf_datasets=None, priority_vars=False): 211,212c210 < priority_vars=priority_vars, background_rcm=background_rcm, < background_rcm_folder=background_rcm_folder) --- > priority_vars=priority_vars) diff '--exclude=.git' '--exclude=version_clubb_core.txt' '--exclude=version_silhs.txt' -r clubb/postprocessing/pyplotgen/pyplotgen.py clubb_release/postprocessing/pyplotgen/pyplotgen.py 48,50c48,50 < plot_budgets=False, bu_morr=False, lumped_buoy_budgets=False, background_rcm=False, diff=None, < show_alphabetic_id=False, time_height=False, animation=None, samstyle=False, disable_multithreading=False, < pdf=False, pdf_filesize_limit=None, plot_subcolumns=False, image_extension=".png"): --- > plot_budgets=False, bu_morr=False, diff=None, show_alphabetic_id=False, > time_height=False, animation=None, samstyle=False, disable_multithreading=False, pdf=False, > pdf_filesize_limit=None, plot_subcolumns=False, image_extension=".png"): 88,89d87 < :param lumped_buoy_budgets: Lump together wpxp_bp and wpxp_pr3 terms in CLUBB's budgets < :param background_rcm: Show a height-based "contour" plot of time-averaged rcm behind CLUBB profiles. 114,115d111 < self.lumped_buoy_budgets = lumped_buoy_budgets < self.background_rcm = background_rcm 422,424c418,420 < plot_subcolumns=self.plot_subcolumns, lumped_buoy_budgets=self.lumped_buoy_budgets, < background_rcm=self.background_rcm, image_extension=self.image_extension, < total_panels_to_plot=0, priority_vars=self.priority_vars) --- > plot_subcolumns=self.plot_subcolumns, > image_extension=self.image_extension, total_panels_to_plot=0, > priority_vars=self.priority_vars) 646,649d641 < parser.add_argument("--lumped-buoy-budgets", help="Lump together wpxp_bp and wpxp_pr3 terms in CLUBB's budgets.", < action="store_true") < parser.add_argument("--background-rcm", help="Show a height-based 'contour' plot of time-averaged rcm behind CLUBB profiles.", < action="store_true") 803,806c795,798 < no_legends=args.no_legends, plot_budgets=args.plot_budgets, bu_morr=args.bu_morr, < lumped_buoy_budgets=args.lumped_buoy_budgets, background_rcm=args.background_rcm, diff=args.diff, < show_alphabetic_id=args.show_alphabetic_id, time_height=args.time_height_plots, animation=args.movies, < samstyle=args.sam_style_budgets, disable_multithreading=args.disable_multithreading, pdf=args.pdf, --- > 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, > time_height=args.time_height_plots, animation=args.movies, samstyle=args.sam_style_budgets, > disable_multithreading=args.disable_multithreading, pdf=args.pdf, diff '--exclude=.git' '--exclude=version_clubb_core.txt' '--exclude=version_silhs.txt' -r clubb/postprocessing/pyplotgen/README.md clubb_release/postprocessing/pyplotgen/README.md 52,53d51 < | --lumped-buoy-budgets | Lump together wpxp_bp and wpxp_pr3 terms in CLUBB's budgets | < | --background_rcm | Show a height-based "contour" plot of time-averaged rcm behind CLUBB profiles | 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, background_rcm=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): 49,50d47 < :param lumped_buoy_budgets: If True and if plot_budgets in true, wpxp_bp and wpxp_pr3 will be lumped into one budget term < :param background_rcm: Show a height-based "contour" plot of time-averaged rcm behind CLUBB profiles. 69,70d65 < self.lumped_buoy_budgets = lumped_buoy_budgets < self.background_rcm = background_rcm 98d92 < self.lumped_buoy_budgets = False 117,122d110 < # Preserve the CLUBB folder listed first to use for background rcm plots. < if len(clubb_folders) != 0: < self.background_rcm_folder = clubb_folders[0] < else: < self.background_rcm_folder = None < 172,177c160,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]}) 250,251c234 < e3sm_datasets=self.e3sm_datasets, cam_datasets=self.cam_file, priority_vars=self.priority_vars, < background_rcm=self.background_rcm, background_rcm_folder=self.background_rcm_folder) --- > e3sm_datasets=self.e3sm_datasets, cam_datasets=self.cam_file, priority_vars=self.priority_vars) 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,36c34,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, background_rcm = False): --- > def __init__(self, plots, panel_type="profile", title="Unnamed panel", dependent_title="dependent variable", > sci_scale = None, centered = False): 41,44d39 < :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. 52d46 < :param background_rcm: Show a height-based "contour" plot of time-averaged rcm behind CLUBB profiles. 56,59d49 < 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 67d56 < self.background_rcm = background_rcm 236,239c225 < if not self.background_rcm: < ax.legend(loc='center left', bbox_to_anchor=(1, 0.5)) < else: < ax.legend(loc='upper right', bbox_to_anchor=(1, 1)) --- > ax.legend(loc='center left', bbox_to_anchor=(1, 0.5)) 253,270d238 < < # Background rcm contour plot < if self.background_rcm: < 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] < min_value = min( self.bkgrnd_rcm_tavg ) < max_value = max( self.bkgrnd_rcm_tavg ) < 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, < vmin=min_value, vmax=2.0*max_value, cmap=plt.set_cmap("gist_yarg") ) < 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 39c39 < priority_vars=False, background_rcm=False, background_rcm_folder=None): --- > priority_vars=False): 55,56d54 < :param background_rcm: Show a height-based "contour" plot of time-averaged rcm behind CLUBB profiles. < :param background_rcm_folder: Folder of CLUBB output data from which to pull the background rcm (if background_rcm is enabled). 80,81d77 < self.background_rcm = background_rcm < self.background_rcm_folder = background_rcm_folder 98,137d93 < if self.background_rcm: < if self.clubb_datasets is not None and len(self.clubb_datasets) != 0: < # Extract rcm from the zt NetCDF file. Also extract the time and height values to which the < # rcm data points correspond. < bkgrnd_rcm = np.squeeze( self.clubb_datasets[self.background_rcm_folder]['zt'].variables['rcm'] ) < self.altitude_bkgrnd_rcm = np.squeeze( self.clubb_datasets[self.background_rcm_folder]['zt'].variables['altitude'] ) < time_bkgrnd_rcm = np.squeeze( self.clubb_datasets[self.background_rcm_folder]['zt'].variables['time'] ) < # Find the indices in the rcm data that correspond to the start time and end time requested as the < # time-averaging interval for the case, as well as the minimum height and maximum height requested < # for the plots. < 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) < # Calculate the time-averaged vertical profile of rcm for use as contours in the background of plots < # of CLUBB time-averaged vertical profiles of various model fields. < 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) < else: < # Set the relevant "output" variables to a value just to have them set. < # They will be flagged out of interacting with the code. < self.bkgrnd_rcm_tavg = 0 < self.altitude_bkgrnd_rcm = 0 < self.start_alt_idx = 0 < self.end_alt_idx = 0 < else: < # Set the relevant "output" variables to a value just to have them set. < # They will be flagged out of interacting with the code. < self.bkgrnd_rcm_tavg = 0 < self.altitude_bkgrnd_rcm = 0 < self.start_alt_idx = 0 < self.end_alt_idx = 0 < 438,440c394,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, background_rcm=self.background_rcm) --- > 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/CLUBB_core/model_flags.F90 clubb_release/src/CLUBB_core/model_flags.F90 604c604 < l_use_tke_in_wp3_pr_turb_term = .true. --- > l_use_tke_in_wp3_pr_turb_term = .false. 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 [Pipeline] } [Pipeline] // stage [Pipeline] stage [Pipeline] { (Declarative: Post Actions) [Pipeline] script [Pipeline] { [Pipeline] cleanWs [WS-CLEANUP] Deleting project workspace... [WS-CLEANUP] Deferred wipeout is used... [WS-CLEANUP] done [Pipeline] } [Pipeline] // script [Pipeline] script [Pipeline] { [Pipeline] emailext Sending email to: messnermet@uwm.edu [Pipeline] } [Pipeline] // script [Pipeline] } [Pipeline] // stage [Pipeline] } [Pipeline] // withEnv [Pipeline] } [Pipeline] // node [Pipeline] End of Pipeline ERROR: script returned exit code 1 Finished: FAILURE