Vlab issue #65376: DA changes for GFSv16. Fixes #65376.

Change-Id: Id7ea8df4b8f5b2b7961456c5c961c1ad712385a6

CMakeLists.txt

@@ -66,10 +66,11 @@ project(GSI)
   option(BUILD_ENKF_PREPROCESS_ARW "Build enkf preprocess for ARW " OFF)
   option(BUILD_COV_CALC "Build the Desroziers utility" OFF)
   option(BUILD_NCDIAG "Build the NCDIAG libraries" ON)
+  option(BUILD_FV3GFS_NCIO "Build the FV3GFS_NCIO library" ON)
+  option(BUILD_NCIO_UTIL "Build the NCIO Utilities" ON)
   option(BUILD_NCDIAG_SERIAL "Build the serial NCDIAG libraries" ON)
   option(BUILD_REG_TESTING "Build the Regression Testing Suite" ON)
   option(BUILD_UNIT_TESTING "Build the Unit Testing Suite" OFF)
-  option(MPI3 "Build EnKF with MPI3" OFF)
   option(BUILD_GSDCLOUD_ARW "Build the GSD cloud analysis " OFF)
   cmake_minimum_required(VERSION 2.8)
   set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/Modules/")
@@ -95,6 +96,7 @@ project(GSI)
   include(${CMAKE_SOURCE_DIR}/cmake/Modules/platforms/Jet.cmake)
   include(${CMAKE_SOURCE_DIR}/cmake/Modules/platforms/S4.cmake)
   include(${CMAKE_SOURCE_DIR}/cmake/Modules/platforms/Hera.cmake)
+  include(${CMAKE_SOURCE_DIR}/cmake/Modules/platforms/Orion.cmake)
   include(${CMAKE_SOURCE_DIR}/cmake/Modules/platforms/WCOSS-C.cmake)
   include(${CMAKE_SOURCE_DIR}/cmake/Modules/platforms/WCOSS-D.cmake)
   include(${CMAKE_SOURCE_DIR}/cmake/Modules/platforms/WCOSS.cmake)
@@ -103,12 +105,6 @@ project(GSI)
     find_package(GSICONTROL)
     include( CTest )
   endif(BUILD_REG_TESTING)
-  if(MPI3)
-    set( MPI3FLAG "-DMPI3" CACHE INTERNAL "" )
-  else()
-    set( MPI3FLAG "" CACHE INTERNAL "" )
-  endif()
-
 
   cmake_policy(SET CMP0009 NEW)
   find_package(OpenMP)
@@ -231,12 +227,21 @@ project(GSI)
   find_package( SFCIO )
   find_package( W3EMC )
   find_package( W3NCO )
+  find_package( IP )
 
   if(BUILD_NCDIAG)
     set(NCDIAG_INCS "${PROJECT_BINARY_DIR}/libsrc/ncdiag/include")
     add_subdirectory(src/ncdiag)
     set(NCDIAG_LIBRARIES ncdiag )
   endif(BUILD_NCDIAG)
+  if(BUILD_FV3GFS_NCIO)
+    set(FV3GFS_NCIO_INCS "${PROJECT_BINARY_DIR}/libsrc/fv3gfs_ncio/include")
+    add_subdirectory(src/fv3gfs_ncio)
+    set(FV3GFS_NCIO_LIBRARIES fv3gfs_ncio )
+  endif(BUILD_FV3GFS_NCIO)
+  if(BUILD_NCIO_UTIL)
+    add_subdirectory(util/netcdf_io)
+  endif(BUILD_NCIO_UTIL)
 
   find_package( BACIO )
   find_package( BUFR )
@@ -247,6 +252,7 @@ project(GSI)
   find_package( SFCIO )
   find_package( W3EMC )
   find_package( W3NCO )
+  find_package( IP )
 
   if(BUILD_GSDCLOUD_ARW)
     set(GSDCLOUD_DIR "${CMAKE_SOURCE_DIR}/libsrc/GSD/gsdcloud")
