diff --git a/.cicd/Jenkinsfile b/.cicd/Jenkinsfile index 6e453f6f25..4211c37b3f 100644 --- a/.cicd/Jenkinsfile +++ b/.cicd/Jenkinsfile @@ -14,11 +14,10 @@ pipeline { // Use the line below to enable the PW AWS cluster // choice(name: 'SRW_PLATFORM_FILTER', choices: ['all', 'cheyenne', 'gaea', 'gaea-c5', 'hera', 'jet', 'orion', 'hercules', 'pclusternoaav2use1'], description: 'Specify the platform(s) to use') // choice(name: 'SRW_PLATFORM_FILTER', choices: ['all', 'cheyenne', 'gaea', 'gaea-c5', 'hera', 'jet', 'orion', 'hercules'], description: 'Specify the platform(s) to use') - choice(name: 'SRW_PLATFORM_FILTER', choices: ['all', 'gaea', 'gaea-c5', 'hera', 'jet', 'orion', 'hercules'], description: 'Specify the platform(s) to use') + choice(name: 'SRW_PLATFORM_FILTER', choices: ['all', 'derecho', 'gaea', 'gaea-c5', 'hera', 'jet', 'orion', 'hercules'], description: 'Specify the platform(s) to use') // Allow job runner to filter based on compiler choice(name: 'SRW_COMPILER_FILTER', choices: ['all', 'gnu', 'intel'], description: 'Specify the compiler(s) to use to build') - // Uncomment the following line to re-enable comprehensive tests - // booleanParam name: 'SRW_WE2E_COMPREHENSIVE_TESTS', defaultValue: false, description: 'Whether to execute the comprehensive end-to-end tests' + booleanParam name: 'SRW_WE2E_COMPREHENSIVE_TESTS', defaultValue: false, description: 'Whether to execute the comprehensive end-to-end tests' } stages { @@ -89,7 +88,7 @@ pipeline { axis { name 'SRW_PLATFORM' // values 'cheyenne', 'gaea', 'gaea-c5', 'hera', 'jet', 'orion', 'hercules' //, 'pclusternoaav2use1', 'azclusternoaav2eus1', 'gclusternoaav2usc1' - values 'gaea', 'gaea-c5', 'hera', 'jet', 'orion', 'hercules' //, 'pclusternoaav2use1', 'azclusternoaav2eus1', 'gclusternoaav2usc1' + values 'derecho', 'gaea', 'gaea-c5', 'hera', 'jet', 'orion', 'hercules' //, 'pclusternoaav2use1', 'azclusternoaav2eus1', 'gclusternoaav2usc1' } axis { @@ -103,7 +102,7 @@ pipeline { exclude { axis { name 'SRW_PLATFORM' - values 'gaea', 'gaea-c5', 'jet', 'orion', 'hercules' //, 'pclusternoaav2use1' , 'azclusternoaav2eus1', 'gclusternoaav2usc1' + values 'derecho', 'gaea', 'gaea-c5', 'jet', 'orion', 'hercules' //, 'pclusternoaav2use1' , 'azclusternoaav2eus1', 'gclusternoaav2usc1' } axis { @@ -184,11 +183,6 @@ pipeline { dir ("${env.SRW_PLATFORM}") { echo "Testing SRW (${env.SRW_COMPILER}) on ${env.SRW_PLATFORM} (using ${env.WORKSPACE}/${env.SRW_PLATFORM})" - // Remove the following line to re-enable comprehensive tests - sh 'SRW_WE2E_COMPREHENSIVE_TESTS=false bash --login "${WORKSPACE}/${SRW_PLATFORM}/.cicd/scripts/srw_test.sh"' - - // Uncomment the following block to re-enable comprehensive tests - /* // If executing for a Pull Request, check for the run_we2e_comprehensive_tests. If set, // override the value of the SRW_WE2E_COMPREHENSIVE_TESTS parameter script { @@ -205,7 +199,6 @@ pipeline { sh "SRW_WE2E_COMPREHENSIVE_TESTS=${run_we2e_comprehensive_tests}" + ' bash --login "${WORKSPACE}/${SRW_PLATFORM}/.cicd/scripts/srw_test.sh"' } - */ } } diff --git a/Externals.cfg b/Externals.cfg index 8101eb46aa..7d23e87626 100644 --- a/Externals.cfg +++ b/Externals.cfg @@ -3,7 +3,7 @@ protocol = git repo_url = https://github.com/ufs-community/UFS_UTILS # Specify either a branch name or a hash but not both. #branch = develop -hash = 6a7d534 +hash = dc0e4a6 local_path = sorc/UFS_UTILS required = True @@ -12,7 +12,7 @@ protocol = git repo_url = https://github.com/ufs-community/ufs-weather-model # Specify either a branch name or a hash but not both. #branch = develop -hash = 1787f26 +hash = 020e783 local_path = sorc/ufs-weather-model required = True @@ -21,7 +21,7 @@ protocol = git repo_url = https://github.com/NOAA-EMC/UPP # Specify either a branch name or a hash but not both. #branch = develop -hash = 520cc23 +hash = fae617b local_path = sorc/UPP required = True diff --git a/scripts/exregional_plot_allvars.py b/scripts/exregional_plot_allvars.py index a8c5611379..27eff0f4b0 100755 --- a/scripts/exregional_plot_allvars.py +++ b/scripts/exregional_plot_allvars.py @@ -429,7 +429,7 @@ def setup_logging(debug=False): t1a = time.perf_counter() # Sea level pressure - slp = data1.select(name="MSLP (Eta model reduction)")[0].values * 0.01 + slp = data1.select(name="Pressure reduced to MSL")[0].values * 0.01 slpsmooth = ndimage.gaussian_filter(slp, 13.78) # 2-m temperature diff --git a/scripts/exregional_plot_allvars_diff.py b/scripts/exregional_plot_allvars_diff.py index 64f6b1b66f..e51a3a6b57 100755 --- a/scripts/exregional_plot_allvars_diff.py +++ b/scripts/exregional_plot_allvars_diff.py @@ -446,9 +446,9 @@ def setup_logging(debug=False): t1a = time.perf_counter() # Sea level pressure - slp_1 = data1.select(name="MSLP (Eta model reduction)")[0].values * 0.01 + slp_1 = data1.select(name="Pressure reduced to MSL")[0].values * 0.01 slpsmooth_1 = ndimage.gaussian_filter(slp_1, 13.78) - slp_2 = data2.select(name="MSLP (Eta model reduction)")[0].values * 0.01 + slp_2 = data2.select(name="Pressure reduced to MSL")[0].values * 0.01 slpsmooth_2 = ndimage.gaussian_filter(slp_2, 13.78) slp_diff = slp_2 - slp_1 diff --git a/scripts/exregional_run_fcst.sh b/scripts/exregional_run_fcst.sh index 21c4253224..6dfad9673b 100755 --- a/scripts/exregional_run_fcst.sh +++ b/scripts/exregional_run_fcst.sh @@ -410,7 +410,7 @@ if [ ${WRITE_DOPOST} = "TRUE" ]; then if [ "${CPL_AQM}" = "TRUE" ]; then post_config_fp="${PARMdir}/upp/postxconfig-NT-AQM.txt" else - post_config_fp="${PARMdir}/upp/postxconfig-NT-fv3lam_rrfs.txt" + post_config_fp="${PARMdir}/upp/postxconfig-NT-fv3lam.txt" fi print_info_msg " ==================================================================== @@ -420,17 +420,6 @@ if [ ${WRITE_DOPOST} = "TRUE" ]; then cp_vrfy ${post_config_fp} ./postxconfig-NT_FH00.txt cp_vrfy ${post_config_fp} ./postxconfig-NT.txt cp_vrfy ${PARMdir}/upp/params_grib2_tbl_new . - if [ ${USE_CRTM} = "TRUE" ]; then - cp_vrfy ${CRTM_DIR}/Nalli.IRwater.EmisCoeff.bin ./ - cp_vrfy ${CRTM_DIR}/FAST*.bin ./ - cp_vrfy ${CRTM_DIR}/NPOESS.IRland.EmisCoeff.bin ./ - cp_vrfy ${CRTM_DIR}/NPOESS.IRsnow.EmisCoeff.bin ./ - cp_vrfy ${CRTM_DIR}/NPOESS.IRice.EmisCoeff.bin ./ - cp_vrfy ${CRTM_DIR}/AerosolCoeff.bin ./ - cp_vrfy ${CRTM_DIR}/CloudCoeff.bin ./ - cp_vrfy ${CRTM_DIR}/*.SpcCoeff.bin ./ - cp_vrfy ${CRTM_DIR}/*.TauCoeff.bin ./ - fi # Set itag for inline-post: if [ "${CPL_AQM}" = "TRUE" ]; then post_itag_add="aqf_on=.true.," diff --git a/scripts/exregional_run_post.sh b/scripts/exregional_run_post.sh index 795efa38f8..cfbed2dcfd 100755 --- a/scripts/exregional_run_post.sh +++ b/scripts/exregional_run_post.sh @@ -95,7 +95,7 @@ else if [ "${CPL_AQM}" = "TRUE" ]; then post_config_fp="${PARMdir}/upp/postxconfig-NT-AQM.txt" else - post_config_fp="${PARMdir}/upp/postxconfig-NT-fv3lam_rrfs.txt" + post_config_fp="${PARMdir}/upp/postxconfig-NT-fv3lam.txt" fi print_info_msg " ==================================================================== diff --git a/tests/WE2E/test_configs/aqm/config.aqm_grid_AQM_NA13km_suite_GFS_v16.yaml b/tests/WE2E/test_configs/aqm/config.aqm_grid_AQM_NA13km_suite_GFS_v16.yaml index 691c4b5725..789c5e9674 100644 --- a/tests/WE2E/test_configs/aqm/config.aqm_grid_AQM_NA13km_suite_GFS_v16.yaml +++ b/tests/WE2E/test_configs/aqm/config.aqm_grid_AQM_NA13km_suite_GFS_v16.yaml @@ -49,7 +49,6 @@ task_run_post: POST_OUTPUT_DOMAIN_NAME: 793 USE_CUSTOM_POST_CONFIG_FILE: false global: - USE_CRTM: false DO_ENSEMBLE: false NUM_ENS_MEMBERS: 2 HALO_BLEND: 0 diff --git a/tests/test_python/test_generate_FV3LAM_wflow.py b/tests/test_python/test_generate_FV3LAM_wflow.py index 9e857d682b..9e9e9f5274 100644 --- a/tests/test_python/test_generate_FV3LAM_wflow.py +++ b/tests/test_python/test_generate_FV3LAM_wflow.py @@ -42,11 +42,6 @@ def run_workflow(USHdir, logfile): logfile = "log.generate_FV3LAM_wflow" sed = get_env_var("SED") - # set USE_CRTM to false in config_defaults.yaml file - run_command( - f"""{sed} -i 's/USE_CRTM: true/USE_CRTM: false/g' {USHdir}/config_defaults.yaml""" - ) - # community test case cp_vrfy(f"{USHdir}/config.community.yaml", f"{USHdir}/config.yaml") run_command( diff --git a/ush/config.aqm.community.yaml b/ush/config.aqm.community.yaml index eabd7c8c20..30e391edf2 100644 --- a/ush/config.aqm.community.yaml +++ b/ush/config.aqm.community.yaml @@ -55,7 +55,6 @@ task_run_post: POST_OUTPUT_DOMAIN_NAME: 793 USE_CUSTOM_POST_CONFIG_FILE: false global: - USE_CRTM: false DO_ENSEMBLE: false NUM_ENS_MEMBERS: 2 HALO_BLEND: 0 diff --git a/ush/config.aqm.nco.realtime.yaml b/ush/config.aqm.nco.realtime.yaml index d6a35a1229..f2299eacc9 100644 --- a/ush/config.aqm.nco.realtime.yaml +++ b/ush/config.aqm.nco.realtime.yaml @@ -73,7 +73,6 @@ task_run_fcst: task_run_post: POST_OUTPUT_DOMAIN_NAME: 793 global: - USE_CRTM: false DO_ENSEMBLE: false NUM_ENS_MEMBERS: 2 HALO_BLEND: 0 diff --git a/ush/config_defaults.yaml b/ush/config_defaults.yaml index 8f3e4e3675..6abe862d7b 100644 --- a/ush/config_defaults.yaml +++ b/ush/config_defaults.yaml @@ -2080,8 +2080,8 @@ task_run_post: # #----------------------------------------------------------------------- # - USE_CUSTOM_POST_CONFIG_FILE: false - CUSTOM_POST_CONFIG_FP: "" + USE_CUSTOM_POST_CONFIG_FILE: true + CUSTOM_POST_CONFIG_FP: "{{ user.SORCdir }}/ufs-weather-model/tests/parm/postxconfig-NT-fv3lam.txt" POST_OUTPUT_DOMAIN_NAME: '{{ workflow.PREDEF_GRID_NAME }}' TESTBED_FIELDS_FN: "" NUMX: 1 diff --git a/ush/machine/cheyenne.yaml b/ush/machine/cheyenne.yaml index 10d0d8414a..482994235f 100644 --- a/ush/machine/cheyenne.yaml +++ b/ush/machine/cheyenne.yaml @@ -32,5 +32,3 @@ platform: data: ics_lbcs: FV3GFS: /glade/p/ral/jntp/UFS_CAM/COMGFS/gfs.${yyyymmdd}/${hh} -global: - CRTM_DIR: /glade/work/epicufsrt/contrib/hpc-stack/intel2022.1_ncdf492/intel-2022.1/mpt-2.25/crtm/2.4.0/fix diff --git a/ush/machine/derecho.yaml b/ush/machine/derecho.yaml index 98d57fc780..c7e144b201 100644 --- a/ush/machine/derecho.yaml +++ b/ush/machine/derecho.yaml @@ -41,5 +41,3 @@ data: HRRR: /glade/work/epicufsrt/contrib/UFS_SRW_data/develop/input_model_data/HRRR/${yyyymmdd}${hh} RAP: /glade/work/epicufsrt/contrib/UFS_SRW_data/develop/input_model_data/RAP/${yyyymmdd}${hh} GSMGFS: /glade/work/epicufsrt/contrib/UFS_SRW_data/develop/input_model_data/GSMGFS/${yyyymmdd}${hh} -global: - CRTM_DIR: /glade/work/epicufsrt/contrib/derecho/hpc-stack/intel-classic-2023.0.0/intel-classic-2023.0.0/cray-mpich-8.1.25/crtm/2.4.0/fix diff --git a/ush/machine/gaea-c5.yaml b/ush/machine/gaea-c5.yaml index 795ee40fde..86653be7b5 100644 --- a/ush/machine/gaea-c5.yaml +++ b/ush/machine/gaea-c5.yaml @@ -52,5 +52,3 @@ rocoto: nnodes: nodesize: ppn: -global: - CRTM_DIR: /lustre/f2/dev/role.epic/contrib/C5/hpc-stack/intel-classic-2023.1.0/intel-classic-2023.1.0/cray-mpich-8.1.25/crtm/2.4.0/fix diff --git a/ush/machine/gaea.yaml b/ush/machine/gaea.yaml index 857b8fbb80..301fa5c5a1 100644 --- a/ush/machine/gaea.yaml +++ b/ush/machine/gaea.yaml @@ -38,8 +38,6 @@ data: grib2: /lustre/f2/dev/role.epic/contrib/UFS_SRW_data/develop/input_model_data/FV3GFS/grib2/${yyyymmdd}${hh} RAP: /lustre/f2/dev/role.epic/contrib/UFS_SRW_data/develop/input_model_data/RAP/${yyyymmdd}${hh} HRRR: /lustre/f2/dev/role.epic/contrib/UFS_SRW_data/develop/input_model_data/HRRR/${yyyymmdd}${hh} -global: - CRTM_DIR: /lustre/f2/dev/role.epic/contrib/hpc-stack/intel-classic-2022.0.2/intel-classic-2022.0.2/cray-mpich-7.7.20/crtm/2.4.0/fix rocoto: tasks: metatask_run_ensemble: diff --git a/ush/machine/hera.yaml b/ush/machine/hera.yaml index ba733c9199..545c9320af 100644 --- a/ush/machine/hera.yaml +++ b/ush/machine/hera.yaml @@ -35,9 +35,6 @@ platform: FIXshp: /scratch1/NCEPDEV/nems/role.epic/UFS_SRW_data/develop/NaturalEarth EXTRN_MDL_DATA_STORES: hpss aws nomads -global: - CRTM_DIR: /scratch1/NCEPDEV/nems/role.epic/hpc-stack/libs/intel-2022.1.2/intel-2022.1.2/impi-2022.1.2/crtm/2.4.0/fix - cpl_aqm_parm: AQM_CONFIG_DIR: /scratch2/NCEPDEV/naqfc/RRFS_CMAQ/aqm/epa/data DCOMINbio_default: /scratch2/NCEPDEV/naqfc/RRFS_CMAQ/aqm/bio diff --git a/ush/machine/hercules.yaml b/ush/machine/hercules.yaml index 0ceb4d917a..33d5732511 100644 --- a/ush/machine/hercules.yaml +++ b/ush/machine/hercules.yaml @@ -43,5 +43,3 @@ data: HRRR: /work/noaa/epic/role-epic/contrib/UFS_SRW_data/develop/input_model_data/HRRR/${yyyymmdd}${hh} RAP: /work/noaa/epic/role-epic/contrib/UFS_SRW_data/develop/input_model_data/RAP/${yyyymmdd}${hh} GSMGFS: /work/noaa/epic/role-epic/contrib/UFS_SRW_data/develop/input_model_data/GSMGFS/${yyyymmdd}${hh} -global: - CRTM_DIR: /work/noaa/epic/role-epic/contrib/hercules/hpc-stack/intel-2022.2.1/intel-oneapi-compilers-2022.2.1/intel-oneapi-mpi-2021.7.1/crtm/2.4.0/fix diff --git a/ush/machine/jet.yaml b/ush/machine/jet.yaml index 49ed686e79..2ecd101ae0 100644 --- a/ush/machine/jet.yaml +++ b/ush/machine/jet.yaml @@ -42,8 +42,6 @@ data: GFS: prepbufr: /public/data/grids/gfs/prepbufr tcvitals: /public/data/grids/gfs/bufr -global: - CRTM_DIR: /mnt/lfs4/HFIP/hfv3gfs/role.epic/hpc-stack/libs/intel-2022.1.2/intel-2022.1.2/impi-2022.1.2/crtm/2.4.0/fix rocoto: tasks: diff --git a/ush/machine/orion.yaml b/ush/machine/orion.yaml index c02dfa68a0..38ccd279f9 100644 --- a/ush/machine/orion.yaml +++ b/ush/machine/orion.yaml @@ -42,5 +42,3 @@ data: HRRR: /work/noaa/epic/role-epic/contrib/UFS_SRW_data/develop/input_model_data/HRRR/${yyyymmdd}${hh} RAP: /work/noaa/epic/role-epic/contrib/UFS_SRW_data/develop/input_model_data/RAP/${yyyymmdd}${hh} GSMGFS: /work/noaa/epic/role-epic/contrib/UFS_SRW_data/develop/input_model_data/GSMGFS/${yyyymmdd}${hh} -global: - CRTM_DIR: /work/noaa/epic/role-epic/contrib/orion/hpc-stack/intel-2022.1.2_ncdf492/intel-2022.1.2/impi-2022.1.2/crtm/2.4.0/fix