resolve inconsistencies between bufr2ioda python converters and jcb templates

parm/atm/jcb-prototype_3dvar.yaml.j2

@@ -5,10 +5,27 @@ algorithm: 3dvar
 # Observation things
 # ------------------
 observations:
-  - satwnd.abi_goes-16
+#  - ADPSFC
+#  - ADPUPA
+#  - SFCSHP
+  - aircraft
   - ascatw.ascat_metop-b
-  #- conv_ps  # Turned off until naming convention of obs files is resolved.
-  #- gnssro   # Turned off until naming convention of obs files is resolved.
+#  - ascatw.ascat_metop-c
+  - atms_n20
+  - atms_npp
+  - conventional_ps
+  - gnssro
+#  - gpsro
+#  - mtiasi_metop-a
+#  - mtiasi_metop-b
+#  - ompsnp_n20
   - ompsnp_npp
+#  - ompstc_n20
   - ompstc_npp
-  - omi_aura
+  - satwnd.abi_goes-16
+  - satwnd.abi_goes-18
+  - satwnd.leogeo_multi
+  - satwnd.viirs_n20
+  - satwnd.viirs_npp
+#  - scatwind_ascat_metop-a
+#  - snowcvr

parm/atm/jcb-prototype_lgetkf.yaml.j2

@@ -1,7 +1,7 @@
 # Use observations for lgetkf
 # ---------------------------
 app_path_observations: {{PARMgfs}}/gdas/jcb-gdas/observations/atmosphere-lgetkf
-app_path_observation_chronicle: {{PARMgfs}}/gdas/jcb-gdas/observation_chronicle/atmosphere-lgetkf
+app_path_observation_chronicle: {{PARMgfs}}/gdas/jcb-gdas/observation_chronicle/atmosphere
 
 # Algorithm
 # ---------
@@ -14,7 +14,27 @@ atmosphere_background_ensemble_path: ./bkg/mem%mem%
 # Observation things
 # ------------------
 observations:
-  - satwnd.abi_goes-16
+#  - ADPSFC
+#  - ADPUPA
+#  - SFCSHP
+  - aircraft
   - ascatw.ascat_metop-b
-  #- conv_ps  # Turned off until naming convention of obs files is resolved.
-  #- gnssro   # Turned off until naming convention of obs files is resolved.
+#  - ascatw.ascat_metop-c
+  - atms_n20
+  - atms_npp
+  - conventional_ps
+  - gnssro
+#  - gpsro
+#  - mtiasi_metop-a
+#  - mtiasi_metop-b
+#  - ompsnp_n20
+  - ompsnp_npp
+#  - ompstc_n20
+  - ompstc_npp
+  - satwnd.abi_goes-16
+  - satwnd.abi_goes-18
+  - satwnd.leogeo_multi
+  - satwnd.viirs_n20
+  - satwnd.viirs_npp
+#  - scatwind_ascat_metop-a
+#  - snowcvr

ush/ioda/bufr2ioda/bufr2ioda_acft_profiles_prepbufr.py

@@ -342,7 +342,7 @@ def bufr_to_ioda(config, logger):
     # Create the dimensions
     dims = {'Location': np.arange(0, lat.shape[0])}
 
-    iodafile = f"{cycle_type}.t{hh}z.acft_profiles.{data_format}.nc"
+    iodafile = f"{cycle_type}.t{hh}z.acft_profiles.tm00.nc"
     OUTPUT_PATH = os.path.join(ioda_dir, iodafile)
     logger.debug(f" ... ... Create OUTPUT file: {OUTPUT_PATH}")
 

ush/ioda/bufr2ioda/bufr2ioda_adpsfc_prepbufr.py

@@ -232,7 +232,7 @@ def bufr_to_ioda(config, logger):
     # Create the dimensions
     dims = {'Location': np.arange(0, lat.shape[0])}
 
-    iodafile = f"{cycle_type}.t{hh}z.{data_type}.{data_format}.nc"
+    iodafile = f"{cycle_type}.t{hh}z.{data_type}.tm00.nc"
     OUTPUT_PATH = os.path.join(ioda_dir, iodafile)
     logger.debug(f" ... ... Create OUTPUT file: {OUTPUT_PATH}")
 

ush/ioda/bufr2ioda/bufr2ioda_adpupa.py

@@ -300,7 +300,7 @@ def bufr_to_ioda(config, logger):
     dims = {'Location': np.arange(0, clat.shape[0])}
 
     # Create IODA ObsSpace
-    iodafile = f"{cycle_type}.t{hh}z.{data_type}.nc"
+    iodafile = f"{cycle_type}.t{hh}z.{data_type}.tm00.nc"
     OUTPUT_PATH = os.path.join(ioda_dir, iodafile)
     logger.info(f"Create output file: {OUTPUT_PATH}")
     obsspace = ioda_ospace.ObsSpace(OUTPUT_PATH, mode='w', dim_dict=dims)

ush/ioda/bufr2ioda/bufr2ioda_adpupa_prepbufr.py

@@ -352,7 +352,7 @@ def bufr_to_ioda(config, logger):
     dims = {'Location': np.arange(0, lat.shape[0])}
 
     # Create IODA ObsSpace
-    iodafile = f"{cycle_type}.t{hh}z.{data_type}.{data_format}.nc"
+    iodafile = f"{cycle_type}.t{hh}z.{data_type}.tm00.nc"
     OUTPUT_PATH = os.path.join(ioda_dir, iodafile)
     logger.info(f"Create output file: {OUTPUT_PATH}")
     obsspace = ioda_ospace.ObsSpace(OUTPUT_PATH, mode='w', dim_dict=dims)

ush/ioda/bufr2ioda/bufr2ioda_conventional_prepbufr_ps.py

@@ -864,7 +864,7 @@ def bufr_to_ioda(config, logger):
     # Create the dimensions
     dims = {'Location': np.arange(0, lat.shape[0])}
 
-    iodafile = f"{cycle_type}.t{hh}z.{data_description}.{data_format}.nc"
+    iodafile = f"{cycle_type}.t{hh}z.{data_description}.tm00.nc"
     OUTPUT_PATH = os.path.join(ioda_dir, iodafile)
     logger.debug(f" ... ... Create OUTPUT file: {OUTPUT_PATH}")
 

ush/ioda/bufr2ioda/bufr2ioda_gnssro_bufr.py → ush/ioda/bufr2ioda/bufr2ioda_gnssro.py

@@ -403,7 +403,7 @@ def bufr_to_ioda(config, logger):
     # Create the dimensions
     dims = {'Location': np.arange(0, clath.shape[0])}
 
-    iodafile = f"{cycle_type}.t{hh}z.{data_type}.tm00.{data_format}.nc"
+    iodafile = f"{cycle_type}.t{hh}z.{data_type}.tm00.nc"
     OUTPUT_PATH = os.path.join(ioda_dir, iodafile)
     logger.debug(f" ... ... Create OUTPUT file: {OUTPUT_PATH}")