Changes

Summary

1. This commit switches the names, but not the values, of the dp1 and pr1 variables for up2 and vp2.  In other words, up2_dp1 <---> up2_pr1 and vp2_dp1 <---> vp2_pr1.  This makes the terms in these equations more consistent with the terms in the wp2 equation.  I believe this commit is BIT_CHANGING since it will affect the values of these variables even though the nightly plot profiles should not change (but the budget plots would have these lines swapped). (details)

This commit switches the names, but not the values, of the dp1 and pr1 variables for up2 and vp2.  In other words, up2_dp1 <---> up2_pr1 and vp2_dp1 <---> vp2_pr1.  This makes the terms in these equations more consistent with the terms in the wp2 equation.  I believe this commit is BIT_CHANGING since it will affect the values of these variables even though the nightly plot profiles should not change (but the budget plots would have these lines swapped).