diff --git a/rrfs-test/CMakeLists.txt b/rrfs-test/CMakeLists.txt index e8106c3..d1a0f4a 100644 --- a/rrfs-test/CMakeLists.txt +++ b/rrfs-test/CMakeLists.txt @@ -152,7 +152,7 @@ if(MPAS_DYCORE) ARGS ${CMAKE_SOURCE_DIR}/rrfs-test/ush/iodaconv_comp_rrfs.sh netcdf "${CMAKE_BINARY_DIR}/bin/bufr2ioda.x ${case}.yaml" - data/obs/ioda_msonet.nc + data/obs/ioda_msonet_ctest.nc ioda_msonet.nc ${IODA_CONV_COMP_TOL} DEPENDS bufr2ioda.x ) diff --git a/rrfs-test/scripts/link_fv3jedi_expr.sh b/rrfs-test/scripts/link_fv3jedi_expr.sh index c66c066..bb88f0b 100755 --- a/rrfs-test/scripts/link_fv3jedi_expr.sh +++ b/rrfs-test/scripts/link_fv3jedi_expr.sh @@ -24,7 +24,20 @@ sed -e "s#@RDASApp@#${RDASApp}#" ${RDASApp}/rrfs-test/scripts/templates/fv3jedi_ cp ${RDASApp}/rrfs-test/ush/colormap.py . cp ${RDASApp}/rrfs-test/ush/fv3jedi_increment_singleob.py . cp ${RDASApp}/rrfs-test/ush/fv3jedi_increment_fulldom.py . -ln -snf ${RDASApp}/fix/expr_data/${exprname}/Data Data +rm -rf Data; mkdir Data +ln -snf ${RDASApp}/fix/expr_data/${exprname}/Data/* Data/ +# link correct ioda files +rm -rf Data/obs; mkdir Data/obs +ln -snf ${RDASApp}/fix/expr_data/${exprname}/Data/obs/* Data/obs/ # keep this line for now to be backward compatible +for dcfile in Data/obs/ioda*dc.nc; do # link to DA runtime prescribed file names + dcfile=${dcfile##*obs/} + regfile="${dcfile%%_dc.nc}.nc" + ln -snf ${RDASApp}/fix/expr_data/${exprname}/Data/obs/${dcfile} Data/obs/${regfile} +done +ln -snf ${RDASApp}/fix/expr_data/${exprname}/Data/obs/amsua_n19_obs.2024052700_dc.nc Data/obs/ioda_amsua_n19.nc +ln -snf ${RDASApp}/fix/expr_data/${exprname}/Data/obs/atms_n20_obs_2024052700_dc.nc Data/obs/ioda_atms_n20.nc +ln -snf ${RDASApp}/fix/expr_data/${exprname}/Data/obs/atms_npp_obs_2024052700_dc.nc Data/obs/ioda_atms_npp.nc +# ln -snf ${RDASApp}/fix/expr_data/${exprname}/DataFix DataFix ln -snf ${RDASApp}/fix/expr_data/${exprname}/Data_static Data_static ln -snf ${RDASApp}/fix/expr_data/${exprname}/INPUT INPUT diff --git a/rrfs-test/scripts/link_mpasjedi_expr.sh b/rrfs-test/scripts/link_mpasjedi_expr.sh index f17128f..0dd5955 100755 --- a/rrfs-test/scripts/link_mpasjedi_expr.sh +++ b/rrfs-test/scripts/link_mpasjedi_expr.sh @@ -54,7 +54,18 @@ ln -snf ${RDASApp}/fix/bumploc/${BUMPLOC} bumploc/${BUMPLOC} ln -snf ${RDASApp}/fix/B_static/L55_20241204 B_static ln -snf ${RDASApp}/fix/expr_data/${exprname}/bkg/mpasout.2024-05-27_00.00.00.nc . ln -snf ${RDASApp}/fix/expr_data/${exprname}/invariant.nc invariant.nc -ln -snf ${RDASApp}/fix/expr_data/${exprname}/obs/* obs/ +# link the correct ioda files +ln -snf ${RDASApp}/fix/expr_data/${exprname}/obs/* obs/ # keep this line for now to be backward compatible +ln -snf ${RDASApp}/fix/expr_data/${exprname}/obs/ioda_msonet.nc obs/ioda_msonet_ctest.nc +for dcfile in obs/ioda*dc.nc; do # link to DA runtime prescribed file names + dcfile=${dcfile##obs/} + regfile="${dcfile%%_dc.nc}.nc" + ln -snf ${RDASApp}/fix/expr_data/${exprname}/obs/${dcfile} obs/${regfile} +done +ln -snf ${RDASApp}/fix/expr_data/${exprname}/obs/amsua_n19_obs.2024052700_dc.nc obs/ioda_amsua_n19.nc +ln -snf ${RDASApp}/fix/expr_data/${exprname}/obs/atms_n20_obs_2024052700_dc.nc obs/ioda_atms_n20.nc +ln -snf ${RDASApp}/fix/expr_data/${exprname}/obs/atms_npp_obs_2024052700_dc.nc obs/ioda_atms_npp.nc +# ln -snf ${RDASApp}/fix/expr_data/${exprname}/ens/* ens/ ln -snf ${RDASApp}/fix/crtm/2.4.0 crtm diff --git a/rrfs-test/validated_yamls/templates/obtype_config/adpsfc_airTemperature_187.yaml b/rrfs-test/validated_yamls/templates/obtype_config/adpsfc_airTemperature_187.yaml index de6fe61..7dfa222 100644 --- a/rrfs-test/validated_yamls/templates/obtype_config/adpsfc_airTemperature_187.yaml +++ b/rrfs-test/validated_yamls/templates/obtype_config/adpsfc_airTemperature_187.yaml @@ -6,7 +6,7 @@ obsdatain: engine: type: H5File - obsfile: "@OBSFILE@" + obsfile: data/obs/ioda_adpsfc.nc obsdataout: engine: type: H5File diff --git a/rrfs-test/validated_yamls/templates/obtype_config/adpsfc_specificHumidity_187.yaml b/rrfs-test/validated_yamls/templates/obtype_config/adpsfc_specificHumidity_187.yaml index d4d22c6..8c5ddbc 100644 --- a/rrfs-test/validated_yamls/templates/obtype_config/adpsfc_specificHumidity_187.yaml +++ b/rrfs-test/validated_yamls/templates/obtype_config/adpsfc_specificHumidity_187.yaml @@ -6,7 +6,7 @@ obsdatain: engine: type: H5File - obsfile: "@OBSFILE@" + obsfile: data/obs/ioda_adpsfc.nc obsdataout: engine: type: H5File diff --git a/rrfs-test/validated_yamls/templates/obtype_config/adpsfc_stationPressure_187.yaml b/rrfs-test/validated_yamls/templates/obtype_config/adpsfc_stationPressure_187.yaml index aa19851..8b5a863 100644 --- a/rrfs-test/validated_yamls/templates/obtype_config/adpsfc_stationPressure_187.yaml +++ b/rrfs-test/validated_yamls/templates/obtype_config/adpsfc_stationPressure_187.yaml @@ -6,7 +6,7 @@ obsdatain: engine: type: H5File - obsfile: "@OBSFILE@" + obsfile: data/obs/ioda_adpsfc.nc obsdataout: engine: type: H5File diff --git a/rrfs-test/validated_yamls/templates/obtype_config/adpsfc_winds_287.yaml b/rrfs-test/validated_yamls/templates/obtype_config/adpsfc_winds_287.yaml index 5d5cc2a..5fa5286 100644 --- a/rrfs-test/validated_yamls/templates/obtype_config/adpsfc_winds_287.yaml +++ b/rrfs-test/validated_yamls/templates/obtype_config/adpsfc_winds_287.yaml @@ -6,7 +6,7 @@ obsdatain: engine: type: H5File - obsfile: "@OBSFILE@" + obsfile: data/obs/ioda_adpsfc.nc obsdataout: engine: type: H5File diff --git a/rrfs-test/validated_yamls/templates/obtype_config/adpupa_airTemperature_120.yaml b/rrfs-test/validated_yamls/templates/obtype_config/adpupa_airTemperature_120.yaml index 549933f..19a6685 100644 --- a/rrfs-test/validated_yamls/templates/obtype_config/adpupa_airTemperature_120.yaml +++ b/rrfs-test/validated_yamls/templates/obtype_config/adpupa_airTemperature_120.yaml @@ -6,7 +6,7 @@ obsdatain: engine: type: H5File - obsfile: "@OBSFILE@" + obsfile: data/obs/ioda_adpupa.nc obsgrouping: group variables: ["stationIdentification"] sort variable: "pressure" diff --git a/rrfs-test/validated_yamls/templates/obtype_config/adpupa_specificHumidity_120.yaml b/rrfs-test/validated_yamls/templates/obtype_config/adpupa_specificHumidity_120.yaml index 9dab7ed..7fe6448 100644 --- a/rrfs-test/validated_yamls/templates/obtype_config/adpupa_specificHumidity_120.yaml +++ b/rrfs-test/validated_yamls/templates/obtype_config/adpupa_specificHumidity_120.yaml @@ -6,7 +6,7 @@ obsdatain: engine: type: H5File - obsfile: "@OBSFILE@" + obsfile: data/obs/ioda_adpupa.nc obsgrouping: group variables: ["stationIdentification"] sort variable: "pressure" diff --git a/rrfs-test/validated_yamls/templates/obtype_config/adpupa_winds_220.yaml b/rrfs-test/validated_yamls/templates/obtype_config/adpupa_winds_220.yaml index e8f512b..cbaf02a 100644 --- a/rrfs-test/validated_yamls/templates/obtype_config/adpupa_winds_220.yaml +++ b/rrfs-test/validated_yamls/templates/obtype_config/adpupa_winds_220.yaml @@ -6,7 +6,7 @@ obsdatain: engine: type: H5File - obsfile: "@OBSFILE@" + obsfile: data/obs/ioda_adpupa.nc obsgrouping: group variables: ["stationIdentification"] sort variable: "pressure" diff --git a/rrfs-test/validated_yamls/templates/obtype_config/aircar_airTemperature_133.yaml b/rrfs-test/validated_yamls/templates/obtype_config/aircar_airTemperature_133.yaml index 671f9c2..cb33d6e 100644 --- a/rrfs-test/validated_yamls/templates/obtype_config/aircar_airTemperature_133.yaml +++ b/rrfs-test/validated_yamls/templates/obtype_config/aircar_airTemperature_133.yaml @@ -6,7 +6,7 @@ obsdatain: engine: type: H5File - obsfile: "@OBSFILE@" + obsfile: data/obs/ioda_aircar.nc obsdataout: engine: type: H5File diff --git a/rrfs-test/validated_yamls/templates/obtype_config/aircar_specificHumidity_133.yaml b/rrfs-test/validated_yamls/templates/obtype_config/aircar_specificHumidity_133.yaml index 134f015..26267a8 100644 --- a/rrfs-test/validated_yamls/templates/obtype_config/aircar_specificHumidity_133.yaml +++ b/rrfs-test/validated_yamls/templates/obtype_config/aircar_specificHumidity_133.yaml @@ -6,7 +6,7 @@ obsdatain: engine: type: H5File - obsfile: "@OBSFILE@" + obsfile: data/obs/ioda_aircar.nc obsdataout: engine: type: H5File diff --git a/rrfs-test/validated_yamls/templates/obtype_config/aircar_winds_233.yaml b/rrfs-test/validated_yamls/templates/obtype_config/aircar_winds_233.yaml index 22c2801..9a30ecf 100644 --- a/rrfs-test/validated_yamls/templates/obtype_config/aircar_winds_233.yaml +++ b/rrfs-test/validated_yamls/templates/obtype_config/aircar_winds_233.yaml @@ -6,7 +6,7 @@ obsdatain: engine: type: H5File - obsfile: "@OBSFILE@" + obsfile: data/obs/ioda_aircar.nc obsdataout: engine: type: H5File diff --git a/rrfs-test/validated_yamls/templates/obtype_config/aircft_airTemperature_130.yaml b/rrfs-test/validated_yamls/templates/obtype_config/aircft_airTemperature_130.yaml index ec2631b..5602b5c 100644 --- a/rrfs-test/validated_yamls/templates/obtype_config/aircft_airTemperature_130.yaml +++ b/rrfs-test/validated_yamls/templates/obtype_config/aircft_airTemperature_130.yaml @@ -6,7 +6,7 @@ obsdatain: engine: type: H5File - obsfile: "@OBSFILE@" + obsfile: data/obs/ioda_aircft.nc obsdataout: engine: type: H5File diff --git a/rrfs-test/validated_yamls/templates/obtype_config/aircft_airTemperature_131.yaml b/rrfs-test/validated_yamls/templates/obtype_config/aircft_airTemperature_131.yaml index 12a0b82..7f0e6da 100644 --- a/rrfs-test/validated_yamls/templates/obtype_config/aircft_airTemperature_131.yaml +++ b/rrfs-test/validated_yamls/templates/obtype_config/aircft_airTemperature_131.yaml @@ -6,7 +6,7 @@ obsdatain: engine: type: H5File - obsfile: "@OBSFILE@" + obsfile: data/obs/ioda_aircft.nc obsdataout: engine: type: H5File diff --git a/rrfs-test/validated_yamls/templates/obtype_config/aircft_airTemperature_134.yaml b/rrfs-test/validated_yamls/templates/obtype_config/aircft_airTemperature_134.yaml index 8292b13..742217b 100644 --- a/rrfs-test/validated_yamls/templates/obtype_config/aircft_airTemperature_134.yaml +++ b/rrfs-test/validated_yamls/templates/obtype_config/aircft_airTemperature_134.yaml @@ -6,7 +6,7 @@ obsdatain: engine: type: H5File - obsfile: "@OBSFILE@" + obsfile: data/obs/ioda_aircft.nc obsdataout: engine: type: H5File diff --git a/rrfs-test/validated_yamls/templates/obtype_config/aircft_airTemperature_135.yaml b/rrfs-test/validated_yamls/templates/obtype_config/aircft_airTemperature_135.yaml index ca5e62f..825f3d2 100644 --- a/rrfs-test/validated_yamls/templates/obtype_config/aircft_airTemperature_135.yaml +++ b/rrfs-test/validated_yamls/templates/obtype_config/aircft_airTemperature_135.yaml @@ -6,7 +6,7 @@ obsdatain: engine: type: H5File - obsfile: "@OBSFILE@" + obsfile: data/obs/ioda_aircft.nc obsdataout: engine: type: H5File diff --git a/rrfs-test/validated_yamls/templates/obtype_config/aircft_specificHumidity_134.yaml b/rrfs-test/validated_yamls/templates/obtype_config/aircft_specificHumidity_134.yaml index 3200d60..6f8813b 100644 --- a/rrfs-test/validated_yamls/templates/obtype_config/aircft_specificHumidity_134.yaml +++ b/rrfs-test/validated_yamls/templates/obtype_config/aircft_specificHumidity_134.yaml @@ -6,7 +6,7 @@ obsdatain: engine: type: H5File - obsfile: "@OBSFILE@" + obsfile: data/obs/ioda_aircft.nc obsdataout: engine: type: H5File diff --git a/rrfs-test/validated_yamls/templates/obtype_config/aircft_winds_230.yaml b/rrfs-test/validated_yamls/templates/obtype_config/aircft_winds_230.yaml index d88ee5d..8feff1e 100644 --- a/rrfs-test/validated_yamls/templates/obtype_config/aircft_winds_230.yaml +++ b/rrfs-test/validated_yamls/templates/obtype_config/aircft_winds_230.yaml @@ -6,7 +6,7 @@ obsdatain: engine: type: H5File - obsfile: "@OBSFILE@" + obsfile: data/obs/ioda_aircft.nc obsdataout: engine: type: H5File diff --git a/rrfs-test/validated_yamls/templates/obtype_config/aircft_winds_231.yaml b/rrfs-test/validated_yamls/templates/obtype_config/aircft_winds_231.yaml index 70ce9d2..2857caa 100644 --- a/rrfs-test/validated_yamls/templates/obtype_config/aircft_winds_231.yaml +++ b/rrfs-test/validated_yamls/templates/obtype_config/aircft_winds_231.yaml @@ -6,7 +6,7 @@ obsdatain: engine: type: H5File - obsfile: "@OBSFILE@" + obsfile: data/obs/ioda_aircft.nc obsdataout: engine: type: H5File diff --git a/rrfs-test/validated_yamls/templates/obtype_config/aircft_winds_234.yaml b/rrfs-test/validated_yamls/templates/obtype_config/aircft_winds_234.yaml index fb69bcc..848169e 100644 --- a/rrfs-test/validated_yamls/templates/obtype_config/aircft_winds_234.yaml +++ b/rrfs-test/validated_yamls/templates/obtype_config/aircft_winds_234.yaml @@ -6,7 +6,7 @@ obsdatain: engine: type: H5File - obsfile: "@OBSFILE@" + obsfile: data/obs/ioda_aircft.nc obsdataout: engine: type: H5File diff --git a/rrfs-test/validated_yamls/templates/obtype_config/aircft_winds_235.yaml b/rrfs-test/validated_yamls/templates/obtype_config/aircft_winds_235.yaml index 40ff748..d5e1c6c 100644 --- a/rrfs-test/validated_yamls/templates/obtype_config/aircft_winds_235.yaml +++ b/rrfs-test/validated_yamls/templates/obtype_config/aircft_winds_235.yaml @@ -6,7 +6,7 @@ obsdatain: engine: type: H5File - obsfile: "@OBSFILE@" + obsfile: data/obs/ioda_aircft.nc obsdataout: engine: type: H5File diff --git a/rrfs-test/validated_yamls/templates/obtype_config/amsua_n19.yaml b/rrfs-test/validated_yamls/templates/obtype_config/amsua_n19.yaml index 62d6669..e4af048 100644 --- a/rrfs-test/validated_yamls/templates/obtype_config/amsua_n19.yaml +++ b/rrfs-test/validated_yamls/templates/obtype_config/amsua_n19.yaml @@ -5,7 +5,7 @@ obsdatain: engine: type: H5File - obsfile: data/obs/amsua_n19_obs.2024052700.nc + obsfile: data/obs/ioda_amsua_n19.nc obsdataout: engine: type: H5File diff --git a/rrfs-test/validated_yamls/templates/obtype_config/atms_npp_qc_bc.yaml b/rrfs-test/validated_yamls/templates/obtype_config/atms_npp_qc_bc.yaml index e350bad..7fd7dc9 100644 --- a/rrfs-test/validated_yamls/templates/obtype_config/atms_npp_qc_bc.yaml +++ b/rrfs-test/validated_yamls/templates/obtype_config/atms_npp_qc_bc.yaml @@ -6,11 +6,11 @@ obsdatain: engine: type: H5File - obsfile: "@OBSFILE@" + obsfile: data/obs/ioda_atms_npp.nc obsdataout: engine: type: H5File - obsfile: rass_atms_obs_2024052700.nc4 + obsfile: jdiag_atms_npp.nc4 simulated variables: [brightnessTemperature] observed variables: [brightnessTemperature] channels: &atms_npp_channels 1-22 diff --git a/rrfs-test/validated_yamls/templates/obtype_config/msonet_airTemperature_188.yaml b/rrfs-test/validated_yamls/templates/obtype_config/msonet_airTemperature_188.yaml index ebef38b..4de29c7 100644 --- a/rrfs-test/validated_yamls/templates/obtype_config/msonet_airTemperature_188.yaml +++ b/rrfs-test/validated_yamls/templates/obtype_config/msonet_airTemperature_188.yaml @@ -6,7 +6,7 @@ obsdatain: engine: type: H5File - obsfile: "@OBSFILE@" + obsfile: data/obs/ioda_msonet.nc obsdataout: engine: type: H5File diff --git a/rrfs-test/validated_yamls/templates/obtype_config/msonet_specificHumidity_188.yaml b/rrfs-test/validated_yamls/templates/obtype_config/msonet_specificHumidity_188.yaml index 1337b97..0d1713e 100644 --- a/rrfs-test/validated_yamls/templates/obtype_config/msonet_specificHumidity_188.yaml +++ b/rrfs-test/validated_yamls/templates/obtype_config/msonet_specificHumidity_188.yaml @@ -6,7 +6,7 @@ obsdatain: engine: type: H5File - obsfile: "@OBSFILE@" + obsfile: data/obs/ioda_msonet.nc obsdataout: engine: type: H5File diff --git a/rrfs-test/validated_yamls/templates/obtype_config/msonet_stationPressure_188.yaml b/rrfs-test/validated_yamls/templates/obtype_config/msonet_stationPressure_188.yaml index 7c8db61..141639d 100644 --- a/rrfs-test/validated_yamls/templates/obtype_config/msonet_stationPressure_188.yaml +++ b/rrfs-test/validated_yamls/templates/obtype_config/msonet_stationPressure_188.yaml @@ -6,7 +6,7 @@ obsdatain: engine: type: H5File - obsfile: "@OBSFILE@" + obsfile: data/obs/ioda_msonet.nc obsdataout: engine: type: H5File diff --git a/rrfs-test/validated_yamls/templates/obtype_config/msonet_winds_288.yaml b/rrfs-test/validated_yamls/templates/obtype_config/msonet_winds_288.yaml index 3ef44ac..7472e53 100644 --- a/rrfs-test/validated_yamls/templates/obtype_config/msonet_winds_288.yaml +++ b/rrfs-test/validated_yamls/templates/obtype_config/msonet_winds_288.yaml @@ -6,7 +6,7 @@ obsdatain: engine: type: H5File - obsfile: "@OBSFILE@" + obsfile: data/obs/ioda_msonet.nc obsdataout: engine: type: H5File diff --git a/rrfs-test/validated_yamls/templates/obtype_config/proflr_winds_227.yaml b/rrfs-test/validated_yamls/templates/obtype_config/proflr_winds_227.yaml index 373a38f..b4b0900 100644 --- a/rrfs-test/validated_yamls/templates/obtype_config/proflr_winds_227.yaml +++ b/rrfs-test/validated_yamls/templates/obtype_config/proflr_winds_227.yaml @@ -6,9 +6,7 @@ obsdatain: engine: type: H5File - obsfile: "@OBSFILE@" - #obsfile: "obsout/windprof_obs_2024052700.nc4" - #obsfile: "obsout/windprof_obs_2024052700_dc.nc4" + obsfile: data/obs/ioda_proflr.nc obsgrouping: group variables: ["stationIdentification"] sort variable: "pressure" diff --git a/rrfs-test/validated_yamls/templates/obtype_config/rassda_airTemperature_126.yaml b/rrfs-test/validated_yamls/templates/obtype_config/rassda_airTemperature_126.yaml index 9517b5e..9225e27 100644 --- a/rrfs-test/validated_yamls/templates/obtype_config/rassda_airTemperature_126.yaml +++ b/rrfs-test/validated_yamls/templates/obtype_config/rassda_airTemperature_126.yaml @@ -6,8 +6,7 @@ obsdatain: engine: type: H5File - obsfile: "@OBSFILE@" - #obsfile: "obsout/rass_tsen_obs_2024052700_dc.nc4" + obsfile: data/obs/ioda_rassda.nc obsgrouping: group variables: ["stationIdentification"] sort variable: "pressure" diff --git a/rrfs-test/validated_yamls/templates/obtype_config/vadwnd_winds_224.yaml b/rrfs-test/validated_yamls/templates/obtype_config/vadwnd_winds_224.yaml index c2aaf11..89534f4 100644 --- a/rrfs-test/validated_yamls/templates/obtype_config/vadwnd_winds_224.yaml +++ b/rrfs-test/validated_yamls/templates/obtype_config/vadwnd_winds_224.yaml @@ -6,7 +6,7 @@ obsdatain: engine: type: H5File - obsfile: "@OBSFILE@" + obsfile: data/obs/ioda_vadwnd.nc obsgrouping: group variables: ["stationIdentification"] sort variable: "pressure"