Merge branch 'ndk/elm/fix-isnan-build-error-with-nvidia' (PR #7821)

With nvidia compiler on pm-cpu, we see new build fails looking for definition of isnan.

Fixes #7820

[bfb]

Author: peterdschwartz

components/elm/src/dyn_subgrid/dynSubgridAdjustmentsMod.F90

@@ -28,7 +28,6 @@ module dynSubgridAdjustmentsMod
   use SpeciesMod             , only : CN_SPECIES_N, CN_SPECIES_P
   use abortutils             , only : endrun
   use shr_log_mod            , only : errMsg => shr_log_errMsg
-
   !
   ! !PUBLIC MEMBER FUNCTIONS:
   implicit none
@@ -876,12 +875,6 @@ subroutine dyn_col_ns_Adjustments(bounds, clump_index, column_state_updater, col
                var         = decomp_npools_vr(begc:endc, j, l),     &
                adjustment  = adjustment_one_level(begc:endc))
 
-          ! Exit if the first element of col_ns%dyn_nbal_adjustments is NaN
-          if (isnan(col_ns%dyn_nbal_adjustments(begc))) then
-               call endrun(msg='dyn_col_ns_Adjustments: col_ns%dyn_nbal_adjustments is NaN: '//&
-               errMsg(__FILE__, __LINE__))
-          endif
-
           col_ns%dyn_nbal_adjustments(begc:endc) = &
                col_ns%dyn_nbal_adjustments(begc:endc) + &
                adjustment_one_level(begc:endc) * dzsoi_decomp(j)
@@ -897,16 +890,10 @@ subroutine dyn_col_ns_Adjustments(bounds, clump_index, column_state_updater, col
             var         = ntrunc_vr(begc:endc,j),     &
             adjustment  = adjustment_one_level(begc:endc))
 
-       ! Exit if the first element of col_ns%dyn_nbal_adjustments is NaN
-       if (isnan(col_ns%dyn_nbal_adjustments(begc))) then
-          call endrun(msg='dyn_col_ns_Adjustments: col_ns%dyn_nbal_adjustments is NaN: '//&
-               errMsg(__FILE__, __LINE__))
-       endif
        col_ns%dyn_nbal_adjustments(begc:endc) = &
             col_ns%dyn_nbal_adjustments(begc:endc) + &
             adjustment_one_level(begc:endc) * dzsoi_decomp(j)
 
-
        call update_column_state_no_special_handling(column_state_updater, &
            bounds      = bounds                          , &
            clump_index = clump_index                     , &
@@ -1571,9 +1558,6 @@ subroutine dyn_col_ps_Adjustments(bounds, clump_index, column_state_updater, col
                var         = decomp_ppools_vr(begc:endc, j, l),     &
                adjustment  = adjustment_one_level(begc:endc) )
 
-          if (isnan(col_ps%dyn_pbal_adjustments(begc))) then
-               call endrun(msg='dyn_col_ps_Adjustments: col_ps%dyn_pbal_adjustments(begc) is NaN: '//errMsg(__FILE__, __LINE__))
-          endif
           col_ps%dyn_pbal_adjustments(begc:endc) =      &
                col_ps%dyn_pbal_adjustments(begc:endc) + &
                adjustment_one_level(begc:endc) * dzsoi_decomp(j)
@@ -1588,9 +1572,6 @@ subroutine dyn_col_ps_Adjustments(bounds, clump_index, column_state_updater, col
             var         = ptrunc_vr(begc:endc,j),                &
             adjustment  = adjustment_one_level(begc:endc))
 
-       if (isnan(col_ps%dyn_pbal_adjustments(begc))) then
-           call endrun(msg='dyn_col_ps_Adjustments: col_ps%dyn_pbal_adjustments(begc) is NaN: '//errMsg(__FILE__, __LINE__))
-       endif
        col_ps%dyn_pbal_adjustments(begc:endc) =      &
            col_ps%dyn_pbal_adjustments(begc:endc) + &
            adjustment_one_level(begc:endc) * dzsoi_decomp(j)

components/elm/src/main/subgridAveMod.F90

@@ -1012,12 +1012,6 @@ subroutine c2g_1d(bounds, carr, garr, c2l_scale_type, l2g_scale_type)
     garr(bounds%begg : bounds%endg) = spval
     sumwt(bounds%begg : bounds%endg) = 0._r8
     do c = bounds%begc,bounds%endc
-       !Check for NaN values in carr
-       !FIXME: iac_present if condition is used as the NaN check fails for the default E3SM
-       !(without IAC). Someone should investigate this further.
-       if (iac_present) then 
-         if (isnan(carr(c))) call endrun(msg='carr(c) is NaN '//errMsg(__FILE__, __LINE__))
-       endif
        if (col_pp%active(c) .and. col_pp%wtgcell(c) /= 0._r8) then
           l = col_pp%landunit(c)
           if (carr(c) /= spval .and. scale_c2l(c) /= spval .and. scale_l2g(l) /= spval) then