From 60b78d5180ce5588d2e9b326f7a99001d6703e6e Mon Sep 17 00:00:00 2001
From: "Andrew.Tangborn" <Andrew.Tangborn@noaa.gov>
Date: Mon, 26 Jun 2023 19:41:01 +0000
Subject: [PATCH] Updated staticb_bump_aero.yaml to work with latest version of
 BUMP.  Changed name to staticb_bump_aero.yaml to match workflow.

---
 parm/aero/berror/staticb_bump.yaml      | 65 -------------------------
 parm/aero/berror/staticb_bump_aero.yaml | 23 +++++++++
 2 files changed, 23 insertions(+), 65 deletions(-)
 delete mode 100644 parm/aero/berror/staticb_bump.yaml
 create mode 100644 parm/aero/berror/staticb_bump_aero.yaml

diff --git a/parm/aero/berror/staticb_bump.yaml b/parm/aero/berror/staticb_bump.yaml
deleted file mode 100644
index 1e6ea4603..000000000
--- a/parm/aero/berror/staticb_bump.yaml
+++ /dev/null
@@ -1,65 +0,0 @@
-covariance model: SABER
-saber central block:
-  saber block name: BUMP_NICAS
-  read:
-    io:
-      data directory: &staticb_aero_dir $(DATA)/berror
-      files prefix: 'nicas_aero'
-      alias:
-      - in code: mass_fraction_of_sulfate_in_air
-        in file: mass_fraction_of_sulfate_in_air-mass_fraction_of_sulfate_in_air
-      - in code: mass_fraction_of_hydrophobic_black_carbon_in_air
-        in file: mass_fraction_of_hydrophobic_black_carbon_in_air-mass_fraction_of_hydrophobic_black_carbon_in_air
-      - in code: mass_fraction_of_hydrophilic_black_carbon_in_air
-        in file: mass_fraction_of_hydrophilic_black_carbon_in_air-mass_fraction_of_hydrophilic_black_carbon_in_air
-      - in code: mass_fraction_of_hydrophobic_organic_carbon_in_air
-        in file: mass_fraction_of_hydrophobic_organic_carbon_in_air-mass_fraction_of_hydrophobic_organic_carbon_in_air
-      - in code: mass_fraction_of_hydrophilic_organic_carbon_in_air
-        in file: mass_fraction_of_hydrophilic_organic_carbon_in_air-mass_fraction_of_hydrophilic_organic_carbon_in_air
-      - in code: mass_fraction_of_dust001_in_air
-        in file: mass_fraction_of_dust001_in_air-mass_fraction_of_dust001_in_air
-      - in code: mass_fraction_of_dust002_in_air
-        in file: mass_fraction_of_dust002_in_air-mass_fraction_of_dust002_in_air
-      - in code: mass_fraction_of_dust003_in_air
-        in file: mass_fraction_of_dust003_in_air-mass_fraction_of_dust003_in_air
-      - in code: mass_fraction_of_dust004_in_air
-        in file: mass_fraction_of_dust004_in_air-mass_fraction_of_dust004_in_air
-      - in code: mass_fraction_of_dust005_in_air
-        in file: mass_fraction_of_dust005_in_air-mass_fraction_of_dust005_in_air
-      - in code: mass_fraction_of_sea_salt001_in_air
-        in file: mass_fraction_of_sea_salt001_in_air-mass_fraction_of_sea_salt001_in_air
-      - in code: mass_fraction_of_sea_salt002_in_air
-        in file: mass_fraction_of_sea_salt002_in_air-mass_fraction_of_sea_salt002_in_air
-      - in code: mass_fraction_of_sea_salt003_in_air
-        in file: mass_fraction_of_sea_salt003_in_air-mass_fraction_of_sea_salt003_in_air
-      - in code: mass_fraction_of_sea_salt004_in_air
-        in file: mass_fraction_of_sea_salt004_in_air-mass_fraction_of_sea_salt004_in_air
-    drivers:
-      multivariate strategy: univariate
-      read local nicas: true
-    input fields:
-    - parameter: universe radius
-      file:
-        filetype: fms restart
-        datetime: '2016-06-30T00:00:00Z'
-        set datetime on read: true
-        psinfile: true
-        datapath: *staticb_aero_dir
-        prefix: '20160630.000000'
-        filename_core: cor_rh.fv_core.res.nc
-        filename_trcr: cor_rh.fv_tracer.res.nc
-        filename_cplr: cor_rh.coupler.res
-  saber outer blocks:
-  - saber block name: StdDev
-    input fields:
-    - parameter: StdDev
-      file:
-        filetype: fms restart
-        datetime: '2016-06-30T00:00:00Z'
-        set datetime on read: true
-        psinfile: true
-        datapath: *staticb_aero_dir
-        prefix: '20160630.000000'
-        filename_core: stddev.fv_core.res.nc
-        filename_trcr: stddev.fv_tracer.res.nc
-        filename_cplr: stddev.coupler.res
diff --git a/parm/aero/berror/staticb_bump_aero.yaml b/parm/aero/berror/staticb_bump_aero.yaml
new file mode 100644
index 000000000..ac746b6c9
--- /dev/null
+++ b/parm/aero/berror/staticb_bump_aero.yaml
@@ -0,0 +1,23 @@
+covariance model: SABER
+saber central block:
+  saber block name: BUMP_NICAS
+  read:
+    io:
+      data directory: &staticb_aero_dir $(DATA)/berror
+      files prefix: 'nicas_aero'
+    drivers:
+      multivariate strategy: univariate
+      read local nicas: true
+  saber outer blocks:
+  - saber block name: StdDev
+    read: 
+      model file: 
+        datetime: '2016-06-30T00:00:00Z'
+        set datetime on read: true
+        filetype: fms restart
+        psinfile: true
+        datapath: Data/staticb_aero/
+        filename_core: 20160630.000000.stddev.fv_core.res.nc
+        filename_trcr: 20160630.000000.stddev.fv_tracer.res.nc
+        filename_cplr: 20160630.000000.stddev.coupler.res
+        date: '2016-06-30T00:00:00Z'