Jon Wolfe

merged to master

Passes sanity testing with: * ERS_Ld5.T62_oQU120.CMPASO-NYF.chrysalis_intel Also passes use of the new configuration with: * SMS_D_Ld1.TL319_r05_IcoswISC30E3r5.GPMPAS-JRA.chrysalis_intel merged to next

merged to master

Passes: * SMS_D_Ld1.ne30pg2_r05_IcoswISC30E3r5.WCYCL1850.chrysalis_intel.allactive-wcprod merged to next

merged to master

@cbegeman -- would you expect this PR to cause non-BFB behavior for a typical IcoswISC30E3r5 fully-coupled case?

Thanks @xylar. Do we have a long-ish comparison run to document the changed behavior then? I didn't see anything on the discussions page

Testing with: * ERP_Ld3.ne30pg2_r05_IcoswISC30E3r5.WCYCL1850.chrysalis_intel.allactive-pioroot1 shows expected NML and baseline DIFFs merged to next

@rljacob - yes, depending on the ocn_ismf setting

merged to master and expected NML and baseline DIFFs blessed -- except for pm-cpu where only landice_developer has reported