Started by an SCM change330a64e4ba99f0396262814ca42e96ad0b31b2b258ba64e4ba99f0396262814ca42e96ad0b31b2b258brefs/remotes/origin/mastera64e4ba99f0396262814ca42e96ad0b31b2b258ba64e4ba99f0396262814ca42e96ad0b31b2b258brefs/remotes/origin/mastera64e4ba99f0396262814ca42e96ad0b31b2b258ba64e4ba99f0396262814ca42e96ad0b31b2b258brefs/remotes/origin/masterhttps://github.com/larson-group/clubb.githttp://carson.math.uwm.edu/jenkins/blue/organizations/jenkins/clubb_timestep_gfortran_tests/detail/clubb_timestep_gfortran_tests/330/artifactshttp://carson.math.uwm.edu/jenkins/blue/organizations/jenkins/clubb_timestep_gfortran_tests/detail/clubb_timestep_gfortran_tests/330/changeshttp://carson.math.uwm.edu/jenkins/blue/organizations/jenkins/clubb_timestep_gfortran_tests/detail/clubb_timestep_gfortran_tests/330/http://carson.math.uwm.edu/jenkins/blue/organizations/jenkins/clubb_timestep_gfortran_tests/detail/clubb_timestep_gfortran_tests/330/testsfalsefalse#3301100562596301clubb_timestep_gfortran_tests #330330false3301375SUCCESS1714724049859http://carson.math.uwm.edu/jenkins/job/clubb_timestep_gfortran_tests/330/microphysics.F90ada570416e5b0d8d9dc6b1745eb4c1d5ae6ba6641714587855000http://carson.math.uwm.edu/jenkins/user/hueblerGunther Hueblerhuebler@uwm.eduMaking compatible with latest clubb changes. 2024-05-01 13:24:15 -0500ada570416e5b0d8d9dc6b1745eb4c1d5ae6ba664Making compatible with latest clubb changes.editmicrophysics.F90src/CLUBB_core/advance_xm_wpxp_module.F906146f6bd56087e573b5c660d1481e3dc928ff5411714680265000http://carson.math.uwm.edu/jenkins/user/bmg2bmg2bmg2@uwm.eduI am committing code that effectively ignores the values of certain zt stats at the ghost level by setting them to 0. This is done to allow for bit-for-bitness comparisons between the master branch and the clubb_ghost_exorcism branch. Technically, since zt stat file output at the irrelevant ghost level is changed for some variables, this commit is BIT_CHANGING. Effectively, this commit doesn't change squat in terms of model results. 2024-05-02 15:04:25 -05006146f6bd56087e573b5c660d1481e3dc928ff541I am committing code that effectively ignores the values of certaineditsrc/CLUBB_core/advance_xm_wpxp_module.F90src/CLUBB_core/advance_xm_wpxp_module.F903b3339a9e9932452f21db516965e9b7e379a22281714685456000http://carson.math.uwm.edu/jenkins/user/bmg2bmg2bmg2@uwm.eduI am moving the advance_xm_wpxp setting of xm(1) = xm(2) from the end of xm_clipping_and_stats to the very end of advance_xm_wpxp, right before the return to advance_clubb_core. The reason I am doing this is the nudging was done after setting xm(1) = xm(2) and would alter the results. This is no longer the case, as setting xm(1) = xm(2) is now being done after nudging. This is being done in advance of removal of the ghost point from CLUBB. This helps ensure a bit-for-bit match between the ghost exorcism branch and the master branch. This commit technically alter fields such as um, vm, um_bt, vm_bt, wpup2, wpvp2, and shear at level 1 only. Thus, this commit is technically BIT_CHANGING. Effectively, once again, this commit doesn't change squat. 2024-05-02 16:30:56 -05003b3339a9e9932452f21db516965e9b7e379a2228I am moving the advance_xm_wpxp setting of xm(1) = xm(2) from theeditsrc/CLUBB_core/advance_xm_wpxp_module.F90githttp://carson.math.uwm.edu/jenkins/user/bmg2bmg2bmg2http://carson.math.uwm.edu/jenkins/user/hueblerGunther HueblerhueblerfalseStarted by an SCM change3310ab983f84a6e8e298c04ac606654aa3d0798dfc80ab983f84a6e8e298c04ac606654aa3d0798dfc8refs/remotes/origin/master0ab983f84a6e8e298c04ac606654aa3d0798dfc80ab983f84a6e8e298c04ac606654aa3d0798dfc8refs/remotes/origin/master0ab983f84a6e8e298c04ac606654aa3d0798dfc80ab983f84a6e8e298c04ac606654aa3d0798dfc8refs/remotes/origin/masterhttps://github.com/larson-group/clubb.gitfalse#3311043060596301clubb_timestep_gfortran_tests #331331false3311445SUCCESS1714810446031http://carson.math.uwm.edu/jenkins/job/clubb_timestep_gfortran_tests/331/doc/triple_gaussian/w_prime_theta_l_prime_2_bar.ipynbdoc/triple_gaussian/w_bar.ipynbdoc/triple_gaussian/checked_functions.pydoc/triple_gaussian/theta_l_prime_r_t_prime_bar.ipynbdoc/triple_gaussian/w_prime_2_theta_l_prime_bar.ipynbdoc/triple_gaussian/theta_l_prime_3_bar_beta.ipynbdoc/triple_gaussian/names.pydoc/triple_gaussian/limits.ipynbdoc/triple_gaussian/w_prime_4_bar.ipynbdoc/triple_gaussian/w_prime_r_t_prime_theta_l_prime_bar.ipynbdoc/triple_gaussian/w_prime_theta_l_prime_bar.ipynbdoc/triple_gaussian/w_prime_r_t_prime_theta_l_prime_bar_beta.ipynbdoc/triple_gaussian/plots2d.ipynbdoc/triple_gaussian/plots1d.ipynbdoc/triple_gaussian/w_prime_3_bar.ipynbdoc/triple_gaussian/theta_l_prime_2_bar.ipynbdoc/triple_gaussian/dataframes.pydoc/triple_gaussian/w_prime_2_bar.ipynbdoc/triple_gaussian/theta_l_prime_3_bar.ipynbdoc/triple_gaussian/w_prime_r_t_prime_theta_l_prime_bar_E.ipynbdoc/triple_gaussian/w_prime_theta_l_prime_2_bar_beta.ipynbdoc/triple_gaussian/symbols.pydoc/triple_gaussian/README.mddoc/triple_gaussian/relationship_delta_lambda.ipynbec0c1d8f05f9e5b47110f431cf36a3dca1322d951714755359000http://carson.math.uwm.edu/jenkins/user/noreplynoreplynoreply@github.comJupyter Notebooks for proving formulas (#1151) * Implement equations 1 through 5. * Update TrivariateGaussian.ipynb Adds parentheses to delta equation * Fixed sigma equation. * Type in higher order equation. * Implement rhs of the equation (48) * Implement ith Gaussian * Somehow add integration with sympy * Somehow add integration with sympy * Added integration with sympy and adjusted variables. * Integration now works. * Add 4th and second order moments. * check equation 56 with 20, 11 and 4 * check equation 56 with 20, 11 and 4 * remove unnecessary symbols * Move documents and rename * Rename document * Add files and start to implement the analytic integral * Add functions * Add symbols and functions. Tried analytic integration with simpler functions but the triple integral still does not work. For integrating numerically I like to use lambdify and then numpy but therefore the symbols have to be renamed because lambdify does not like backslashes. * Numerical evaluation of the first, second, third, and fourth order moments of the triple Gaussian with limits -10 to 10. * Added mixture fractions to the Gaussian. * Convert results to dataframe for better readability. * Check results for third Gaussian, also adjusted the third Gaussian. * Tidy up code. * Changed name of file. Added function for evaluating the fraction w_prime_4_bar divided by w_prime_2_bar_squared which is parameterized. * Added columns to the dataframe to check if the numerical evaluation of the 4th order moment is equal to the parameterized evaluation of the 4th order moment. * Adjusted symbols and added the constant for lambda_w. * Added documentation. * Added check for w_prime_4_bar calculated just with the parameters. * Improved functions and improved calculating the moments from a dataframe. * Tidied up code * Tidied up code * Reordered document * Added some files and restructured the document. * Added a file to compute another function * Added a file for computing the 4th order moment based on the parameters and checking this with the numeric integrals. * fixed notebook * Checked some equations analytically. * Added document for checking eq_26 * Added document for checking eq_24 * Added document for checking eq_33 * Fixed some parameters * finished document for computing the moments numerically. * Verified(?) eq 75 * Changed values for ?verifying? eq 75 * Adjusted alphas and deltas but did not run it to the end yet. * Ran the code with the adjusted alphas and deltas. * Calculated the integral based on the marginal of G_3 * Ran the notebook again. * Added Checking for eq 80. Not done yet. * Added new document. * Calculated w_bar * Finished 1 dim integral. * Added calculation for sigma_lambda_w and lambda_w. * Added calculation for sigma_lambda_w and lambda_w. * Added third Gaussian. * Calculated 4th order moment. * Added files and split up evaluation of the moments for w * Verified all moments for w. * Fixed a typo. * Set up document for another integral. * Working on the integral for w_prime_theta_l_prime_bar. * Working on the integral for w_prime_theta_l_prime_bar. * Did the check for w_prime_theta_l_prime_bar. * Did the check for w_prime_theta_l_prime_bar. * Did the check for w_prime_theta_l_prime_bar with rational numbers. * Add numerical difference. * Add numerical difference. * Finished the check for w_prime_theta_l_prime * Finished the check for w_prime_squared_theta_l_prime * Finished the check for theta_l_prime_3_bar * Finished the check for w_prime_theta_l_prime_squared_bar * Did the checks again with arbitrary distinct values. * Did the checks again with arbitrary distinct values. * Add check for theta_l_prime_2_bar. * Calculated $\beta$. * Corrected a minor mistake. * Backed out beta from the theta_prime_l_bar equation. * Checked the beta equation numerically. * Printed all NaN values. * Reformat Check. * Reformat Check. * Reformat Check. * Reformat Check. * Reformat Check. * Reformat Check. * Reformat Check. * Reformat Check. * Reformat Check. * Changed Heading. * Changed the limits of integration. * Delete doc/.ipynb_checkpoints directory * Rearrange symbols * Added beta to the dataframe. * Added diagnostic values to the dataframe. * Fixed typo. * rearranged dataframe * rearranged dataframe * rearranged dataframe * rearranged dataframe * rearranged dataframe * Computed the triple integral again. * Rearranged symbols. * Working on the trivariate Normal. * Fixed numerical integration for triple gaussian * plot relationship between delta and lambda_w * plotted proposed relationship * Rearranged files and computed everything again. * Added README.md * Added file to README.md * Add function for plotting * Finished numerical check for w_prime_q_t_prime_theta_l_prime_bar_beta.ipynb * Finished numerical check for w_prime_q_t_prime_theta_l_prime_bar_beta.ipynb * Finished numerical check for theta_l_prime_q_t_prime_bar.ipynb * Worked on plotting * Worked on README.md * replace q_t with r_t * replace q_t with r_t * replace q_t with r_t * Add explanation * Reformat code * Corrected a file * Corrected a file * Worked on checking w_prime_r_t_prime_theta_l_prime_bar_beta.ipynb * Simplified creating of dataframe. * - Added calculation for w_prime_r_t_prime_theta_l_prime_bar_E.ipynb and improved diagnostics output. * Changed all sigma_lamda to sigma_3 and plotted \lambda vs \delta * Plotted \lambda vs \delta with the "initial condition" * Plotted \lambda vs \delta with the "initial condition" * Update README.md * Reran jupyter notebooks * Refactored code * Reran notebook * Rearranged README.md * Rearranged README.md * Remove files --------- Co-authored-by: Vincent Larson <vlarson@users.noreply.github.com> 2024-05-03 11:55:59 -0500ec0c1d8f05f9e5b47110f431cf36a3dca1322d95Jupyter Notebooks for proving formulas (#1151)adddoc/triple_gaussian/plots2d.ipynbadddoc/triple_gaussian/dataframes.pyadddoc/triple_gaussian/plots1d.ipynbadddoc/triple_gaussian/w_bar.ipynbadddoc/triple_gaussian/theta_l_prime_r_t_prime_bar.ipynbadddoc/triple_gaussian/README.mdadddoc/triple_gaussian/symbols.pyadddoc/triple_gaussian/w_prime_2_theta_l_prime_bar.ipynbadddoc/triple_gaussian/theta_l_prime_3_bar_beta.ipynbadddoc/triple_gaussian/w_prime_theta_l_prime_2_bar.ipynbadddoc/triple_gaussian/w_prime_2_bar.ipynbadddoc/triple_gaussian/w_prime_theta_l_prime_bar.ipynbadddoc/triple_gaussian/theta_l_prime_3_bar.ipynbadddoc/triple_gaussian/w_prime_r_t_prime_theta_l_prime_bar_beta.ipynbadddoc/triple_gaussian/checked_functions.pyadddoc/triple_gaussian/relationship_delta_lambda.ipynbadddoc/triple_gaussian/w_prime_4_bar.ipynbadddoc/triple_gaussian/names.pyadddoc/triple_gaussian/w_prime_r_t_prime_theta_l_prime_bar.ipynbadddoc/triple_gaussian/limits.ipynbadddoc/triple_gaussian/w_prime_3_bar.ipynbadddoc/triple_gaussian/w_prime_theta_l_prime_2_bar_beta.ipynbadddoc/triple_gaussian/theta_l_prime_2_bar.ipynbadddoc/triple_gaussian/w_prime_r_t_prime_theta_l_prime_bar_E.ipynbsrc/CLUBB_core/advance_xm_wpxp_module.F900ab983f84a6e8e298c04ac606654aa3d0798dfc81714763847000http://carson.math.uwm.edu/jenkins/user/hueblerGunther Hueblerhuebler@uwm.eduAdding extra exclamation to acc statement to comment it out. 2024-05-03 14:17:27 -05000ab983f84a6e8e298c04ac606654aa3d0798dfc8Adding extra exclamation to acc statement to comment it out.editsrc/CLUBB_core/advance_xm_wpxp_module.F90githttp://carson.math.uwm.edu/jenkins/user/noreplynoreplyhttp://carson.math.uwm.edu/jenkins/user/hueblerGunther Hueblerfalse332http://carson.math.uwm.edu/jenkins/job/clubb_timestep_gfortran_tests/332/330http://carson.math.uwm.edu/jenkins/job/clubb_timestep_gfortran_tests/330/Started by an SCM change3292090eb2e167c2bd651d84762128d49894a7d54602090eb2e167c2bd651d84762128d49894a7d5460refs/remotes/origin/master2090eb2e167c2bd651d84762128d49894a7d54602090eb2e167c2bd651d84762128d49894a7d5460refs/remotes/origin/master2090eb2e167c2bd651d84762128d49894a7d54602090eb2e167c2bd651d84762128d49894a7d5460refs/remotes/origin/masterhttps://github.com/larson-group/clubb.gitfalse#3291070382596301clubb_timestep_gfortran_tests #329329false3291307SUCCESS1714637645211http://carson.math.uwm.edu/jenkins/job/clubb_timestep_gfortran_tests/329/src/CLUBB_core/advance_clubb_core_module.F90src/CLUBB_core/advance_xm_wpxp_module.F90src/CLUBB_core/advance_wp2_wp3_module.F90src/CLUBB_core/clubb_api_module.F90src/Morrison_microphys/microphysics.F90src/CLUBB_core/fill_holes.F90src/CLUBB_core/advance_xp2_xpyp_module.F903abb325943da1a557e1213b2908ead3c828aff161714587276000http://carson.math.uwm.edu/jenkins/user/hueblerGunther Hueblerhuebler@uwm.eduMaking num_draw_points in fill_holes a constant. We were already using this value as a constant everywhere, but passing a constant by argument list makes it difficult/impossible for a compiler to optimize using that constant, unless it does inlining. Now, rather than passing the constant num_hf_draw_points (or sometimes a hardcoded 2) we just use num_hf_draw_points directly from constants_clubb. This massively improves the performance of a loop in fill holes when using nvhpc+omp, which was the motivation for this, but should also improve the performance on CPUs. Everything is BFB. 2024-05-01 13:14:36 -05003abb325943da1a557e1213b2908ead3c828aff16Making num_draw_points in fill_holes a constant. We were already using this value as a constant everywhere, but passing a constant by argument list makes it difficult/impossible for a compiler to optimize using that constant, unless it does inlining. Now, rather than passing the constant num_hf_draw_points (or sometimes a hardcoded 2) we just use num_hf_draw_points directly from constants_clubb. This massively improves the performance of a loop in fill holes when using nvhpc+omp, which was the motivation for this, but should also improve the performance on CPUs. Everything is BFB.editsrc/CLUBB_core/advance_clubb_core_module.F90editsrc/CLUBB_core/advance_wp2_wp3_module.F90editsrc/CLUBB_core/clubb_api_module.F90editsrc/Morrison_microphys/microphysics.F90editsrc/CLUBB_core/advance_xp2_xpyp_module.F90editsrc/CLUBB_core/fill_holes.F90editsrc/CLUBB_core/advance_xm_wpxp_module.F90src/Morrison_microphys/microphysics.F902090eb2e167c2bd651d84762128d49894a7d54601714622486000http://carson.math.uwm.edu/jenkins/user/pickettCole Pickettlarsongroupgithub@gmail.comRaw-copy updating src/Morrison_microphys 2024-05-01 23:01:26 -05002090eb2e167c2bd651d84762128d49894a7d5460Raw-copy updating src/Morrison_microphyseditsrc/Morrison_microphys/microphysics.F90githttp://carson.math.uwm.edu/jenkins/user/pickettCole Picketthttp://carson.math.uwm.edu/jenkins/user/hueblerGunther Hueblerfalse330http://carson.math.uwm.edu/jenkins/job/clubb_timestep_gfortran_tests/330/328http://carson.math.uwm.edu/jenkins/job/clubb_timestep_gfortran_tests/328/