Merge branch 'develop' into build_gsinfo

Author: jswhit

.github/CODEOWNERS

@@ -82,7 +82,7 @@ jobs/JGLOBAL_WAVE_* @JessicaMeixner-NOAA @sbanihash
 
 # System-specific modules
 modulefiles/gw_gsi_wcoss2.lua @RussTreadon-NOAA @CoryMartin-NOAA
-modulefiles/gw_gsi_wcoss2.lua @RussTreadon-NOAA @CoryMartin-NOAA
+modulefiles/gw_upp_wcoss2.lua @WenMeng-NOAA
 
 # scripts
 scripts/exgdas_aero_analysis_generate_bmatrix.py @CoryMartin-NOAA

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -43,7 +43,7 @@ body:
         - All or N/A
         - WCOSS2
         - Hera
-        - Gaea-C5
+        - Ursa
         - Gaea-C6
         - Orion
         - Hercules

.github/ISSUE_TEMPLATE/static_data.yml

@@ -9,8 +9,8 @@ assignees:
 body:
   - type: markdown
     attributes:
-      description: |
-        Process:
+      value: |
+        **Process:**
         - Stage data on Ursa or WCOSS2
         - Make sure permissions are set properly (global read access)
         - CMs will push data and ask for verification
@@ -23,55 +23,54 @@ body:
         - Initial conditions: ICs needed to run one of global-workflow's included tests
         - Experimental data: Temporary datasets needed for development that will be replaced by other sources for operations (e.g. data that will be in DCOM)
       options:
-        - Fix
-        - Initial conditions
-        - Experimental data
+        - label: "Fix"
+        - label: "Initial conditions"
+        - label: "Experimental data"
     validations:
       required: true
 
   - type: checkboxes
     attributes:
       label: Target directory
       options:
-        - "Fix: aer"
-        - "Fix: am"
-        - "Fix: chem"
-        - "Fix: cice"
-        - "Fix: cpl"
-        - "Fix: datm"
-        - "Fix: gdas/aero"
-        - "Fix: gdas/crtm"
-        - "Fix: gdas/fv3jedi"
-        - "Fix: gdas/gsibec"
-        - "Fix: gdas/obs"
-        - "Fix: gdas/snow"
-        - "Fix: gdas/soca"
-        - "Fix: gldas"
-        - "Fix: glwu"
-        - "Fix: gsi"
-        - "Fix: lut"
-        - "Fix: mom6"
-        - "Fix: orog"
-        - "Fix: raw"
-        - "Fix: reg2grb2"
-        - "Fix: sfc_climo"
-        - "Fix: ugwd"
-        - "Fix: verif"
-        - "Fix: wave"
-        - "Fix: *NEW*"
-        - "ICs: C48/C48 mx500"
-        - "ICs: C96/C48"
-        - "ICs: C96 mx100"
-        - "ICs: C384/C192"
-        - "ICs: C384 mx025"
-        - "ICs: C768 mx025"
-        - "ICs: C1152 mx025"
-        - "ICs: *NEW RESOLUTION*"
-        - "Exp Data: Experimental obs"
-        - "Exp Data: GOCART emissions"
-        - "Exp Data: JEDI obs"
-        - "Exp Data: *NEW*"
-      multiple: true
+        - label: "Fix: aer"
+        - label: "Fix: am"
+        - label: "Fix: chem"
+        - label: "Fix: cice"
+        - label: "Fix: cpl"
+        - label: "Fix: datm"
+        - label: "Fix: gdas/aero"
+        - label: "Fix: gdas/crtm"
+        - label: "Fix: gdas/fv3jedi"
+        - label: "Fix: gdas/gsibec"
+        - label: "Fix: gdas/obs"
+        - label: "Fix: gdas/snow"
+        - label: "Fix: gdas/soca"
+        - label: "Fix: gldas"
+        - label: "Fix: glwu"
+        - label: "Fix: gsi"
+        - label: "Fix: lut"
+        - label: "Fix: mom6"
+        - label: "Fix: orog"
+        - label: "Fix: raw"
+        - label: "Fix: reg2grb2"
+        - label: "Fix: sfc_climo"
+        - label: "Fix: ugwd"
+        - label: "Fix: verif"
+        - label: "Fix: wave"
+        - label: "Fix: *NEW*"
+        - label: "ICs: C48/C48 mx500"
+        - label: "ICs: C96/C48"
+        - label: "ICs: C96 mx100"
+        - label: "ICs: C384/C192"
+        - label: "ICs: C384 mx025"
+        - label: "ICs: C768 mx025"
+        - label: "ICs: C1152 mx025"
+        - label: "ICs: *NEW RESOLUTION*"
+        - label: "Exp Data: Experimental obs"
+        - label: "Exp Data: GOCART emissions"
+        - label: "Exp Data: JEDI obs"
+        - label: "Exp Data: *NEW*"
     validations:
       required: true
 
