diff --git a/CMakeLists.txt b/CMakeLists.txt
index a5dd1f4c59..d35ae3e184 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -114,7 +114,7 @@ project(GSI)
   setHOST()
 
   if(FIND_HDF5_HL)
-    find_package(HDF5 COMPONENTS C HL Fortran_HL )
+    find_package(HDF5 COMPONENTS C HL)
   elseif(FIND_HDF5)
     find_package(HDF5)
   endif()
diff --git a/cmake/Modules/setIntelFlags.cmake b/cmake/Modules/setIntelFlags.cmake
index 70544725a3..88e5061ffc 100644
--- a/cmake/Modules/setIntelFlags.cmake
+++ b/cmake/Modules/setIntelFlags.cmake
@@ -64,7 +64,7 @@ function(set_GSI_ENKF_Intel)
 endfunction(set_GSI_ENKF_Intel)
 
 function (set_GSI_ENKF_Debug_Intel)
-    set(GSI_Fortran_FLAGS "-DPOUND_FOR_STRINGIFY -O0 -fp-model source -convert big_endian -assume byterecl -implicitnone -mcmodel medium -shared-intel -g -traceback -debug -ftrapuv -check all,noarg_temp_created -fp-stack-check -fstack-protector -warn all,nointerfaces -convert big_endian -implicitnone -D_REAL8_ ${OpenMP_Fortran_FLAGS} ${MPI_Fortran_COMPILE_FLAGS} ${GSDCLOUDOPT}" CACHE INTERNAL "")
+    set(GSI_Fortran_FLAGS "-DPOUND_FOR_STRINGIFY -O0 -fp-model source -convert big_endian -assume byterecl -implicitnone -g -traceback -debug -ftrapuv -check all,noarg_temp_created -fp-stack-check -fstack-protector -warn all,nointerfaces -convert big_endian -implicitnone -D_REAL8_ ${OpenMP_Fortran_FLAGS} ${MPI_Fortran_COMPILE_FLAGS} ${GSDCLOUDOPT}" CACHE INTERNAL "")
     set(ENKF_Fortran_FLAGS "-O0 ${HOST_FLAG} -warn all -implicitnone -traceback -g -debug all -check all,noarg_temp_created -fp-model strict -convert big_endian -assume byterecl -D_REAL8_  ${OpenMP_Fortran_FLAGS} ${GSDCLOUDOPT}" CACHE INTERNAL "")
     set(GSDCLOUD_Fortran_FLAGS "-DPOUND_FOR_STRINGIFY -O3 -convert big_endian" CACHE INTERNAL "")
     #Common debug flags
diff --git a/modulefiles/modulefile.ProdGSI.jet b/modulefiles/modulefile.ProdGSI.jet
index 1f932ea765..c6f4368fe4 100644
--- a/modulefiles/modulefile.ProdGSI.jet
+++ b/modulefiles/modulefile.ProdGSI.jet
@@ -11,21 +11,20 @@
 #module-whatis " GDAS_ENKF whatis description"
 #
 #
-module load newdefaults
-module load intel/2016.2.181 
-module load impi/5.1.1.109
+
+module load intel/18.0.5.274
+module load impi
 #
-module load szip/2.1   
+module load szip/2.1
 module load hdf5/1.8.9
-module load netcdf4/4.2.1.1  
+#module load netcdf4/4.2.1.1
 
-export COREPATH=/lfs3/projects/hfv3gfs/nwprod/lib
-export COREPATH=/mnt/lfs3/projects/hfv3gfs/gwv/ljtjet/lib
+export COREPATH=/lfs4/HFIP/hfv3gfs/gwv/l0530/lib
 export NCEPLIBS=$COREPATH
 module use $NCEPLIBS/modulefiles
 
-export FFLAGS="-openmp"
-export LDFLAGS="-openmp"
+export FFLAGS="-qopenmp"
+export LDFLAGS="-qopenmp"
 module load bacio-intel-sandybridge/2.0.2
 module load crtm-intel-sandybridge/2.2.5
 module load bufr-intel-sandybridge/11.1.0
@@ -35,10 +34,12 @@ module load w3emc-intel-sandybridge/2.2.0
 module load w3nco-intel-sandybridge/2.0.6
 module load sigio-intel-sandybridge/2.0.1
 module load sfcio-intel-sandybridge/1.0.0
+module load ip-intel-sandybridge/3.0.0
 
-module use /home/George.Vandenberghe/t1/l1025/lib/modulefiles
-module load hdf5
-module load netcdf
+#module use /home/George.Vandenberghe/t1/l1025/lib/modulefiles
+#module load hdf5
+#module load netcdf
 
-export NETCDF=${NETCDF4}
-export NETCDF_DIR=${NETCDF4}
+module load netcdfp/4.7.4
+#export NETCDF=${NETCDF4}
+#export NETCDF_DIR=${NETCDF4}
diff --git a/modulefiles/modulefile.ProdGSI.wcoss_c b/modulefiles/modulefile.ProdGSI.wcoss_c
index 8a2ec237ec..cf354deb70 100644
--- a/modulefiles/modulefile.ProdGSI.wcoss_c
+++ b/modulefiles/modulefile.ProdGSI.wcoss_c
@@ -40,16 +40,18 @@ module unload intel/15.0.3.187
 module load intel/18.1.163
 
 # Loading pe environment
+module load craype-sandybridge
 module load cray-mpich/7.2.0
-module load craype-haswell
+#module load craype-haswell
 
 module use /usrx/local/dev/modulefiles
 module load cmake/3.6.2
 module unuse /usrx/local/dev/modulefiles
 
 # Loading netcdf modules
-module load cray-netcdf/4.3.2
-module load cray-hdf5/1.8.14
+module use /usrx/local/dev/modulefiles
+module load NetCDF-intel-sandybridge/4.7.4
+module load HDF5-parallel-intel-sandybridge/1.10.6
 
 # Loading nceplibs modules
 module use /gpfs/hps/nco/ops/nwprod/lib/modulefiles
diff --git a/regression/regression_var.sh b/regression/regression_var.sh
index da0582bad3..1a8b5d9fa9 100755
--- a/regression/regression_var.sh
+++ b/regression/regression_var.sh
@@ -138,6 +138,8 @@ case $machine in
       export noscrub="/gpfs/hps3/emc/global/noscrub/$LOGNAME"
    elif [ -d /gpfs/hps3/emc/da/noscrub/$LOGNAME ]; then
       export noscrub="/gpfs/hps3/emc/da/noscrub/$LOGNAME"
+   elif [ -d /gpfs/hps3/emc/hwrf/noscrub/$LOGNAME ]; then
+       export noscrub="/gpfs/hps3/emc/hwrf/noscrub/$LOGNAME"
    fi
    if [[ "$cmaketest" = "false" ]]; then
      export basedir="/gpfs/hps3/emc/global/noscrub/$LOGNAME/svn/gsi"
