Resolved merge conflict: kept changes from feature branch

parm/snow/obs/config/bufr2ioda_mapping.yaml.j2

@@ -0,0 +1,4 @@
+mkdir:
+- '{{ DATA }}/obs'
+copy:
+- ['{{PARMgfs}}/gdas/snow/obs/config/bufr_sfcsno_mapping.yaml', '{{ DATA }}/obs/']

parm/snow/obs/config/bufr_sfcsno_mapping.yaml

@@ -0,0 +1,75 @@
+# (C) Copyright 2024 NOAA/NWS/NCEP/EMC
+#
+
+bufr:
+  variables:
+    # MetaData
+    timestamp:
+      datetime:
+        year: "*/YEAR[1]"
+        month: "*/MNTH[1]"
+        day: "*/DAYS[1]"
+        hour: "*/HOUR[1]"
+        minute: "*/MINU[1]"
+    latitude:
+      query: "[*/CLAT, */CLATH]"
+    longitude:
+      query: "[*/CLON, */CLONH]"
+    stationIdentification:
+      query: "*/RPID"
+
+    stationElevation:
+      query: "[*/SELV, */HSMSL]"
+
+    # ObsValue
+    totalSnowDepth:
+      query: "[*/SNWSQ1/TOSD, */MTRMSC/TOSD, */STGDSNDM/TOSD]"
+      transforms:
+        - scale: 1000.0
+  filters:
+    - bounding:
+        variable: totalSnowDepth
+        lowerBound: 0
+        upperBound: 10000000
+
+encoder:
+  variables:
+
+    # MetaData
+    - name: "MetaData/dateTime"
+      coordinates: "longitude latitude"        
+      source: variables/timestamp
+      longName: "Datetime"
+      units: "seconds since 1970-01-01T00:00:00Z"
+
+    - name: "MetaData/latitude"
+      coordinates: "longitude latitude"
+      source: variables/latitude
+      longName: "Latitude"
+      units: "degree_north"
+      range: [-90, 90]
+
+    - name: "MetaData/longitude"
+      coordinates: "longitude latitude"
+      source: variables/longitude
+      longName: "Longitude"
+      units: "degree_east"
+      range: [-180, 180]
+
+    - name: "MetaData/stationElevation"
+      coordinates: "longitude latitude"
+      source: variables/stationElevation
+      longName: "Height of Station"
+
+    - name: "MetaData/stationIdentification"
+      coordinates: "longitude latitude"
+      source: variables/stationIdentification
+      longName: "Identification of Observing Location"
+      units: "m"
+
+    # ObsValue
+    - name: "ObsValue/totalSnowDepth"
+      coordinates: "longitude latitude"
+      source: variables/totalSnowDepth
+      longName: "Total Snow Depth"
+      units: "mm"

parm/snow/obs/config/sfcsno_snow.yaml.j2

@@ -5,8 +5,9 @@
       halo size: 250e3
     obsdatain:
       engine:
-        type: H5File
-        obsfile: '{{ DATA }}/obs/{{ OPREFIX }}sfcsno_snow.nc4'
+        type: bufr
+        obsfile: '{{ DATA }}/obs/{{ OPREFIX }}sfcsno.tm00.bufr_d'
+        mapping file: '{{ DATA }}/obs/bufr_sfcsno_mapping.yaml'
     obsdataout:
       engine:
         type: H5File

parm/soca/berror/soca_diagb.yaml.j2

@@ -12,7 +12,7 @@ background:
   read_from_file: 1
 
 background error:
-  datadir: ./diagb/
+  datadir: ./staticb/
   date: '{{ MARINE_WINDOW_MIDDLE | to_isotime }}'
   exp: bkgerr_stddev
   type: incr

parm/soca/berror/soca_ensb.yaml.j2

@@ -34,44 +34,44 @@ steric height:
   - linear variable change name: BalanceSOCA  # Only the steric balance is applied
 
 ensemble mean output:
-  datadir: ./diagb/
+  datadir: ./staticb/
   date: '{{ MARINE_WINDOW_BEGIN | to_isotime }}'
   exp: ens_mean
   type: incr
 
 ssh output:
   unbalanced:
