Merge branch 'develop' into feature/rename_atm

* develop: Yaml updates for use with updated GDASApp submodules (#8)
NOAA-EMC · Jun 6, 2024 · c6d017c · c6d017c
2 parents 0b26c2f + 0d66231
commit c6d017c
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 16 deletions.
diff --git a/model/atmosphere/atmosphere_background_error_hybrid_gsibec_bump.yaml.j2 b/model/atmosphere/atmosphere_background_error_hybrid_gsibec_bump.yaml.j2
@@ -3,7 +3,7 @@ components:
 - covariance:
     covariance model: SABER
     saber central block:
-      saber block name: gsi covariance
+      saber block name: gsi static covariance
       read:
         gsi akbk: {{atmosphere_fv3jedi_files_path}}/akbk.nc4
         gsi error covariance file: {{atmosphere_gsibec_path}}/gsi-coeffs-gfs-global.nc4

diff --git a/model/atmosphere/atmosphere_background_error_static_gsibec.yaml.j2 b/model/atmosphere/atmosphere_background_error_static_gsibec.yaml.j2
@@ -1,7 +1,7 @@
 covariance model: SABER
 full inverse: true
 saber central block:
-  saber block name: gsi covariance
+  saber block name: gsi static covariance
   read:
     gsi akbk: {{atmosphere_fv3jedi_files_path}}/akbk.nc4
     gsi error covariance file: {{atmosphere_gsibec_path}}/gsi-coeffs-gfs-global.nc4

diff --git a/observations/atmosphere-lgetkf/amsua_n19.yaml.j2 b/observations/atmosphere-lgetkf/amsua_n19.yaml.j2
@@ -45,19 +45,19 @@
     variational bc:
       predictors:
       - name: constant
-      - name: lapse_rate
+      - name: lapseRate
         order: 2
         tlapse: &{{observation_from_jcb}}_tlapse "{{atmosphere_obsbiasin_path}}/{{atmosphere_obstlapsein_prefix}}{{observation_from_jcb}}{{atmosphere_obstlapsein_suffix}}"
-      - name: lapse_rate
+      - name: lapseRate
         tlapse: *{{observation_from_jcb}}_tlapse
-      - name: emissivity
-      - name: scan_angle
+      - name: emissivityJacobian
+      - name: sensorScanAngle
         order: 4
-      - name: scan_angle
+      - name: sensorScanAngle
         order: 3
-      - name: scan_angle
+      - name: sensorScanAngle
         order: 2
-      - name: scan_angle
+      - name: sensorScanAngle
     covariance:
       minimal required obs number: 20
       variance range: [1.0e-6, 10.0]

diff --git a/observations/atmosphere/amsua_n19.yaml.j2 b/observations/atmosphere/amsua_n19.yaml.j2
@@ -37,19 +37,19 @@
     variational bc:
       predictors:
       - name: constant
-      - name: lapse_rate
+      - name: lapseRate
         order: 2
         tlapse: &{{observation_from_jcb}}_tlapse "{{atmosphere_obsbiasin_path}}/{{atmosphere_obstlapsein_prefix}}{{observation_from_jcb}}{{atmosphere_obstlapsein_suffix}}"
-      - name: lapse_rate
+      - name: lapseRate
         tlapse: *{{observation_from_jcb}}_tlapse
-      - name: emissivity
-      - name: scan_angle
+      - name: emissivityJacobian
+      - name: sensorScanAngle
         order: 4
-      - name: scan_angle
+      - name: sensorScanAngle
         order: 3
-      - name: scan_angle
+      - name: sensorScanAngle
         order: 2
-      - name: scan_angle
+      - name: sensorScanAngle
     covariance:
       minimal required obs number: 20
       variance range: [1.0e-6, 10.0]