Merge branch 'develop' into feature/rm_sfcanl

RussTreadon-NOAA · Jun 13, 2022 · 257f6eb · 257f6eb
2 parents 9c48261 + ad84f17
commit 257f6eb
Show file tree

Hide file tree

Showing 580 changed files with 232 additions and 120,095 deletions.
diff --git a/INSTALL.md b/INSTALL.md
@@ -89,7 +89,6 @@ CMake allows for various options that can be specified on the command line via `
 | `BUILD_UTIL_EFSOI`    | Build Ensemble FSOI application (`OFF`)              |
 | `BUILD_UTIL_ENKF_GFS` | Build GFS ensemble utilities (`OFF`)                 |
 | `BUILD_UTIL_ENKF_ARW` | Build ARW ensemble utilities (`OFF`)                 |
-| `BUILD_UTIL_MON`      | Build Observation Monitoring utilities (`OFF`)       |
 | `BUILD_UTIL_NCIO`     | Build NetCDF IO utilities (`OFF`)                    |
 | `BUILD_UTIL_COM`      | Build Miscellaneous community utilities (`OFF`)       |
 | `BUILD_UTIL_BKGERR`   | Build Background Error utility (`OFF`)               |

diff --git a/jobs/JGDAS_ATMOS_ANALYSIS_DIAG b/jobs/JGDAS_ATMOS_ANALYSIS_DIAG
@@ -85,8 +85,8 @@ if [ $RUN_ENVIR = "nco" -o ${ROTDIR_DUMP:-NO} = "YES" ]; then
     export COMIN_GES_OBS=${COMIN_GES_OBS:-$(compath.py ${envir}/obsproc/${obsproc_ver})/$GDUMP.$gPDY/$gcyc/$COMPONENT}
 else
     export COMOUT="$ROTDIR/$CDUMP.$PDY/$cyc/$COMPONENT"
-    export COMIN_OBS="$DMPDIR/$CDUMP.$PDY/$cyc"
-    export COMIN_GES_OBS="$DMPDIR/$GDUMP.$gPDY/$gcyc"
+    export COMIN_OBS="$DMPDIR/$CDUMP.$PDY/$cyc/$COMPONENT"
+    export COMIN_GES_OBS="$DMPDIR/$GDUMP.$gPDY/$gcyc/$COMPONENT"
 fi
 mkdir -m 775 -p $COMOUT
 # COMIN_GES and COMIN_GES_ENS are used in script

diff --git a/jobs/JGDAS_ATMOS_CHGRES_FORENKF b/jobs/JGDAS_ATMOS_CHGRES_FORENKF
@@ -87,8 +87,8 @@ if [ $RUN_ENVIR = "nco" -o ${ROTDIR_DUMP:-NO} = "YES" ]; then
 else
     export COMOUT="$ROTDIR/$CDUMP.$PDY/$cyc/$COMPONENT"
     export COMOUT_ENS="$ROTDIR/enkfgdas.$PDY/$cyc/$COMPONENT"
-    export COMIN_OBS="$DMPDIR/$CDUMP.$PDY/$cyc"
-    export COMIN_GES_OBS="$DMPDIR/$GDUMP.$gPDY/$gcyc"
+    export COMIN_OBS="$DMPDIR/$CDUMP.$PDY/$cyc/$COMPONENT"
+    export COMIN_GES_OBS="$DMPDIR/$GDUMP.$gPDY/$gcyc/$COMPONENT"
 fi
 mkdir -m 775 -p $COMOUT
 # COMIN_GES and COMIN_GES_ENS are used in script

diff --git a/jobs/JGDAS_ENKF_DIAG b/jobs/JGDAS_ENKF_DIAG
@@ -82,8 +82,8 @@ if [ $RUN_ENVIR = "nco" -o ${ROTDIR_DUMP:-NO} = "YES" ]; then
     export COMIN_OBS=${COMIN_OBS:-$(compath.py ${envir}/obsproc/${obsproc_ver})/$RUN.$PDY/$cyc/$COMPONENT}
     export COMIN_GES_OBS=${COMIN_GES_OBS:-$(compath.py ${envir}/obsproc/${obsproc_ver})/$GDUMP.$gPDY/$gcyc/$COMPONENT}
 else
-    export COMIN_OBS="$DMPDIR/$CDUMP.$PDY/$cyc"
-    export COMIN_GES_OBS="$DMPDIR/$GDUMP.$gPDY/$gcyc"
+    export COMIN_OBS="$DMPDIR/$CDUMP.$PDY/$cyc/$COMPONENT"
+    export COMIN_GES_OBS="$DMPDIR/$GDUMP.$gPDY/$gcyc/$COMPONENT"
 fi
 
 # COMIN_GES, COMIN_ANL COMIN_GES_ENS, and COMOUT  are used in script

diff --git a/jobs/JGDAS_ENKF_ECEN b/jobs/JGDAS_ENKF_ECEN
@@ -90,8 +90,8 @@ if [ $RUN_ENVIR = "nco" -o ${ROTDIR_DUMP:-NO} = "YES" ]; then
     export COMIN_OBS=${COMIN_OBS:-$(compath.py ${envir}/obsproc/${obsproc_ver})/$RUN.$PDY/$cyc/$COMPONENT}
     export COMIN_GES_OBS=${COMIN_GES_OBS:-$(compath.py ${envir}/obsproc/${obsproc_ver})/$GDUMP.$gPDY/$gcyc/$COMPONENT}
 else
-    export COMIN_OBS="$DMPDIR/$CDUMP.$PDY/$cyc"
-    export COMIN_GES_OBS="$DMPDIR/$GDUMP.$gPDY/$gcyc"
+    export COMIN_OBS="$DMPDIR/$CDUMP.$PDY/$cyc/$COMPONENT"
+    export COMIN_GES_OBS="$DMPDIR/$GDUMP.$gPDY/$gcyc/$COMPONENT"
 fi
 
 # COMIN, COMIN_ENS and COMIN_GES_ENS are used in script

diff --git a/jobs/JGDAS_ENKF_SELECT_OBS b/jobs/JGDAS_ENKF_SELECT_OBS
@@ -82,8 +82,8 @@ if [ $RUN_ENVIR = "nco" -o ${ROTDIR_DUMP:-NO} = "YES" ]; then
     export COMIN_OBS=${COMIN_OBS:-$(compath.py ${envir}/obsproc/${obsproc_ver})/$RUN.$PDY/$cyc/$COMPONENT}
     export COMIN_GES_OBS=${COMIN_GES_OBS:-$(compath.py ${envir}/obsproc/${obsproc_ver})/$GDUMP.$gPDY/$gcyc/$COMPONENT}
 else
-    export COMIN_OBS="$DMPDIR/$CDUMP.$PDY/$cyc"
-    export COMIN_GES_OBS="$DMPDIR/$GDUMP.$gPDY/$gcyc"
+    export COMIN_OBS="$DMPDIR/$CDUMP.$PDY/$cyc/$COMPONENT"
+    export COMIN_GES_OBS="$DMPDIR/$GDUMP.$gPDY/$gcyc/$COMPONENT"
 fi
 
 # COMIN_GES, COMIN_ANL COMIN_GES_ENS, and COMOUT  are used in script

diff --git a/jobs/JGDAS_ENKF_SFC b/jobs/JGDAS_ENKF_SFC
@@ -90,8 +90,8 @@ if [ $RUN_ENVIR = "nco" -o ${ROTDIR_DUMP:-NO} = "YES" ]; then
     export COMIN_OBS=${COMIN_OBS:-$(compath.py ${envir}/obsproc/${obsproc_ver})/$RUN.$PDY/$cyc/$COMPONENT}
     export COMIN_GES_OBS=${COMIN_GES_OBS:-$(compath.py ${envir}/obsproc/${obsproc_ver})/$GDUMP.$gPDY/$gcyc/$COMPONENT}
 else
-    export COMIN_OBS="$DMPDIR/$CDUMP.$PDY/$cyc"
-    export COMIN_GES_OBS="$DMPDIR/$GDUMP.$gPDY/$gcyc"
+    export COMIN_OBS="$DMPDIR/$CDUMP.$PDY/$cyc/$COMPONENT"
+    export COMIN_GES_OBS="$DMPDIR/$GDUMP.$gPDY/$gcyc/$COMPONENT"
 fi
 
 # COMIN, COMIN_ENS and COMIN_GES_ENS are used in script

diff --git a/jobs/JGLOBAL_ATMOS_ANALYSIS b/jobs/JGLOBAL_ATMOS_ANALYSIS
@@ -85,8 +85,8 @@ if [ $RUN_ENVIR = "nco" -o ${ROTDIR_DUMP:-NO} = "YES" ]; then
     export COMIN_GES_OBS=${COMIN_GES_OBS:-$(compath.py ${envir}/obsproc/${obsproc_ver})/$GDUMP.$gPDY/$gcyc/$COMPONENT}
 else
     export COMOUT="$ROTDIR/$CDUMP.$PDY/$cyc/$COMPONENT"
-    export COMIN_OBS="$DMPDIR/$CDUMP.$PDY/$cyc"
-    export COMIN_GES_OBS="$DMPDIR/$GDUMP.$gPDY/$gcyc"
+    export COMIN_OBS="$DMPDIR/$CDUMP.$PDY/$cyc/$COMPONENT"
+    export COMIN_GES_OBS="$DMPDIR/$GDUMP.$gPDY/$gcyc/$COMPONENT"
 fi
 mkdir -m 775 -p $COMOUT
 # COMIN_GES and COMIN_GES_ENS are used in script
@@ -131,6 +131,13 @@ export TCVITL="${COMOUT}/${OPREFIX}syndata.tcvitals.tm00"
 [[ $DONST = "YES" ]] && export NSSTBF="${COMIN_OBS}/${OPREFIX}nsstbufr"
 
 
+# Copy fix file for obsproc
+if [ $RUN = "gfs" ]; then
+    mkdir -p $ROTDIR/fix
+    cp $FIXgsi/prepobs_errtable.global $ROTDIR/fix/
+fi
+
+
 ###############################################################
 # Run relevant script
 env

diff --git a/jobs/JGLOBAL_ATMOS_ANALYSIS_CALC b/jobs/JGLOBAL_ATMOS_ANALYSIS_CALC
@@ -85,8 +85,8 @@ if [ $RUN_ENVIR = "nco" -o ${ROTDIR_DUMP:-NO} = "YES" ]; then
     export COMIN_GES_OBS=${COMIN_GES_OBS:-$(compath.py ${envir}/obsproc/${obsproc_ver})/$GDUMP.$gPDY/$gcyc/$COMPONENT}
 else
     export COMOUT="$ROTDIR/$CDUMP.$PDY/$cyc/$COMPONENT"
-    export COMIN_OBS="$DMPDIR/$CDUMP.$PDY/$cyc"
-    export COMIN_GES_OBS="$DMPDIR/$GDUMP.$gPDY/$gcyc"
+    export COMIN_OBS="$DMPDIR/$CDUMP.$PDY/$cyc/$COMPONENT"
+    export COMIN_GES_OBS="$DMPDIR/$GDUMP.$gPDY/$gcyc/$COMPONENT"
 fi
 mkdir -m 775 -p $COMOUT
 # COMIN_GES and COMIN_GES_ENS are used in script

diff --git a/scripts/exgdas_enkf_update.sh b/scripts/exgdas_enkf_update.sh
@@ -43,7 +43,7 @@ APRUN_ENKF=${APRUN_ENKF:-${APRUN:-""}}
 NTHREADS_ENKF=${NTHREADS_ENKF:-${NTHREADS:-1}}
 
 # Executables
-ENKFEXEC=${ENKFEXEC:-$HOMEgfs/exec/global_enkf.x}
+ENKFEXEC=${ENKFEXEC:-$HOMEgfs/exec/enkf.x}
 
 # Cycling and forecast hour specific parameters
 CDATE=${CDATE:-"2001010100"}

diff --git a/scripts/exglobal_atmos_analysis.sh b/scripts/exglobal_atmos_analysis.sh
@@ -72,7 +72,7 @@ DOIAU=${DOIAU:-"NO"}
 export IAUFHRS=${IAUFHRS:-"6"}
 
 # Dependent Scripts and Executables
-GSIEXEC=${GSIEXEC:-$HOMEgfs/exec/global_gsi.x}
+GSIEXEC=${GSIEXEC:-$HOMEgfs/exec/gsi.x}
 export NTHREADS_CALCINC=${NTHREADS_CALCINC:-1}
 export APRUN_CALCINC=${APRUN_CALCINC:-${APRUN:-""}}
 export APRUN_CALCANL=${APRUN_CALCANL:-${APRUN:-""}}

diff --git a/scripts/exglobal_diag.sh b/scripts/exglobal_diag.sh
@@ -47,7 +47,7 @@ export NLN=${NLN:-"/bin/ln -sf"}
 export CHGRP_CMD=${CHGRP_CMD:-"chgrp ${group_name:-rstprod}"}
 export NEMSIOGET=${NEMSIOGET:-${NWPROD}/exec/nemsio_get}
 export NCLEN=${NCLEN:-$HOMEgfs/ush/getncdimlen}
-export CATEXEC=${CATEXEC:-$HOMEgfs/exec/ncdiag_cat.x}
+export CATEXEC=${CATEXEC:-$HOMEgfs/exec/ncdiag_cat_serial.x}
 COMPRESS=${COMPRESS:-gzip}
 UNCOMPRESS=${UNCOMPRESS:-gunzip}
 APRUNCFP=${APRUNCFP:-""}

diff --git a/src/GSD/gsdcloud/CMakeLists.txt b/src/GSD/gsdcloud/CMakeLists.txt
@@ -22,9 +22,9 @@ if(NOT CMAKE_Fortran_COMPILER_ID MATCHES "^(GNU|Intel)$")
 endif()
 
 if(CMAKE_Fortran_COMPILER_ID MATCHES "^(Intel)$")
-  set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -convert big_endian")
+  set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -g -traceback -convert big_endian")
 elseif(CMAKE_Fortran_COMPILER_ID MATCHES "^(GNU)$")
-  set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -fconvert=big-endian")
+  set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -g -fbacktrace -fconvert=big-endian")
 endif()
 
 if(NOT CMAKE_BUILD_TYPE MATCHES "Debug")

diff --git a/src/gsi/fv3_regional_interface.f90 b/src/gsi/fv3_regional_interface.f90
@@ -18,7 +18,7 @@ subroutine convert_fv3_regional
 !   2017-04-08  parrish
 !   2018-02-16  wu   - read in grid and time infor from fv3 files
 !                      read directly from fv3 files and not writeout GSI internal file 
-!
+!   2020-11-19  Lu & Wang - add time label it for fgat. POC: xuguang.wang@ou.edu
 !
 ! attributes:
 !   language: f90
@@ -28,18 +28,13 @@ subroutine convert_fv3_regional
 
   use kinds, only: r_single,r_kind,i_kind
   use gsi_rfv3io_mod, only: gsi_rfv3io_get_grid_specs
-  use gsi_rfv3io_mod, only: bg_fv3regfilenameg 
 
   implicit none
   integer(i_kind) ierr
-  character(128) grid_spec,ak_bk
 
 
 !!!!!!!!!!! get grid specs !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-  grid_spec='fv3_grid_spec'            ! horizontal grid information
-  ak_bk='fv3_akbk'                     ! vertical grid information
-  call bg_fv3regfilenameg%init(grid_spec_input='fv3_grid_spec',ak_bk_input='fv3_akbk')
-  call gsi_rfv3io_get_grid_specs(bg_fv3regfilenameg,ierr)
+  call gsi_rfv3io_get_grid_specs(ierr)
   if(ierr/=0)then
      write(6,*)' problem in convert_fv3_regional - get_grid_specs   Status = ',ierr
      call stop2 (555)