diff --git a/.gitignore b/.gitignore index c2e98c210d..9ac9ece1dd 100644 --- a/.gitignore +++ b/.gitignore @@ -144,6 +144,7 @@ ush/make_tif.sh ush/month_name.sh ush/imsfv3_scf2ioda.py ush/atparse.bash +ush/run_bufr2ioda.py # version files versions/build.ver diff --git a/Externals.cfg b/Externals.cfg index d46bebfd78..1bd8645aa6 100644 --- a/Externals.cfg +++ b/Externals.cfg @@ -15,7 +15,7 @@ protocol = git required = True [gfs-utils] -hash = 8965258 +hash = a283262 local_path = sorc/gfs_utils.fd repo_url = https://github.com/NOAA-EMC/gfs-utils protocol = git @@ -57,7 +57,7 @@ protocol = git required = False [GDASApp] -hash = 2774a10 +hash = ac8fdb1 local_path = sorc/gdas.cd repo_url = https://github.com/NOAA-EMC/GDASApp.git protocol = git diff --git a/jobs/JGLOBAL_ATM_PREP_IODA_OBS b/jobs/JGLOBAL_ATM_PREP_IODA_OBS new file mode 100755 index 0000000000..ef0e682468 --- /dev/null +++ b/jobs/JGLOBAL_ATM_PREP_IODA_OBS @@ -0,0 +1,36 @@ +#! /usr/bin/env bash + +source "${HOMEgfs}/ush/preamble.sh" +source "${HOMEgfs}/ush/jjob_header.sh" -e "prepatmiodaobs" -c "base prepatmiodaobs" + +############################################## +# Set variables used in the script +############################################## + + +############################################## +# Begin JOB SPECIFIC work +############################################## +# Generate COM variables from templates +YMD=${PDY} HH=${cyc} generate_com -rx COM_OBS + + +############################################################### +# Run relevant script +EXSCRIPT=${BUFR2IODASH:-${HOMEgfs}/ush/run_bufr2ioda.py} +${EXSCRIPT} "${PDY}${cyc}" "${RUN}" "${DMPDIR}" "${IODAPARM}" "${COM_OBS}/" +status=$? +[[ ${status} -ne 0 ]] && (echo "FATAL ERROR: Error executing ${EXSCRIPT}, ABORT!"; exit "${status}") + +############################################## +# End JOB SPECIFIC work +############################################## + +############################################## +# Final processing +############################################## +if [[ -e "${pgmout}" ]] ; then + cat "${pgmout}" +fi + +exit 0 diff --git a/jobs/rocoto/prepatmiodaobs.sh b/jobs/rocoto/prepatmiodaobs.sh new file mode 100755 index 0000000000..d424df9261 --- /dev/null +++ b/jobs/rocoto/prepatmiodaobs.sh @@ -0,0 +1,25 @@ +#! /usr/bin/env bash + +source "${HOMEgfs}/ush/preamble.sh" + +############################################################### +# Source UFSDA workflow modules +. "${HOMEgfs}/ush/load_ufsda_modules.sh" +status=$? +[[ ${status} -ne 0 ]] && exit "${status}" + +export job="prepatmobs" +export jobid="${job}.$$" + +############################################################### +# setup python path for workflow and ioda utilities +wxflowPATH="${HOMEgfs}/ush/python:${HOMEgfs}/ush/python/wxflow/src" +PYIODALIB="${HOMEgfs}/sorc/gdas.cd/build/lib/python3.7" +PYTHONPATH="${PYIODALIB}:${wxflowPATH}:${PYTHONPATH}" +export PYTHONPATH + +############################################################### +# Execute the JJOB +"${HOMEgfs}/jobs/JGLOBAL_ATM_PREP_IODA_OBS" +status=$? +exit "${status}" diff --git a/parm/config/gfs/config.coupled_ic b/parm/config/gfs/config.coupled_ic index 809cc3c1a2..bafd4e111d 100644 --- a/parm/config/gfs/config.coupled_ic +++ b/parm/config/gfs/config.coupled_ic @@ -21,7 +21,7 @@ case "${CASE}" in export CPL_WAVIC=GEFSwave20210528v2 ;; "C768") - export CPL_ATMIC=HR1 + export CPL_ATMIC=HR2 export CPL_ICEIC=HR1 export CPL_OCNIC=HR1 export CPL_WAVIC=HR1 diff --git a/parm/config/gfs/config.prepatmiodaobs b/parm/config/gfs/config.prepatmiodaobs new file mode 100644 index 0000000000..ed9b246120 --- /dev/null +++ b/parm/config/gfs/config.prepatmiodaobs @@ -0,0 +1,14 @@ +#! /usr/bin/env bash + +########## config.prepatmiodaobs ########## +# Atm Obs Prep specific + +echo "BEGIN: config.prepatmiodaobs" + +# Get task specific resources +. "${EXPDIR}/config.resources" prepatmiodaobs + +export BUFR2IODASH="${HOMEgfs}/ush/run_bufr2ioda.py" +export IODAPARM="${HOMEgfs}/sorc/gdas.cd/parm/ioda/bufr2ioda" + +echo "END: config.prepatmiodaobs" diff --git a/parm/config/gfs/config.resources b/parm/config/gfs/config.resources index 6844802a0b..624155671e 100644 --- a/parm/config/gfs/config.resources +++ b/parm/config/gfs/config.resources @@ -9,7 +9,7 @@ if [[ $# -ne 1 ]]; then echo "Must specify an input task argument to set resource variables!" echo "argument can be any one of the following:" echo "coupled_ic aerosol_init" - echo "prep preplandobs" + echo "prep preplandobs prepatmiodaobs" echo "atmanlinit atmanlrun atmanlfinal" echo "atmensanlinit atmensanlrun atmensanlfinal" echo "landanl" @@ -73,6 +73,13 @@ elif [[ "${step}" = "preplandobs" ]]; then npe_node_preplandobs=1 export npe_node_preplandobs +elif [[ "${step}" = "prepatmiodaobs" ]]; then + export wtime_prepatmiodaobs="00:10:00" + export npe_prepatmiodaobs=1 + export nth_prepatmiodaobs=1 + npe_node_prepatmiodaobs=$(echo "${npe_node_max} / ${nth_prepatmiodaobs}" | bc) + export npe_node_prepatmiodaobs + elif [[ "${step}" = "aerosol_init" ]]; then export wtime_aerosol_init="00:05:00" export npe_aerosol_init=1 @@ -249,7 +256,7 @@ elif [[ "${step}" = "aeroanlinit" ]]; then # below lines are for creating JEDI YAML case ${CASE} in - C768) + C768) layout_x=8 layout_y=8 ;; @@ -257,10 +264,15 @@ elif [[ "${step}" = "aeroanlinit" ]]; then layout_x=8 layout_y=8 ;; - C192 | C96 | C48) + C192 | C96) layout_x=8 layout_y=8 ;; + C48 ) + # this case is for testing only + layout_x=1 + layout_y=1 + ;; *) echo "FATAL ERROR: Resolution not supported for aerosol analysis'" exit 1 @@ -279,7 +291,7 @@ elif [[ "${step}" = "aeroanlinit" ]]; then elif [[ "${step}" = "aeroanlrun" ]]; then case ${CASE} in - C768) + C768) layout_x=8 layout_y=8 ;; @@ -287,10 +299,15 @@ elif [[ "${step}" = "aeroanlrun" ]]; then layout_x=8 layout_y=8 ;; - C192 | C96 | C48) + C192 | C96) layout_x=8 layout_y=8 ;; + C48 ) + # this case is for testing only + layout_x=1 + layout_y=1 + ;; *) echo "FATAL ERROR: Resolution ${CASE} is not supported, ABORT!" exit 1 diff --git a/parm/config/gfs/config.ufs b/parm/config/gfs/config.ufs index 3e1fa382d7..67075f300b 100644 --- a/parm/config/gfs/config.ufs +++ b/parm/config/gfs/config.ufs @@ -171,7 +171,7 @@ case "${fv3_res}" in export WRITE_GROUP=2 export WRTTASK_PER_GROUP_PER_THREAD_PER_TILE=10 export WRITE_GROUP_GFS=4 - export WRTTASK_PER_GROUP_PER_THREAD_PER_TILE_GFS=20 + export WRTTASK_PER_GROUP_PER_THREAD_PER_TILE_GFS=20 #Note this should be 10 for WCOSS2 ;; "C1152") export DELTIM=120 diff --git a/parm/wave/wave_gefs.buoys b/parm/wave/wave_gefs.buoys new file mode 100644 index 0000000000..6a56303b87 --- /dev/null +++ b/parm/wave/wave_gefs.buoys @@ -0,0 +1,300 @@ +$ +$ Global output point data file for global wave ensembles +$ +$ Retained only deep water buoys or so from general buoy file +$ taken from multi_1/2 +$ +$ Key to data in file: +$ +$ LON Longitude, east positive +$ LAT Latitude +$ NAME Output point name C*10, no blanks in name allowed +$ AH Anemometer height, dummy value for none-data points +$ TYPE Buoy type indicator, used for plotting and postprocessing +$ DAT Data point +$ XDT Former data point +$ BPT Boundary data for external models. +$ VBY 'Virtual buoy' +$ SOURCE Source of data point +$ ENCAN Environment Canada +$ GOMOOS Gulf of Maine OOS +$ IDT Irish Department of Transportation +$ METFR Meteo France +$ NCEP Boundary and other data points +$ NDBC National Data Buoy Center +$ PRIV Private and incidental data sources +$ SCRIPPS Scripps +$ UKMO UK Met Office +$ PDES Puertos del Estados +$ SHOM Service Hydrographique et Oceanographique de la Marine +$ OCNOR Fugro Oceanor +$ WHOI Woods Hole Oceanographic Institute +$ SKOREA South Korea +$ MVEW Ministerie van Verkeer en Waterstaat +$ CORMP Coastal Ocean Research and Monitoring Program +$ DIMAR Direccion General Maritima (Columbia) +$ BP British Petroleum +$ SCALE Scale indicator for plotting of locations on map +$ Point will only be plotted if SCALE =< DX in our +$ GrADS scripts, DX is width of plot in logitude +$ +$ DEptH Depth in meters +$ +$ Notes: +$ +$ - The '$' at the first position identifies comments for WAVEWATCH III +$ input. +$ - The first three data columns are used by the forecats code, the other +$ are used by postprocessing scripts. +$ +$ LON LAT NAME AH TYPE SOURCE SCALE DEPTH +$ --------------------------------------------------------------- + -85.078 -19.425 '32012 ' -1 DAT WHOI 360 4534 + -90.000 -55.000 '34002 ' 6.2 DAT OCOBSI 360 4800 + -72.522 34.502 '41001 ' 4 DAT NDBC 360 4556 + -74.930 31.892 '41002 ' 4 DAT NDBC 360 3920 + -79.099 32.501 '41004 ' 4 DAT NDBC 360 39 + -80.868 31.400 '41008 ' 5 DAT NDBC 360 14.9 + -80.185 28.508 '41009 ' 4 DAT NDBC 360 42 + -78.485 28.878 '41010 ' 4 DAT NDBC 360 890 + -77.743 33.436 '41013 ' 4 DAT NDBC 360 23.5 + -78.477 33.837 '41024 ' 2.95 DAT CORMP 360 10 + -75.363 35.025 '41025 ' 4 DAT NDBC 360 59.4 + -79.624 32.803 '41029 ' 2.95 DAT CORMP 360 10 + -80.406 32.279 '41033 ' 2.95 DAT CORMP 360 10 + -77.362 33.988 '41037 ' 2.95 DAT CORMP 360 30 + -77.715 34.141 '41038 ' 2.95 DAT CORMP 360 18 + -53.045 14.554 '41040 ' 4 DAT NDBC 360 5112 + -46.093 14.311 '41041 ' 4 DAT NDBC 360 3595 + -64.830 21.124 '41043 ' 4 DAT NDBC 360 5271 + -58.630 21.582 '41044 ' 4 DAT NDBC 360 5419 + -68.384 23.822 '41046 ' 4 DAT NDBC 360 5549 + -71.494 27.514 '41047 ' 4 DAT NDBC 360 5321 + -69.585 31.838 '41048 ' 4 DAT NDBC 360 5340 + -62.938 27.490 '41049 ' 4 DAT NDBC 360 5459 + -65.004 18.257 '41051 ' 4 DAT CARICOOS 360 32 + -64.763 18.249 '41052 ' 4 DAT CARICOOS 360 44 + -65.464 18.261 '41056 ' 4 DAT CARICOOS 360 30 + -65.157 18.476 '41058 ' 4 DAT CARICOOS 360 40 + -51.017 14.824 '41060 ' -1 DAT WHOI 360 5021 + -75.095 35.778 '41062 ' 3.5 DAT UNC 360 36 + -75.941 34.782 '41063 ' 3.5 DAT UNC 360 30 + -76.949 34.207 '41064 ' 2.95 DAT CORMP 360 30 + -78.015 33.721 '41108 ' -1 DAT SIO 360 12.8 + -77.717 34.141 '41110 ' -1 DAT CORMP 360 17 + -81.292 30.709 '41112 ' -1 DAT SIO 360 15.54 + -80.534 28.400 '41113 ' -1 DAT SIO 360 9.8 + -80.188 28.523 '41116 ' -1 DAT SIO 360 41 + -81.080 30.000 '41117 ' -1 DAT USACE 360 24.4 + -80.590 28.609 '41118 ' -1 DAT SIO 360 7.3 + -78.483 33.842 '41119 ' -1 DAT CORMP 360 13 + -76.946 34.213 '41159 ' -1 DAT CORMP 360 30.5 + -89.650 25.961 '42001 ' 3.6 DAT NDBC 360 3334 + -93.758 26.091 '42002 ' 5 DAT NDBC 360 3125.1 + -85.615 25.925 '42003 ' 4 DAT NDBC 360 3265 + -87.551 30.064 '42012 ' 4 DAT NDBC 360 25.9 + -95.350 27.906 '42019 ' 5 DAT NDBC 360 82.2 + -96.693 26.968 '42020 ' 4 DAT NDBC 360 84.1 + -83.741 27.505 '42022 ' 3.1 DAT COMPS 360 50 + -83.086 26.010 '42023 ' 3.1 DAT COMPS 360 50 + -83.475 25.171 '42026 ' 3.2 DAT COMPS 360 70 + -94.413 29.232 '42035 ' 4 DAT NDBC 360 16.2 + -84.516 28.501 '42036 ' 4 DAT NDBC 360 49.7 + -86.008 28.788 '42039 ' 4 DAT NDBC 360 270 + -88.226 29.208 '42040 ' 4 DAT NDBC 360 183 + -94.899 28.982 '42043 ' 4 DAT TAMUNI 360 19 + -96.500 26.217 '42045 ' 4 DAT TAMUNI 360 62 + -94.037 27.890 '42046 ' 4 DAT TAMUNI 360 105 + -93.597 27.897 '42047 ' 4 DAT TAMUNI 360 89 + -93.941 22.124 '42055 ' 4 DAT NDBC 360 3624 + -84.946 19.812 '42056 ' 4 DAT NDBC 360 4565 + -81.422 16.908 '42057 ' 4 DAT NDBC 360 377 + -74.560 14.775 '42058 ' 4 DAT NDBC 360 4150 + -67.483 15.252 '42059 ' 4 DAT NDBC 360 4784 + -63.354 16.413 '42060 ' 4 DAT NDBC 360 1507 + -81.251 24.500 '42078 ' -1 DAT CDIP 360 170 + -81.242 24.535 '42079 ' -1 DAT CDIP 360 99 + -66.532 17.869 '42085 ' 4 DAT CARICOOS 360 18.9 + -60.848 11.185 '42087 ' 3.35 DAT ICON 360 1266 + -60.521 11.301 '42088 ' 3.35 DAT ICON 360 1266 + -80.061 19.699 '42089 ' 3.35 DAT ICON 360 5726 + -69.580 18.432 '42090 ' 3.35 DAT ICON 360 1188 + -81.967 24.407 '42095 ' -1 DAT USACE 360 100 + -83.650 25.700 '42097 ' -1 DAT USACE 360 81 + -84.275 27.345 '42099 ' -1 DAT SIO 360 93.9 + -90.459 26.689 '42360 ' 3 DAT MURPHY 360 2539.9 + -92.490 27.550 '42361 ' 122 DAT SHELL 360 871.7 + -90.648 27.795 '42362 ' 122 DAT ENVEN 360 910 + -89.220 28.160 '42363 ' 122 DAT SHELL 360 894 + -88.090 29.060 '42364 ' 122 DAT SHELL 360 980.2 + -90.283 27.207 '42369 ' 60.4 DAT BP 360 1371.9 + -88.289 28.521 '42375 ' 61 DAT BP 360 1920.2 + -94.898 26.129 '42390 ' -1 DAT SHELL 360 2382.6 + -90.027 27.196 '42392 ' -1 DAT BP 360 2156.16 + -89.240 28.157 '42394 ' 100 DAT SHELL 360 923.5 + -90.792 26.404 '42395 ' 3 DAT SHELL 360 2941.9 + -125.032 10.051 '43010 ' -1 DAT WHOI 360 4769 + -69.128 43.201 '44005 ' 5 DAT NDBC 360 180.7 + -70.141 43.525 '44007 ' 5 DAT NDBC 360 26.5 + -69.248 40.504 '44008 ' 4 DAT NDBC 360 74.7 + -74.702 38.457 '44009 ' 5 DAT NDBC 360 30 + -66.588 41.070 '44011 ' 4 DAT NDBC 360 88.4 + -70.651 42.346 '44013 ' 5 DAT NDBC 360 64 + -74.840 36.606 '44014 ' 5 DAT NDBC 360 47 + -72.049 40.693 '44017 ' 5 DAT NDBC 360 48 + -70.143 42.206 '44018 ' 5 DAT NDBC 360 41.5 + -70.279 41.493 '44020 ' 4 DAT NDBC 360 14.3 + -73.728 40.883 '44022 ' 3.5 DAT UCT 360 22.5 + -65.912 42.327 '44024 ' 4 DAT NRCOOS 360 225 + -73.164 40.251 '44025 ' 5 DAT NDBC 360 36.3 + -67.300 44.283 '44027 ' 5 DAT NDBC 360 185.3 + -70.566 42.523 '44029 ' 4 DAT NRCOOS 360 65 + -70.426 43.179 '44030 ' 4 DAT NRCOOS 360 62 + -69.355 43.715 '44032 ' 4 DAT NRCOOS 360 100 + -68.996 44.055 '44033 ' 4 DAT NRCOOS 360 110 + -68.112 44.103 '44034 ' 4 DAT NRCOOS 360 100 + -67.876 43.497 '44037 ' 4 DAT NRCOOS 360 285 + -73.580 40.956 '44040 ' 3.5 DAT UCT 360 18.3 + -75.715 36.199 '44056 ' -1 DAT USACE 360 17.4 + -73.703 40.369 '44065 ' 4 DAT NDBC 360 25 + -72.644 39.618 '44066 ' 4 DAT NDBC 360 78 + -73.087 40.699 '44069 ' 3 DAT SBROOKU 360 46 + -70.540 43.020 '44073 ' 2.6 DAT UNH 360 131 + -75.421 36.001 '44086 ' -1 DAT SIO 360 21 + -74.838 36.612 '44088 ' -1 DAT SIO 360 47 + -75.334 37.757 '44089 ' -1 DAT USACE 360 16.9 + -70.329 41.840 '44090 ' -1 DAT USGS 360 26 + -73.769 39.778 '44091 ' -1 DAT USACE 360 25.6 + -75.492 36.872 '44093 ' -1 DAT SIO 360 26.82 + -75.330 35.750 '44095 ' -1 DAT SIO 360 18.3 + -75.809 37.023 '44096 ' -1 DAT SIO 360 11.9 + -71.127 40.969 '44097 ' -1 DAT SIO 360 48.16 + -70.168 42.798 '44098 ' -1 DAT SIO 360 76.5 + -75.720 36.914 '44099 ' -1 DAT SIO 360 18.3 + -75.594 36.260 '44100 ' -1 DAT SIO 360 25.9 + -62.000 42.260 '44137 ' 5 DAT ENCAN 360 4000 + -57.100 44.240 '44139 ' 5 DAT ENCAN 360 1500 + -64.020 42.500 '44150 ' 5 DAT ENCAN 360 1300 + -63.400 44.500 '44258 ' 5 DAT ENCAN 360 58 + -147.949 56.232 '46001 ' 5 DAT NDBC 360 4054 + -130.537 42.612 '46002 ' 4 DAT NDBC 360 3413 + -136.100 50.930 '46004 ' 5 DAT ENCAN 360 3600 + -131.079 46.134 '46005 ' 4 DAT NDBC 360 2852 + -137.397 40.782 '46006 ' 4 DAT NDBC 360 4378 + -121.019 34.956 '46011 ' 5 DAT NDBC 360 464.8 + -160.000 57.700 '46021 ' -1 DAT NDBC 360 59 + -120.967 34.714 '46023 ' 10 DAT NDBC 360 384.1 + -119.200 33.000 '46024 ' -1 DAT NDBC 360 1213 + -119.053 33.763 '46025 ' 4 DAT NDBC 360 888 + -121.857 35.703 '46028 ' 5 DAT NDBC 360 1048 + -177.708 57.018 '46035 ' 5 DAT NDBC 360 3687 + -122.398 36.785 '46042 ' 5 DAT NDBC 360 1645.9 + -119.506 32.404 '46047 ' 4 DAT NDBC 360 1394 + -120.477 34.265 '46054 ' 4 DAT NDBC 360 469.4 + -129.951 38.094 '46059 ' 4 DAT NDBC 360 4628 + -146.805 60.584 '46060 ' 5 DAT NDBC 360 445 + -154.987 52.765 '46066 ' 5 DAT NDBC 360 4460 + -120.213 33.677 '46069 ' 4 DAT NDBC 360 977.8 + 175.153 55.082 '46070 ' 5 DAT NDBC 360 3835 + 179.012 51.125 '46071 ' 5 DAT NDBC 360 1681 + -172.088 51.672 '46072 ' 5 DAT NDBC 360 3572 + -172.001 55.031 '46073 ' 5 DAT NDBC 360 3051.5 + -160.817 53.983 '46075 ' 5 DAT NDBC 360 2392.7 + -147.990 59.502 '46076 ' 5 DAT NDBC 360 195.1 + -152.582 55.556 '46078 ' 5 DAT NDBC 360 5380 + -150.042 57.947 '46080 ' 5 DAT NDBC 360 254.5 + -143.372 59.681 '46082 ' 5 DAT NDBC 360 300 + -137.997 58.300 '46083 ' 5 DAT NDBC 360 136 + -136.102 56.622 '46084 ' 5 DAT NDBC 360 1158 + -142.882 55.883 '46085 ' 4 DAT NDBC 360 3721 + -118.052 32.499 '46086 ' 4 DAT NDBC 360 1844.7 + -125.771 45.925 '46089 ' 5 DAT NDBC 360 2293.3 + -122.029 36.751 '46092 ' 4 DAT MBARI 360 1000 + -122.351 36.723 '46114 ' -1 DAT SIO 360 1463 + -131.220 51.830 '46147 ' 5 DAT ENCAN 360 2000 + -131.100 53.620 '46183 ' 5 DAT ENCAN 360 65 + -138.850 53.910 '46184 ' 5 DAT ENCAN 360 3200 + -129.790 52.420 '46185 ' 5 DAT ENCAN 360 230 + -128.770 51.380 '46204 ' -1 DAT ENCAN 360 222 + -134.320 54.190 '46205 ' 5 DAT ENCAN 360 2675 + -126.000 48.840 '46206 ' 5 DAT ENCAN 360 72 + -129.920 50.870 '46207 ' 5 DAT ENCAN 360 2125 + -132.690 52.520 '46208 ' 5 DAT ENCAN 360 2950 + -123.472 37.950 '46214 ' -1 DAT SIO 360 550 + -120.783 34.454 '46218 ' -1 DAT SIO 360 548.6 + -119.882 33.225 '46219 ' -1 DAT SIO 360 274.3 + -118.634 33.855 '46221 ' -1 DAT SIO 360 370 + -118.317 33.618 '46222 ' -1 DAT SIO 360 457 + -117.391 32.933 '46225 ' -1 DAT SIO 360 549 + -117.370 32.747 '46231 ' -1 DAT SIO 360 201.17 + -117.421 32.530 '46232 ' -1 DAT SIO 360 1143 + -117.169 32.570 '46235 ' -1 DAT SIO 360 21 + -122.096 36.343 '46239 ' -1 DAT SIO 360 369 + -145.200 50.033 '46246 ' -1 DAT SIO 360 4252 + -119.559 33.761 '46251 ' -1 DAT SIO 360 1920 + -118.181 33.576 '46253 ' -1 DAT SIO 360 66 + -117.267 32.868 '46254 ' -1 DAT SIO 360 38.71 + -119.651 33.400 '46255 ' -1 DAT SIO 360 105 + -118.201 33.700 '46256 ' -1 DAT SIO 360 23.25 + -120.766 34.439 '46257 ' -1 DAT SIO 360 576.07 + -117.501 32.752 '46258 ' -1 DAT SIO 360 588.6 + -121.497 34.767 '46259 ' -1 DAT USACE 360 646.8 + -119.004 33.704 '46262 ' -1 DAT SIO 360 905 + -151.695 57.479 '46264 ' -1 DAT SIO 360 86 + -165.475 64.473 '46265 ' -1 DAT SIO 360 18.2 + -153.781 23.535 '51000 ' 5 DAT NDBC 360 4811 + -162.000 24.453 '51001 ' 4 DAT NDBC 360 4895 + -157.742 17.043 '51002 ' 4 DAT NDBC 360 4948 + -160.662 19.172 '51003 ' 4 DAT NDBC 360 4943.3 + -152.364 17.604 '51004 ' 4 DAT NDBC 360 4998 + -162.075 24.361 '51101 ' 4 DAT NDBC 360 4849 + -158.117 21.671 '51201 ' -1 DAT SIO 360 200 + -157.678 21.415 '51202 ' -1 DAT SIO 360 89 + -157.010 20.788 '51203 ' -1 DAT SIO 360 201 + -158.124 21.281 '51204 ' -1 DAT SIO 360 300 + -156.425 21.018 '51205 ' -1 DAT SIO 360 200 + -154.970 19.780 '51206 ' -1 DAT SIO 360 345 + -157.752 21.477 '51207 ' -1 DAT SIO 360 81 + -159.574 22.285 '51208 ' -1 DAT SIO 360 200 + -170.493 -14.264 '51209 ' -1 DAT SIO 360 82 + -157.756 21.477 '51210 ' -1 DAT SIO 360 80 + -157.959 21.297 '51211 ' -1 DAT SIO 360 35 + -158.149 21.323 '51212 ' -1 DAT SIO 360 280 + -157.003 20.750 '51213 ' -1 DAT SIO 360 235 + 144.788 13.354 '52200 ' -1 DAT SIO 360 200 + 171.392 7.083 '52201 ' -1 DAT SIO 360 540 + 144.812 13.684 '52202 ' -1 DAT SIO 360 510 + 145.662 15.268 '52211 ' -1 DAT SIO 360 487.68 + 134.667 7.630 '52212 ' -1 DAT SIO 360 97 + -5.000 45.230 '62001 ' 3 DAT UKMO 360 4556 + -12.430 48.720 '62029 ' 3 DAT UKMO 360 3575 + -4.400 50.000 '62050 ' -1 DAT UKMO 360 53 + -2.900 49.900 '62103 ' 14 DAT UKMO 360 18 + -12.570 55.420 '62105 ' 3 DAT UKMO 360 2899 + -6.100 50.102 '62107 ' 14 DAT UKMO 360 61 + 0.000 58.300 '62114 ' -1 DAT PRIVATE 360 142 + 0.700 54.000 '62127 ' -1 DAT PRIVATE 360 39 + 1.700 53.400 '62144 ' -1 DAT PRIVATE 360 16 + 2.800 53.102 '62145 ' -1 DAT PRIVATE 360 26 + 2.100 57.200 '62146 ' -1 DAT PRIVATE 360 98 + 1.500 53.600 '62148 ' -1 DAT PRIVATE 360 16 + 1.100 53.700 '62149 ' -1 DAT PRIVATE 360 16 + -8.470 47.550 '62163 ' 3 DAT UKMO 360 4000 + 1.100 54.000 '62165 ' -1 DAT PRIVATE 360 41 + 0.000 50.400 '62305 ' 14 DAT UKMO 360 39 + 1.500 59.500 '63110 ' -1 DAT PRIVATE 360 117 + 1.000 61.100 '63112 ' -1 DAT PRIVATE 360 156 + 1.708 61.000 '63113 ' -1 DAT PRIVATE 360 156 + 1.300 61.600 '63115 ' -1 DAT PRIVATE 360 156 + 1.100 61.400 '63117 ' -1 DAT PRIVATE 360 156 + -11.420 59.070 '64045 ' 3 DAT UKMO 360 1935 + -4.167 60.483 '64046 ' 3 DAT UKMO 360 230 +$ +$ --------------------------------------------------------------- +$ +$ End of list +$ +$ --------------------------------------------------------------- +$ + 0.00 0.00 'STOPSTRING' 999. XXX NCEP 0 +$ diff --git a/scripts/exgfs_atmos_postsnd.sh b/scripts/exgfs_atmos_postsnd.sh index 668234c357..368f001ed0 100755 --- a/scripts/exgfs_atmos_postsnd.sh +++ b/scripts/exgfs_atmos_postsnd.sh @@ -71,7 +71,7 @@ export FINT=$NINT1 ic=0 while [ $ic -lt 1000 ]; do - if [[ ! -f "${COM_ATMOS_HISTORY}/${RUN}.${cycle}.logf${FEND}.${logfm}" ]]; then + if [[ ! -f "${COM_ATMOS_HISTORY}/${RUN}.${cycle}.atm.logf${FEND}.${logfm}" ]]; then sleep 10 ic=$(expr $ic + 1) else diff --git a/sorc/checkout.sh b/sorc/checkout.sh index 57bdae649f..da53ea9ff0 100755 --- a/sorc/checkout.sh +++ b/sorc/checkout.sh @@ -150,7 +150,7 @@ source "${topdir}/../workflow/gw_setup.sh" # The checkout version should always be a speciifc commit (hash or tag), not a branch errs=0 checkout "wxflow" "https://github.com/NOAA-EMC/wxflow" "528f5ab" ; errs=$((errs + $?)) -checkout "gfs_utils.fd" "https://github.com/NOAA-EMC/gfs-utils" "8965258" ; errs=$((errs + $?)) +checkout "gfs_utils.fd" "https://github.com/NOAA-EMC/gfs-utils" "a283262" ; errs=$((errs + $?)) checkout "ufs_utils.fd" "https://github.com/ufs-community/UFS_UTILS.git" "72a0471" ; errs=$((errs + $?)) checkout "ufs_model.fd" "https://github.com/ufs-community/ufs-weather-model" "${ufs_model_hash:-4d05445}" ; errs=$((errs + $?)) checkout "verif-global.fd" "https://github.com/NOAA-EMC/EMC_verif-global.git" "c267780" ; errs=$((errs + $?)) @@ -160,7 +160,7 @@ if [[ ${checkout_gsi} == "YES" ]]; then fi if [[ ${checkout_gdas} == "YES" ]]; then - checkout "gdas.cd" "https://github.com/NOAA-EMC/GDASApp.git" "2774a10"; errs=$((errs + $?)) + checkout "gdas.cd" "https://github.com/NOAA-EMC/GDASApp.git" "ac8fdb1"; errs=$((errs + $?)) fi if [[ ${checkout_gsi} == "YES" || ${checkout_gdas} == "YES" ]]; then diff --git a/sorc/link_workflow.sh b/sorc/link_workflow.sh index 3c1d19f740..0e2cdf5edd 100755 --- a/sorc/link_workflow.sh +++ b/sorc/link_workflow.sh @@ -203,6 +203,7 @@ if [[ -d "${HOMEgfs}/sorc/gdas.cd" ]]; then cd "${HOMEgfs}/ush" || exit 1 ${LINK_OR_COPY} "${HOMEgfs}/sorc/gdas.cd/ush/ufsda" . ${LINK_OR_COPY} "${HOMEgfs}/sorc/gdas.cd/ush/jediinc2fv3.py" . + ${LINK_OR_COPY} "${HOMEgfs}/sorc/gdas.cd/ush/ioda/bufr2ioda/run_bufr2ioda.py" . ${LINK_OR_COPY} "${HOMEgfs}/sorc/gdas.cd/build/bin/imsfv3_scf2ioda.py" . fi diff --git a/ush/gfs_bufr.sh b/ush/gfs_bufr.sh index b782c707c9..5ed05f9beb 100755 --- a/ush/gfs_bufr.sh +++ b/ush/gfs_bufr.sh @@ -58,7 +58,7 @@ for (( hr = 10#${FSTART}; hr <= 10#${FEND}; hr = hr + 10#${FINT} )); do # Make sure all files are available: ic=0 while (( ic < 1000 )); do - if [[ ! -f "${COM_ATMOS_HISTORY}/${RUN}.${cycle}.logf${hh3}.${logfm}" ]]; then + if [[ ! -f "${COM_ATMOS_HISTORY}/${RUN}.${cycle}.atm.logf${hh3}.${logfm}" ]]; then sleep 10 ic=$((ic + 1)) else diff --git a/ush/parsing_namelists_FV3.sh b/ush/parsing_namelists_FV3.sh index baf81602c2..0a499a8f26 100755 --- a/ush/parsing_namelists_FV3.sh +++ b/ush/parsing_namelists_FV3.sh @@ -345,6 +345,7 @@ cat >> input.nml <