Merge branch 'master' into feature/2mDA

Conflicts: src/enkf/controlvec.f90 src/enkf/params.f90 src/enkf/readconvobs.f90 src/gsi/jfunc.f90 src/gsi/read_prepbufr.f90
ClaraDraper-NOAA · Mar 2, 2022 · 9ac41fe · 9ac41fe
2 parents c8f68f1 + d2931d5
commit 9ac41fe
Show file tree

Hide file tree

Showing 338 changed files with 21,556 additions and 17,058 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -37,28 +37,38 @@ project(GSI)
   option(BUILD_GLOBAL "Build GSI without WRF (regional) module " OFF)
   option(BUILD_ENKF "Build the Enkf executable " ON)
   option(USE_BASELINE "Use baseline control runs" ON)
-  SET(ENKF_MODE "GFS" CACHE STRING "EnKF build mode: GFS, WRF, NMMB")
+  SET(ENKF_MODE "GFS" CACHE STRING "EnKF build mode: GFS, WRF, NMMB, and FV3reg")
   string(TOUPPER ${ENKF_MODE} ENKF_MODE)
   if (ENKF_MODE MATCHES "^GFS$")
     message("Build the EnKF with GFS module")
     option(BUILD_GFS "Build the Enkf with GFS module " ON)
     option(BUILD_NMMB "Build the Enkf with NMMB module " OFF)
     option(BUILD_WRF "Build the Enkf with WRF module " OFF)
+    option(BUILD_FV3reg "Build the Enkf with FV3reg module " OFF)
   elseif (ENKF_MODE MATCHES "^WRF$")
     message("Build the EnKF with WRF module")
     option(BUILD_GFS "Build the Enkf with GFS module " OFF)
     option(BUILD_NMMB "Build the Enkf with NMMB module " OFF)
     option(BUILD_WRF "Build the Enkf with WRF module " ON)
+    option(BUILD_FV3reg "Build the Enkf with FV3reg module " OFF)
   elseif (ENKF_MODE MATCHES "^NMMB$")
     message("Build the EnKF with NMMB module")
     option(BUILD_GFS "Build the Enkf with GFS module " OFF)
     option(BUILD_NMMB "Build the Enkf with NMMB module " ON)
     option(BUILD_WRF "Build the Enkf with WRF module " OFF)
+    option(BUILD_FV3reg "Build the Enkf with FV3reg module " OFF)
+  elseif (ENKF_MODE MATCHES "^FV3REG$")
+    message("Build the EnKF with FV3reg module")
+    option(BUILD_GFS "Build the Enkf with GFS module " OFF)
+    option(BUILD_NMMB "Build the Enkf with NMMB module " OFF)
+    option(BUILD_WRF "Build the Enkf with WRF module " OFF)
+    option(BUILD_FV3reg "Build the Enkf with FV3reg module " ON)
   else()
     message("unkown ENKF_MODE: ${ENKF_MODE} !\nBuild the EnKF with GFS module by default")
     option(BUILD_GFS "Build the Enkf with GFS module " ON)
     option(BUILD_NMMB "Build the Enkf with NMMB module " OFF)
     option(BUILD_WRF "Build the Enkf with WRF module " OFF)
+    option(BUILD_FV3reg "Build the Enkf with FV3reg module " OFF)
   endif()
   option(BUILD_UTIL "Build the Enkf utilities " OFF)
 

diff --git a/cmake/Modules/FindGSICONTROL.cmake b/cmake/Modules/FindGSICONTROL.cmake
@@ -21,6 +21,7 @@ find_file( CONTROL_EXE
         /gpfs/hps3/emc/da/noscrub/Michael.Lueken/svn1/build/bin
         /gpfs/hps3/emc/da/noscrub/Michael.Lueken/svn1/src
         /scratch1/NCEPDEV/da/Michael.Lueken/svn1/build/bin
+        /lfs1/NESDIS/nesdis-rdo2/David.Huber/save/gsi_control/exec
 
     ${NO_DEFAULT_PATH})
 
@@ -45,6 +46,7 @@ find_file( ENKF_CONTROL_EXE
         /gpfs/hps3/emc/da/noscrub/Michael.Lueken/svn1/build/bin
         /gpfs/hps3/emc/da/noscrub/Michael.Lueken/svn1/src/enkf
         /scratch1/NCEPDEV/da/Michael.Lueken/svn1/build/bin
+        /lfs1/NESDIS/nesdis-rdo2/David.Huber/save/gsi_control/exec
 
     ${NO_DEFAULT_PATH})
 

