Skip to content

Commit

Permalink
Merge pull request #42 from NOAA-GFDL/develop
Browse files Browse the repository at this point in the history 
Sync with develop branch
  • Loading branch information
@wrongkindofdoctor
wrongkindofdoctor committed Mar 21, 2022
2 parents 7a73ea7 + 748d6da commit dcda682
Show file tree
Hide file tree
Showing 3 changed files with 85 additions and 54 deletions.
22 changes: 11 additions & 11 deletions .github/workflows/mdtf_tests.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -108,12 +108,12 @@ jobs:
# attempt FTP data fetch
# allow 20 min for transfer before timeout; Github actions allows 6 hours for individual
# jobs, but we don't want to max out resources that are shared by the NOAA-GFDL repos.
curl --verbose --ipv4 --connect-timeout 8 --max-time 1200 --retry 128 --ftp-ssl --disable-epsv --ftp-pasv -u "anonymous:anonymous" ftp://ftp.gfdl.noaa.gov/perm/oar.gfdl.mdtf/convective_transition_diag_obs_data.tar --output convective_transition_diag_obs_data.tar
curl --verbose --ipv4 --connect-timeout 8 --max-time 1200 --retry 128 --ftp-ssl --disable-epsv --ftp-pasv -u "anonymous:anonymous" ftp://ftp.gfdl.noaa.gov/perm/oar.gfdl.mdtf/EOF_500hPa_obs_data.tar --output EOF_500hPa_obs_data.tar
curl --verbose --ipv4 --connect-timeout 8 --max-time 1200 --retry 128 --ftp-ssl --disable-epsv --ftp-pasv -u "anonymous:anonymous" ftp://ftp.gfdl.noaa.gov/perm/oar.gfdl.mdtf/Wheeler_Kiladis_obs_data.tar --output Wheeler_Kiladis_obs_data.tar
curl --verbose --ipv4 --connect-timeout 8 --max-time 1200 --retry 128 --ftp-ssl --disable-epsv --ftp-pasv -u "anonymous:anonymous" ftp://ftp.gfdl.noaa.gov/perm/oar.gfdl.mdtf/MJO_teleconnection_obs_data.tar --output MJO_teleconnection_obs_data.tar
curl --verbose --ipv4 --connect-timeout 8 --max-time 1200 --retry 128 --ftp-ssl --disable-epsv --ftp-pasv -u "anonymous:anonymous" ftp://ftp.gfdl.noaa.gov/perm/oar.gfdl.mdtf/MJO_suite_obs_data.tar --output MJO_suite_obs_data.tar
curl --verbose --ipv4 --connect-timeout 8 --max-time 1200 --retry 128 --ftp-ssl --disable-epsv --ftp-pasv -u "anonymous:anonymous" ftp://ftp.gfdl.noaa.gov/perm/oar.gfdl.mdtf/precip_diurnal_cycle_obs_data.tar --output precip_diurnal_cycle_obs_data.tar
curl --verbose --ipv4 --connect-timeout 8 --max-time 1200 --retry 128 --ftp-ssl --ftp-pasv -u "anonymous:anonymous" ftp://ftp.gfdl.noaa.gov/perm/oar.gfdl.mdtf/convective_transition_diag_obs_data.tar --output convective_transition_diag_obs_data.tar
curl --verbose --ipv4 --connect-timeout 8 --max-time 1200 --retry 128 --ftp-ssl --ftp-pasv -u "anonymous:anonymous" ftp://ftp.gfdl.noaa.gov/perm/oar.gfdl.mdtf/EOF_500hPa_obs_data.tar --output EOF_500hPa_obs_data.tar
curl --verbose --ipv4 --connect-timeout 8 --max-time 1200 --retry 128 --ftp-ssl --ftp-pasv -u "anonymous:anonymous" ftp://ftp.gfdl.noaa.gov/perm/oar.gfdl.mdtf/Wheeler_Kiladis_obs_data.tar --output Wheeler_Kiladis_obs_data.tar
curl --verbose --ipv4 --connect-timeout 8 --max-time 1200 --retry 128 --ftp-ssl --ftp-pasv -u "anonymous:anonymous" ftp://ftp.gfdl.noaa.gov/perm/oar.gfdl.mdtf/MJO_teleconnection_obs_data.tar --output MJO_teleconnection_obs_data.tar
curl --verbose --ipv4 --connect-timeout 8 --max-time 1200 --retry 128 --ftp-ssl --ftp-pasv -u "anonymous:anonymous" ftp://ftp.gfdl.noaa.gov/perm/oar.gfdl.mdtf/MJO_suite_obs_data.tar --output MJO_suite_obs_data.tar
curl --verbose --ipv4 --connect-timeout 8 --max-time 1200 --retry 128 --ftp-ssl --ftp-pasv -u "anonymous:anonymous" ftp://ftp.gfdl.noaa.gov/perm/oar.gfdl.mdtf/precip_diurnal_cycle_obs_data.tar --output precip_diurnal_cycle_obs_data.tar
## make input data directories
mkdir -p inputdata/obs_data
echo "Untarring test files"
Expand Down Expand Up @@ -149,7 +149,7 @@ jobs:
# attempt FTP data fetch
# allow 20 min for transfer before timeout; Github actions allows 6 hours for individual
# jobs, but we don't want to max out resources that are shared by the NOAA-GFDL repos.
curl --verbose --ipv4 --connect-timeout 8 --max-time 1200 --retry 128 --ftp-ssl --disable-epsv --ftp-pasv -u "anonymous:anonymous" ftp://ftp.gfdl.noaa.gov/perm/oar.gfdl.mdtf/MJO_prop_amp_obs_data.tar --output MJO_prop_amp_obs_data.tar
curl --verbose --ipv4 --connect-timeout 8 --max-time 1200 --retry 128 --ftp-ssl --ftp-pasv -u "anonymous:anonymous" ftp://ftp.gfdl.noaa.gov/perm/oar.gfdl.mdtf/MJO_prop_amp_obs_data.tar --output MJO_prop_amp_obs_data.tar
echo "Untarring set 2 test files"
tar -xvf MJO_prop_amp_obs_data.tar
# clean up tarballs
Expand All @@ -173,10 +173,10 @@ jobs:
# attempt FTP data fetch
# allow 20 min for transfer before timeout; Github actions allows 6 hours for individual
# jobs, but we don't want to max out resources that are shared by the NOAA-GFDL repos.
curl --verbose --ipv4 --connect-timeout 8 --max-time 1200 --retry 128 --ftp-ssl --disable-epsv --ftp-pasv -u "anonymous:anonymous" ftp://ftp.gfdl.noaa.gov/perm/oar.gfdl.mdtf/temp_extremes_distshape_obs_data.tar --output temp_extremes_distshape_obs_data.tar
curl --verbose --ipv4 --connect-timeout 8 --max-time 1200 --retry 128 --ftp-ssl --disable-epsv --ftp-pasv -u "anonymous:anonymous" ftp://ftp.gfdl.noaa.gov/perm/oar.gfdl.mdtf/tropical_pacific_sea_level_obs_data.tar.gz --output tropical_pacific_sea_level_obs_data.tar.gz
curl --verbose --ipv4 --connect-timeout 8 --max-time 1200 --retry 128 --ftp-ssl --disable-epsv --ftp-pasv -u "anonymous:anonymous" ftp://ftp.gfdl.noaa.gov/perm/oar.gfdl.mdtf/mixed_layer_depth_obs_data.tar --output mixed_layer_depth_obs_data.tar
curl --verbose --ipv4 --connect-timeout 8 --max-time 1200 --retry 128 --ftp-ssl --disable-epsv --ftp-pasv -u "anonymous:anonymous" ftp://ftp.gfdl.noaa.gov/perm/oar.gfdl.mdtf/ocn_surf_flux_diag_obs_data.tar --output ocn_surf_flux_diag_obs_data.tar
curl --verbose --ipv4 --connect-timeout 8 --max-time 1200 --retry 128 --ftp-ssl --ftp-pasv -u "anonymous:anonymous" ftp://ftp.gfdl.noaa.gov/perm/oar.gfdl.mdtf/temp_extremes_distshape_obs_data.tar --output temp_extremes_distshape_obs_data.tar
curl --verbose --ipv4 --connect-timeout 8 --max-time 1200 --retry 128 --ftp-ssl --ftp-pasv -u "anonymous:anonymous" ftp://ftp.gfdl.noaa.gov/perm/oar.gfdl.mdtf/tropical_pacific_sea_level_obs_data.tar.gz --output tropical_pacific_sea_level_obs_data.tar.gz
curl --verbose --ipv4 --connect-timeout 8 --max-time 1200 --retry 128 --ftp-ssl --ftp-pasv -u "anonymous:anonymous" ftp://ftp.gfdl.noaa.gov/perm/oar.gfdl.mdtf/mixed_layer_depth_obs_data.tar --output mixed_layer_depth_obs_data.tar
curl --verbose --ipv4 --connect-timeout 8 --max-time 1200 --retry 128 --ftp-ssl --ftp-pasv -u "anonymous:anonymous" ftp://ftp.gfdl.noaa.gov/perm/oar.gfdl.mdtf/ocn_surf_flux_diag_obs_data.tar --output ocn_surf_flux_diag_obs_data.tar
echo "Untarring set 3 test files"
tar -xvf temp_extremes_distshape_obs_data.tar
tar -zxvf tropical_pacific_sea_level_obs_data.tar.gz
Expand Down
2 changes: 1 addition & 1 deletion CODEOWNERS
View file
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
@@ -1 +1 @@
* @jkrasting @wrongkindofdoctor
* @jkrasting @wrongkindofdoctor @aradhakrishnanGFDL
115 changes: 73 additions & 42 deletions sites/NOAA_GFDL/CM4_proto_diag_table.txt
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# REQUIRED FIELDS TO RUN MDTF DIAGNOSTICS
#--------------------------------------------------------------------------------------------------
# REQUIRED FIELDS TO RUN MDTF DIAGNOSTICS on supported atmosphere and land PODs