@@ -92,10 +91,10 @@ body:
       description: |
         ANY fix or IC change other than adding files will require at least a new version.
       options:
-        - No change needed
-        - Fix/IC version update only
-        - Fix/IC version update + additional changes
-        - Non-version changes only
+        - label: "No change needed"
+        - label: "Fix/IC version update only"
+        - label: "Fix/IC version update + additional changes"
+        - label: "Non-version changes only"
     validations:
       required: true
 
@@ -140,7 +139,7 @@ body:
 
   - type: checkboxes
     attributes:
-      label: Checklist for GW CM Only: Sync to supported platforms
+      label: Checklist for GW CM Only -- Sync to supported platforms
       options:
         - label: WCOSS2
         - label: Gaea C6

.gitignore

@@ -61,6 +61,7 @@ parm/gdas/stat
 parm/gdas/jcb-gdas
 parm/gdas/jcb-algorithms
 parm/gsinfo
+parm/gdas/spoc
 parm/monitor
 parm/post/nam_micro_lookup.dat
 parm/post/optics_luts_DUST.dat
@@ -165,17 +166,18 @@ ush/fv3gfs_driver_grid.sh
 ush/fv3gfs_filter_topo.sh
 ush/fv3gfs_make_grid.sh
 ush/fv3gfs_make_orog.sh
-ush/bufr2ioda_insitu_profile*.py
-ush/bufr2ioda_insitu_surface*.py
 ush/global_chgres.sh
 ush/global_chgres_driver.sh
 ush/global_cycle_driver.sh
 ush/jediinc2fv3.py
 ush/imsfv3_scf2ioda.py
+ush/bufr_snocvr_snomad.py
 ush/atparse.bash
 ush/run_bufr2ioda.py
 ush/bufr2ioda_insitu*
+ush/python/gsincdiag_to_ioda
 ush/python/ufsda
+ush/python/pyiodaconv
 ush/python/soca
 ush/python/gen_bufr2ioda_json.py
 ush/python/gen_bufr2ioda_yaml.py

.gitmodules

@@ -20,6 +20,7 @@
 [submodule "sorc/gdas.cd"]
   path = sorc/gdas.cd
   url = https://github.com/NOAA-EMC/GDASApp.git
+  ignore = dirty
 [submodule "sorc/gsi_utils.fd"]
   path = sorc/gsi_utils.fd
   url = https://github.com/NOAA-EMC/GSI-Utils.git

dev/ci/cases/gfsv17/marine3dvar.yaml

@@ -20,6 +20,10 @@ prepoceanobs:
   # will not work for realtime or retros
   dmpdir_exp: "${BASE_DATA}/experimental_obs"
 
+marinebmat:
+  SOCA_INPUT_FIX_DIR: {{ HOMEgfs }}/fix/gdas/soca/1440x1080x75/soca
+  SOCA_ANL_GEOM: {{ HOMEgfs }}/fix/gdas/soca/720x540x75/soca
+
 marineanl:
   SOCA_INPUT_FIX_DIR: {{ HOMEgfs }}/fix/gdas/soca/1440x1080x75/soca
   SOCA_ANL_GEOM: {{ HOMEgfs }}/fix/gdas/soca/720x540x75/soca

dev/ci/cases/gfsv17/marinehyb.yaml

@@ -20,8 +20,21 @@ prepoceanobs:
   # will not work for realtime or retros
   dmpdir_exp: "${BASE_DATA}/experimental_obs"
 
+marinebmat:
+  SOCA_INPUT_FIX_DIR: {{ HOMEgfs }}/fix/gdas/soca/1440x1080x75/soca
+  SOCA_ANL_GEOM: {{ HOMEgfs }}/fix/gdas/soca/720x540x75/soca
 
 marineanl:
   SOCA_INPUT_FIX_DIR: {{ HOMEgfs }}/fix/gdas/soca/1440x1080x75/soca
   SOCA_ANL_GEOM: {{ HOMEgfs }}/fix/gdas/soca/720x540x75/soca
+  SOCA_OBS_LIST: {{ HOMEgfs }}/parm/gdas/marine/obs/obs_list_gfsv17.yaml.j2
   SOCA_NINNER: 100
+
+marineanlecen:
+  SOCA_INPUT_FIX_DIR: {{ HOMEgfs }}/fix/gdas/soca/1440x1080x75/soca
+  SOCA_ANL_GEOM: {{ HOMEgfs }}/fix/gdas/soca/720x540x75/soca
+
+marineanlletkf:
+  SOCA_INPUT_FIX_DIR: {{ HOMEgfs }}/fix/gdas/soca/1440x1080x75/soca
+  SOCA_ANL_GEOM: {{ HOMEgfs }}/fix/gdas/soca/720x540x75/soca
+  SOCA_OBS_LIST: {{ HOMEgfs }}/parm/gdas/marine/obs/obs_list_gfsv17.yaml.j2

dev/ci/cases/gfsv17/s2sw.yaml

