Revert "Revert "Merge branch 'mt5555/homme/intel17bug-workaround' (PR #…

…1922)""

This reverts commit e88e39a.

The restores the bug fix for Intel17

[non-BFB] for B,F cases on Intel17

components/homme/src/preqx/share/prim_advance_mod.F90

@@ -942,8 +942,13 @@ subroutine advance_hypervis_dp(edge3,elem,hvcoord,hybrid,deriv,nt,nets,nete,dt2,
               do j=1,np
                  do i=1,np
                     ! update v first (gives better results than updating v after heating)
-                    elem(ie)%state%v(i,j,:,k,nt)=elem(ie)%state%v(i,j,:,k,nt) + &
-                         vtens(i,j,:,k,ie)
+                    ! intel/17 compiler bug on Edison produces incorrect results with this:
+                    !elem(ie)%state%v(i,j,:,k,nt)=elem(ie)%state%v(i,j,:,k,nt) + &
+                    !     vtens(i,j,:,k,ie)
+                    elem(ie)%state%v(i,j,1,k,nt)=elem(ie)%state%v(i,j,1,k,nt) + &
+                         vtens(i,j,1,k,ie)
+                    elem(ie)%state%v(i,j,2,k,nt)=elem(ie)%state%v(i,j,2,k,nt) + &
+                         vtens(i,j,2,k,ie)
 
                     v1=elem(ie)%state%v(i,j,1,k,nt)
                     v2=elem(ie)%state%v(i,j,2,k,nt)