#--------------------------------------------------------------------------------------------------
#-- grid_spec
#--------------------------------------------------------------------------------------------------

Expand All @@ -19,22 +19,41 @@
"dynamics", "zsurf", "zsurf", "grid_spec", "all", .false., "none", 2




#--------------------------------------------------------------------------------------------------
#-- Monthly Data
#--------------------------------------------------------------------------------------------------


"atmos_month_cmip", 1, "months", 1, "days", "time",


"flux", "evspsbl", "evspsbl", "atmos_month_cmip", "all", .true., "none", 2
"moist", "pr", "pr", "atmos_month_cmip", "all", .true., "none", 2
"flux", "psl", "psl", "atmos_month_cmip", "all", .true., "none", 2
"atmos", "ps", "ps", "atmos_month_cmip", "all", .true., "none", 2
"atmos_plev19", "zg", "zg_unmsk", "atmos_month_cmip", "all", .true., "none", 2

"atmos_month", 1, "months", 1, "days", "time",

"flux", "land_mask", "land_mask", "atmos_month", "all", .false., "none", 2
"dynamics", "zsurf", "zsurf", "atmos_month", "all", .false., "none", 2
"dynamics", "bk", "bk", "atmos_month", "all", .false., "none", 2
"dynamics", "pk", "pk", "atmos_month", "all", .false., "none", 2
"dynamics", "temp", "temp", "atmos_month", "all", .true., "none", 2
"dynamics", "sphum", "sphum", "atmos_month", "all", .true., "none", 2
"moist", "pr", "pr", "atmos_month", "all", .true., "none", 2
"moist", "prw", "pw", "atmos_month", "all", .true., "none", 2
"flux", "evspsbl", "evspsbl", "atmos_month", "all", .true., "none", 2
"flux", "psl", "psl", "atmos_month", "all", .true., "none", 2
"flux", "t_surf", "t_surf", "atmos_month", "all", .true., "none", 2
"flux", "hfss", "hfss", "atmos_month", "all", .true., "none", 2
"flux", "lwflx", "lwflx", "atmos_month", "all", .true., "none", 2
"flux", "shflx", "shflx", "atmos_month", "all", .true., "none", 2
"radiation", "swdn_toa", "swdn_toa", "atmos_month", "all", .true., "none", 2
"radiation", "swup_toa", "swup_toa", "atmos_month", "all", .true., "none", 2
"radiation", "lwtoa_ad", "lwtoa_ad", "atmos_month", "all", .true., "none", 2
"radiation", "lwdn_sfc", "lwdn_sfc", "atmos_month", "all", .true., "none", 2
"radiation", "lwup_sfc", "lwup_sfc", "atmos_month", "all", .true., "none", 2
"radiation", "swdn_sfc", "swdn_sfc", "atmos_month", "all", .true., "none", 2
"radiation", "swup_sfc", "swup_sfc", "atmos_month", "all", .true., "none", 2
"atmos", "ps", "ps", "atmos_month", "all", .true., "none", 2
"atmos", "zg500", "zg500", "atmos_month", "all", .true., "none", 2
"atmos_plev19", "zg", "zg_unmsk", "atmos_month", "all", .true., "none", 2
"atmos_plev19", "ua", "ua_unmsk", "atmos_month", "all", .true., "none", 2
"atmos_plev19", "va", "va_unmsk", "atmos_month", "all", .true., "none", 2
"atmos_plev19", "ta", "ta_unmsk", "atmos_month", "all", .true., "none", 2
"atmos_plev19", "wap", "wap_unmsk", "atmos_month", "all", .true., "none", 2
"atmos_plev19", "hus", "hus_unmsk", "atmos_month", "all", .true., "none", 2