-    datadir: ./diagb/
+    datadir: ./staticb/
     date: '{{ MARINE_WINDOW_BEGIN | to_isotime }}'
     exp: ssh_unbal_stddev
     type: incr
 
   steric:
-    datadir: ./diagb/
+    datadir: ./staticb/
     date: '{{ MARINE_WINDOW_BEGIN | to_isotime }}'
     exp: ssh_steric_stddev
     type: incr
 
   total:
-    datadir: ./diagb/
+    datadir: ./staticb/
     date: '{{ MARINE_WINDOW_BEGIN | to_isotime }}'
     exp: ssh_total_stddev
     type: incr
 
   explained variance:
-    datadir: ./diagb/
+    datadir: ./staticb/
     date: '{{ MARINE_WINDOW_BEGIN | to_isotime }}'
     exp: steric_explained_variance
     type: incr
 
   recentering error:
-    datadir: ./diagb/
+    datadir: ./staticb/
     date: '{{ MARINE_WINDOW_BEGIN | to_isotime }}'
     exp: ssh_recentering_error
     type: incr
 
 background error output:
-  datadir: ./diagb/
+  datadir: ./staticb/
   date: '{{ MARINE_WINDOW_BEGIN | to_isotime }}'
   exp: bkgerr_stddev
   type: incr
@@ -90,7 +90,7 @@ trajectory:
 
 output increment:
   # TODO: Revert this when fms can take more than 128 charactres file names
-  datadir: '{{ ENSPERT_RELPATH }}/ens/'
+  datadir: '{{ ENSPERT_RELPATH }}/enspert/'
   date: '{{ MARINE_WINDOW_BEGIN | to_isotime }}'
   exp: trash
   type: incr

parm/soca/berror/soca_parameters_diffusion_hz.yaml.j2

@@ -27,11 +27,11 @@ background error:
             filename: ocn.cor_rh.incr.0001-01-01T00:00:00Z.nc
             variable name: ave_ssh
         write:
-          filename: hz_ocean.nc
+          filename: ./staticb/hz_ocean.nc
 
       - name: ice
         horizontal:
           as gaussian: true
           fixed value: 50000.0
         write:
-          filename: hz_ice.nc
+          filename: ./staticb/hz_ice.nc

parm/soca/berror/soca_parameters_diffusion_vt.yaml.j2

@@ -29,4 +29,4 @@ background error:
             filename: vt_scales.nc
             variable name: vt
         write:
-          filename: vt_ocean.nc
+          filename: ./staticb/vt_ocean.nc

parm/soca/berror/soca_vtscales.yaml.j2

@@ -1,6 +1,6 @@
 gridspec_filename: soca_gridspec.nc
 restart_filename: ./INPUT/MOM.res.nc
-mld_filename: './diagb/ocn.bkgerr_stddev.incr.{{ MARINE_WINDOW_END | to_isotime }}.nc'
+mld_filename: './staticb/ocn.bkgerr_stddev.incr.{{ MARINE_WINDOW_END | to_isotime }}.nc'
 output_filename: ./vt_scales.nc
 output_variable_vt: vt
 output_variable_hz: hz

parm/soca/fms/input.nml.j2

@@ -0,0 +1,28 @@
+ &MOM_input_nml
+        output_directory = './',
+        input_filename = 'r'
+        restart_input_dir = 'INPUT/',
+        restart_output_dir = 'RESTART/',
+        parameter_filename = 'MOM_input' /
+
+ &diag_manager_nml
+ /
+
+ &ocean_solo_nml
+            months = 0
+            days   = 1
+            date_init = {{ date_init }},
+            hours = 0
+            minutes = 0
+            seconds = 0
+            calendar = 'NOLEAP' /
+
+ &fms_io_nml
+      max_files_w=100
+      checksum_required=.false.
+/
+
+ &fms_nml
+       clock_grain='MODULE'
+       domains_stack_size = {{ domain_stack_size }}
+       clock_flags='SYNC' /

parm/soca/marine-jcb-base.yaml

@@ -17,8 +17,8 @@ final_increment_file: marine_final_increment
 
 # Assimilation standard things (not prepended with model choice)
 # ----------------------------
