bfb: Bugfix for FatesSp compiled with intel

cime_config/testdefs/ExpectedTestFails.xml

@@ -306,16 +306,4 @@
     </phase>
   </test>
 
-  <test name="ERI_D_Ld9.f45_f45_mg37.I2000Clm60FatesSpCruRsGs.derecho_gnu.clm-FatesColdSatPhenCamLndTuningMode">
-    <phase name="COMPARE_base_rest">
-      <status>FAIL</status>
-      <issue>#3496</issue>
-    </phase>
-  </test>
-  <test name="ERI_D_Ld9.f45_f45_mg37.I2000Clm60FatesSpCruRsGs.derecho_intel.clm-FatesColdSatPhenCamLndTuningMode">
-    <phase name="RUN">
-      <status>FAIL</status>
-      <issue>#3507</issue>
-    </phase>
-  </test>  
 </expectedFails>

src/biogeochem/SatellitePhenologyMod.F90

@@ -505,12 +505,28 @@ subroutine readMonthlyVegetation (bounds, fveg, months, canopystate_inst)
                 do ft = surfpft_lb,surfpft_ub
                    p = ft + col%patchi(c)
                    g = patch%gridcell(p)
-                   mlai2t(p,k) = mlai(g,ft)
-                   msai2t(p,k) = msai(g,ft)
-                   mhvt2t(p,k) = mhgtt(g,ft)
-                   mhvb2t(p,k) = mhgtb(g,ft)
+                   if (patch%is_fates(p)) then
+                     mlai2t(p,k) = mlai(g,ft)
+                     msai2t(p,k) = msai(g,ft)
+                     mhvt2t(p,k) = mhgtt(g,ft)
+                     mhvb2t(p,k) = mhgtb(g,ft)
+                   else
+                      ! Just in case if somehow a non-fates patch is on a fates column
+                      mlai2t(p,k) = 0._r8
+                      msai2t(p,k) = 0._r8
+                      mhvt2t(p,k) = 0._r8
+                      mhvb2t(p,k) = 0._r8
+                   endif
                 end do
-             end if
+             else
+                ! There are non-fates columns when you run with fates
+                ! gnu does not catch nans as fpes, so this is needed
+                ! to make intel happy.
+                mlai2t(col%patchi(c):col%patchf(c),k) = 0._r8
+                msai2t(col%patchi(c):col%patchf(c),k) = 0._r8
+                mhvt2t(col%patchi(c):col%patchf(c),k) = 0._r8
+                mhvb2t(col%patchi(c):col%patchf(c),k) = 0._r8
+             endif
           end do
        else          
           do p = bounds%begp,bounds%endp