"land_month_cmip", 1, "months", 1, "days", "time",

Expand All @@ -43,38 +62,50 @@
"land", "geolat_t", "geolat_t", "land_month_cmip", "all", .false., "none", 1
"cmor_land", "mrsos", "mrsos", "land_month_cmip", "all", .true., "none", 2




#--------------------------------------------------------------------------------------------------
--------------------------------------------------------------------------------------------------
#-- Daily Data
#--------------------------------------------------------------------------------------------------


"atmos_daily_cmip", 24, "hours", 1, "days", "time",


"atmos_plev19", "hus", "hus_unmsk", "atmos_daily_cmip", "all", .true., "none", 2
"radiation", "rlut", "rlut", "atmos_daily_cmip", "all", .true., "none", 2
"atmos_plev19", "ua", "ua_unmsk", "atmos_daily_cmip", "all", .true., "none", 2
"atmos_plev19", "va", "va_unmsk", "atmos_daily_cmip", "all", .true., "none", 2
"atmos_plev19", "wap", "wap_unmsk", "atmos_daily_cmip", "all", .true. , "none", 2
"atmos_plev19", "zg", "zg_unmsk", "atmos_daily_cmip", "all", .true., "none", 2
"moist", "pr", "pr", "atmos_daily_cmip", "all", .true., "none", 2
"atmos", "ps", "ps", "atmos_daily_cmip", "all", .true., "none", 2


