From 583ca6a72305f7dd7cd9901789c59c1090bb86b6 Mon Sep 17 00:00:00 2001 From: AndrewEichmann-NOAA Date: Thu, 18 Jan 2024 19:10:26 +0000 Subject: [PATCH 1/5] moved info for obsprep to where it belongs --- parm/soca/obsprep/obsprep_config.yaml | 50 +++++++++++++++++++++++++++ ush/soca/prep_marine_obs.py | 50 --------------------------- 2 files changed, 50 insertions(+), 50 deletions(-) diff --git a/parm/soca/obsprep/obsprep_config.yaml b/parm/soca/obsprep/obsprep_config.yaml index 1be4c45d3..03c4a130f 100644 --- a/parm/soca/obsprep/obsprep_config.yaml +++ b/parm/soca/obsprep/obsprep_config.yaml @@ -39,3 +39,53 @@ observations: units: C min: -3.0 max: 50.0 +- obs space: + dmpdir regex: ??????????????-STAR-L3C_GHRSST-SSTsubskin-ABI_G16-ACSPO_V2.70-v02.0-fv01.0.nc + dmpdir subdir: sst + name: ABI_G16 + provider: GHRSST +- obs space: + dmpdir regex: ??????????????-STAR-L3C_GHRSST-SSTsubskin-ABI_G17-ACSPO_V2.71-v02.0-fv01.0.nc + dmpdir subdir: sst + name: ABI_G17 + provider: GHRSST +- obs space: + dmpdir regex: ??????????????-STAR-L3C_GHRSST-SSTsubskin-ABI_G18-ACSPO_V2.71-v02.0-fv01.0.nc + dmpdir subdir: sst + name: ABI_G18 + provider: GHRSST +- obs space: + dmpdir regex: ??????????????-STAR-L3C_GHRSST-SSTsubskin-AHI_H09-ACSPO_V2.70-v02.0-fv01.0.nc + dmpdir subdir: sst + name: AHI_H09 + provider: GHRSST +- obs space: + dmpdir regex: rads_adt_3b_???????.nc + dmpdir subdir: ADT + name: adt_3b_egm2008 + provider: RADS +- obs space: + dmpdir regex: rads_adt_c2_???????.nc + dmpdir subdir: ADT + name: adt_c2_egm2008 + provider: RADS +- obs space: + dmpdir regex: rads_adt_sa_???????.nc + dmpdir subdir: ADT + name: adt_sa_egm2008 + provider: RADS +- obs space: + dmpdir regex: ??????????????-OSPO-L3U_GHRSST-SSTsubskin-AVHRRF_MA-ACSPO_V2.70-v02.0-fv01.0.nc + dmpdir subdir: sst + name: sst_metopa_l3u_so025 + provider: GHRSST +- obs space: + dmpdir regex: ??????????????-OSPO-L3U_GHRSST-SSTsubskin-VIIRS_N20-ACSPO_V2.61-v02.0-fv01.0.nc + dmpdir subdir: sst + name: sst_viirs_n20_l3u_so025 + provider: GHRSST +- obs space: + dmpdir regex: ??????????????-OSPO-L3U_GHRSST-SSTsubskin-VIIRS_NPP-ACSPO_V2.61-v02.0-fv01.0.nc + dmpdir subdir: sst + name: sst_viirs_npp_l3u_so025 + provider: GHRSST diff --git a/ush/soca/prep_marine_obs.py b/ush/soca/prep_marine_obs.py index 5f1ec429f..71d53aef5 100755 --- a/ush/soca/prep_marine_obs.py +++ b/ush/soca/prep_marine_obs.py @@ -13,56 +13,6 @@ cycDir = os.path.join(DMPDIR, RUN + '.' + str(PDY), str(cyc)) -# TODO: this looks good for a yaml -obs_dict = { - # '20210630210000-STAR-L3C_GHRSST-SSTsubskin-ABI_G16-ACSPO_V2.70-v02.0-fv01.0.nc' - 'ABI_G16': ('sst', '??????????????-STAR-L3C_GHRSST-SSTsubskin-ABI_G16-ACSPO_V2.70-v02.0-fv01.0.nc '), - - # '20210630210000-STAR-L3C_GHRSST-SSTsubskin-ABI_G17-ACSPO_V2.71-v02.0-fv01.0.nc' - 'ABI_G17': ('sst', '??????????????-STAR-L3C_GHRSST-SSTsubskin-ABI_G17-ACSPO_V2.71-v02.0-fv01.0.nc '), - - # '20210630210000-STAR-L3C_GHRSST-SSTsubskin-ABI_G18-ACSPO_V2.71-v02.0-fv01.0.nc' - 'ABI_G18': ('sst', '??????????????-STAR-L3C_GHRSST-SSTsubskin-ABI_G18-ACSPO_V2.71-v02.0-fv01.0.nc '), - - # '20210630210000-STAR-L3C_GHRSST-SSTsubskin-AHI_H09-ACSPO_V2.70-v02.0-fv01.0.nc' - 'AHI_H09': ('sst', '??????????????-STAR-L3C_GHRSST-SSTsubskin-AHI_H09-ACSPO_V2.70-v02.0-fv01.0.nc '), - - # 'rads_adt_3b_2021182.nc' - 'adt_3b_egm2008': ('ADT', 'rads_adt_3b_???????.nc'), - - # 'rads_adt_c2_2021182.nc' - 'adt_c2_egm2008': ('ADT', 'rads_adt_c2_???????.nc'), - - # 'rads_adt_sa_2021182.nc' - 'adt_sa_egm2008': ('ADT', 'rads_adt_sa_???????.nc'), - - # 'AMSR2-SEAICE-NH_v2r2_GW1_s202107011426180_e202107011605170_c202107011642250.nc' - 'icec_amsr2_north': ('icec', 'AMSR2-SEAICE-NH_v2r2_GW1_s???????????????_e???????????????_c???????????????.nc'), - - # 'AMSR2-SEAICE-SH_v2r2_GW1_s202107011426180_e202107011605170_c202107011642250.nc' - 'icec_amsr2_south': ('icec', 'AMSR2-SEAICE-SH_v2r2_GW1_s???????????????_e???????????????_c???????????????.nc'), - - # 'SM_OPER_MIR_OSUDP2_20210701T093946_20210701T103256_700_001_1.nc' - 'sss_smos': ('SSS', 'SM_OPER_MIR_OSUDP2_????????T??????_????????T??????_700_001_1.nc'), - - # 'SMAP_L2B_SSS_NRT_34268_A_20210701T153914.h5' - 'sss_smap': ('SSS', 'SMAP_L2B_SSS_NRT_?????_[AD]_????????T??????.h5'), - - # '20210701145000-OSPO-L3U_GHRSST-SSTsubskin-AVHRRF_MA-ACSPO_V2.70-v02.0-fv01.0.nc' - 'sst_metopa_l3u_so025': ('sst', '??????????????-OSPO-L3U_GHRSST-SSTsubskin-AVHRRF_MA-ACSPO_V2.70-v02.0-fv01.0.nc'), - - # '20210701145000-OSPO-L3U_GHRSST-SSTsubskin-AVHRRF_MB-ACSPO_V2.70-v02.0-fv01.0.nc' - 'sst_metopb_l3u_so025': ('sst', '??????????????-OSPO-L3U_GHRSST-SSTsubskin-AVHRRF_MB-ACSPO_V2.70-v02.0-fv01.0.nc'), - - # '20210701150000-OSPO-L3U_GHRSST-SSTsubskin-VIIRS_N20-ACSPO_V2.61-v02.0-fv01.0.nc' - 'sst_viirs_n20_l3u_so025': ('sst', '??????????????-OSPO-L3U_GHRSST-SSTsubskin-VIIRS_N20-ACSPO_V2.61-v02.0-fv01.0.nc'), - - # '20210701150000-OSPO-L3U_GHRSST-SSTsubskin-VIIRS_NPP-ACSPO_V2.61-v02.0-fv01.0.nc' - 'sst_viirs_npp_l3u_so025': ('sst', '??????????????-OSPO-L3U_GHRSST-SSTsubskin-VIIRS_NPP-ACSPO_V2.61-v02.0-fv01.0.nc'), - -} - - def obs_fetch(obsprepSpace): subDir = obsprepSpace['dmpdir subdir'] From e9806a8107aa14cc2e9f9f200c886e07e0b1a35b Mon Sep 17 00:00:00 2001 From: AndrewEichmann-NOAA Date: Thu, 18 Jan 2024 19:17:36 +0000 Subject: [PATCH 2/5] code style --- ush/soca/prep_marine_obs.py | 1 + 1 file changed, 1 insertion(+) diff --git a/ush/soca/prep_marine_obs.py b/ush/soca/prep_marine_obs.py index 71d53aef5..bc09b78fa 100755 --- a/ush/soca/prep_marine_obs.py +++ b/ush/soca/prep_marine_obs.py @@ -13,6 +13,7 @@ cycDir = os.path.join(DMPDIR, RUN + '.' + str(PDY), str(cyc)) + def obs_fetch(obsprepSpace): subDir = obsprepSpace['dmpdir subdir'] From 72b9157d8991d76de5684d268558b04a4d0a7d65 Mon Sep 17 00:00:00 2001 From: AndrewEichmann-NOAA Date: Wed, 24 Jan 2024 21:10:08 +0000 Subject: [PATCH 3/5] backing out new yet unused observers --- parm/soca/obsprep/obsprep_config.yaml | 50 --------------------------- 1 file changed, 50 deletions(-) diff --git a/parm/soca/obsprep/obsprep_config.yaml b/parm/soca/obsprep/obsprep_config.yaml index 03c4a130f..1be4c45d3 100644 --- a/parm/soca/obsprep/obsprep_config.yaml +++ b/parm/soca/obsprep/obsprep_config.yaml @@ -39,53 +39,3 @@ observations: units: C min: -3.0 max: 50.0 -- obs space: - dmpdir regex: ??????????????-STAR-L3C_GHRSST-SSTsubskin-ABI_G16-ACSPO_V2.70-v02.0-fv01.0.nc - dmpdir subdir: sst - name: ABI_G16 - provider: GHRSST -- obs space: - dmpdir regex: ??????????????-STAR-L3C_GHRSST-SSTsubskin-ABI_G17-ACSPO_V2.71-v02.0-fv01.0.nc - dmpdir subdir: sst - name: ABI_G17 - provider: GHRSST -- obs space: - dmpdir regex: ??????????????-STAR-L3C_GHRSST-SSTsubskin-ABI_G18-ACSPO_V2.71-v02.0-fv01.0.nc - dmpdir subdir: sst - name: ABI_G18 - provider: GHRSST -- obs space: - dmpdir regex: ??????????????-STAR-L3C_GHRSST-SSTsubskin-AHI_H09-ACSPO_V2.70-v02.0-fv01.0.nc - dmpdir subdir: sst - name: AHI_H09 - provider: GHRSST -- obs space: - dmpdir regex: rads_adt_3b_???????.nc - dmpdir subdir: ADT - name: adt_3b_egm2008 - provider: RADS -- obs space: - dmpdir regex: rads_adt_c2_???????.nc - dmpdir subdir: ADT - name: adt_c2_egm2008 - provider: RADS -- obs space: - dmpdir regex: rads_adt_sa_???????.nc - dmpdir subdir: ADT - name: adt_sa_egm2008 - provider: RADS -- obs space: - dmpdir regex: ??????????????-OSPO-L3U_GHRSST-SSTsubskin-AVHRRF_MA-ACSPO_V2.70-v02.0-fv01.0.nc - dmpdir subdir: sst - name: sst_metopa_l3u_so025 - provider: GHRSST -- obs space: - dmpdir regex: ??????????????-OSPO-L3U_GHRSST-SSTsubskin-VIIRS_N20-ACSPO_V2.61-v02.0-fv01.0.nc - dmpdir subdir: sst - name: sst_viirs_n20_l3u_so025 - provider: GHRSST -- obs space: - dmpdir regex: ??????????????-OSPO-L3U_GHRSST-SSTsubskin-VIIRS_NPP-ACSPO_V2.61-v02.0-fv01.0.nc - dmpdir subdir: sst - name: sst_viirs_npp_l3u_so025 - provider: GHRSST From a3e4aa0e228ebd9f4e9bcc3a56276d644b995264 Mon Sep 17 00:00:00 2001 From: AndrewEichmann-NOAA Date: Wed, 24 Jan 2024 21:42:27 +0000 Subject: [PATCH 4/5] removed obsolete output file entry --- parm/soca/obsprep/obsprep_config.yaml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/parm/soca/obsprep/obsprep_config.yaml b/parm/soca/obsprep/obsprep_config.yaml index 1be4c45d3..5cbd2ea48 100644 --- a/parm/soca/obsprep/obsprep_config.yaml +++ b/parm/soca/obsprep/obsprep_config.yaml @@ -4,36 +4,30 @@ observations: dmpdir subdir: SSS dmpdir regex: SMAP_L2B_SSS_NRT_?????_[AD]_????????T??????.h5 provider: SMAP - output file: sss_smap.ioda.nc - obs space: name: sss_smos provider: SMOS dmpdir subdir: SSS - output file: sss_smos.ioda.nc dmpdir regex: SM_OPER_MIR_OSUDP2_????????T??????_????????T??????_700_001_1.nc - obs space: name: adt_rads_all dmpdir subdir: ADT dmpdir regex: rads_adt_??_???????.nc provider: RADS - output file: adt_rads_all.nc4 - obs space: name: icec_amsr2_north provider: AMSR2 dmpdir subdir: icec - output file: icec_amsr2_north.ioda.nc dmpdir regex: AMSR2-SEAICE-NH_v2r2_GW1_s???????????????_e???????????????_c???????????????.nc - obs space: name: icec_amsr2_south provider: AMSR2 dmpdir subdir: icec - output file: icec_amsr2_south.ioda.nc dmpdir regex: AMSR2-SEAICE-SH_v2r2_GW1_s???????????????_e???????????????_c???????????????.nc - obs space: name: sst_metopb_l3u provider: GHRSST dmpdir subdir: 'sst' - output file: sst_metopb_l3u.ioda.nc dmpdir regex: '??????????????-STAR-L3U_GHRSST-SSTsubskin-AVHRRF_MB-ACSPO_V2.80-v02.0-fv01.0.nc' bounds: units: C From 6c2e72f2a073c3cb64f3a028651b4fa9d65f1183 Mon Sep 17 00:00:00 2001 From: AndrewEichmann-NOAA <58948505+AndrewEichmann-NOAA@users.noreply.github.com> Date: Tue, 30 Jan 2024 09:24:59 -0500 Subject: [PATCH 5/5] Update prep_marine_obs.py removing lines for coding style --- ush/soca/prep_marine_obs.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/ush/soca/prep_marine_obs.py b/ush/soca/prep_marine_obs.py index 1fb540c25..3bcfdcc42 100755 --- a/ush/soca/prep_marine_obs.py +++ b/ush/soca/prep_marine_obs.py @@ -6,7 +6,6 @@ logger = Logger() - DMPDIR = os.getenv('DMPDIR') cyc = os.getenv('cyc') PDY = os.getenv('PDY') @@ -14,7 +13,6 @@ COMIN_OBS = os.getenv('COMIN_OBS') - def obs_fetch(obsprepSpace, cycles): subDir = obsprepSpace['dmpdir subdir']