@@ -17,7 +17,7 @@ base:
   DO_FIT2OBS: "YES"
   DO_VERFOZN: "YES"
   DO_VERFRAD: "YES"
-  EUPD_CYC: "both"
+  EUPD_CYC: "gdas"
   INTERVAL_GFS: 6
   SDATE_GFS: 2024111512
   FHMAX_GFS: 384
@@ -26,13 +26,26 @@ base:
 
 prepoceanobs:
   use_exp_obs: "YES"
-  # retro 
+  # retro
   # dmpdir_exp: /lfs/h2/emc/da/noscrub/common_obsForge
   # realtime
   dmpdir_exp: /lfs/h2/emc/da/noscrub/mindo.choi/MARINE_obs/COMROOT/realtime
 
+marinebmat:
+  SOCA_INPUT_FIX_DIR: {{ HOMEgfs }}/fix/gdas/soca/1440x1080x75/soca
+  SOCA_ANL_GEOM: {{ HOMEgfs }}/fix/gdas/soca/720x540x75/soca
+
 marineanl:
-  SOCA_INPUT_FIX_DIR: {{ HOMEgfs }}/fix/gdas/soca/1440x1080x75/soca            
+  SOCA_INPUT_FIX_DIR: {{ HOMEgfs }}/fix/gdas/soca/1440x1080x75/soca
   SOCA_ANL_GEOM: {{ HOMEgfs }}/fix/gdas/soca/720x540x75/soca
   SOCA_OBS_LIST: {{ HOMEgfs }}/parm/gdas/marine/obs/obs_list_gfsv17.yaml.j2
   SOCA_NINNER: 100
+
+marineanlecen:
+  SOCA_INPUT_FIX_DIR: {{ HOMEgfs }}/fix/gdas/soca/1440x1080x75/soca
+  SOCA_ANL_GEOM: {{ HOMEgfs }}/fix/gdas/soca/720x540x75/soca
+
+marineanlletkf:
+  SOCA_INPUT_FIX_DIR: {{ HOMEgfs }}/fix/gdas/soca/1440x1080x75/soca
+  SOCA_ANL_GEOM: {{ HOMEgfs }}/fix/gdas/soca/720x540x75/soca
+  SOCA_OBS_LIST: {{ HOMEgfs }}/parm/gdas/marine/obs/obs_list_gfsv17.yaml.j2

dev/ci/cases/gfsv17/s2sw_rdhpcs.yaml

@@ -17,11 +17,12 @@ base:
   DO_FIT2OBS: "YES"
   DO_VERFOZN: "YES"
   DO_VERFRAD: "YES"
-  EUPD_CYC: "both"
+  EUPD_CYC: "gdas"
   INTERVAL_GFS: 6
   SDATE_GFS: 2024111512
   FHMAX_GFS: 384
   FHMAX_HF_GFS: 120
+  CASE_HIST: "C768"
 
 prepoceanobs:
   use_exp_obs: "YES"
@@ -30,8 +31,21 @@ prepoceanobs:
   # ursa
   # dmpdir_exp: /scratch3/NCEPDEV/da/common_obsForge
 
+marinebmat:
+  SOCA_INPUT_FIX_DIR: {{ HOMEgfs }}/fix/gdas/soca/1440x1080x75/soca
+  SOCA_ANL_GEOM: {{ HOMEgfs }}/fix/gdas/soca/720x540x75/soca
+
 marineanl:
-  SOCA_INPUT_FIX_DIR: {{ HOMEgfs }}/fix/gdas/soca/1440x1080x75/soca            
+  SOCA_INPUT_FIX_DIR: {{ HOMEgfs }}/fix/gdas/soca/1440x1080x75/soca
   SOCA_ANL_GEOM: {{ HOMEgfs }}/fix/gdas/soca/720x540x75/soca
   SOCA_OBS_LIST: {{ HOMEgfs }}/parm/gdas/marine/obs/obs_list_gfsv17.yaml.j2
   SOCA_NINNER: 100
+
+marineanlecen:
+  SOCA_INPUT_FIX_DIR: {{ HOMEgfs }}/fix/gdas/soca/1440x1080x75/soca
+  SOCA_ANL_GEOM: {{ HOMEgfs }}/fix/gdas/soca/720x540x75/soca
+
+marineanlletkf:
+  SOCA_INPUT_FIX_DIR: {{ HOMEgfs }}/fix/gdas/soca/1440x1080x75/soca
+  SOCA_ANL_GEOM: {{ HOMEgfs }}/fix/gdas/soca/720x540x75/soca
+  SOCA_OBS_LIST: {{ HOMEgfs }}/parm/gdas/marine/obs/obs_list_gfsv17.yaml.j2

dev/ci/cases/pr/C96_atm3DVar.yaml

@@ -16,8 +16,8 @@ experiment:
 
 skip_ci_on_hosts:
   - gaeac5
-  - wcoss2
   - awsepicglobalworkflow
+  - wcoss2
 
 workflow:
   engine: rocoto