"atmos_daily", 24, "hours", 1, "days", "time",

"flux", "land_mask", "land_mask", "atmos_daily", "all", .false., "none", 2
"dynamics", "zsurf", "zsurf", "atmos_daily", "all", .false., "none", 2
"dynamics", "bk", "bk", "atmos_daily", "all", .false., "none", 2
"dynamics", "pk", "pk", "atmos_daily", "all", .false., "none", 2
"atmos_plev19", "hus", "hus_unmsk", "atmos_daily", "all", .true., "none", 2
"atmos_plev19", "omega", "omega_unmsk", "atmos_daily", "all", .true., "none", 2
"atmos_plev19", "ua", "ua_unmsk", "atmos_daily", "all", .true., "none", 2
"atmos_plev19", "va", "va_unmsk", "atmos_daily", "all", .true., "none", 2
"atmos_plev19", "wap", "wap_unmsk", "atmos_daily", "all", .true., "none", 2
"atmos_plev19", "zg", "zg_unmsk", "atmos_daily", "all", .true., "none", 2
"moist", "pr", "pr", "atmos_daily", "all", .true., "none", 2
"moist", "prw", "prw", "atmos_daily", "all", .true., "none", 2
"atmos", "zg500", "zg500", "atmos_daily", "all", .true., "none", 2
"atmos", "ps", "ps", "atmos_daily", "all", .true., "none", 2
"dynamics", "u200", "u200", "atmos_daily", "all", .true., "none", 2
"dynamics", "v200", "v200", "atmos_daily", "all", .true., "none", 2
"dynamics", "u850", "u850", "atmos_daily", "all", .true., "none", 2
"dynamics", "v850", "v850", "atmos_daily", "all", .true., "none", 2
"flux", "tas", "tas", "atmos_daily", "all", .true., "none", 2
"flux", "psl", "psl", "atmos_daily", "all", .true., "none", 2
"dynamics", "omega500", "omega500", "atmos_daily", "all", .true., "none", 2
"radiation", "rlut", "rlut", "atmos_daily", "all", .true., "none", 2
"dynamics", "temp", "temp", "atmos_daily", "all", .true., "none", 2
"dynamics", "sphum", "sphum", "atmos_daily", "all", .true., "none", 2


#--------------------------------------------------------------------------------------------------
#-- 6 hourly data
#--------------------------------------------------------------------------------------------------


"atmos_4xdaily_cmip", 6, "hours", 1, "days", "time",


"moist", "pr", "pr", "atmos_4xdaily_cmip", "all", .true., "none", 2
"moist", "prw", "prw", "atmos_4xdaily_cmip", "all", .true., "none", 2
"atmos", "ps", "ps", "atmos_4xdaily_cmip", "all", .true., "none", 2
"atmos_plev19", "ta", "ta_unmsk", "atmos_4xdaily_cmip", "all", .true., "none", 2
"atmos_4xdaily", 6, "hours", 1, "days", "time",

"flux", "land_mask", "land_mask", "atmos_4xdaily", "all", .false., "none", 2
"dynamics", "zsurf", "zsurf", "atmos_4xdaily", "all", .false., "none", 2
"dynamics", "bk", "bk", "atmos_4xdaily", "all", .false., "none", 2
"dynamics", "pk", "pk", "atmos_4xdaily", "all", .false., "none", 2
"dynamics", "temp", "temp", "atmos_4xdaily", "all", .true., "none", 2
"dynamics", "sphum", "sphum", "atmos_4xdaily", "all", .true., "none", 2
"moist", "pr", "pr", "atmos_4xdaily", "all", .true., "none", 2
"moist", "prw", "prw", "atmos_4xdaily", "all", .true., "none", 2
"atmos", "ps", "ps", "atmos_4xdaily", "all", .true., "none", 2
"atmos_plev19", "ta", "ta_unmsk", "atmos_4xdaily", "all", .true., "none", 2

0 comments on commit dcda682

Please sign in to comment.