-window_begin: '{{ATM_WINDOW_BEGIN}}'
-window_length: '{{ATM_WINDOW_LENGTH}}'
+window_begin: '{{MARINE_WINDOW_BEGIN}}'
+window_length: '{{MARINE_WINDOW_LENGTH}}'
 bound_to_include: begin
 minimizer: RPCG
 final_diagnostics_departures: oman
@@ -29,24 +29,24 @@ analysis_variables: [cicen, hicen, hsnon, socn, tocn, uocn, vocn, ssh]
 
 # Model things
 # ------------
-marine_window_begin: '{{ATM_WINDOW_BEGIN}}'
-marine_window_middle: '{{ATM_WINDOW_MIDDLE}}'
+marine_window_begin: '{{MARINE_WINDOW_BEGIN}}'
+marine_window_middle: '{{MARINE_WINDOW_MIDDLE}}'
 
 # Geometry
 marine_soca_files_path: .
 
-# Background
+# Initial conditions
 marine_background_path: ./INPUT/
-marine_background_time: '{{ATM_WINDOW_BEGIN}}'
+marine_background_time: '{{MARINE_WINDOW_BEGIN_ISO}}'
 
 # Pseudo model
 marine_forecast_timestep: PT3H
-marine_pseudo_model_states: !INC ${BKG_LIST}
+marine_pseudo_model_states: !INC 'bkg_list.yaml'
 
 # Background error model
 background_error_file: '{{berror_model}}'
 marine_number_ensemble_members: '{{nmem_ens}}'
-marine_stddev_time: '{{ATM_WINDOW_MIDDLE}}'
+marine_stddev_time: '{{MARINE_WINDOW_MIDDLE}}'
 
 # Observations
 observations: all_observations

parm/soca/obs/config/adt_rads_all.yaml

@@ -3,11 +3,11 @@ obs space:
   obsdatain:
     engine:
       type: H5File
-      obsfile: !ENV ${DATA}/obs/${OPREFIX}adt_rads_all.${PDY}${cyc}.nc4
+      obsfile: ${DATA}/obs/${OPREFIX}adt_rads_all.${PDY}${cyc}.nc4
   obsdataout:
     engine:
       type: H5File
-      obsfile: !ENV ${DATA}/diags/adt_rads_all.${PDY}${cyc}.nc4
+      obsfile: ${DATA}/diags/adt_rads_all.${PDY}${cyc}.nc4
   simulated variables: [absoluteDynamicTopography]
   io pool:
     max pool size: 1

parm/soca/obs/config/icec_amsr2_north.yaml

@@ -3,11 +3,11 @@ obs space:
   obsdatain:
     engine:
       type: H5File
-      obsfile: !ENV ${DATA}/obs/${OPREFIX}icec_amsr2_north.${PDY}${cyc}.nc4
+      obsfile: ${DATA}/obs/${OPREFIX}icec_amsr2_north.${PDY}${cyc}.nc4
   obsdataout:
     engine:
       type: H5File
-      obsfile: !ENV ${DATA}/diags/icec_amsr2_north.${PDY}${cyc}.nc4
+      obsfile: ${DATA}/diags/icec_amsr2_north.${PDY}${cyc}.nc4
   simulated variables: [seaIceFraction]
   io pool:
     max pool size: 1

parm/soca/obs/config/icec_amsr2_south.yaml

@@ -3,11 +3,11 @@ obs space:
   obsdatain:
     engine:
       type: H5File
-      obsfile: !ENV ${DATA}/obs/${OPREFIX}icec_amsr2_south.${PDY}${cyc}.nc4
+      obsfile: ${DATA}/obs/${OPREFIX}icec_amsr2_south.${PDY}${cyc}.nc4
   obsdataout:
     engine:
       type: H5File
-      obsfile: !ENV ${DATA}/diags/icec_amsr2_south.${PDY}${cyc}.nc4
+      obsfile: ${DATA}/diags/icec_amsr2_south.${PDY}${cyc}.nc4
   simulated variables: [seaIceFraction]
   io pool:
     max pool size: 1

parm/soca/obs/config/insitu_profile_argo.yaml

