Skip to content

Commit

Permalink
Add Hercules support for the GSI monitor (NOAA-EMC#2373)
Browse files Browse the repository at this point in the history
# Description
This updates the GSI monitor hash and updates the modulefiles to add
support for the monitor on Hercules.
  • Loading branch information
DavidHuber-NOAA committed Mar 5, 2024
1 parent 732a874 commit ba6a4fd
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 14 deletions.
1 change: 0 additions & 1 deletion modulefiles/module_base.hercules.lua
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ load(pathJoin("stack-intel", (os.getenv("stack_intel_ver") or "None")))
load(pathJoin("stack-intel-oneapi-mpi", (os.getenv("stack_impi_ver") or "None")))
load(pathJoin("intel-oneapi-mkl", (os.getenv("intel_mkl_ver") or "None")))
load(pathJoin("python", (os.getenv("python_ver") or "None")))
load(pathJoin("perl", (os.getenv("perl_ver") or "None")))

load(pathJoin("jasper", (os.getenv("jasper_ver") or "None")))
load(pathJoin("libpng", (os.getenv("libpng_ver") or "None")))
Expand Down
13 changes: 3 additions & 10 deletions parm/config/gfs/config.base
Original file line number Diff line number Diff line change
Expand Up @@ -57,16 +57,9 @@ export DO_NPOESS="NO" # NPOESS products
export DO_TRACKER="YES" # Hurricane track verification
export DO_GENESIS="YES" # Cyclone genesis verification
export DO_GENESIS_FSU="NO" # Cyclone genesis verification (FSU)
# The monitor is not yet supported on Hercules
if [[ "${machine}" == "HERCULES" ]]; then
export DO_VERFOZN="NO" # Ozone data assimilation monitoring
export DO_VERFRAD="NO" # Radiance data assimilation monitoring
export DO_VMINMON="NO" # GSI minimization monitoring
else
export DO_VERFOZN="YES" # Ozone data assimilation monitoring
export DO_VERFRAD="YES" # Radiance data assimilation monitoring
export DO_VMINMON="YES" # GSI minimization monitoring
fi
export DO_VERFOZN="YES" # Ozone data assimilation monitoring
export DO_VERFRAD="YES" # Radiance data assimilation monitoring
export DO_VMINMON="YES" # GSI minimization monitoring
export DO_MOS="NO" # GFS Model Output Statistics - Only supported on WCOSS2

# NO for retrospective parallel; YES for real-time parallel
Expand Down
2 changes: 1 addition & 1 deletion sorc/gsi_monitor.fd
Submodule gsi_monitor.fd updated 40 files
+1 −1 README.md
+21 −0 modulefiles/hercules.intel-run.lua
+16 −0 modulefiles/hercules.intel.lua
+13 −1 parm/Mon_config
+2 −1 src/Conventional_Monitor/data_extract/ush/ConMon_DE.sh
+283 −0 src/Conventional_Monitor/data_extract/ush/ConMon_DE_rgn.sh
+8 −5 src/Conventional_Monitor/image_gen/ush/mk_horz_hist.sh
+9 −6 src/Conventional_Monitor/image_gen/ush/mk_time_vert.sh
+5 −5 src/Conventional_Monitor/nwprod/conmon_shared/sorc/conmon_grads_lev.fd/conmon_read_diag.F90
+5 −5 src/Conventional_Monitor/nwprod/conmon_shared/sorc/conmon_grads_mandlev.fd/conmon_read_diag.F90
+5 −5 src/Conventional_Monitor/nwprod/conmon_shared/sorc/conmon_grads_sfc.fd/conmon_read_diag.F90
+3 −3 src/Conventional_Monitor/nwprod/conmon_shared/sorc/conmon_grads_sfc.fd/grads_sfc.f90
+5 −5 src/Conventional_Monitor/nwprod/conmon_shared/sorc/conmon_grads_sfctime.fd/conmon_read_diag.F90
+5 −5 src/Conventional_Monitor/nwprod/conmon_shared/sorc/conmon_time.fd/conmon_read_diag.F90
+38 −0 src/Conventional_Monitor/nwprod/conmon_shared/ush/clean_tankdir_rgn.sh
+2 −2 src/Conventional_Monitor/nwprod/conmon_shared/ush/diag2grad_ps_case.sh
+1 −1 src/Conventional_Monitor/nwprod/conmon_shared/ush/diag2grad_q_case.sh
+1 −4 src/Conventional_Monitor/nwprod/conmon_shared/ush/diag2grad_t_case.sh
+1 −1 src/Conventional_Monitor/nwprod/conmon_shared/ush/diag2grad_uv_case.sh
+28 −30 src/Conventional_Monitor/nwprod/conmon_shared/ush/horz_hist.sh
+3 −9 src/Conventional_Monitor/nwprod/conmon_shared/ush/time_vert.sh
+207 −0 src/Conventional_Monitor/nwprod/nam_conmon/fix/nam_regional_convinfo.txt
+111 −0 src/Conventional_Monitor/nwprod/nam_conmon/jobs/JNAM_CONMON
+114 −0 src/Conventional_Monitor/nwprod/nam_conmon/scripts/exnam_conmon.sh
+11 −4 src/Conventional_Monitor/parm/ConMon_config
+1 −1 src/Minimization_Monitor/README
+1 −1 src/Ozone_Monitor/README
+2 −2 src/Ozone_Monitor/data_xtrct/ush/OznMon_CP.sh
+1 −1 src/Ozone_Monitor/image_gen/ush/mk_horiz.sh
+4 −2 src/Ozone_Monitor/image_gen/ush/mk_summary.sh
+4 −2 src/Ozone_Monitor/image_gen/ush/mk_time.sh
+1 −1 src/Radiance_Monitor/README
+2 −1 src/Radiance_Monitor/data_extract/ush/RadMon_DE_glb.sh
+8 −5 src/Radiance_Monitor/image_gen/ush/mk_angle_plots.sh
+1 −1 src/Radiance_Monitor/image_gen/ush/mk_bcoef_plots.sh
+6 −4 src/Radiance_Monitor/image_gen/ush/mk_bcor_plots.sh
+7 −5 src/Radiance_Monitor/image_gen/ush/mk_time_plots.sh
+1 −1 ush/detect_machine.sh
+8 −1 ush/module-setup.sh
+47 −185 ush/rgn_find_cycle.pl
2 changes: 0 additions & 2 deletions versions/run.hercules.ver
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,5 @@ export stack_impi_ver=2021.9.0
export intel_mkl_ver=2023.1.0
export spack_env=gsi-addon-env

export perl_ver=5.36.0

source "${HOMEgfs:-}/versions/run.spack.ver"
export spack_mod_path="/work/noaa/epic/role-epic/spack-stack/hercules/spack-stack-${spack_stack_ver}/envs/${spack_env}/install/modulefiles/Core"

0 comments on commit ba6a4fd

Please sign in to comment.