Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update diag table to remove diagnostic wav-ocn coupling fields #979

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion jobs/rocoto/arch.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
18 changes: 0 additions & 18 deletions parm/parm_fv3diag/diag_table_cpl
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
4 changes: 0 additions & 4 deletions ush/forecast_postdet.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 0 additions & 3 deletions ush/hpssarch_gen.sh
Original file line number Diff line number Diff line change
Expand Up @@ -233,21 +233,18 @@ 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
touch ocn_2D.txt
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

Expand Down