@@ -3,7 +3,7 @@ obs space:
   obsdatain:
     engine:
       type: H5File
-      obsfile: !ENV ${DATA}/obs/${OPREFIX}insitu_profile_argo.${PDY}${cyc}.nc4
+      obsfile: ${DATA}/obs/${OPREFIX}insitu_profile_argo.${PDY}${cyc}.nc4
     obsgrouping:
       group variables: [latitude, longitude, dateTime]
       sort variable: depth
@@ -12,7 +12,7 @@ obs space:
   obsdataout:
     engine:
       type: H5File
-      obsfile: !ENV ${DATA}/diags/insitu_profile_argo.${PDY}${cyc}.nc4
+      obsfile: ${DATA}/diags/insitu_profile_argo.${PDY}${cyc}.nc4
   simulated variables: [waterTemperature, salinity]
   observed variables: [waterTemperature, salinity]
 #  derived variables: [waterPressure]

parm/soca/obs/config/insitu_profile_bathy.yaml

@@ -3,11 +3,11 @@ obs space:
   obsdatain:
     engine:
       type: H5File
-      obsfile: !ENV ${DATA}/obs/${OPREFIX}insitu_profile_bathy.${PDY}${cyc}.nc4
+      obsfile: ${DATA}/obs/${OPREFIX}insitu_profile_bathy.${PDY}${cyc}.nc4
   obsdataout:
     engine:
       type: H5File
-      obsfile: !ENV ${DATA}/diags/insitu_profile_bathy.${PDY}${cyc}.nc4
+      obsfile: ${DATA}/diags/insitu_profile_bathy.${PDY}${cyc}.nc4
   simulated variables: [waterTemperature]
   io pool:
     max pool size: 1

parm/soca/obs/config/insitu_profile_dbuoy.yaml

@@ -3,11 +3,11 @@ obs space:
   obsdatain:
     engine:
       type: H5File
-      obsfile: !ENV ${DATA}/obs/${OPREFIX}insitu_profile_dbuoy.${PDY}${cyc}.nc4
+      obsfile: ${DATA}/obs/${OPREFIX}insitu_profile_dbuoy.${PDY}${cyc}.nc4
   obsdataout:
     engine:
       type: H5File
-      obsfile: !ENV ${DATA}/diags/insitu_profile_dbuoy.${PDY}${cyc}.nc4
+      obsfile: ${DATA}/diags/insitu_profile_dbuoy.${PDY}${cyc}.nc4
   simulated variables: [waterTemperature]
   observed variables: [waterTemperature]
   io pool:

parm/soca/obs/config/insitu_profile_dbuoyb.yaml

@@ -3,11 +3,11 @@ obs space:
   obsdatain:
     engine:
       type: H5File
-      obsfile: !ENV ${DATA}/obs/${OPREFIX}insitu_profile_dbuoyb.${PDY}${cyc}.nc4
+      obsfile: ${DATA}/obs/${OPREFIX}insitu_profile_dbuoyb.${PDY}${cyc}.nc4
   obsdataout:
     engine:
       type: H5File
-      obsfile: !ENV ${DATA}/diags/insitu_profile_dbuoyb.${PDY}${cyc}.nc4
+      obsfile: ${DATA}/diags/insitu_profile_dbuoyb.${PDY}${cyc}.nc4
   simulated variables: [waterTemperature]
   observed variables: [waterTemperature]
   io pool:

parm/soca/obs/config/insitu_profile_glider.yaml

@@ -3,11 +3,11 @@ obs space:
   obsdatain:
     engine:
       type: H5File
-      obsfile: !ENV ${DATA}/obs/${OPREFIX}insitu_profile_glider.${PDY}${cyc}.nc4
+      obsfile: ${DATA}/obs/${OPREFIX}insitu_profile_glider.${PDY}${cyc}.nc4
   obsdataout:
     engine:
       type: H5File
-      obsfile: !ENV ${DATA}/diags/insitu_profile_glider.${PDY}${cyc}.nc4
+      obsfile: ${DATA}/diags/insitu_profile_glider.${PDY}${cyc}.nc4
   simulated variables: [waterTemperature]
   observed variables: [waterTemperature]
   io pool: