Started by an SCM change746fc57497840efaa7acc394c10ac9c6892ef162206fc57497840efaa7acc394c10ac9c6892ef16220origin/clubb_silhs_devel6fc57497840efaa7acc394c10ac9c6892ef162206fc57497840efaa7acc394c10ac9c6892ef16220origin/clubb_silhs_devel69cca799cfb394e7eeadc21211ae811b4a370d31eecca799cfb394e7eeadc21211ae811b4a370d31eeorigin/changes_to_not_breakcca799cfb394e7eeadc21211ae811b4a370d31eecca799cfb394e7eeadc21211ae811b4a370d31eeorigin/changes_to_not_break190fa55d35e38ee47d9e0c2d85e0105d0830c74fee3fa55d35e38ee47d9e0c2d85e0105d0830c74fee3refs/remotes/origin/clubb_silhs_develfa55d35e38ee47d9e0c2d85e0105d0830c74fee3fa55d35e38ee47d9e0c2d85e0105d0830c74fee3refs/remotes/origin/clubb_silhs_develfa55d35e38ee47d9e0c2d85e0105d0830c74fee3fa55d35e38ee47d9e0c2d85e0105d0830c74fee3refs/remotes/origin/clubb_silhs_develhttps://github.com/larson-group/cam.githttp://carson.math.uwm.edu/jenkins/blue/organizations/jenkins/cam_global_ERP_Ln9_gfortran_test/detail/cam_global_ERP_Ln9_gfortran_test/190/artifactshttp://carson.math.uwm.edu/jenkins/blue/organizations/jenkins/cam_global_ERP_Ln9_gfortran_test/detail/cam_global_ERP_Ln9_gfortran_test/190/changeshttp://carson.math.uwm.edu/jenkins/blue/organizations/jenkins/cam_global_ERP_Ln9_gfortran_test/detail/cam_global_ERP_Ln9_gfortran_test/190/http://carson.math.uwm.edu/jenkins/blue/organizations/jenkins/cam_global_ERP_Ln9_gfortran_test/detail/cam_global_ERP_Ln9_gfortran_test/190/testsfalseCheck out externalsCopy Config FilesMake cprncRun CAMfalse#19012832753605478cam_global_ERP_Ln9_gfortran_test #190190false19014089SUCCESS1647420426965http://carson.math.uwm.edu/jenkins/job/cam_global_ERP_Ln9_gfortran_test/190/src/physics/cam/clubb_intr.F90fa55d35e38ee47d9e0c2d85e0105d0830c74fee31647388609000http://carson.math.uwm.edu/jenkins/user/hueblerGunther Hueblerhuebler@uwm.eduThis should fix the problem Kate is experiencing. The bug is only exposed when using multiple threads, and this is a workaround, we should still remove the grid setup functionality from setup_clubb_core. I wasn't able to get the run to finish since cam also crashes with multiple threads due to clubb stats, but it get passed the grid allocation thread error. 2022-03-15 18:56:49 -0500fa55d35e38ee47d9e0c2d85e0105d0830c74fee3This should fix the problem Kate is experiencing. The bug is only exposed when using multiple threads, and this is a workaround, we should still remove the grid setup functionality from setup_clubb_core. I wasn't able to get the run to finish since cam also crashes with multiple threads due to clubb stats, but it get passed the grid allocation thread error.editsrc/physics/cam/clubb_intr.F90githttp://carson.math.uwm.edu/jenkins/user/hueblerGunther HueblerhueblerfalseStarted by an SCM change746fc57497840efaa7acc394c10ac9c6892ef162206fc57497840efaa7acc394c10ac9c6892ef16220origin/clubb_silhs_devel6fc57497840efaa7acc394c10ac9c6892ef162206fc57497840efaa7acc394c10ac9c6892ef16220origin/clubb_silhs_devel69cca799cfb394e7eeadc21211ae811b4a370d31eecca799cfb394e7eeadc21211ae811b4a370d31eeorigin/changes_to_not_breakcca799cfb394e7eeadc21211ae811b4a370d31eecca799cfb394e7eeadc21211ae811b4a370d31eeorigin/changes_to_not_break1917cdd1f8a1e444a6a01168c331f18419d675277857cdd1f8a1e444a6a01168c331f18419d67527785refs/remotes/origin/clubb_silhs_devel7cdd1f8a1e444a6a01168c331f18419d675277857cdd1f8a1e444a6a01168c331f18419d67527785refs/remotes/origin/clubb_silhs_devel7cdd1f8a1e444a6a01168c331f18419d675277857cdd1f8a1e444a6a01168c331f18419d67527785refs/remotes/origin/clubb_silhs_develhttps://github.com/larson-group/cam.gitfalse#19146210763605478cam_global_ERP_Ln9_gfortran_test #191191false19114151SUCCESS1647506827949http://carson.math.uwm.edu/jenkins/job/cam_global_ERP_Ln9_gfortran_test/191/advance_clubb_core_module.F906216b8e6e638a0862df4c9ccde780c0de21dc4841647434771000http://carson.math.uwm.edu/jenkins/user/noreplynoreplynoreply@github.comRemoves a blank line in order to trigger merge with E3SM 2022-03-16 07:46:11 -05006216b8e6e638a0862df4c9ccde780c0de21dc484Removes a blank line in order to trigger merge with E3SMeditadvance_clubb_core_module.F90advance_xm_wpxp_module.F90mono_flux_limiter.F90e71c3c281fdec86134cae0107f02f9eefd7a6edd1647461903000http://carson.math.uwm.edu/jenkins/user/37674341+huebleruwm37674341+huebleruwm37674341+huebleruwm@users.noreply.github.comPushing column loop into xm_wpxp_clipping_and_stats and monotonic_turbulent_flux_limit. This essentially completes advance_xm_wpxp for now. larson-group/clubb#972 2022-03-16 15:18:23 -0500e71c3c281fdec86134cae0107f02f9eefd7a6eddPushing column loop into xm_wpxp_clipping_and_stats and monotonic_turbulent_flux_limit. This essentially completes advance_xm_wpxp for now. larson-group/clubb#972editmono_flux_limiter.F90editadvance_xm_wpxp_module.F90advance_xp2_xpyp_module.F902422347813eaf7ab1402e8abb63072fdb362f0fe1647461903000http://carson.math.uwm.edu/jenkins/user/37674341+huebleruwm37674341+huebleruwm37674341+huebleruwm@users.noreply.github.comReplacing the i loop iterator for scalars with sclr. 2022-03-16 15:18:23 -05002422347813eaf7ab1402e8abb63072fdb362f0feReplacing the i loop iterator for scalars with sclr.editadvance_xp2_xpyp_module.F90advance_clubb_core_module.F90advance_xp2_xpyp_module.F900e2049891bace38ffa03c49004d4dbbb303817fb1647461903000http://carson.math.uwm.edu/jenkins/user/37674341+huebleruwm37674341+huebleruwm37674341+huebleruwm@users.noreply.github.comPushing loop into advance_xp2_wpxp. 2022-03-16 15:18:23 -05000e2049891bace38ffa03c49004d4dbbb303817fbPushing loop into advance_xp2_wpxp.editadvance_xp2_xpyp_module.F90editadvance_clubb_core_module.F90advance_xp2_xpyp_module.F90548c0002fa64ad11e86a754012f61a0b1fb7ef521647461903000http://carson.math.uwm.edu/jenkins/user/37674341+huebleruwm37674341+huebleruwm37674341+huebleruwm@users.noreply.github.comMoving the lhs_dp1 calculation to outside of xp2_xpyp_lhs. This gives us more flexibility, since we want to pass lhs_dp1 into xp2_xpyp_implicit_stats. 2022-03-16 15:18:23 -0500548c0002fa64ad11e86a754012f61a0b1fb7ef52Moving the lhs_dp1 calculation to outside of xp2_xpyp_lhs. This gives us more flexibility, since we want to pass lhs_dp1 into xp2_xpyp_implicit_stats.editadvance_xp2_xpyp_module.F90advance_xp2_xpyp_module.F90b042151c9b68a3625a5ed0716f92daca6fd56b6f1647461903000http://carson.math.uwm.edu/jenkins/user/37674341+huebleruwm37674341+huebleruwm37674341+huebleruwm@users.noreply.github.comMoving the lmm_stepping and stats calls to immediately after calls to xp2_xpyp_solve. This is because xp2_xpyp_implicit_stats saves things that are saved by scratch variables, and these scratch variables are set by the lhs and rhs setup calls. So for the multiple lhs routine, we need to save the scratch variables immediately after these calls before overwriting them by calling lhs and rhs again for a different variable. Since the stats also saves the variable were solving for, we also have to move the lmm_stepping to before this call. 2022-03-16 15:18:23 -0500b042151c9b68a3625a5ed0716f92daca6fd56b6fMoving the lmm_stepping and stats calls to immediately after calls to xp2_xpyp_solve. This is because xp2_xpyp_implicit_stats saves things that are saved by scratch variables, and these scratch variables are set by the lhs and rhs setup calls. So for the multiple lhs routine, we need to save the scratch variables immediately after these calls before overwriting them by calling lhs and rhs again for a different variable. Since the stats also saves the variable were solving for, we also have to move the lmm_stepping to before this call.editadvance_xp2_xpyp_module.F90advance_xp2_xpyp_module.F908c8f3fa1d2bbf4c47cc00e8c15eb63354ac4ba411647461903000http://carson.math.uwm.edu/jenkins/user/37674341+huebleruwm37674341+huebleruwm37674341+huebleruwm@users.noreply.github.comRemoving need for stats scratch variables by passing lhs terms to save through agument lists. This makes everything better in every way. 2022-03-16 15:18:23 -05008c8f3fa1d2bbf4c47cc00e8c15eb63354ac4ba41Removing need for stats scratch variables by passing lhs terms to save through agument lists. This makes everything better in every way.editadvance_xp2_xpyp_module.F90advance_xp2_xpyp_module.F90d2b10e704a1f3896db7b05eab3249c1db38f27541647461903000http://carson.math.uwm.edu/jenkins/user/37674341+huebleruwm37674341+huebleruwm37674341+huebleruwm@users.noreply.github.comAdding slicing for some lhs arrays being saved in stats. This was causing bit changing in a few lhs terms when run in multicolumn. 2022-03-16 15:18:23 -0500d2b10e704a1f3896db7b05eab3249c1db38f2754Adding slicing for some lhs arrays being saved in stats. This was causing bit changing in a few lhs terms when run in multicolumn.editadvance_xp2_xpyp_module.F90advance_xp2_xpyp_module.F90ecf272020b8de2182a362ed7eca489443cdcbb941647461903000http://carson.math.uwm.edu/jenkins/user/37674341+huebleruwm37674341+huebleruwm37674341+huebleruwm@users.noreply.github.comChanging names of dp1 variables for up2 and vp2. Surrounding where they're set to be within a l_stats_samp. 2022-03-16 15:18:23 -0500ecf272020b8de2182a362ed7eca489443cdcbb94Changing names of dp1 variables for up2 and vp2. Surrounding where they're set to be within a l_stats_samp.editadvance_xp2_xpyp_module.F90githttp://carson.math.uwm.edu/jenkins/user/noreplynoreplyhttp://carson.math.uwm.edu/jenkins/user/37674341+huebleruwm37674341+huebleruwmfalse192http://carson.math.uwm.edu/jenkins/job/cam_global_ERP_Ln9_gfortran_test/192/190http://carson.math.uwm.edu/jenkins/job/cam_global_ERP_Ln9_gfortran_test/190/Started by an SCM change746fc57497840efaa7acc394c10ac9c6892ef162206fc57497840efaa7acc394c10ac9c6892ef16220origin/clubb_silhs_devel6fc57497840efaa7acc394c10ac9c6892ef162206fc57497840efaa7acc394c10ac9c6892ef16220origin/clubb_silhs_devel69cca799cfb394e7eeadc21211ae811b4a370d31eecca799cfb394e7eeadc21211ae811b4a370d31eeorigin/changes_to_not_breakcca799cfb394e7eeadc21211ae811b4a370d31eecca799cfb394e7eeadc21211ae811b4a370d31eeorigin/changes_to_not_break1894f09400ffc9a554458247b6df4008c59959f20714f09400ffc9a554458247b6df4008c59959f2071refs/remotes/origin/clubb_silhs_devel4f09400ffc9a554458247b6df4008c59959f20714f09400ffc9a554458247b6df4008c59959f2071refs/remotes/origin/clubb_silhs_devel4f09400ffc9a554458247b6df4008c59959f20714f09400ffc9a554458247b6df4008c59959f2071refs/remotes/origin/clubb_silhs_develhttps://github.com/larson-group/cam.gitfalse#18944067153605478cam_global_ERP_Ln9_gfortran_test #189189false18914073SUCCESS1647334026631http://carson.math.uwm.edu/jenkins/job/cam_global_ERP_Ln9_gfortran_test/189/run_scripts/run_scam.bash569a50e3c92f0659394fc4a8bd840bfdb8455b861647289427000http://carson.math.uwm.edu/jenkins/user/noreplynoreplynoreply@github.comBIT_CHANGING:7e8ad492b0e42efda4bc0e45f96ff6471d702c2e because Kate Thayer-Calder set `clubb_l_damp_wp2_using_em = F`. (Gunther confirmed that code change is the only thing that changes answers.) However, this change only affects the answer when SILHS is on, and so we're going to leave it in. 2022-03-14 15:23:47 -0500569a50e3c92f0659394fc4a8bd840bfdb8455b86BIT_CHANGING:7e8ad492b0e42efda4bc0e45f96ff6471d702c2eeditrun_scripts/run_scam.bashadvance_clubb_core_module.F90960a16c889d0898e95595a6bb59a2f296c3bffa71647296994000http://carson.math.uwm.edu/jenkins/user/noreplynoreplynoreply@github.comAdds a blank line to trigger git merge with E3SM 2022-03-14 17:29:54 -0500960a16c889d0898e95595a6bb59a2f296c3bffa7Adds a blank line to trigger git merge with E3SMeditadvance_clubb_core_module.F90githttp://carson.math.uwm.edu/jenkins/user/noreplynoreplyfalse190http://carson.math.uwm.edu/jenkins/job/cam_global_ERP_Ln9_gfortran_test/190/188http://carson.math.uwm.edu/jenkins/job/cam_global_ERP_Ln9_gfortran_test/188/