@@ -300,7 +306,7 @@ project(GSI)
     endif(USE_BASELINE)
     if(USE_WRF)
       file(WRITE "${PROJECT_BINARY_DIR}/regression_var.out" "${CMAKE_SOURCE_DIR}/regression/regression_var.sh ${host} ${CMAKE_SOURCE_DIR}/.. ${PROJECT_BINARY_DIR} ${CMAKE_SOURCE_DIR} ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${GSIEXEC} ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${ENKFEXEC} ${GSICONTROL} ${ENKFCONTROL} ${BASELINE_FLAG} ")
-      set( REG_TEST_NAMES "global_T62;global_T62_ozonly;global_4dvar_T62;global_4denvar_T126;global_fv3_4denvar_T126;global_lanczos_T62;arw_netcdf;
+      set( REG_TEST_NAMES "global_T62;global_T62_ozonly;global_4dvar_T62;global_4denvar_T126;global_fv3_4denvar_T126;;global_fv3_4denvar_C192;global_lanczos_T62;arw_netcdf;
           arw_binary;nmm_binary;nmm_netcdf;nmmb_nems_4denvar;hwrf_nmm_d2;hwrf_nmm_d3;rtma;global_enkf_T62;netcdf_fv3_regional;global_C96_fv3aero")
     else()
       file(WRITE "${PROJECT_BINARY_DIR}/regression_var.out" "${CMAKE_SOURCE_DIR}/regression/regression_var.sh ${host} ${CMAKE_SOURCE_DIR}/.. ${PROJECT_BINARY_DIR} ${CMAKE_SOURCE_DIR} ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${GSIEXEC} ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${ENKFEXEC} ${GSICONTROL} ${ENKFCONTROL} ${BASELINE_FLAG} ")

cmake/Modules/FindHDF5.cmake

@@ -12,7 +12,6 @@ endif()
 #endif()
 
 if(HDF5_FOUND AND (HDF5_IS_PARALLEL OR HDF5_ENABLE_PARALLEL))
-  include(vtkMPI)
   if(MPI_C_INCLUDE_PATH)
     list(APPEND HDF5_INCLUDE_DIRS ${MPI_C_INCLUDE_PATH})
   endif()

cmake/Modules/FindIP.cmake

@@ -0,0 +1,83 @@
+# This module defines
+#  CORE_INCS
+#    List of include file paths for all required modules for GSI
+#  CORE_LIBRARIES
+#    Full list of libraries required to link GSI executable
+include(findHelpers)
+if(DEFINED ENV{IP_VER})
+  set(IP_VER $ENV{IP_VER})
+  STRING(REGEX REPLACE "v" "" IP_VER ${IP_VER})
+endif()
+
+set( NO_DEFAULT_PATH )
+if(NOT BUILD_IP )
+  if(DEFINED ENV{IP_LIBd} )
+    set(IP_LIBRARY $ENV{IP_LIBd} )
+    message("IP library ${IP_LIBRARY} set via Environment variable")
+  else()
+    find_library( IP_LIBRARY 
+    NAMES libip_d.a libip_i4r8.a libip_v${IP_VER}_d.a
+    HINTS 
+      $ENV{COREPATH}/lib 
+      /usr/local/jcsda/nwprod_gdas_2014/lib	
+      ${COREPATH}/ip/v${IP_VER}
+      ${COREPATH}/ip/v${IP_VER}/intel
+      ${COREPATH}/ip/v${IP_VER}/ips/${COMPILER_VERSION}
+    PATH_SUFFIXES
+        lib
+     ${NO_DEFAULT_PATH})
+    set( ip "ip_v${IP_VER}_d")
+    message("Found IP library ${IP_LIBRARY}")
+  endif()
+  if(DEFINED ENV{IP_LIB4} )
+    set(IP_4_LIBRARY $ENV{IP_LIB4} )
+    message("IP 4 library ${IP_4_LIBRARY} set via Environment variable")
+  else()
+    find_library( IP_4_LIBRARY
+    NAMES libip_4.a libip_i4r4.a libip_v${IP_VER}_4.a
+    HINTS 
+      $ENV{COREPATH}/lib 
+      /usr/local/jcsda/nwprod_gdas_2014/lib	
+      ${COREPATH}/ip/v${IP_VER}
+      ${COREPATH}/ip/v${IP_VER}/intel
+      ${COREPATH}/ip/v${IP_VER}/ips/${COMPILER_VERSION}
+    PATH_SUFFIXES
+        lib
+     ${NO_DEFAULT_PATH})
+    set( ip "ip_v${IP_VER}_4")
+    message("Found IP_4 library ${IP_4_LIBRARY}")
+  endif()
+endif()
+if( NOT IP_LIBRARY ) # didn't find the library, so build it from source
+    message("Could not find IP library, so building from libsrc")
+    if( NOT DEFINED ENV{IP_SRC} )
+        findSrc( "ip" IP_VER IP_DIR )
+    else()
+      set( IP_DIR "$ENV{IP_SRC}/libsrc" CACHE STRING "IP Source Location")
+    endif()
+    set( libsuffix "_v${IP_VER}${debug_suffix}" )
+    set( IP_LIBRARY "${LIBRARY_OUTPUT_PATH}/libip${libsuffix}.a" CACHE STRING "IP Library" )
+    set( IP_4_LIBRARY "${LIBRARY_OUTPUT_PATH}/libip_4${libsuffix}.a" CACHE STRING "IP_4 Library" )
+    set( ip "ip${libsuffix}")
+    set( ip4 "ip_4${libsuffix}")
+    set( BUILD_IP "ON" CACHE INTERNAL "Build the IP library")
+    add_subdirectory(${CMAKE_SOURCE_DIR}/libsrc/ip)
+    set( IP_LIBRARY ${ip} )
+    set( IP_4_LIBRARY ${ip4} )
+    if( CORE_BUILT )
+      list( APPEND CORE_BUILT ${IP_LIBRARY} )
+    else()
+      set( CORE_BUILT ${IP_LIBRARY} )
+    endif()
+else( NOT IP_LIBRARY )
+  if( CORE_LIBRARIES )
+    list( APPEND CORE_LIBRARIES ${IP_LIBRARY} )
+  else()
+    set( CORE_LIBRARIES ${IP_LIBRARY} )
+  endif()
+endif( NOT IP_LIBRARY )
+
+
+set( IP_LIBRARY_PATH ${IP_LIBRARY} CACHE STRING "IP Library Location" )
+set( IP_4_LIBRARY_PATH ${IP_4_LIBRARY} CACHE STRING "IP_4 Library Location" )
+

cmake/Modules/platforms/Cheyenne.cmake

@@ -6,7 +6,7 @@ macro (setCheyenne)
   set(HOST_FLAG "-xHOST" CACHE INTERNAL "Host Flag")
   set(MKL_FLAG "-mkl"  CACHE INTERNAL "MKL Flag")
   set(GSI_Intel_Platform_FLAGS "-DPOUND_FOR_STRINGIFY -O3 -fp-model source -assume byterecl -convert big_endian -g -traceback -D_REAL8_ ${OpenMP_Fortran_FLAGS} ${MPI_Fortran_COMPILE_FLAGS}" CACHE INTERNAL "GSI Fortran Flags")
-  set(ENKF_Platform_FLAGS "-O3 ${HOST_FLAG} -warn all -implicitnone -traceback -fp-model strict -convert big_endian -DGFS -D_REAL8_ ${MPI3FLAG} ${OpenMP_Fortran_FLAGS}" CACHE INTERNAL "ENKF Fortran Flags")
+  set(ENKF_Platform_FLAGS "-O3 ${HOST_FLAG} -warn all -implicitnone -traceback -fp-model strict -convert big_endian -DGFS -D_REAL8_  ${OpenMP_Fortran_FLAGS}" CACHE INTERNAL "ENKF Fortran Flags")
 
   set(BUILD_CORELIBS "ON" )
   set(BUILD_UTIL "OFF" CACHE INTERNAL "" )

cmake/Modules/platforms/Discover.cmake

@@ -7,7 +7,7 @@ macro (setDiscover)
   set(HOST_FLAG "-xHOST" CACHE INTERNAL "Host Flag")
   set(MKL_FLAG "-mkl"  CACHE INTERNAL "MKL Flag")
   set(GSI_Intel_Platform_FLAGS "-DPOUND_FOR_STRINGIFY -O3 -fp-model source -assume byterecl -convert big_endian -g -traceback -D_REAL8_ ${OpenMP_Fortran_FLAGS} ${MPI_Fortran_COMPILE_FLAGS}" CACHE INTERNAL "GSI Fortran Flags")
-  set(ENKF_Platform_FLAGS "-O3 ${HOST_FLAG} -warn all -implicitnone -traceback -fp-model strict -convert big_endian -DGFS -D_REAL8_ ${MPI3FLAG} ${OpenMP_Fortran_FLAGS}" CACHE INTERNAL "ENKF Fortran Flags")
+  set(ENKF_Platform_FLAGS "-O3 ${HOST_FLAG} -warn all -implicitnone -traceback -fp-model strict -convert big_endian -DGFS -D_REAL8_  ${OpenMP_Fortran_FLAGS}" CACHE INTERNAL "ENKF Fortran Flags")
   set(host "Discover" CACHE INTERNAL "")
 
   set(COREPATH $ENV{COREPATH}  )

cmake/Modules/platforms/Gaea.cmake

@@ -8,7 +8,7 @@ macro (setGaea)
   set(HOST_FLAG "-xCORE-AVX2" CACHE INTERNAL "Host Flag") # for Haswell (C4)
   set(MKL_FLAG "-mkl" CACHE INTERNAL "MKL Flag" )
   set(GSI_Intel_Platform_FLAGS "-DPOUND_FOR_STRINGIFY -fp-model strict -assume byterecl -convert big_endian -implicitnone -D_REAL8_ -traceback ${HOST_FLAG} ${MKL_FLAG} ${OpenMP_Fortran_FLAGS} ${MPI_Fortran_COMPILE_FLAGS} -O3" CACHE INTERNAL "")
-  set(ENKF_Platform_FLAGS "-O3 -fp-model strict -convert big_endian -assume byterecl -implicitnone  -DGFS -D_REAL8_ -traceback ${HOST_FLAG} ${MKL_FLAG} ${MPI3FLAG} ${OpenMP_Fortran_FLAGS} " CACHE INTERNAL "")
+  set(ENKF_Platform_FLAGS "-O3 -fp-model strict -convert big_endian -assume byterecl -implicitnone  -DGFS -D_REAL8_ -traceback ${HOST_FLAG} ${MKL_FLAG}  ${OpenMP_Fortran_FLAGS} " CACHE INTERNAL "")
   set(GSI_LDFLAGS "${MKL_FLAG} ${OpenMP_Fortran_FLAGS}" CACHE INTERNAL "")
   set(BUILD_CORELIBS "OFF" )
 endmacro()

cmake/Modules/platforms/Generic.cmake

@@ -9,6 +9,6 @@ macro (setGeneric)
   endif()
   set(MKL_FLAG "-mkl"  CACHE INTERNAL "MKL Flag")
   set(GSI_Intel_Platform_FLAGS "-DPOUND_FOR_STRINGIFY -O3 -fp-model source -assume byterecl -convert big_endian -g -traceback -D_REAL8_ ${OpenMP_Fortran_FLAGS} ${MPI_Fortran_COMPILE_FLAGS}" CACHE INTERNAL "GSI Fortran Flags")
-  set(ENKF_Platform_FLAGS "-O3 ${HOST_FLAG} -warn all -implicitnone -traceback -fp-model strict -convert big_endian -DGFS -D_REAL8_ ${MPI3FLAG} ${OpenMP_Fortran_FLAGS}" CACHE INTERNAL "ENKF Fortran Flags")
+  set(ENKF_Platform_FLAGS "-O3 ${HOST_FLAG} -warn all -implicitnone -traceback -fp-model strict -convert big_endian -DGFS -D_REAL8_  ${OpenMP_Fortran_FLAGS}" CACHE INTERNAL "ENKF Fortran Flags")
 
 endmacro()

cmake/Modules/platforms/Hera.cmake

@@ -1,12 +1,12 @@
 macro (setHERA)
   message("Setting paths for HERA")
-  option(FIND_HDF5 "Try to Find HDF5 libraries" OFF)
+  option(FIND_HDF5 "Try to Find HDF5 libraries" ON)
   option(FIND_HDF5_HL "Try to Find HDF5 libraries" OFF)
   set(HOST_FLAG "-xHOST" CACHE INTERNAL "Host Flag")
   set(MKL_FLAG "-mkl"  CACHE INTERNAL "MKL Flag")
   set(GSI_Intel_Platform_FLAGS "-DPOUND_FOR_STRINGIFY -O3 -fp-model source -assume byterecl -convert big_endian -g -traceback -D_REAL8_ ${OpenMP_Fortran_FLAGS} ${MPI_Fortran_COMPILE_FLAGS}" CACHE INTERNAL "GSI Fortran Flags")
-  set(ENKF_Platform_FLAGS "-O3 ${HOST_FLAG} -warn all -implicitnone -traceback -fp-model strict -convert big_endian -DGFS -D_REAL8_ ${MPI3FLAG} ${OpenMP_Fortran_FLAGS}" CACHE INTERNAL "ENKF Fortran Flags")
-  set(HDF5_USE_STATIC_LIBRARIES "OFF")
+  set(ENKF_Platform_FLAGS "-O3 ${HOST_FLAG} -warn all -implicitnone -traceback -fp-model strict -convert big_endian -DGFS -D_REAL8_  ${OpenMP_Fortran_FLAGS}" CACHE INTERNAL "ENKF Fortran Flags")
+  set(HDF5_USE_STATIC_LIBRARIES "ON")
 
   if( NOT DEFINED ENV{NETCDF_VER} )
     set(NETCDF_VER "3.6.3" )

cmake/Modules/platforms/Jet.cmake

@@ -5,6 +5,6 @@ macro (setJet)
   set(HOST_FLAG "-axSSE4.2,AVX,CORE-AVX2" CACHE INTERNAL "Host Flag")
   set(MKL_FLAG "-mkl"  CACHE INTERNAL "MKL Flag")
   set(GSI_Intel_Platform_FLAGS "${HOST_FLAG} -DPOUND_FOR_STRINGIFY -O3 -fp-model source -assume byterecl -convert big_endian -g -traceback -D_REAL8_ ${OpenMP_Fortran_FLAGS} ${MPI_Fortran_COMPILE_FLAGS}" CACHE INTERNAL "GSI Fortran Flags")
-  set(ENKF_Platform_FLAGS "-O3 ${HOST_FLAG} -warn all -implicitnone -traceback -fp-model strict -convert big_endian -DGFS -D_REAL8_ ${MPI3FLAG} ${OpenMP_Fortran_FLAGS}" CACHE INTERNAL "ENKF Fortran Flags")
+  set(ENKF_Platform_FLAGS "-O3 ${HOST_FLAG} -warn all -implicitnone -traceback -fp-model strict -convert big_endian -DGFS -D_REAL8_  ${OpenMP_Fortran_FLAGS}" CACHE INTERNAL "ENKF Fortran Flags")
 endmacro()
 

cmake/Modules/platforms/Orion.cmake

@@ -0,0 +1,42 @@
+macro (setOrion)
+  message("Setting paths for Orion")
+  option(FIND_HDF5 "Try to Find HDF5 libraries" ON)
+  option(FIND_HDF5_HL "Try to Find HDF5 libraries" OFF)
+  set(HOST_FLAG "-xHOST" CACHE INTERNAL "Host Flag")
+  set(MKL_FLAG "-mkl"  CACHE INTERNAL "MKL Flag")
+  set(GSI_Intel_Platform_FLAGS "-DPOUND_FOR_STRINGIFY -O3 -fp-model source -assume byterecl -convert big_endian -g -traceback -D_REAL8_ ${OpenMP_Fortran_FLAGS} ${MPI_Fortran_COMPILE_FLAGS}" CACHE INTERNAL "GSI Fortran Flags")
+  set(ENKF_Platform_FLAGS "-O3 ${HOST_FLAG} -warn all -implicitnone -traceback -fp-model strict -convert big_endian -DGFS -D_REAL8_  ${OpenMP_Fortran_FLAGS}" CACHE INTERNAL "ENKF Fortran Flags")
+  set(HDF5_USE_STATIC_LIBRARIES "ON")
+
+  if( NOT DEFINED ENV{NETCDF_VER} )
+    set(NETCDF_VER "3.6.3" )
+  endif()
+  if( NOT DEFINED ENV{BACIO_VER} )
+    set(BACIO_VER "2.0.1" )
+  endif()
+  if( NOT DEFINED ENV{BUFR_VER} )
+    set(BUFR_VER "10.2.5" )
+  endif()
+  if( NOT DEFINED ENV{CRTM_VER} )
+    set(CRTM_VER "2.2.3" )
+  endif()
+  if( NOT DEFINED ENV{NEMSIO_VER} )
+    set(NEMSIO_VER "2.2.1" )
+  endif()
+  if( NOT DEFINED ENV{SFCIO_VER} )
+    set(SFCIO_VER "1.0.0" )
+  endif()
+  if( NOT DEFINED ENV{SIGIO_VER} )
+    set(SIGIO_VER "2.0.1" )
+  endif()
+  if( NOT DEFINED ENV{SP_VER} )
+    set(SP_VER "2.0.2" )
+  endif()
+  if( NOT DEFINED ENV{W3EMC_VER} )
+    set(W3EMC_VER "2.0.5" )
+  endif()
+  if( NOT DEFINED ENV{W3NCO_VER} )
+    set(W3NCO_VER "2.0.6" )
+  endif()
+endmacro()
+

cmake/Modules/platforms/S4.cmake

@@ -5,6 +5,6 @@ macro (setS4)
   set(HOST_FLAG "-xHOST" CACHE INTERNAL "Host Flag")
   set(MKL_FLAG "-mkl"  CACHE INTERNAL "MKL Flag")
   set(GSI_Intel_Platform_FLAGS "-DPOUND_FOR_STRINGIFY -O3 -fp-model source -assume byterecl -convert big_endian -g -traceback -D_REAL8_ ${OpenMP_Fortran_FLAGS} ${MPI_Fortran_COMPILE_FLAGS}" CACHE INTERNAL "GSI Fortran Flags")
-  set(ENKF_Platform_FLAGS "-O3 ${HOST_FLAG} -warn all -implicitnone -traceback -fp-model strict -convert big_endian -DGFS -D_REAL8_ ${MPI3FLAG} ${OpenMP_Fortran_FLAGS}" CACHE INTERNAL "ENKF Fortran Flags")
+  set(ENKF_Platform_FLAGS "-O3 ${HOST_FLAG} -warn all -implicitnone -traceback -fp-model strict -convert big_endian -DGFS -D_REAL8_  ${OpenMP_Fortran_FLAGS}" CACHE INTERNAL "ENKF Fortran Flags")
   set(HDF5_USE_STATIC_LIBRARIES "OFF")
 endmacro()

cmake/Modules/platforms/WCOSS-D.cmake

@@ -1,13 +1,13 @@
 macro (setWCOSS_D)
   message("Setting paths for Dell")
-  option(FIND_HDF5 "Try to Find HDF5 libraries" OFF)
+  option(FIND_HDF5 "Try to Find HDF5 libraries" ON)
   option(FIND_HDF5_HL "Try to Find HDF5 libraries" OFF)
 
   set(HOST_FLAG "-xHOST" CACHE INTERNAL "Host Flag")
   set(MKL_FLAG "-mkl"  CACHE INTERNAL "MKL Flag")
   set(GSI_Intel_Platform_FLAGS "-DPOUND_FOR_STRINGIFY -fp-model strict -assume byterecl -convert big_endian -implicitnone -D_REAL8_ ${OpenMP_Fortran_FLAGS} ${MPI_Fortran_COMPILE_FLAGS} -O3" CACHE INTERNAL "GSI Fortran Flags")
   set(GSI_LDFLAGS "${OpenMP_Fortran_FLAGS} ${MKL_FLAG}" CACHE INTERNAL "")
-  set(ENKF_Platform_FLAGS "-O3 -fp-model strict -convert big_endian -assume byterecl -implicitnone  -DGFS -D_REAL8_ ${MPI3FLAG} ${OpenMP_Fortran_FLAGS} " CACHE INTERNAL "ENKF Fortran Flags")
+  set(ENKF_Platform_FLAGS "-O3 -fp-model strict -convert big_endian -assume byterecl -implicitnone  -DGFS -D_REAL8_  ${OpenMP_Fortran_FLAGS} " CACHE INTERNAL "ENKF Fortran Flags")
 
   set(HDF5_USE_STATIC_LIBRARIES "ON" CACHE INTERNAL "" )
   if( NOT DEFINED ENV{COREPATH} )
@@ -25,7 +25,7 @@ macro (setWCOSS_D)
     set(BACIO_VER "2.0.2" )
   endif()
   if( NOT DEFINED ENV{BUFR_VER} )
-    set(BUFR_VER "11.2.0" )
+    set(BUFR_VER "11.3.0" )
   endif()
   if( NOT DEFINED ENV{CRTM_VER} )
     set(CRTM_VER "2.2.5" )

cmake/Modules/setHOST.cmake

@@ -4,6 +4,7 @@ macro( setHOST )
   string(REGEX MATCH "s4-" HOST-S4 ${HOSTNAME}  )
   string(REGEX MATCH "gaea" HOST-Gaea ${HOSTNAME}  )
   string(REGEX MATCH "hfe[0-9]" HOST-Hera ${HOSTNAME}  )
+  string(REGEX MATCH "Orion" HOST-Orion ${HOSTNAME}  )
   if(EXISTS /jetmon) 
     set(HOST-Jet "True" )
   endif()
@@ -51,6 +52,11 @@ macro( setHOST )
     option(BUILD_CORELIBS "Build the Core libraries " OFF)
     setHERA()
     set( HOST-Hera "TRUE"  )
+  elseif( HOST-Orion )
+    set( host "Orion"  )
+    option(BUILD_CORELIBS "Build the Core libraries " OFF)
+    setOrion()
+    set( HOST-Orion "TRUE"  )
   elseif( HOST-Gaea )
     set( host "Gaea"  )
     option(BUILD_CORELIBS "Build the Core libraries " On)

cmake/Modules/setIntelFlags.cmake

@@ -20,6 +20,7 @@ function(set_LIBRARY_UTIL_Intel)
     set (W3NCO_C_FLAGS "-O0 -DUNDERSCORE -DLINUX -D__linux__ " CACHE INTERNAL "" )
     set (NDATE_Fortran_FLAGS "${HOST_FLAG} -fp-model source -ftz -assume byterecl -convert big_endian -heap-arrays  -DCOMMCODE -DLINUX -DUPPLITTLEENDIAN -O3 -Wl,-noinhibit-exec" CACHE INTERNAL "" )
     set(NCDIAG_Fortran_FLAGS "-free -assume byterecl -convert big_endian" CACHE INTERNAL "" )
+    set(FV3GFS_NCIO_Fortran_FLAGS "-free" CACHE INTERNAL "" )
     set(UTIL_Fortran_FLAGS "-O3 ${HOST_FLAG} -warn all -implicitnone -traceback -fp-model strict -convert big_endian -DWRF -D_REAL8_ ${OpenMP_Fortran_FLAGS}" CACHE INTERNAL "")
     set(UTIL_COM_Fortran_FLAGS "-O3 -fp-model source -convert big_endian -assume byterecl -implicitnone" CACHE INTERNAL "")
 #    set(COV_CALC_FLAGS "-O3 ${HOST_FLAG} -warn all -implicitnone -traceback -fp-model strict -convert little_endian -D_REAL8_ -openmp -fpp -auto" CACHE INTERNAL "" )
@@ -45,6 +46,7 @@ function(set_LIBRARY_UTIL_Debug_Intel)
     set(W3NCO_4_Fortran_FLAGS " -g -auto -assume nocc_omp -i${intsize}     -convert big_endian -assume byterecl -fp-model strict ${OpenMP_Fortran_FLAGS} " CACHE INTERNAL "" )
     set(W3NCO_C_FLAGS "-O0 -g -DUNDERSCORE -DLINUX -D__linux__ " CACHE INTERNAL "" )
     set(NCDIAG_Fortran_FLAGS "-free -assume byterecl -convert big_endian" CACHE INTERNAL "" )
+    set(FV3GFS_NCIO_Fortran_FLAGS "-free" CACHE INTERNAL "" )
     set(WRFLIB_Fortran_FLAGS "-DPOUND_FOR_STRINGIFY -O1 -g -fp-model source -assume byterecl -convert big_endian -g -traceback -D_REAL8_ ${MPI_Fortran_COMPILE_FLAGS}" CACHE INTERNAL "")
     set(NDATE_Fortran_FLAGS "${HOST_FLAG} -fp-model source -ftz -assume byterecl -convert big_endian -heap-arrays  -DCOMMCODE -DLINUX -DUPPLITTLEENDIAN -g -Wl,-noinhibit-exec" CACHE INTERNAL "" )
     set(WRFLIB_C_FLAGS "-I. -DFortranByte=char -DFortranInt=int -DFortranLlong='long long'  -g  -Dfunder" CACHE INTERNAL "" )
@@ -63,7 +65,7 @@ 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(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_ ${MPI3FLAG} ${OpenMP_Fortran_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
     set(GSI_CFLAGS "-I. -DFortranByte=char -DFortranInt=int -DFortranLlong='long long'  -g  -Dfunder" CACHE INTERNAL "" )

cmake/Modules/setPlatformVariables.cmake

@@ -3,6 +3,7 @@ include(${CMAKE_CURRENT_LIST_DIR}/platforms/WCOSS.cmake)
 include(${CMAKE_CURRENT_LIST_DIR}/platforms/WCOSS-C.cmake)
 include(${CMAKE_CURRENT_LIST_DIR}/platforms/S4.cmake)
 include(${CMAKE_CURRENT_LIST_DIR}/platforms/Hera.cmake)
+include(${CMAKE_CURRENT_LIST_DIR}/platforms/Orion.cmake)
 include(${CMAKE_CURRENT_LIST_DIR}/platforms/Gaea.cmake)
 include(${CMAKE_CURRENT_LIST_DIR}/platforms/Cheyenne.cmake)
 include(${CMAKE_CURRENT_LIST_DIR}/platforms/Discover.cmake)