diff --git a/cmake/Modules/Testing/Temporary/CTestCostData.txt b/cmake/Modules/Testing/Temporary/CTestCostData.txt
diff --git a/cmake/Modules/Testing/Temporary/LastTest.log b/cmake/Modules/Testing/Temporary/LastTest.log
diff --git a/cmake/Modules/comp_src.pl b/cmake/Modules/comp_src.pl
diff --git a/cmake/Modules/platforms/Jet.cmake b/cmake/Modules/platforms/Jet.cmake
@@ -1,10 +1,42 @@
 macro (setJet)
   message("Setting paths for Jet")
-  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 "-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(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()
 
diff --git a/cmake/Modules/setHOST.cmake b/cmake/Modules/setHOST.cmake
@@ -42,7 +42,7 @@ macro( setHOST )
     set( HOST-Generic "TRUE"  )
     setGeneric()
   elseif(HOST-Jet)
-    option(BUILD_CORELIBS "Build the Core libraries " ON)
+    option(BUILD_CORELIBS "Build the Core libraries " OFF)
     set( host "Jet"  )
     set( HOST-Jet "TRUE"  )
     setJet()

diff --git a/fix b/fix
diff --git a/jobs/JGDAS_EFSOI b/jobs/JGDAS_EFSOI
@@ -79,6 +79,7 @@ vPDY=$(echo $VDATE | cut -c1-8)
 vcyc=$(echo $VDATE | cut -c9-10)
 
 export APREFIX="${CDUMP}.t${cyc}z."
+export VPREFIX="${CDUMP}.t${vcyc}z."
 export GPREFIX="gdas.t${gcyc}z."
 export ASUFFIX=${ASUFFIX:-$SUFFIX}
 export GSUFFIX=${GSUFFIX:-$SUFFIX}
@@ -105,7 +106,6 @@ ${EFSOIUPDSH:-$SCRgfs/exgdas_efsoi.sh}
 status=$?
 [[ $status -ne 0 ]] && exit $status
 
-
 ##############################################
 # End JOB SPECIFIC work
 ##############################################

diff --git a/jobs/JGDAS_EFSOI_FCST b/jobs/JGDAS_EFSOI_FCST
@@ -62,6 +62,8 @@ if [ $RUN_ENVIR = "nco" ]; then
     export ROTDIR=${COMROOT:?}/$NET/$envir
 fi
 
+# tells the forecast script to use efsoi ensemble
+export EFSOI_TASK="YES" 
 
 ##############################################
 # Begin JOB SPECIFIC work
@@ -81,7 +83,8 @@ export FHMIN=$FHMIN_ENKF
 export FHOUT=$FHOUT_ENKF
 export FHMAX=$FHMAX_ENKF
 
-export FORECASTSH=$HOMEgfs/scripts/exglobal_efsoi_forecast.sh
+export FORECASTSH=$HOMEgfs/scripts/exglobal_forecast.sh
+
 
 # Get ENSBEG/ENSEND from ENSGRP and NMEM_EFCSGRP
 export ENSEND=$((NMEM_EFCSGRP * ENSGRP))

diff --git a/modulefiles/modulefile.ProdGSI.jet b/modulefiles/modulefile.ProdGSI.jet
@@ -1,22 +1,23 @@
- #%Module######################################################################
-## NOAA-EMC/GSI
-##_____________________________________________________
+#%Module######################################################################
+# NOAA-EMC/GSI
+#_____________________________________________________
 #proc ModulesHelp { } {
 #puts stderr "Set environment variables for NOAA-EMC/GSI"
 #puts stderr "This module initializes the environment "
 #puts stderr "for the Intel Compiler Suite $version\n"
-#}
+##}
 #module-whatis " NOAA-EMC/GSI whatis description"
 #
 #
 
-set CRTM_FIX /lfs4/HFIP/hfv3gfs/gwv/l0530/lib/crtm/v2.3.0/fix
+setenv CRTM_FIX /lfs4/HFIP/hfv3gfs/glopara/crtm_v2.3.0
 
 # Load cmake
 module load cmake/3.16.1
 
 # Load python
-module load intelpython/3.6.5
+module use /contrib/anaconda/modulefiles
+module load anaconda/5.3.1
 
 # Load hpc-stack
 module use /lfs4/HFIP/hfv3gfs/nwprod/hpc-stack/libs/modulefiles/stack

diff --git a/modulefiles/modulefile.ProdGSI.wcoss b/modulefiles/modulefile.ProdGSI.wcoss