diff --git a/src/enkf/CMakeLists.txt b/src/enkf/CMakeLists.txt
index 2b126c2e1a..4431d42526 100644
--- a/src/enkf/CMakeLists.txt
+++ b/src/enkf/CMakeLists.txt
@@ -78,7 +78,7 @@ if(BUILD_ENKF)
   set(ENKFEXEC "${ENKF_BASE}${debug_suffix}${GSISUFFIX}" CACHE INTERNAL "ENKF Executable name")
   add_executable(${ENKFEXEC} enkf_main.f90)
   target_link_libraries(${ENKFEXEC} enkflib enkfdeplib ${GSILIB} ${GSISHAREDLIB} ${CORE_LIBRARIES}
-  ${MPI_Fortran_LIBRARIES} ${LAPACK_LIBRARIES} ${NETCDF_LIBRARIES_F90} ${NETCDF_LIBRARIES}  ${HDF5_Fortran_HL_LIBRARIES}
+  ${MPI_Fortran_LIBRARIES} ${LAPACK_LIBRARIES} ${NETCDF_LIBRARIES_F90} ${NETCDF_LIBRARIES}  ${HDF5_HL_LIBRARIES}
   ${EXTRA_LINKER_FLAGS} ${HDF5_LIBRARIES} ${CURL_LIBRARIES} ${GSI_LDFLAGS} ${CORE_BUILT} ${CORE_LIBRARIES} ${CORE_BUILT} ${NCDIAG_LIBRARIES} ${FV3GFS_NCIO_LIBRARIES})
   install(TARGETS ${ENKFEXEC} enkfdeplib enkflib 
         RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/bin
diff --git a/src/enkf/gridio_wrf.f90 b/src/enkf/gridio_wrf.f90
index 2717b1e0b6..cb5fff80e7 100644
--- a/src/enkf/gridio_wrf.f90
+++ b/src/enkf/gridio_wrf.f90
@@ -46,7 +46,8 @@ module gridio
   ! Define all public subroutines within this module
   private
   public :: readgriddata, readgriddata_pnc
-  public :: writegriddata, writegriddata_pnc, WRITEINCREMENT, WRITEINCREMENT_PNC
+  public :: writegriddata, writegriddata_pnc
+  public :: writeincrement, writeincrement_pnc
 
   !-------------------------------------------------------------------------
 
@@ -74,6 +75,7 @@ subroutine readgriddata(nanal1,nanal2,vars3d,vars2d,n3d,n2d,levels,ndim,ntimes,f
 
   end subroutine readgriddata
 
+
   !========================================================================
   ! readgriddata_arw.f90: read WRF-ARW state or control vector
   !-------------------------------------------------------------------------
@@ -730,7 +732,7 @@ subroutine writegriddata(nanal1,nanal2,vars3d,vars2d,n3d,n2d,levels,ndim,vargrid
 
     !----------------------------------------------------------------------
     if (nbackgrounds > 1) then
-       write(6,*)'gridio/writegriddata: writing multiple backgrounds not yet supported'
+       write(6,*)'gridio/writegriddata_wrf: writing multiple backgrounds not yet supported'
        call stop2(23)
     endif
 
@@ -1036,6 +1038,7 @@ subroutine writegriddata(nanal1,nanal2,vars3d,vars2d,n3d,n2d,levels,ndim,vargrid
 
   end subroutine writegriddata
 
+
   !======================================================================
   ! readwrfvar.f90: This subroutine reads a varname variable from WRF
   ! ARW or NMM netcdf file and returns the variable interpolated to 
diff --git a/src/gsi/CMakeLists.txt b/src/gsi/CMakeLists.txt
index 7adab2eed1..666bdedcff 100644
--- a/src/gsi/CMakeLists.txt
+++ b/src/gsi/CMakeLists.txt
@@ -145,7 +145,7 @@ cmake_minimum_required(VERSION 2.8)
   endif()
 # Specify all the libraries to be linked into the executable
   target_link_libraries(${GSIEXEC} ${GSISHAREDLIB} ${GSILIB} ${GSISHAREDLIB} ${WRF_LIBRARIES} 
-         ${NETCDF_LIBRARIES_F90} ${NETCDF_LIBRARIES} ${HDF5_Fortran_HL_LIBRARIES} ${MPI_Fortran_LIBRARIES} 
+         ${NETCDF_LIBRARIES_F90} ${NETCDF_LIBRARIES} ${HDF5_HL_LIBRARIES} ${MPI_Fortran_LIBRARIES} 
          ${LAPACK_LIBRARIES} -L./ ${EXTRA_LINKER_FLAGS} ${HDF5_LIBRARIES} ${CURL_LIBRARIES} ${CORE_LIBRARIES} ${CORE_BUILT}
          ${GSI_LDFLAGS} ${NCDIAG_LIBRARIES} ${GSDCLOUD_LIBRARY} ${ZLIB_LIBRARIES} ${wrflib} ${EXTRA_LINKER_FLAGS} ${FV3GFS_NCIO_LIBRARIES})
   install(TARGETS ${GSIEXEC}
diff --git a/src/gsi/gesinfo.F90 b/src/gsi/gesinfo.F90
index 136271aae0..19b553c3c2 100644
--- a/src/gsi/gesinfo.F90
+++ b/src/gsi/gesinfo.F90
@@ -255,6 +255,9 @@ subroutine gesinfo
            jcap=gfshead%jcap, ntrac=gfshead%ntrac, idvc=gfshead%idvc, &
            idsl=gfshead%idsl,   ncldt=gfshead%ncldt, iret=iret2)
 
+        ! FV3GFS write component does not include JCAP, infer from DIMY-2
+        !if (gfshead%jcap<0) gfshead%jcap=gfshead%latb-2
+
         if ( iret2 /= 0 .or. TRIM(filetype) /= 'NEMSIO' ) then
            write(6,*)' GESINFO:  UNKNOWN FORMAT FOR GFSATM file = ', &
               trim(filename),' Status = ',iret2
diff --git a/src/gsi/get_gefs_for_regional.f90 b/src/gsi/get_gefs_for_regional.f90
index 022f1f1612..c017232a31 100644
--- a/src/gsi/get_gefs_for_regional.f90
+++ b/src/gsi/get_gefs_for_regional.f90
@@ -22,6 +22,7 @@ subroutine get_gefs_for_regional
 !   2016-05-19  Carley/s.liu   - prevent the GSI from printing out erroneous error  
 !                               when using ensembles from different time
 !   2016-12-12  tong    - add code to get nemsio meta data, if use_gfs_nemsio=True
+!   2020-07-01  Bi   - add code to get netCDF data, if use_gfs_ncio=.true.
 !
 !   input argument list:
 !
@@ -33,7 +34,8 @@ subroutine get_gefs_for_regional
 !
 !$$$ end documentation block
 
-  use gridmod, only: idsl5,regional,use_gfs_nemsio
+  use gridmod, only: idsl5,regional,use_gfs_nemsio,use_gfs_ncio,&
+                     ncepgfs_head,ncepgfs_headv
   use gridmod, only: nlon,nlat,lat2,lon2,nsig,rotate_wind_ll2xy
   use hybrid_ensemble_parameters, only: region_lat_ens,region_lon_ens
   use hybrid_ensemble_parameters, only: en_perts,ps_bar,nelen
@@ -74,6 +76,9 @@ subroutine get_gefs_for_regional
   use nemsio_module, only: nemsio_init,nemsio_open,nemsio_close
   use ncepnems_io, only: error_msg
   use nemsio_module, only: nemsio_gfile,nemsio_getfilehead
+  use module_fv3gfs_ncio, only: Dimension, Dataset, open_dataset, get_dim, &
+                                read_vardata, get_idate_from_time_units,&
+                                read_attribute, close_dataset
   use get_wrf_mass_ensperts_mod, only: get_wrf_mass_ensperts_class
   use gsi_io, only: verbose
   use obsmod, only: l_wcp_cwm
@@ -109,9 +114,12 @@ subroutine get_gefs_for_regional
   character(len=*),parameter::myname='get_gefs_for_regional'
   real(r_kind) bar_norm,sig_norm,kapr,kap1,trk
   integer(i_kind) iret,i,j,k,k2,n,mm1,iderivative
+  integer(i_kind) mype_out
   integer(i_kind) ic2,ic3,it
   integer(i_kind) ku,kv,kt,kq,koz,kcw,kz,kps
   character(255) filename,filelists(ntlevs_ens)
+  character(6) sfilename
+
   logical ice
   integer(sigio_intkind):: lunges = 11
   type(sigio_head):: sighead
@@ -121,10 +129,11 @@ subroutine get_gefs_for_regional
   logical,allocatable :: vector(:)
   real(r_kind),parameter::  zero_001=0.001_r_kind
   real(r_kind),allocatable,dimension(:) :: xspli,yspli,xsplo,ysplo
-  integer(i_kind) iyr,ihourg
+  integer(i_kind) iyr,ihourg,kr
   integer(i_kind),dimension(4):: idate4
   integer(i_kind),dimension(8) :: ida,jda 
   integer(i_kind),dimension(5) :: iadate_gfs
+  integer(i_kind),dimension(6):: idate6
   real(r_kind) hourg
   real(r_kind),dimension(5):: fha
   integer(i_kind) istatus
@@ -136,6 +145,14 @@ subroutine get_gefs_for_regional
   integer(i_kind),dimension(7):: idate
   real(r_kind) :: fhour
   type(nemsio_gfile) :: gfile
+  type(Dataset) :: atmges,sfcges      
+  type(ncepgfs_head):: gfshead
+  type(ncepgfs_headv):: gfsheadv
+  integer(i_kind),allocatable,dimension(:) :: ntrac,ncld
+  real(r_single),allocatable,dimension(:) :: aknc, bknc, fhour1
+
+
+  type(Dimension) :: ncdim
   integer(i_kind) :: nvcoord
   real(r_single),allocatable:: nems_vcoord(:,:,:)
   real(r_single),allocatable:: vcoord(:,:)
@@ -223,7 +240,7 @@ subroutine get_gefs_for_regional
 
   rewind (10) 
   read(10,'(a)',err=20,end=20)filename 
-  if(.not. use_gfs_nemsio)then
+  if ((.not. use_gfs_nemsio) .and. (.not. use_gfs_ncio))then
      open(lunges,file=trim(filename),form='unformatted')
      call sigio_srhead(lunges,sighead,iret)
      close(lunges)
@@ -264,7 +281,7 @@ subroutine get_gefs_for_regional
      idate4(2)= sighead%idate(2)
      idate4(3)= sighead%idate(3)
      idate4(4)= sighead%idate(4)
-  else
+  else if ( use_gfs_nemsio ) then
      call nemsio_init(iret=iret)
      if (iret /= 0) call error_msg(trim(my_name),trim(filename),' ','init',istop,iret)
 
@@ -336,12 +353,82 @@ subroutine get_gefs_for_regional
      if(mype == 0) then
         write(6,*) ' nemsio: fhour,idate=',fhour,idate
         write(6,*) ' iadate(y,m,d,hr,min)=',iadate
-        write(6,*) ' nemsio: jcap,levs=',njcap,levs
+        write(6,*) ' nemsio: jcap,levs=',levs
         write(6,*) ' nemsio: latb,lonb=',latb,lonb
         write(6,*) ' nemsio: idvc,nvcoord=',idvc,nvcoord
         write(6,*) ' nemsio: idsl=',idsl
      end if
 
+!  add netCDF header information: 
+     else ! use_gfs_ncio and get this information
+        write(sfilename,'("sfcf",i2.2)')nhr_assimilation
+        ! open the netCDF file
+        atmges = open_dataset(filename)
+        !sfcges = open_dataset(sfilename)
+        ! get dimension sizes
+        ncdim = get_dim(atmges, 'grid_xt'); gfshead%lonb = ncdim%len
+        ncdim = get_dim(atmges, 'grid_yt'); gfshead%latb = ncdim%len
+        ncdim = get_dim(atmges, 'pfull') ; gfshead%levs = ncdim%len
+        write(6,*) 'region lonb latb=',gfshead%lonb, gfshead%latb,gfshead%levs         
+        nsig_gfs = gfshead%levs
+        ! hard code jcap,idsl,idvc
+        gfshead%jcap = -9999
+        gfshead%idsl= 1
+        gfshead%idvc = 2
+
+        ! FV3GFS write component does not include JCAP, infer from DIMY-2
+        if (njcap<0) njcap=latb-2
+
+        nlat_gfs=gfshead%latb+2
+        nlon_gfs=gfshead%lonb
+        nsig_gfs=gfshead%levs
+
+        jcap_gfs=gfshead%latb-2
+
+        write(6,*) 'regional jcap_gfs=',jcap_gfs
+
+
+        if (mype==mype_out) write(6,*)'GESINFO:  Read NCEP FV3GFS netCDF ', &
+           'format file, ',trim(filename)
+        ! hard code nvcoord to be 2
+        gfshead%nvcoord=2 ! ak and bk
+        if (allocated(gfsheadv%vcoord)) deallocate(gfsheadv%vcoord)
+        allocate(gfsheadv%vcoord(gfshead%levs+1,gfshead%nvcoord))
+        call read_attribute(atmges, 'ak', aknc)
+        call read_attribute(atmges, 'bk', bknc)
+        do k=1,gfshead%levs+1
+           kr = gfshead%levs+2-k
+           gfsheadv%vcoord(k,1) = aknc(kr)
+           gfsheadv%vcoord(k,2) = bknc(kr)
+        end do
+        deallocate(aknc,bknc) 
+        ! get time information
+        idate6 = get_idate_from_time_units(atmges)
+        gfshead%idate(1) = idate6(4)  !hour
+        gfshead%idate(2) = idate6(2)  !month
+        gfshead%idate(3) = idate6(3)  !day
+        gfshead%idate(4) = idate6(1)  !year
+        call read_vardata(atmges, 'time', fhour1) ! might need to change this to attribute later
+                                               ! depends on model changes from Jeff Whitaker
+        gfshead%fhour = fhour1(1)
+
+        call close_dataset(atmges)
+
+        if(mype == 0) then
+          write(6,*) ' netCDF:fhour,idate=',fhour1,idate6
+          write(6,*) ' netCDF:iadate(y,m,d,hr,min)=',iadate
+          write(6,*) ' netCDF: jcap,levs=',gfshead%levs
+          write(6,*) ' netCDF: latb,lonb=',gfshead%latb,gfshead%lonb
+          write(6,*) ' netCDF: nvcoord=',gfshead%nvcoord
+          write(6,*) ' netCDF: idvc,idsl=',gfshead%idvc,gfshead%idsl
+        endif
+
+        hourg = fhour1(1)
+        idate4(1) = idate6(4)
+        idate4(2) = idate6(2)
+        idate4(3) = idate6(3)
+        idate4(4) = idate6(1)
+
   end if
 
 ! Compute valid time from ensemble date and forecast length and compare to iadate, the analysis time
@@ -354,6 +441,7 @@ subroutine get_gefs_for_regional
         iyr=iyr+2000
      end if
   end if
+
   fha=zero ; ida=0; jda=0
   fha(2)=ihourg    ! relative time interval in hours
   ida(1)=iyr       ! year
@@ -371,30 +459,36 @@ subroutine get_gefs_for_regional
      iadate_gfs(4)=jda(5) ! hour
   endif
   iadate_gfs(5)=0      ! minute
+
+
   if(mype == 0) then
      write(6,*)' in get_gefs_for_regional, iadate_gefs=',iadate_gfs
      write(6,*)' in get_gefs_for_regional, iadate    =',iadate
   end if
-           call w3fs21(iadate,nming1)
-           call w3fs21(iadate_gfs,nming2)
+
+     call w3fs21(iadate,nming1)
+     call w3fs21(iadate_gfs,nming2)
+
   if( (nming1/=nming2) .and. (.not.l_ens_in_diff_time) ) then
      if(mype == 0) write(6,*)' GEFS ENSEMBLE MEMBER DATE NOT EQUAL TO ANALYSIS DATE, PROGRAM STOPS'
      call stop2(85)
   end if
      
-
 !         set up ak5,bk5,ck5 for use in computing 3d pressure field (needed for vertical interp to regional)
 !                            following is code segment from gesinfo.F90
   allocate(ak5(nsig_gfs+1))
   allocate(bk5(nsig_gfs+1))
   allocate(ck5(nsig_gfs+1))
   allocate(tref5(nsig_gfs))
+  
+  idvc=gfshead%idvc
+  idsl=gfshead%idsl
   do k=1,nsig_gfs+1
      ak5(k)=zero
      bk5(k)=zero
      ck5(k)=zero
   end do
-  if (.not. use_gfs_nemsio) then
+  if ((.not. use_gfs_nemsio) .and. (.not. use_gfs_ncio))then
      if (sighead%nvcoord == 1) then
         do k=1,sighead%levs+1
            bk5(k) = sighead%vcoord(k,1)
@@ -414,6 +508,26 @@ subroutine get_gefs_for_regional
         write(6,*)'GET_GEFS_FOR_REGIONAL:  ***ERROR*** INVALID value for nvcoord=',sighead%nvcoord
         call stop2(85)
      endif
+  else if ( use_gfs_ncio ) then 
+     if (gfshead%nvcoord == 1) then
+        do k=1,nsig_gfs+1
+           bk5(k) = gfsheadv%vcoord(k,1)
+        end do
+     elseif (gfshead%nvcoord == 2) then
+        do k = 1,nsig_gfs+1
+           ak5(k) = gfsheadv%vcoord(k,1)*zero_001
+           bk5(k) = gfsheadv%vcoord(k,2)
+        end do
+     elseif (gfshead%nvcoord == 3) then
+        do k = 1,nsig_gfs+1
+           ak5(k) = gfsheadv%vcoord(k,1)*zero_001
+           bk5(k) = gfsheadv%vcoord(k,2)
+           ck5(k) = gfsheadv%vcoord(k,3)*zero_001
+        end do
+     else
+        write(6,*)'GET_GEFS_FOR_REGIONAL netCDF:  ***ERROR*** INVALID value for nvcoord=',gfshead%nvcoord
+        call stop2(85)
+     endif
   else
      if (nvcoord == 1) then
         do k=1,nsig_gfs+1
@@ -436,6 +550,7 @@ subroutine get_gefs_for_regional
      endif
   end if
 
+
   if(mype == 0 .and. print_verbose)then
      do k=1,nsig_gfs+1
         write(6,*)' ak5,bk5,ck5=',ak5(k),bk5(k),ck5(k)
@@ -509,6 +624,9 @@ subroutine get_gefs_for_regional
      if(use_gfs_nemsio)then
         call general_read_gfsatm_nems(grd_gfst,sp_gfs,filename,uv_hyb_ens,.false.,.true., &
                atm_bundle,.true.,iret)
+     else if (use_gfs_ncio) then
+        call general_read_gfsatm_nc(grd_gfst,sp_gfs,filename,uv_hyb_ens,.false.,.true., &
+               atm_bundle,.true.,iret)
      else
         call general_read_gfsatm(grd_gfst,sp_gfs,sp_gfs,filename,uv_hyb_ens,.false.,.true., &
                atm_bundle,inithead,iret)
@@ -543,6 +661,8 @@ subroutine get_gefs_for_regional
            end do
         end do
      end do
+
+     
      kz=num_fields ; kps=kz-1
      do j=1,grd_gfs%lon2
         do i=1,grd_gfs%lat2
@@ -805,6 +925,7 @@ subroutine get_gefs_for_regional
 
   end do   !  end loop over ensemble members.
 
+
 !   next, compute mean of ensembles.
 
   allocate(stbar(grd_mix%lat2,grd_mix%lon2,grd_mix%nsig))
diff --git a/src/gsi/gfs_stratosphere.f90 b/src/gsi/gfs_stratosphere.f90
index 6d6a3de433..d4617971a9 100644
--- a/src/gsi/gfs_stratosphere.f90
+++ b/src/gsi/gfs_stratosphere.f90
@@ -109,7 +109,7 @@ subroutine init_gfs_stratosphere
 
    use_gfs_stratosphere=.false.
    good_o3mr=.false.
-   nsig_max=120
+   nsig_max=127
    k0m=0
    k1m=0
    k0r=0
@@ -1153,7 +1153,12 @@ subroutine add_gfs_stratosphere
          ncdim = get_dim(atmges, 'grid_xt'); lonb = ncdim%len
          ncdim = get_dim(atmges, 'grid_yt'); latb = ncdim%len
          ncdim = get_dim(atmges, 'pfull'); levs = ncdim%len
+         if ( mype == 0 ) then
+            write(6,*) 'ncio lonb latb lev =',lonb, latb, levs
+         endif
          njcap = -9999
+         ! FV3GFS write component does not include JCAP, infer from DIMY-2
+         if (njcap<0) njcap=latb-2
          jcap_org = njcap
          idate6 = get_idate_from_time_units(atmges)
          call read_vardata(atmges, 'time', fhour2)
diff --git a/src/gsi/read_gfs_ozone_for_regional.f90 b/src/gsi/read_gfs_ozone_for_regional.f90
index 9cdee423f5..16f7555d01 100644
--- a/src/gsi/read_gfs_ozone_for_regional.f90
+++ b/src/gsi/read_gfs_ozone_for_regional.f90
@@ -29,6 +29,7 @@ subroutine read_gfs_ozone_for_regional
 !   2015-05-13  wu      - read in just one GFS for ozone even when nfldsig > 1 
 !                         use the same ges_oz in all time levels
 !   2016-12-12  tong    - add code to get nemsio meta data, if use_gfs_nemsio=True
+!   2012-07-02  bi      - add code to get netcdf data, if use_gfs_ncio=.true.
 !
 !   input argument list:
 !
@@ -41,7 +42,8 @@ subroutine read_gfs_ozone_for_regional
 !$$$ end documentation block
 
   use gridmod, only: nlat,nlon,lat2,lon2,nsig,region_lat,region_lon,check_gfs_ozone_date
-  use gridmod, only: jcap_gfs,nlat_gfs,nlon_gfs,wrf_nmm_regional,use_gfs_nemsio
+  use gridmod, only: jcap_gfs,nlat_gfs,nlon_gfs,wrf_nmm_regional,use_gfs_nemsio, &
+                     use_gfs_ncio,ncepgfs_head,ncepgfs_headv
   use constants,only: zero,half,rd_over_cp,one,h300,r60,r3600
   use constants, only: max_varname_length
   use mpimod, only: mpi_comm_world,ierror,mype,mpi_rtype,mpi_min,mpi_max,npe
@@ -64,6 +66,9 @@ subroutine read_gfs_ozone_for_regional
   use nemsio_module, only: nemsio_init,nemsio_open,nemsio_close
   use ncepnems_io, only: error_msg
   use nemsio_module, only: nemsio_gfile,nemsio_getfilehead
+  use module_fv3gfs_ncio, only: Dataset, Dimension, get_dim, read_vardata,&
+                                 open_dataset, close_dataset, read_attribute,&
+                                 get_idate_from_time_units
 
   implicit none
 
@@ -88,6 +93,7 @@ subroutine read_gfs_ozone_for_regional
   integer(i_kind) iret,i,j,k,k2,ndim
   integer(i_kind) it,it_beg,it_end   
   integer(i_kind) istatus
+  integer(i_kind) kr
   character(24) filename
   character(255),allocatable,dimension(:)::infiles
   logical uv_hyb_ens
@@ -106,6 +112,7 @@ subroutine read_gfs_ozone_for_regional
   real(r_kind),allocatable,dimension(:) :: xspli,yspli,xsplo,ysplo
   integer(i_kind) iyr,ihourg
   integer(i_kind),dimension(4):: idate4
+  integer(i_kind),dimension(6):: idate6
   integer(i_kind),dimension(8) :: ida,jda 
   integer(i_kind),dimension(5) :: iadate_gfs
   real(r_kind) hourg
@@ -124,6 +131,12 @@ subroutine read_gfs_ozone_for_regional
   real(r_kind),allocatable,dimension(:)::glb_ozmin,glb_ozmax,reg_ozmin,reg_ozmax
   real(r_kind),allocatable,dimension(:)::glb_ozmin0,glb_ozmax0,reg_ozmin0,reg_ozmax0
   real(r_kind),allocatable,dimension(:,:,:,:)::ges_oz
+  logical print_verbose
+  type(Dataset) :: atmges
+  type(ncepgfs_head):: gfshead
+  type(ncepgfs_headv):: gfsheadv
+  type(Dimension) :: ncdim
+  real(r_kind), allocatable, dimension(:) :: fhour2,aknc,bknc
 
   type(gsi_bundle) :: atm_bundle
   type(gsi_grid)   :: atm_grid
@@ -171,7 +184,7 @@ subroutine read_gfs_ozone_for_regional
   filename=infiles(it)
   if (mype==0) write(6,*)'read_gfs_ozone_for_regional: reading in gfs file:',trim(filename)                  
 
-  if(.not. use_gfs_nemsio)then
+  if ((.not. use_gfs_nemsio) .and. (.not. use_gfs_ncio))then
      open(lunges,file=trim(filename),form='unformatted')
      call sigio_srhead(lunges,sighead,iret)
      close(lunges)
@@ -197,6 +210,71 @@ subroutine read_gfs_ozone_for_regional
      idate4(2)= sighead%idate(2)
      idate4(3)= sighead%idate(3)
      idate4(4)= sighead%idate(4)
+
+!  add netcdf code here
+   else if (use_gfs_ncio) then
+      atmges = open_dataset(filename)
+      ! get dimension sizes
+      ncdim = get_dim(atmges, 'grid_xt'); gfshead%lonb = ncdim%len
+      ncdim = get_dim(atmges, 'grid_yt'); gfshead%latb = ncdim%len
+      ncdim = get_dim(atmges, 'pfull'); gfshead%levs = ncdim%len
+      nsig_gfs=gfshead%levs
+      ! hard code jcap,idsl,idvc
+      gfshead%jcap = -9999
+      gfshead%idsl= 1
+      gfshead%idvc = 2
+
+      ! FV3GFS write component does not include JCAP, infer from DIMY-2
+      if (njcap<0) njcap=latb-2
+      
+      nlat_gfs=gfshead%latb+2
+      nlon_gfs=gfshead%lonb
+      nsig_gfs=gfshead%levs
+      
+      jcap_gfs=gfshead%latb-2
+
+      ! get time information
+      idate6 = get_idate_from_time_units(atmges)
+      gfshead%idate(1) = idate6(4)  !hour
+      gfshead%idate(2) = idate6(2)  !month
+      gfshead%idate(3) = idate6(3)  !day
+      gfshead%idate(4) = idate6(1)  !year
+      call read_vardata(atmges, 'time', fhour2) ! might need to change this to attribute later
+                                               ! depends on model changes from Jeff Whitaker
+      gfshead%fhour = fhour2(1)
+
+      ! hard code nvcoord to be 2
+      gfshead%nvcoord=2 ! ak and bk
+      if (allocated(gfsheadv%vcoord)) deallocate(gfsheadv%vcoord)
+      allocate(gfsheadv%vcoord(gfshead%levs+1,gfshead%nvcoord))
+
+      call read_attribute(atmges, 'ak', aknc)
+      call read_attribute(atmges, 'bk', bknc)
+
+      do k=1,gfshead%levs+1
+          kr = gfshead%levs+2-k
+          gfsheadv%vcoord(k,1) = aknc(kr)
+          gfsheadv%vcoord(k,2) = bknc(kr)
+      end do
+      deallocate(aknc,bknc)
+
+      call close_dataset(atmges)
+
+      if(mype == 0) then
+        write(6,*) ' reozone:fhour,idate=',fhour2,idate6
+        write(6,*) ' reozone:iadate(y,m,d,hr,min)=',iadate
+        write(6,*) ' reozone: jcap,levs=',gfshead%levs
+        write(6,*) ' reozone: latb,lonb=',gfshead%latb,gfshead%lonb
+        write(6,*) ' reozone: nvcoord=',gfshead%nvcoord
+        write(6,*) ' reozone: idvc,idsl=',gfshead%idvc,gfshead%idsl
+      endif
+
+       hourg = fhour2(1)
+       idate4(1) = idate6(4)
+       idate4(2) = idate6(2)
+       idate4(3) = idate6(3)
+       idate4(4) = idate6(1)
+
   else
      call nemsio_init(iret=iret)
      if (iret /= 0) call error_msg(trim(my_name),trim(filename),' ','init',istop,iret)
@@ -294,6 +372,7 @@ subroutine read_gfs_ozone_for_regional
      write(6,*)' in read_gfs_ozone_for_regional, iadate_gfs=',iadate_gfs
      write(6,*)' in read_gfs_ozone_for_regional, iadate    =',iadate
   end if
+
   if((iadate_gfs(1)/=iadate(1).or.iadate_gfs(2)/=iadate(2).or.iadate_gfs(3)/=iadate(3).or.&
       iadate_gfs(4)/=iadate(4).or.iadate_gfs(5)/=iadate(5)) .and. .not. wrf_nmm_regional ) then
      if(mype == 0) write(6,*)' WARNING: GFS OZONE FIELD DATE NOT EQUAL TO ANALYSIS DATE'
@@ -310,12 +389,15 @@ subroutine read_gfs_ozone_for_regional
   allocate(bk5(nsig_gfs+1))
   allocate(ck5(nsig_gfs+1))
   allocate(tref5(nsig_gfs))
+
+  idvc=gfshead%idvc
+  idsl=gfshead%idsl
   do k=1,nsig_gfs+1
      ak5(k)=zero
      bk5(k)=zero
      ck5(k)=zero
   end do
-  if (.not. use_gfs_nemsio) then
+  if((.not. use_gfs_nemsio).and.(.not. use_gfs_ncio))then
      if (sighead%nvcoord == 1) then
         do k=1,sighead%levs+1
            bk5(k) = sighead%vcoord(k,1)
@@ -335,6 +417,26 @@ subroutine read_gfs_ozone_for_regional
         write(6,*)'READ_GFS_OZONE_FOR_REGIONAL:  ***ERROR*** INVALID value for nvcoord=',sighead%nvcoord,filename
         call stop2(85)
      endif
+   else if ( use_gfs_ncio ) then 
+     if (gfshead%nvcoord == 1) then
+        do k=1,nsig_gfs+1
+           bk5(k) = gfsheadv%vcoord(k,1)
+        end do
+     elseif (gfshead%nvcoord == 2) then
+        do k = 1,nsig_gfs+1
+           ak5(k) = gfsheadv%vcoord(k,1)*zero_001
+           bk5(k) = gfsheadv%vcoord(k,2)
+        end do
+     elseif (gfshead%nvcoord == 3) then
+        do k = 1,nsig_gfs+1
+           ak5(k) = gfsheadv%vcoord(k,1)*zero_001
+           bk5(k) = gfsheadv%vcoord(k,2)
+           ck5(k) = gfsheadv%vcoord(k,3)*zero_001
+        end do
+     else
+        write(6,*)'***ERROR*** INVALID value nvcoord=',gfshead%nvcoord
+        call stop2(85)
+     endif
   else
      if (nvcoord == 1) then
         do k=1,nsig_gfs+1
@@ -373,7 +475,7 @@ subroutine read_gfs_ozone_for_regional
      hires=.true.
   else
      hires=.false.
-     if(.not. use_gfs_nemsio)then
+     if((.not. use_gfs_nemsio).and.(.not. use_gfs_ncio))then
         jcap_gfs=sighead%jcap
         nlat_gfs=sighead%latf+2
         nlon_gfs=sighead%lonf
@@ -399,7 +501,7 @@ subroutine read_gfs_ozone_for_regional
   deallocate(vector)
   jcap_gfs_test=jcap_gfs
   call general_init_spec_vars(sp_gfs,jcap_gfs,jcap_gfs_test,grd_gfs%nlat,grd_gfs%nlon)
-  if (hires .and. .not. use_gfs_nemsio) then
+  if (hires .and. .not. use_gfs_nemsio .and. .not. use_gfs_ncio) then
       call general_init_spec_vars(sp_b,jcap_org,jcap_org,nlat_gfs,nlon_b)
   end if
 
@@ -426,6 +528,9 @@ subroutine read_gfs_ozone_for_regional
   if(use_gfs_nemsio)then
      call general_read_gfsatm_nems(grd_gfst,sp_gfs,filename,uv_hyb_ens,.false.,.false., &
                               atm_bundle,.true.,iret)
+  else if (use_gfs_ncio) then
+     call general_read_gfsatm_nc(grd_gfst,sp_gfs,filename,uv_hyb_ens,.false.,.true., &
+                              atm_bundle,.true.,iret)
   else
      if (hires) then
         call general_read_gfsatm(grd_gfst,sp_gfs,sp_b,filename,uv_hyb_ens,.false.,.false., &
@@ -623,7 +728,7 @@ subroutine read_gfs_ozone_for_regional
      end do
   end if
   call general_destroy_spec_vars(sp_gfs)
-  if ( hires .and. .not. use_gfs_nemsio ) call general_destroy_spec_vars(sp_b)
+  if ( hires .and. .not. use_gfs_nemsio .and. .not. use_gfs_ncio) call general_destroy_spec_vars(sp_b)
   deallocate(xspli,yspli,xsplo,ysplo,glb_ozmin,glb_ozmax,reg_ozmin,reg_ozmax,&
              glb_ozmin0,glb_ozmax0,reg_ozmin0,reg_ozmax0)
 
diff --git a/src/ncdiag/CMakeLists.txt b/src/ncdiag/CMakeLists.txt
index 154a098ed9..a3166d7b06 100644
--- a/src/ncdiag/CMakeLists.txt
+++ b/src/ncdiag/CMakeLists.txt
@@ -17,8 +17,8 @@ if(BUILD_NCDIAG)
   add_library(ncdiag STATIC ${NCDIAG_SRC})
   add_executable(test_nc_unlimdims.x ${CMAKE_CURRENT_SOURCE_DIR}/test_nc_unlimdims.F90 )
   add_executable(nc_diag_cat.x ${CMAKE_CURRENT_SOURCE_DIR}/nc_diag_cat.F90 )
-  target_link_libraries(nc_diag_cat.x ncdiag ${NETCDF_LIBRARIES} ${HDF5_Fortran_HL_LIBRARIES} ${HDF5_LIBRARIES} ${ZLIB_LIBRARIES} ${MPI_Fortran_LIBRARIES})  
-  target_link_libraries(test_nc_unlimdims.x ncdiag ${NETCDF_LIBRARIES} ${HDF5_Fortran_HL_LIBRARIES} ${HDF5_LIBRARIES} ${ZLIB_LIBRARIES} ${MPI_Fortran_LIBRARIES})  
+  target_link_libraries(nc_diag_cat.x ncdiag ${NETCDF_LIBRARIES} ${HDF5_HL_LIBRARIES} ${HDF5_LIBRARIES} ${ZLIB_LIBRARIES} ${MPI_Fortran_LIBRARIES})  
+  target_link_libraries(test_nc_unlimdims.x ncdiag ${NETCDF_LIBRARIES} ${HDF5_HL_LIBRARIES} ${HDF5_LIBRARIES} ${ZLIB_LIBRARIES} ${MPI_Fortran_LIBRARIES})  
 # set_target_properties(test_nc_unlimdims.x PROPERTIES Fortran_MODULE_DIRECTORY ${NCDIAG_INCS} )
 # set_target_properties(nc_diag_cat.x PROPERTIES Fortran_MODULE_DIRECTORY ${NCDIAG_INCS} ${MPI_Fortran_INCLUDE_PATH})
  
diff --git a/src/ncdiag/serial/CMakeLists.txt b/src/ncdiag/serial/CMakeLists.txt
index 6f6de2348e..4cf5f386cc 100644
--- a/src/ncdiag/serial/CMakeLists.txt
+++ b/src/ncdiag/serial/CMakeLists.txt
@@ -22,7 +22,7 @@ if(BUILD_NCDIAG)
     add_executable(nc_diag_cat_serial.x ${CMAKE_CURRENT_SOURCE_DIR}/../nc_diag_cat.F90 )
     set_target_properties( nc_diag_cat_serial.x PROPERTIES COMPILE_FLAGS ${NCDIAG_Fortran_FLAGS} )
     set_target_properties( nc_diag_cat_serial.x PROPERTIES Fortran_MODULE_DIRECTORY ${NCDIAG_SERIAL_MODULE_DIR} )
-    target_link_libraries(nc_diag_cat_serial.x ncdiag_serial ${NETCDF_LIBRARIES} ${HDF5_Fortran_HL_LIBRARIES} ${HDF5_LIBRARIES} ${ZLIB_LIBRARIES} ${MPI_Fortran_LIBRARIES} )  
+    target_link_libraries(nc_diag_cat_serial.x ncdiag_serial ${NETCDF_LIBRARIES} ${HDF5_HL_LIBRARIES} ${HDF5_LIBRARIES} ${ZLIB_LIBRARIES} ${MPI_Fortran_LIBRARIES} )  
   endif(BUILD_NCDIAG_SERIAL)
   endif( NOT USE_BASELIBS )
 endif(BUILD_NCDIAG)
diff --git a/unit-tests/CMakeLists.txt b/unit-tests/CMakeLists.txt
index a778f19514..0c63251819 100644
--- a/unit-tests/CMakeLists.txt
+++ b/unit-tests/CMakeLists.txt
@@ -41,7 +41,7 @@ foreach(_test ${UNIT_TEST_LIST})
     ${PFUNIT_DIR}/lib/libpfunit.a 
     gsilib_global${debug_suffix} gsilib_shrd${debug_suffix} gsilib_global${debug_suffix} gsilib_shrd${debug_suffix} 
          gsilib_global${debug_suffix} ${FRAMEPACK} ${FRAMEMODULE}
-         ${NETCDF_LIBRARIES_F90} ${NETCDF_LIBRARIES} ${HDF5_Fortran_HL_LIBRARIES} ${MPI_Fortran_LIBRARIES}   
+         ${NETCDF_LIBRARIES_F90} ${NETCDF_LIBRARIES} ${HDF5_HL_LIBRARIES} ${MPI_Fortran_LIBRARIES}   
          ${LAPACK_LIBRARIES} -L./ ${EXTRA_LINKER_FLAGS} ${HDF5_LIBRARIES} ${CURL_LIBRARIES} ${CORE_LIBRARIES} 
          ${IOINT_LIB} ${WRFNETCDF_LIB} )
   target_include_directories( ${_test}.x PUBLIC ${PROJECT_BINARY_DIR}/generated/${_test})
diff --git a/ush/build_all_cmake.sh b/ush/build_all_cmake.sh
index ceaf91d9c7..3c72d81346 100755
--- a/ush/build_all_cmake.sh
+++ b/ush/build_all_cmake.sh
@@ -80,7 +80,7 @@ else
 fi
 
 if [ $build_type = PRODUCTION -o $build_type = DEBUG ] ; then
-  cmake -DBUILD_UTIL=ON -DBUILD_NCDIAG_SERIAL=ON -DCMAKE_BUILD_TYPE=$build_type -DBUILD_CORELIBS=OFF ..
+  cmake -DBUILD_UTIL=ON -DMPI3FLAG=-DMPI3 -DMPI3=ON -DBUILD_NCDIAG_SERIAL=ON -DCMAKE_BUILD_TYPE=$build_type -DBUILD_CORELIBS=OFF -DENKF_MODE=WRF ..
 else 
   cmake ..
 fi
diff --git a/util/AeroDA/calc_increment_ens.fd/CMakeLists.txt b/util/AeroDA/calc_increment_ens.fd/CMakeLists.txt
index 7a11c1fd16..9bf49916c4 100644
--- a/util/AeroDA/calc_increment_ens.fd/CMakeLists.txt
+++ b/util/AeroDA/calc_increment_ens.fd/CMakeLists.txt
@@ -10,5 +10,5 @@ if(BUILD_UTIL_COM)
   set_target_properties( calc_increment_ens_aero.x PROPERTIES Fortran_MODULE_DIRECTORY ${Util_MODULE_DIRECTORY} )
   SET( CMAKE_EXE_LINKER_FLAGS  "${CMAKE_EXE_LINKER_FLAGS} ${OpenMP_Fortran_FLAGS}" )
   include_directories( ${UTIL_INC} ${NEMSIOINC} ${NETCDF_INCLUDES} ${MPI_Fortran_INCLUDE_PATH} ) 
-  target_link_libraries( calc_increment_ens_aero.x ${NEMSIO_LIBRARY} ${BACIO_LIBRARY} ${W3NCO_4_LIBRARY} ${NETCDF_LIBRARIES_F90} ${NETCDF_LIBRARIES} ${MPI_Fortran_LIBRARIES} ${HDF5_Fortran_HL_LIBRARIES} ${HDF5_LIBRARIES} ${ZLIB_LIBRARIES} ${CURL_LIBRARIES} )
+  target_link_libraries( calc_increment_ens_aero.x ${NEMSIO_LIBRARY} ${BACIO_LIBRARY} ${W3NCO_4_LIBRARY} ${NETCDF_LIBRARIES_F90} ${NETCDF_LIBRARIES} ${MPI_Fortran_LIBRARIES} ${HDF5_HL_LIBRARIES} ${HDF5_LIBRARIES} ${ZLIB_LIBRARIES} ${CURL_LIBRARIES} )
 endif()
diff --git a/util/EnKF/arw/src/enspreproc_regional.fd/CMakeLists.txt b/util/EnKF/arw/src/enspreproc_regional.fd/CMakeLists.txt
index a994eb945e..65253a9fd1 100644
--- a/util/EnKF/arw/src/enspreproc_regional.fd/CMakeLists.txt
+++ b/util/EnKF/arw/src/enspreproc_regional.fd/CMakeLists.txt
@@ -7,7 +7,7 @@ cmake_minimum_required(VERSION 2.6)
   add_executable(enspreproc.x ${LOCAL_SRC} )
   set_target_properties( enspreproc.x PROPERTIES COMPILE_FLAGS ${GSI_Fortran_FLAGS_LOCAL} )
   target_link_libraries(enspreproc.x ${GSISHAREDLIB} ${GSILIB} ${GSISHAREDLIB} ${WRF_LIBRARIES} 
-         ${NETCDF_LIBRARIES_F90} ${NETCDF_LIBRARIES} ${HDF5_Fortran_HL_LIBRARIES} ${MPI_Fortran_LIBRARIES} 
+         ${NETCDF_LIBRARIES_F90} ${NETCDF_LIBRARIES} ${HDF5_HL_LIBRARIES} ${MPI_Fortran_LIBRARIES} 
          ${LAPACK_LIBRARIES} -L./ ${EXTRA_LINKER_FLAGS} ${HDF5_LIBRARIES} ${CURL_LIBRARIES} ${CORE_LIBRARIES} ${CORE_BUILT}
          ${GSI_LDFLAGS} ${NCDIAG_LIBRARIES} ${ZLIB_LIBRARIES} ${wrflib} ${FV3GFS_NCIO_LIBRARIES} )
   add_dependencies(enspreproc.x ${GSILIB})
diff --git a/util/EnKF/arw/src/initialens_regional.fd/CMakeLists.txt b/util/EnKF/arw/src/initialens_regional.fd/CMakeLists.txt
index f2064c73b5..7fc94ce680 100644
--- a/util/EnKF/arw/src/initialens_regional.fd/CMakeLists.txt
+++ b/util/EnKF/arw/src/initialens_regional.fd/CMakeLists.txt
@@ -6,7 +6,7 @@ cmake_minimum_required(VERSION 2.6)
   add_executable(initialens.x ${LOCAL_SRC} )
   set_target_properties( initialens.x PROPERTIES COMPILE_FLAGS ${GSI_Fortran_FLAGS} )
   target_link_libraries( initialens.x ${GSISHAREDLIB} ${GSILIB} ${GSISHAREDLIB} ${WRF_LIBRARIES} 
-         ${NETCDF_LIBRARIES_F90} ${NETCDF_LIBRARIES} ${HDF5_Fortran_HL_LIBRARIES} ${MPI_Fortran_LIBRARIES} 
+         ${NETCDF_LIBRARIES_F90} ${NETCDF_LIBRARIES} ${HDF5_HL_LIBRARIES} ${MPI_Fortran_LIBRARIES} 
          ${LAPACK_LIBRARIES} -L./ ${EXTRA_LINKER_FLAGS} ${HDF5_LIBRARIES} ${CURL_LIBRARIES} ${CORE_LIBRARIES} ${CORE_BUILT}
          ${GSI_LDFLAGS} ${NCDIAG_LIBRARIES} ${ZLIB_LIBRARIES} ${wrflib} )
   add_dependencies(initialens.x ${GSILIB})
diff --git a/util/EnKF/gfs/src/calc_increment_ens.fd/CMakeLists.txt b/util/EnKF/gfs/src/calc_increment_ens.fd/CMakeLists.txt
index 30e1925dc0..04b6d2ad07 100644
--- a/util/EnKF/gfs/src/calc_increment_ens.fd/CMakeLists.txt
+++ b/util/EnKF/gfs/src/calc_increment_ens.fd/CMakeLists.txt
@@ -10,5 +10,5 @@ if(BUILD_UTIL)
   set_target_properties( calc_increment_ens.x PROPERTIES Fortran_MODULE_DIRECTORY ${Util_MODULE_DIRECTORY} )
   SET( CMAKE_EXE_LINKER_FLAGS  "${CMAKE_EXE_LINKER_FLAGS} ${OpenMP_Fortran_FLAGS}" )
   include_directories( ${UTIL_INC} ${NEMSIOINC} ${NETCDF_INCLUDES} ${MPI_Fortran_INCLUDE_PATH} ) 
-  target_link_libraries( calc_increment_ens.x ${NEMSIO_LIBRARY} ${BACIO_LIBRARY} ${W3NCO_4_LIBRARY} ${NETCDF_LIBRARIES_F90} ${NETCDF_LIBRARIES} ${MPI_Fortran_LIBRARIES} ${HDF5_Fortran_HL_LIBRARIES} ${HDF5_LIBRARIES} ${ZLIB_LIBRARIES} ${CURL_LIBRARIES} )
+  target_link_libraries( calc_increment_ens.x ${NEMSIO_LIBRARY} ${BACIO_LIBRARY} ${W3NCO_4_LIBRARY} ${NETCDF_LIBRARIES_F90} ${NETCDF_LIBRARIES} ${MPI_Fortran_LIBRARIES} ${HDF5_HL_LIBRARIES} ${HDF5_LIBRARIES} ${ZLIB_LIBRARIES} ${CURL_LIBRARIES} )
 endif()
diff --git a/util/EnKF/gfs/src/calc_increment_ens_ncio.fd/CMakeLists.txt b/util/EnKF/gfs/src/calc_increment_ens_ncio.fd/CMakeLists.txt
index bc97cffb28..6956fff2e0 100644
--- a/util/EnKF/gfs/src/calc_increment_ens_ncio.fd/CMakeLists.txt
+++ b/util/EnKF/gfs/src/calc_increment_ens_ncio.fd/CMakeLists.txt
@@ -10,5 +10,5 @@ if(BUILD_UTIL)
   set_target_properties( calc_increment_ens_ncio.x PROPERTIES Fortran_MODULE_DIRECTORY ${Util_MODULE_DIRECTORY} )
   SET( CMAKE_EXE_LINKER_FLAGS  "${CMAKE_EXE_LINKER_FLAGS} ${OpenMP_Fortran_FLAGS}" )
   include_directories( ${UTIL_INC} ${NEMSIOINC} ${NETCDF_INCLUDES} ${MPI_Fortran_INCLUDE_PATH} ${FV3GFS_NCIO_INCS}) 
-  target_link_libraries( calc_increment_ens_ncio.x ${NEMSIO_LIBRARY} ${BACIO_LIBRARY} ${W3NCO_4_LIBRARY} ${NETCDF_LIBRARIES_F90} ${NETCDF_LIBRARIES} ${MPI_Fortran_LIBRARIES} ${HDF5_Fortran_HL_LIBRARIES} ${HDF5_LIBRARIES} ${ZLIB_LIBRARIES} ${CURL_LIBRARIES} ${FV3GFS_NCIO_LIBRARIES})
+  target_link_libraries( calc_increment_ens_ncio.x ${NEMSIO_LIBRARY} ${BACIO_LIBRARY} ${W3NCO_4_LIBRARY} ${NETCDF_LIBRARIES_F90} ${NETCDF_LIBRARIES} ${MPI_Fortran_LIBRARIES} ${HDF5_HL_LIBRARIES} ${HDF5_LIBRARIES} ${ZLIB_LIBRARIES} ${CURL_LIBRARIES} ${FV3GFS_NCIO_LIBRARIES})
 endif()
diff --git a/util/EnKF/gfs/src/calc_increment_ncio.fd/CMakeLists.txt b/util/EnKF/gfs/src/calc_increment_ncio.fd/CMakeLists.txt
index cd3928f602..407fe4d115 100644
--- a/util/EnKF/gfs/src/calc_increment_ncio.fd/CMakeLists.txt
+++ b/util/EnKF/gfs/src/calc_increment_ncio.fd/CMakeLists.txt
@@ -7,5 +7,5 @@ if(BUILD_UTIL)
   set_target_properties( calc_increment_ncio.x PROPERTIES COMPILE_FLAGS ${UTIL_Fortran_FLAGS} )
   SET( CMAKE_EXE_LINKER_FLAGS  "${CMAKE_EXE_LINKER_FLAGS} ${OpenMP_Fortran_FLAGS}" )
   include_directories( ${UTIL_INC} ${NEMSIOINC} ${NETCDF_INCLUDES} ${MPI_Fortran_INCLUDE_PATH} ${FV3GFS_NCIO_INCS}) 
-  target_link_libraries( calc_increment_ncio.x ${CORE_LIBRARIES} ${NETCDF_LIBRARIES_F90} ${NETCDF_LIBRARIES} ${HDF5_Fortran_HL_LIBRARIES} ${MPI_Fortran_LIBRARIES} ${HDF5_LIBRARIES} ${FV3GFS_NCIO_LIBRARIES} )
+  target_link_libraries( calc_increment_ncio.x ${CORE_LIBRARIES} ${NETCDF_LIBRARIES_F90} ${NETCDF_LIBRARIES} ${HDF5_HL_LIBRARIES} ${MPI_Fortran_LIBRARIES} ${HDF5_LIBRARIES} ${FV3GFS_NCIO_LIBRARIES} )
 endif()
diff --git a/util/EnKF/gfs/src/calc_increment_serial.fd/CMakeLists.txt b/util/EnKF/gfs/src/calc_increment_serial.fd/CMakeLists.txt
index d9c40e8a4d..4957f8050a 100644
--- a/util/EnKF/gfs/src/calc_increment_serial.fd/CMakeLists.txt
+++ b/util/EnKF/gfs/src/calc_increment_serial.fd/CMakeLists.txt
@@ -8,6 +8,6 @@ if(BUILD_UTIL)
   set_target_properties( calc_increment_serial.x PROPERTIES COMPILE_FLAGS ${UTIL_Fortran_FLAGS} )
   SET( CMAKE_EXE_LINKER_FLAGS  "${CMAKE_EXE_LINKER_FLAGS} ${OpenMP_Fortran_FLAGS}" )
   include_directories( ${UTIL_INC} ${CORE_INCS} ${NETCDF_INCLUDES} ) 
-  target_link_libraries( calc_increment_serial.x ${CORE_LIBRARIES} ${NETCDF_LIBRARIES_F90} ${NETCDF_LIBRARIES} ${MPI_Fortran_LIBRARIES} ${HDF5_Fortran_HL_LIBRARIES} ${HDF5_LIBRARIES} )
+  target_link_libraries( calc_increment_serial.x ${CORE_LIBRARIES} ${NETCDF_LIBRARIES_F90} ${NETCDF_LIBRARIES} ${MPI_Fortran_LIBRARIES} ${HDF5_HL_LIBRARIES} ${HDF5_LIBRARIES} )
   add_dependencies( calc_increment_serial.x enkfdeplib enkflib )
 endif()
diff --git a/util/EnKF/gfs/src/getsfcensmeanp.fd/CMakeLists.txt b/util/EnKF/gfs/src/getsfcensmeanp.fd/CMakeLists.txt
index df033c979a..1f20243bf9 100644
--- a/util/EnKF/gfs/src/getsfcensmeanp.fd/CMakeLists.txt
+++ b/util/EnKF/gfs/src/getsfcensmeanp.fd/CMakeLists.txt
@@ -6,5 +6,5 @@ if(BUILD_UTIL)
   set_target_properties(  getsfcensmeanp.x PROPERTIES COMPILE_FLAGS ${UTIL_Fortran_FLAGS} )
   SET( CMAKE_EXE_LINKER_FLAGS  "${CMAKE_EXE_LINKER_FLAGS} ${OpenMP_Fortran_FLAGS}" )
   include_directories( ${NEMSIOINC} ${SFCIOINC} ${NETCDF_INCLUDES}  ${FV3GFS_NCIO_INCS}) 
-  target_link_libraries( getsfcensmeanp.x ${BACIO_LIBRARY} ${NEMSIO_LIBRARY} ${BACIO_LIBRARY} ${SFCIO_LIBRARY} ${W3NCO_4_LIBRARY} ${MPI_Fortran_LIBRARIES} ${NETCDF_LIBRARIES_F90} ${NETCDF_LIBRARIES}  ${FV3GFS_NCIO_LIBRARIES} )
+  target_link_libraries( getsfcensmeanp.x ${FV3GFS_NCIO_LIBRARIES} ${BACIO_LIBRARY} ${NEMSIO_LIBRARY} ${BACIO_LIBRARY} ${SFCIO_LIBRARY} ${W3NCO_4_LIBRARY} ${MPI_Fortran_LIBRARIES} ${NETCDF_LIBRARIES_F90} ${NETCDF_LIBRARIES} ${HDF5_HL_LIBRARIES} ${HDF5_LIBRARIES})
 endif()
diff --git a/util/EnKF/gfs/src/getsigensmeanp_smooth.fd/CMakeLists.txt b/util/EnKF/gfs/src/getsigensmeanp_smooth.fd/CMakeLists.txt
index 0e41e9a848..ed6d9e1f16 100644
--- a/util/EnKF/gfs/src/getsigensmeanp_smooth.fd/CMakeLists.txt
+++ b/util/EnKF/gfs/src/getsigensmeanp_smooth.fd/CMakeLists.txt
@@ -8,5 +8,5 @@ if(BUILD_UTIL)
   set_target_properties( getsigensmeanp_smooth.x PROPERTIES COMPILE_FLAGS ${LOCAL_Fortran_FLAGS} )
   SET( CMAKE_EXE_LINKER_FLAGS  "${CMAKE_EXE_LINKER_FLAGS} ${OpenMP_Fortran_FLAGS}" )
   include_directories( ${NEMSIOINC} ${SIGIOINC} ${NETCDF_INCLUDES}  ${FV3GFS_NCIO_INCS}) 
-  target_link_libraries( getsigensmeanp_smooth.x ${BACIO_LIBRARY} ${NEMSIO_LIBRARY} ${BACIO_LIBRARY} ${SIGIO_LIBRARY} ${W3NCO_4_LIBRARY} ${SP_4_LIBRARY} ${MPI_Fortran_LIBRARIES} ${NETCDF_LIBRARIES_F90} ${NETCDF_LIBRARIES}  ${FV3GFS_NCIO_LIBRARIES} )
+  target_link_libraries( getsigensmeanp_smooth.x ${FV3GFS_NCIO_LIBRARIES} ${BACIO_LIBRARY} ${NEMSIO_LIBRARY} ${BACIO_LIBRARY} ${SIGIO_LIBRARY} ${W3NCO_4_LIBRARY} ${SP_4_LIBRARY} ${MPI_Fortran_LIBRARIES} ${NETCDF_LIBRARIES_F90} ${NETCDF_LIBRARIES} ${HDF5_HL_LIBRARIES} ${HDF5_LIBRARIES})
 endif()
diff --git a/util/EnKF/gfs/src/getsigensstatp.fd/CMakeLists.txt b/util/EnKF/gfs/src/getsigensstatp.fd/CMakeLists.txt
index c888c52710..ac155e0490 100644
--- a/util/EnKF/gfs/src/getsigensstatp.fd/CMakeLists.txt
+++ b/util/EnKF/gfs/src/getsigensstatp.fd/CMakeLists.txt
@@ -7,5 +7,5 @@ if(BUILD_UTIL)
   SET( CMAKE_EXE_LINKER_FLAGS  "${CMAKE_EXE_LINKER_FLAGS} ${OpenMP_Fortran_FLAGS}" )
   message(" hey, incl dirs are ${MPI_Fortran_INCLUDE_PATH} ")
   include_directories( ${NETCDF_INCLUDES} ${SIGIOINC} ${NEMSIOINC} ${MPI_Fortran_INCLUDE_PATH} ${FV3GFS_NCIO_INCS}) 
-  target_link_libraries( getsigensstatp.x ${SIGIO_LIBRARY} ${NEMSIO_LIBRARY} ${BACIO_LIBRARY} ${SP_4_LIBRARY} ${W3NCO_4_LIBRARY} ${NETCDF_LIBRARIES_F90} ${NETCDF_LIBRARIES} ${MPI_Fortran_LIBRARIES} ${HDF5_Fortran_HL_LIBRARIES} ${HDF5_LIBRARIES} ${ZLIB_LIBRARIES} ${CURL_LIBRARIES} ${FV3GFS_NCIO_LIBRARIES})
+  target_link_libraries( getsigensstatp.x ${SIGIO_LIBRARY} ${NEMSIO_LIBRARY} ${BACIO_LIBRARY} ${SP_4_LIBRARY} ${W3NCO_4_LIBRARY} ${NETCDF_LIBRARIES_F90} ${NETCDF_LIBRARIES} ${MPI_Fortran_LIBRARIES} ${HDF5_HL_LIBRARIES} ${HDF5_LIBRARIES} ${ZLIB_LIBRARIES} ${CURL_LIBRARIES} ${FV3GFS_NCIO_LIBRARIES})
 endif()
diff --git a/util/EnKF/gfs/src/recenterncio_hybgain.fd/CMakeLists.txt b/util/EnKF/gfs/src/recenterncio_hybgain.fd/CMakeLists.txt
index 22671e6ba1..c888f1e3ae 100644
--- a/util/EnKF/gfs/src/recenterncio_hybgain.fd/CMakeLists.txt
+++ b/util/EnKF/gfs/src/recenterncio_hybgain.fd/CMakeLists.txt
@@ -6,5 +6,5 @@ if(BUILD_UTIL)
   set_target_properties( recenterncio_hybgain.x PROPERTIES COMPILE_FLAGS ${UTIL_Fortran_FLAGS} )
   SET( CMAKE_EXE_LINKER_FLAGS  "${CMAKE_EXE_LINKER_FLAGS} ${OpenMP_Fortran_FLAGS}" )
   include_directories( ${NETCDF_INCLUDES}  ${FV3GFS_NCIO_INCS}) 
-  target_link_libraries( recenterncio_hybgain.x ${W3NCO_4_LIBRARY} ${MPI_Fortran_LIBRARIES} ${NETCDF_LIBRARIES_F90} ${NETCDF_LIBRARIES}  ${FV3GFS_NCIO_LIBRARIES} )
+  target_link_libraries( recenterncio_hybgain.x ${FV3GFS_NCIO_LIBRARIES} ${W3NCO_4_LIBRARY} ${MPI_Fortran_LIBRARIES} ${NETCDF_LIBRARIES_F90} ${NETCDF_LIBRARIES} ${HDF5_HL_LIBRARIES} ${HDF5_LIBRARIES})
 endif()
diff --git a/util/EnKF/gfs/src/recentersigp.fd/CMakeLists.txt b/util/EnKF/gfs/src/recentersigp.fd/CMakeLists.txt
index 7a9d49192d..5682685914 100644
--- a/util/EnKF/gfs/src/recentersigp.fd/CMakeLists.txt
+++ b/util/EnKF/gfs/src/recentersigp.fd/CMakeLists.txt
@@ -6,5 +6,5 @@ if(BUILD_UTIL)
   set_target_properties( recentersigp.x PROPERTIES COMPILE_FLAGS ${UTIL_Fortran_FLAGS} )
   SET( CMAKE_EXE_LINKER_FLAGS  "${CMAKE_EXE_LINKER_FLAGS} ${OpenMP_Fortran_FLAGS}" )
   include_directories( ${NEMSIOINC} ${SIGIOINC} ${NETCDF_INCLUDES}  ${FV3GFS_NCIO_INCS}) 
-  target_link_libraries( recentersigp.x ${SIGIO_LIBRARY} ${NEMSIO_LIBRARY} ${BACIO_LIBRARY} ${W3NCO_4_LIBRARY} ${MPI_Fortran_LIBRARIES} ${NETCDF_LIBRARIES_F90} ${NETCDF_LIBRARIES}  ${FV3GFS_NCIO_LIBRARIES} )
+  target_link_libraries( recentersigp.x ${FV3GFS_NCIO_LIBRARIES} ${SIGIO_LIBRARY} ${NEMSIO_LIBRARY} ${BACIO_LIBRARY} ${W3NCO_4_LIBRARY} ${MPI_Fortran_LIBRARIES} ${NETCDF_LIBRARIES_F90} ${NETCDF_LIBRARIES} ${HDF5_HL_LIBRARIES} ${HDF5_LIBRARIES})
 endif()
diff --git a/util/Ozone_Monitor/nwprod/oznmon_shared.v2.0.0/sorc/oznmon_horiz.fd/CMakeLists.txt b/util/Ozone_Monitor/nwprod/oznmon_shared.v2.0.0/sorc/oznmon_horiz.fd/CMakeLists.txt
index fd434a4da2..aa468e55ed 100644
--- a/util/Ozone_Monitor/nwprod/oznmon_shared.v2.0.0/sorc/oznmon_horiz.fd/CMakeLists.txt
+++ b/util/Ozone_Monitor/nwprod/oznmon_shared.v2.0.0/sorc/oznmon_horiz.fd/CMakeLists.txt
@@ -7,7 +7,7 @@ cmake_minimum_required(VERSION 2.6)
   set_target_properties( oznmon_horiz.x PROPERTIES COMPILE_FLAGS ${OZNMON_HORIZ_Fortran_FLAGS} )
   set_target_properties( oznmon_horiz.x PROPERTIES Fortran_MODULE_DIRECTORY ${Util_MODULE_DIR} )
   include_directories( ${CORE_INCS} ${NCDIAG_INCS} )
-  target_link_libraries( oznmon_horiz.x ${W3NCO_4_LIBRARY} ${NCDIAG_LIBRARIES} ${NETCDF_LIBRARIES_F90} ${NETCDF_LIBRARIES} ${HDF5_Fortran_HL_LIBRARIES} ${MPI_Fortran_LIBRARIES} ${HDF5_LIBRARIES} )
+  target_link_libraries( oznmon_horiz.x ${W3NCO_4_LIBRARY} ${NCDIAG_LIBRARIES} ${NETCDF_LIBRARIES_F90} ${NETCDF_LIBRARIES} ${HDF5_HL_LIBRARIES} ${MPI_Fortran_LIBRARIES} ${HDF5_LIBRARIES} )
   if(BUILD_W3NCO)
     add_dependencies( oznmon_horiz.x ${W3NCO_4_LIBRARY} )
   endif()
diff --git a/util/Ozone_Monitor/nwprod/oznmon_shared.v2.0.0/sorc/oznmon_time.fd/CMakeLists.txt b/util/Ozone_Monitor/nwprod/oznmon_shared.v2.0.0/sorc/oznmon_time.fd/CMakeLists.txt
index 5a6c15b41a..a9f9a575e1 100644
--- a/util/Ozone_Monitor/nwprod/oznmon_shared.v2.0.0/sorc/oznmon_time.fd/CMakeLists.txt
+++ b/util/Ozone_Monitor/nwprod/oznmon_shared.v2.0.0/sorc/oznmon_time.fd/CMakeLists.txt
@@ -7,7 +7,7 @@ cmake_minimum_required(VERSION 2.6)
   set_target_properties( oznmon_time.x PROPERTIES COMPILE_FLAGS ${OZNMON_TIME_Fortran_FLAGS} )
   set_target_properties( oznmon_time.x PROPERTIES Fortran_MODULE_DIRECTORY ${Util_MODULE_DIR} )
   include_directories( ${CORE_INCS} ${NCDIAG_INCS} ) 
-  target_link_libraries( oznmon_time.x ${W3NCO_4_LIBRARY} ${NCDIAG_LIBRARIES} ${NETCDF_LIBRARIES_F90} ${NETCDF_LIBRARIES} ${HDF5_Fortran_HL_LIBRARIES} ${MPI_Fortran_LIBRARIES} ${HDF5_LIBRARIES} )
+  target_link_libraries( oznmon_time.x ${W3NCO_4_LIBRARY} ${NCDIAG_LIBRARIES} ${NETCDF_LIBRARIES_F90} ${NETCDF_LIBRARIES} ${HDF5_HL_LIBRARIES} ${MPI_Fortran_LIBRARIES} ${HDF5_LIBRARIES} )
   if(BUILD_W3NCO)
     add_dependencies( oznmon_time.x ${W3NCO_4_LIBRARY} )
   endif()
diff --git a/util/Radiance_Monitor/image_gen/src/radmon_ig_horiz.fd/CMakeLists.txt b/util/Radiance_Monitor/image_gen/src/radmon_ig_horiz.fd/CMakeLists.txt
index 2efb30847b..a080c3e61b 100644
--- a/util/Radiance_Monitor/image_gen/src/radmon_ig_horiz.fd/CMakeLists.txt
+++ b/util/Radiance_Monitor/image_gen/src/radmon_ig_horiz.fd/CMakeLists.txt
@@ -7,7 +7,7 @@ cmake_minimum_required(VERSION 2.6)
   set_target_properties( radmon_ig_horiz.x PROPERTIES COMPILE_FLAGS ${RADMON_HORIZ_Fortran_FLAGS} )
   set_target_properties( radmon_ig_horiz.x PROPERTIES Fortran_MODULE_DIRECTORY ${Util_MODULE_DIR} )
   include_directories( ${CORE_INCS} ${NCDIAG_INCS} ) 
-  target_link_libraries( radmon_ig_horiz.x ${W3NCO_4_LIBRARY} ${NCDIAG_LIBRARIES} ${NETCDF_LIBRARIES_F90} ${NETCDF_LIBRARIES} ${HDF5_Fortran_HL_LIBRARIES} ${HDF5_LIBRARIES} ${MPI_Fortran_LIBRARIES})
+  target_link_libraries( radmon_ig_horiz.x ${W3NCO_4_LIBRARY} ${NCDIAG_LIBRARIES} ${NETCDF_LIBRARIES_F90} ${NETCDF_LIBRARIES} ${HDF5_HL_LIBRARIES} ${HDF5_LIBRARIES} ${MPI_Fortran_LIBRARIES})
   if(BUILD_W3NCO)
     add_dependencies( radmon_ig_horiz.x ${W3NCO_4_LIBRARY} )
   endif()
diff --git a/util/Radiance_Monitor/nwprod/radmon_shared.v3.0.0/sorc/verf_radang.fd/CMakeLists.txt b/util/Radiance_Monitor/nwprod/radmon_shared.v3.0.0/sorc/verf_radang.fd/CMakeLists.txt
index b60da32a7d..acb5d28cb2 100644
--- a/util/Radiance_Monitor/nwprod/radmon_shared.v3.0.0/sorc/verf_radang.fd/CMakeLists.txt
+++ b/util/Radiance_Monitor/nwprod/radmon_shared.v3.0.0/sorc/verf_radang.fd/CMakeLists.txt
@@ -7,7 +7,7 @@ cmake_minimum_required(VERSION 2.6)
   set_target_properties( radmon_angle.x PROPERTIES COMPILE_FLAGS ${RADMON_ANGLE_Fortran_FLAGS} )
   set_target_properties( radmon_angle.x PROPERTIES Fortran_MODULE_DIRECTORY ${Util_MODULE_DIR} )
   include_directories( ${CORE_INCS} ${NCDIAG_INCS} ) 
-  target_link_libraries( radmon_angle.x ${W3NCO_4_LIBRARY} ${NCDIAG_LIBRARIES} ${NETCDF_LIBRARIES_F90} ${NETCDF_LIBRARIES} ${HDF5_Fortran_HL_LIBRARIES} ${HDF5_LIBRARIES} ${MPI_Fortran_LIBRARIES} )
+  target_link_libraries( radmon_angle.x ${W3NCO_4_LIBRARY} ${NCDIAG_LIBRARIES} ${NETCDF_LIBRARIES_F90} ${NETCDF_LIBRARIES} ${HDF5_HL_LIBRARIES} ${HDF5_LIBRARIES} ${MPI_Fortran_LIBRARIES} )
   if(BUILD_W3NCO)
     add_dependencies( radmon_angle.x ${W3NCO_4_LIBRARY} )
   endif()
diff --git a/util/Radiance_Monitor/nwprod/radmon_shared.v3.0.0/sorc/verf_radbcoef.fd/CMakeLists.txt b/util/Radiance_Monitor/nwprod/radmon_shared.v3.0.0/sorc/verf_radbcoef.fd/CMakeLists.txt
index 4a94749272..b9837ce627 100644
--- a/util/Radiance_Monitor/nwprod/radmon_shared.v3.0.0/sorc/verf_radbcoef.fd/CMakeLists.txt
+++ b/util/Radiance_Monitor/nwprod/radmon_shared.v3.0.0/sorc/verf_radbcoef.fd/CMakeLists.txt
@@ -7,7 +7,7 @@ cmake_minimum_required(VERSION 2.6)
   set_target_properties( radmon_bcoef.x PROPERTIES COMPILE_FLAGS ${RADMON_BCOEF_Fortran_FLAGS} )
   set_target_properties( radmon_bcoef.x PROPERTIES Fortran_MODULE_DIRECTORY ${Util_MODULE_DIR} )
   include_directories( ${CORE_INCS} ${NCDIAG_INCS} ) 
-  target_link_libraries( radmon_bcoef.x ${W3NCO_4_LIBRARY} ${NCDIAG_LIBRARIES} ${NETCDF_LIBRARIES_F90} ${NETCDF_LIBRARIES} ${HDF5_Fortran_HL_LIBRARIES} ${HDF5_LIBRARIES} ${MPI_Fortran_LIBRARIES} )
+  target_link_libraries( radmon_bcoef.x ${W3NCO_4_LIBRARY} ${NCDIAG_LIBRARIES} ${NETCDF_LIBRARIES_F90} ${NETCDF_LIBRARIES} ${HDF5_HL_LIBRARIES} ${HDF5_LIBRARIES} ${MPI_Fortran_LIBRARIES} )
   if(BUILD_W3NCO)
     add_dependencies( radmon_bcoef.x ${W3NCO_4_LIBRARY} )
   endif()
diff --git a/util/Radiance_Monitor/nwprod/radmon_shared.v3.0.0/sorc/verf_radbcor.fd/CMakeLists.txt b/util/Radiance_Monitor/nwprod/radmon_shared.v3.0.0/sorc/verf_radbcor.fd/CMakeLists.txt
index 607d841e09..3bbd6bdb6a 100644
--- a/util/Radiance_Monitor/nwprod/radmon_shared.v3.0.0/sorc/verf_radbcor.fd/CMakeLists.txt
+++ b/util/Radiance_Monitor/nwprod/radmon_shared.v3.0.0/sorc/verf_radbcor.fd/CMakeLists.txt
@@ -7,7 +7,7 @@ cmake_minimum_required(VERSION 2.6)
   set_target_properties( radmon_bcor.x PROPERTIES COMPILE_FLAGS ${RADMON_BCOR_Fortran_FLAGS} )
   set_target_properties( radmon_bcor.x PROPERTIES Fortran_MODULE_DIRECTORY ${Util_MODULE_DIR} )
   include_directories( ${CORE_INCS} ${NCDIAG_INCS} )
-  target_link_libraries( radmon_bcor.x ${W3NCO_4_LIBRARY} ${NCDIAG_LIBRARIES} ${NETCDF_LIBRARIES_F90} ${NETCDF_LIBRARIES} ${HDF5_Fortran_HL_LIBRARIES} ${HDF5_LIBRARIES} ${MPI_Fortran_LIBRARIES} )
+  target_link_libraries( radmon_bcor.x ${W3NCO_4_LIBRARY} ${NCDIAG_LIBRARIES} ${NETCDF_LIBRARIES_F90} ${NETCDF_LIBRARIES} ${HDF5_HL_LIBRARIES} ${HDF5_LIBRARIES} ${MPI_Fortran_LIBRARIES} )
   if(BUILD_W3NCO)
     add_dependencies( radmon_bcor.x ${W3NCO_4_LIBRARY} )
   endif()
diff --git a/util/Radiance_Monitor/nwprod/radmon_shared.v3.0.0/sorc/verf_radtime.fd/CMakeLists.txt b/util/Radiance_Monitor/nwprod/radmon_shared.v3.0.0/sorc/verf_radtime.fd/CMakeLists.txt
index 8c59a6349b..15f885b2b2 100644
--- a/util/Radiance_Monitor/nwprod/radmon_shared.v3.0.0/sorc/verf_radtime.fd/CMakeLists.txt
+++ b/util/Radiance_Monitor/nwprod/radmon_shared.v3.0.0/sorc/verf_radtime.fd/CMakeLists.txt
@@ -7,7 +7,7 @@ cmake_minimum_required(VERSION 2.6)
   set_target_properties( radmon_time.x PROPERTIES COMPILE_FLAGS ${RADMON_TIME_Fortran_FLAGS} )
   set_target_properties( radmon_time.x PROPERTIES Fortran_MODULE_DIRECTORY ${Util_MODULE_DIR} )
   include_directories( ${CORE_INCS} ${NCDIAG_INCS} ) 
-  target_link_libraries( radmon_time.x ${W3NCO_4_LIBRARY} ${NCDIAG_LIBRARIES} ${NETCDF_LIBRARIES_F90} ${NETCDF_LIBRARIES} ${HDF5_Fortran_HL_LIBRARIES} ${HDF5_LIBRARIES} ${MPI_Fortran_LIBRARIES} ) 
+  target_link_libraries( radmon_time.x ${W3NCO_4_LIBRARY} ${NCDIAG_LIBRARIES} ${NETCDF_LIBRARIES_F90} ${NETCDF_LIBRARIES} ${HDF5_HL_LIBRARIES} ${HDF5_LIBRARIES} ${MPI_Fortran_LIBRARIES} ) 
   if(BUILD_W3NCO)
     add_dependencies( radmon_time.x ${W3NCO_4_LIBRARY} )
   endif()
diff --git a/util/netcdf_io/calc_analysis.fd/CMakeLists.txt b/util/netcdf_io/calc_analysis.fd/CMakeLists.txt
index 06927e8e7c..5476502fb2 100644
--- a/util/netcdf_io/calc_analysis.fd/CMakeLists.txt
+++ b/util/netcdf_io/calc_analysis.fd/CMakeLists.txt
@@ -9,5 +9,5 @@ if(BUILD_NCIO_UTIL)
   set_target_properties( calc_analysis.x PROPERTIES Fortran_MODULE_DIRECTORY ${Util_MODULE_DIRECTORY} )
   SET( CMAKE_EXE_LINKER_FLAGS  "${CMAKE_EXE_LINKER_FLAGS} ${OpenMP_Fortran_FLAGS}" )
   include_directories( ${UTIL_INC} ${NEMSIOINC} ${NETCDF_INCLUDES} ${MPI_Fortran_INCLUDE_PATH} ${FV3GFS_NCIO_INCS}) 
-  target_link_libraries( calc_analysis.x ${NEMSIO_LIBRARY} ${BACIO_LIBRARY} ${W3NCO_4_LIBRARY} ${NETCDF_LIBRARIES_F90} ${NETCDF_LIBRARIES} ${MPI_Fortran_LIBRARIES} ${HDF5_Fortran_HL_LIBRARIES} ${HDF5_LIBRARIES} ${ZLIB_LIBRARIES} ${CURL_LIBRARIES} ${FV3GFS_NCIO_LIBRARIES})
+  target_link_libraries( calc_analysis.x ${FV3GFS_NCIO_LIBRARIES} ${NEMSIO_LIBRARY} ${BACIO_LIBRARY} ${W3NCO_4_LIBRARY} ${NETCDF_LIBRARIES} ${MPI_Fortran_LIBRARIES} ${HDF5_HL_LIBRARIES} ${HDF5_LIBRARIES} ${ZLIB_LIBRARIES} ${CURL_LIBRARIES})
 endif()
diff --git a/util/netcdf_io/interp_inc.fd/CMakeLists.txt b/util/netcdf_io/interp_inc.fd/CMakeLists.txt
index 98abb9c90c..ff5aa938bc 100644
--- a/util/netcdf_io/interp_inc.fd/CMakeLists.txt
+++ b/util/netcdf_io/interp_inc.fd/CMakeLists.txt
@@ -9,5 +9,5 @@ if(BUILD_NCIO_UTIL)
   set_target_properties( interp_inc.x PROPERTIES Fortran_MODULE_DIRECTORY ${Util_MODULE_DIRECTORY} )
   SET( CMAKE_EXE_LINKER_FLAGS  "${CMAKE_EXE_LINKER_FLAGS} ${OpenMP_Fortran_FLAGS}" )
   include_directories( ${UTIL_INC} ${NETCDF_INCLUDES} ${MPI_Fortran_INCLUDE_PATH}) 
-  target_link_libraries( interp_inc.x ${W3NCO_4_LIBRARY} ${NETCDF_LIBRARIES_F90} ${NETCDF_LIBRARIES} ${MPI_Fortran_LIBRARIES} ${HDF5_Fortran_HL_LIBRARIES} ${HDF5_LIBRARIES} ${ZLIB_LIBRARIES} ${CURL_LIBRARIES} ${IP_LIBRARY} ${SP_LIBRARY})
+  target_link_libraries( interp_inc.x ${W3NCO_4_LIBRARY} ${NETCDF_LIBRARIES_F90} ${NETCDF_LIBRARIES} ${MPI_Fortran_LIBRARIES} ${HDF5_HL_LIBRARIES} ${HDF5_LIBRARIES} ${ZLIB_LIBRARIES} ${CURL_LIBRARIES} ${IP_LIBRARY} ${SP_LIBRARY})
 endif()