Merge branch 'thorntonpe/lnd/archv2_cols' into next (PR #2742)

Implement ELM v2 data architecture for mass and energy state and flux variables

Re-merge to fix the floating-point exception for F cases

[BFB]

components/clm/src/data_types/ColumnDataType.F90

@@ -5096,7 +5096,7 @@ subroutine col_wf_init(this, begc, endc)
     allocate(this%qflx_drain_vr          (begc:endc,1:nlevgrnd))  ; this%qflx_drain_vr        (:,:) = nan
     allocate(this%qflx_h2osfc2topsoi     (begc:endc))             ; this%qflx_h2osfc2topsoi   (:)   = nan
     allocate(this%qflx_snow2topsoi       (begc:endc))             ; this%qflx_snow2topsoi     (:)   = nan
-    allocate(this%qflx_lateral           (begc:endc))             ; this%qflx_lateral         (:)   = nan
+    allocate(this%qflx_lateral           (begc:endc))             ; this%qflx_lateral         (:)   = 0._r8
     allocate(this%snow_sources           (begc:endc))             ; this%snow_sources         (:)   = nan
     allocate(this%snow_sinks             (begc:endc))             ; this%snow_sinks           (:)   = nan
     allocate(this%qflx_irrig             (begc:endc))             ; this%qflx_irrig           (:)   = nan