From b71851a79742627d5670e99f85becc875abd4777 Mon Sep 17 00:00:00 2001 From: Jessica Meixner Date: Wed, 17 Aug 2022 12:39:11 +0000 Subject: [PATCH] update diag_table so that wavocn output is removed which means that S2S runs should not run into failures --- jobs/rocoto/arch.sh | 2 +- parm/parm_fv3diag/diag_table_cpl | 18 ------------------ ush/forecast_postdet.sh | 4 ---- ush/hpssarch_gen.sh | 3 --- 4 files changed, 1 insertion(+), 26 deletions(-) diff --git a/jobs/rocoto/arch.sh b/jobs/rocoto/arch.sh index c9441b5a755..05eb34e1adf 100755 --- a/jobs/rocoto/arch.sh +++ b/jobs/rocoto/arch.sh @@ -203,7 +203,7 @@ if [ $CDUMP = "gfs" ]; then fi if [ $DO_OCN = "YES" ]; then - targrp_list="$targrp_list ocn_ice_grib2_0p5 ocn_ice_grib2_0p25 ocn_2D ocn_3D ocn_xsect ocn_daily wavocn gfs_flux_1p00" + targrp_list="$targrp_list ocn_ice_grib2_0p5 ocn_ice_grib2_0p25 ocn_2D ocn_3D ocn_xsect ocn_daily gfs_flux_1p00" fi if [ $DO_ICE = "YES" ]; then diff --git a/parm/parm_fv3diag/diag_table_cpl b/parm/parm_fv3diag/diag_table_cpl index 3a5bb4a5bc4..6974dafac3d 100644 --- a/parm/parm_fv3diag/diag_table_cpl +++ b/parm/parm_fv3diag/diag_table_cpl @@ -9,7 +9,6 @@ ###################### "ocn%4yr%2mo%2dy%2hr", 6, "hours", 1, "hours", "time", 6, "hours", "1901 1 1 0 0 0" "ocn_daily%4yr%2mo%2dy", 1, "days", 1, "days", "time", 1, "days", "1901 1 1 0 0 0" -"wavocn%4yr%2mo%2dy%2hr", 6, "hours", 1, "hours", "time", 6, "hours", "1901 1 1 0 0 0" ############################################## # static fields "ocean_model", "geolon", "geolon", "ocn%4yr%2mo%2dy%2hr", "all", .false., "none", 2 @@ -81,23 +80,6 @@ "ocean_model", "LwLatSens", "LwLatSens", "ocn%4yr%2mo%2dy%2hr","all",.true.,"none",2 "ocean_model", "Heat_PmE", "Heat_PmE", "ocn%4yr%2mo%2dy%2hr","all",.true.,"none",2 -#wave_variables - "ocean_model", "geolon", "geolon", "wavocn%4yr%2mo%2dy%2hr","all", .false., "none", 2 - "ocean_model", "geolat", "geolat", "wavocn%4yr%2mo%2dy%2hr","all", .false., "none", 2 - "ocean_model", "MSTAR", "MSTAR", "wavocn%4yr%2mo%2dy%2hr","all", .true., "none", 2 - "ocean_model", "LA", "LA", "wavocn%4yr%2mo%2dy%2hr","all", .true., "none", 2 - "ocean_model", "LA_MOD", "LA_MOD", "wavocn%4yr%2mo%2dy%2hr","all", .true., "none", 2 - "ocean_model", "MSTAR_LT", "MSTAR_LT", "wavocn%4yr%2mo%2dy%2hr","all", .true., "none", 2 - "ocean_model", "ePBL_h_ML", "ePBL", "wavocn%4yr%2mo%2dy%2hr","all", .true., "none", 2 - "ocean_model", "ustar", "ustar", "wavocn%4yr%2mo%2dy%2hr","all", .true., "none", 2 - "ocean_model", "ePBL_TKE_wind", "ePBL_TKE_wind", "wavocn%4yr%2mo%2dy%2hr","all", .true., "none", 2 - "ocean_model", "ePBL_TKE_MKE", "ePBL_TKE_MKE", "wavocn%4yr%2mo%2dy%2hr","all", .true., "none", 2 - "ocean_model", "ePBL_TKE_conv", "ePBL_TKE_conv", "wavocn%4yr%2mo%2dy%2hr","all", .true., "none", 2 - "ocean_model", "ePBL_TKE_forcing", "ePBL_TKE_forcing", "wavocn%4yr%2mo%2dy%2hr","all", .true., "none", 2 - "ocean_model", "ePBL_TKE_mixing", "ePBL_TKE_mixing", "wavocn%4yr%2mo%2dy%2hr","all", .true., "none", 2 - "ocean_model", "ePBL_TKE_mech_decay","ePBL_TKE_mech_decay","wavocn%4yr%2mo%2dy%2hr","all", .true., "none", 2 - "ocean_model", "ePBL_TKE_conv_decay","ePBL_TKE_conv_decay","wavocn%4yr%2mo%2dy%2hr","all", .true., "none", 2 - #============================================================================================= "gfs_dyn", "ucomp", "ugrd", "fv3_history", "all", .false., "none", 2 "gfs_dyn", "vcomp", "vgrd", "fv3_history", "all", .false., "none", 2 diff --git a/ush/forecast_postdet.sh b/ush/forecast_postdet.sh index 089ff7dd5b4..eeae89c11ba 100755 --- a/ush/forecast_postdet.sh +++ b/ush/forecast_postdet.sh @@ -844,10 +844,6 @@ MOM6_postdet() { dest_file="ocn${VDATE}.${ENSMEM}.${IDATE}.nc" ${NLN} ${COMOUTocean}/${dest_file} ${DATA}/${source_file} - source_file="wavocn_${YYYY_MID}_${MM_MID}_${DD_MID}_${HH_MID}.nc" - dest_file=${source_file} - ${NLN} ${COMOUTocean}/${dest_file} ${DATA}/${source_file} - source_file="ocn_daily_${YYYY}_${MM}_${DD}.nc" dest_file=${source_file} if [ ! -a "${DATA}/${source_file}" ]; then diff --git a/ush/hpssarch_gen.sh b/ush/hpssarch_gen.sh index 9785de98acf..245a4026925 100755 --- a/ush/hpssarch_gen.sh +++ b/ush/hpssarch_gen.sh @@ -233,7 +233,6 @@ if [ $type = "gfs" ]; then rm -f ocn_3D.txt rm -f ocn_xsect.txt rm -f ocn_daily.txt - rm -f wavocn.txt touch gfs_flux_1p00.txt touch ocn_ice_grib2_0p5.txt touch ocn_ice_grib2_0p25.txt @@ -241,13 +240,11 @@ if [ $type = "gfs" ]; then touch ocn_3D.txt touch ocn_xsect.txt touch ocn_daily.txt - touch wavocn.txt echo "${dirname}MOM_input " >>ocn_2D.txt echo "${dirname}ocn_2D* " >>ocn_2D.txt echo "${dirname}ocn_3D* " >>ocn_3D.txt echo "${dirname}ocn*EQ* " >>ocn_xsect.txt echo "${dirname}ocn_daily* " >>ocn_daily.txt - echo "${dirname}wavocn* " >>wavocn.txt echo "${dirname}ocn_ice*0p5x0p5.grb2 " >>ocn_ice_grib2_0p5.txt echo "${dirname}ocn_ice*0p25x0p25.grb2 " >>ocn_ice_grib2_0p25.txt