Change obs error for GNSSRO bending angle and update build

build/CMakeLists.txt

@@ -11,7 +11,7 @@
 # Usage: cmake <mpas-bundle src dir> -DCMAKE_BUILD_TYPE=RelWithDebINfo -DCMAKE_VERBOSE_MAKEFILE=ON -DSNAPSHOT_DATE=2024-06-01 -DMPAS_DOUBLE_PRECISION=OFF
 
 cmake_minimum_required( VERSION 3.14 )
-project( mpas-bundle VERSION 3.0.0 LANGUAGES C CXX Fortran )
+project( mpas-bundle VERSION 3.0.2 LANGUAGES C CXX Fortran )
 
 ## ECBuild integration
 include(GNUInstallDirs)
@@ -67,10 +67,10 @@ find_package(ESMF 8.3.0 MODULE)
 set(MPAS_DOUBLE_PRECISION "ON" CACHE STRING "MPAS-Model: Use double precision 64-bit Floating point.")
 set(MPAS_CORES init_atmosphere atmosphere CACHE STRING "MPAS-Model: cores to build.")
 
-ecbuild_bundle( PROJECT MPAS      GIT "https://github.com/MPAS-Dev/MPAS-Model" TAG v8.2.1 )
+ecbuild_bundle( PROJECT MPAS      GIT "https://github.com/MPAS-Dev/MPAS-Model" TAG v8.2.2 )
 option(ENABLE_MPAS_JEDI_DATA "Obtain mpas-jedi test data from mpas-jedi-data repository (vs tarball)" ON)
 ecbuild_bundle( PROJECT mpas-jedi-data  GIT "https://github.com/JCSDA-internal/mpas-jedi-data.git"  TAG 12cdc56 )
-ecbuild_bundle( PROJECT mpas-jedi GIT "https://github.com/JCSDA-internal/mpas-jedi"      TAG 3.0.0.mmm )
+ecbuild_bundle( PROJECT mpas-jedi GIT "https://github.com/JCSDA-internal/mpas-jedi"      TAG 3.0.2.mmm )
 
 # Set GIT_BRANCH_FUNC to MPAS-JEDI's current branch so that it can be used for mpas-jedi-data
 find_branch_name(REPO_DIR_NAME mpas-jedi)

config/jedi/ObsPlugs/da/filters/gnssrobndmo.yaml

@@ -13,176 +13,179 @@
         name: MetaData/geoidUndulation
       minvalue: -200.0
       maxvalue: 200.0
+  - filter: ROobserror
+    filter variables:
+    - name: bendingAngle
+    errmodel: NRL
+  - filter: Background Check
+    threshold: 3.0
+    <<: *multiIterationFilter
 
-#  # reject where refractivity is assimilated
+##  # reject where refractivity is assimilated
+##  # NPol
+##  - filter: RejectList
+##    defer to post: true
+##    filter variables:
+##    - name: bendingAngle
+##    where:
+##    - variable:
+##        name: MetaData/latitude
+##      minvalue: *minNPol
+##      maxvalue: *maxNPol
+##    - variable:
+##        name: MetaData/impactHeightRO
+##      maxvalue: *gnssrorefncepNPolExcludeMin
+##  # NMid
+##  - filter: RejectList
+##    defer to post: true
+##    filter variables:
+##    - name: bendingAngle
+##    where:
+##    - variable:
+##        name: MetaData/latitude
+##      minvalue: *minNMid
+##      maxvalue: *maxNMid
+##    - variable:
+##        name: MetaData/impactHeightRO
+##      maxvalue: *gnssrorefncepNMidExcludeMin
+##  # Tro
+##  - filter: RejectList
+##    defer to post: true
+##    filter variables:
+##    - name: bendingAngle
+##    where:
+##    - variable:
+##        name: MetaData/latitude
+##      maxvalue: *minTro
+##      maxvalue: *maxTro
+##    - variable:
+##        name: MetaData/impactHeightRO
+##      minvalue: *gnssrorefncepTroExcludeMin
+##  # SMid
+##  - filter: RejectList
+##    defer to post: true
+##    filter variables:
+##    - name: bendingAngle
+##    where:
+##    - variable:
+##        name: MetaData/latitude
+##      minvalue: *minSMid
+##      maxvalue: *maxSMid
+##    - variable:
+##        name: MetaData/impactHeightRO
+##      maxvalue: *gnssrorefncepSMidExcludeMin
+##  # SPol
+##  - filter: RejectList
+##    defer to post: true
+##    filter variables:
+##    - name: bendingAngle
+##    where:
+##    - variable:
+##        name: MetaData/latitude
+##      minvalue: *minSPol
+##      maxvalue: *maxSPol
+##    - variable:
+##        name: MetaData/impactHeightRO
+##      maxvalue: *gnssrorefncepSPolExcludeMin
+#
+#  ## Scale ObsError based on ObsValue
 #  # NPol
-#  - filter: RejectList
-#    defer to post: true
+#  - filter: Perform Action
 #    filter variables:
 #    - name: bendingAngle
 #    where:
 #    - variable:
 #        name: MetaData/latitude
 #      minvalue: *minNPol
 #      maxvalue: *maxNPol
-#    - variable:
-#        name: MetaData/impactHeightRO
-#      maxvalue: *gnssrorefncepNPolExcludeMin
+#    action:
+#      name: assign error
+#      error function:
+#        name: ObsFunction/ObsErrorModelStepwiseLinear
+#        options:
+#          xvar:
+#            name: MetaData/impactHeightRO
+#          scale_factor_var:
+#            name: ObsValue/bendingAngle
+#          xvals: *gnssroErrorLevels
+#          errors: *gnssrobndmoNPolErrors
 #  # NMid
-#  - filter: RejectList
-#    defer to post: true
+#  - filter: Perform Action
 #    filter variables:
 #    - name: bendingAngle
 #    where:
 #    - variable:
 #        name: MetaData/latitude
 #      minvalue: *minNMid
 #      maxvalue: *maxNMid
-#    - variable:
-#        name: MetaData/impactHeightRO
-#      maxvalue: *gnssrorefncepNMidExcludeMin
+#    action:
+#      name: assign error
+#      error function:
+#        name: ObsFunction/ObsErrorModelStepwiseLinear
+#        options:
+#          xvar:
+#            name: MetaData/impactHeightRO
+#          scale_factor_var:
+#            name: ObsValue/bendingAngle
+#          xvals: *gnssroErrorLevels
+#          errors: *gnssrobndmoNMidErrors
 #  # Tro
-#  - filter: RejectList
-#    defer to post: true
+#  - filter: Perform Action
 #    filter variables:
 #    - name: bendingAngle
 #    where:
 #    - variable:
 #        name: MetaData/latitude
-#      maxvalue: *minTro
+#      minvalue: *minTro
 #      maxvalue: *maxTro
-#    - variable:
-#        name: MetaData/impactHeightRO
-#      minvalue: *gnssrorefncepTroExcludeMin
+#    action:
+#      name: assign error
+#      error function:
+#        name: ObsFunction/ObsErrorModelStepwiseLinear
+#        options:
+#          xvar:
+#            name: MetaData/impactHeightRO
+#          scale_factor_var:
+#            name: ObsValue/bendingAngle
+#          xvals: *gnssroErrorLevels
+#          errors: *gnssrobndmoTroErrors
 #  # SMid
-#  - filter: RejectList
-#    defer to post: true
+#  - filter: Perform Action
 #    filter variables:
 #    - name: bendingAngle
 #    where:
 #    - variable:
 #        name: MetaData/latitude
 #      minvalue: *minSMid
 #      maxvalue: *maxSMid
-#    - variable:
-#        name: MetaData/impactHeightRO
-#      maxvalue: *gnssrorefncepSMidExcludeMin
+#    action:
+#      name: assign error
+#      error function:
+#        name: ObsFunction/ObsErrorModelStepwiseLinear
+#        options:
+#          xvar:
+#            name: MetaData/impactHeightRO
+#          scale_factor_var:
+#            name: ObsValue/bendingAngle
+#          xvals: *gnssroErrorLevels
+#          errors: *gnssrobndmoSMidErrors
 #  # SPol
-#  - filter: RejectList
-#    defer to post: true
+#  - filter: Perform Action
 #    filter variables:
 #    - name: bendingAngle
 #    where:
 #    - variable:
 #        name: MetaData/latitude
 #      minvalue: *minSPol
 #      maxvalue: *maxSPol
-#    - variable:
-#        name: MetaData/impactHeightRO
-#      maxvalue: *gnssrorefncepSPolExcludeMin
-
-  ## Scale ObsError based on ObsValue
-  # NPol
-  - filter: Perform Action
-    filter variables:
-    - name: bendingAngle
-    where:
-    - variable:
-        name: MetaData/latitude
-      minvalue: *minNPol
-      maxvalue: *maxNPol
-    action:
-      name: assign error
-      error function:
-        name: ObsFunction/ObsErrorModelStepwiseLinear
-        options:
-          xvar:
-            name: MetaData/impactHeightRO
-          scale_factor_var:
-            name: ObsValue/bendingAngle
-          xvals: *gnssroErrorLevels
-          errors: *gnssrobndmoNPolErrors
-  # NMid
-  - filter: Perform Action
-    filter variables:
-    - name: bendingAngle
-    where:
-    - variable:
-        name: MetaData/latitude
-      minvalue: *minNMid
-      maxvalue: *maxNMid
-    action:
-      name: assign error
-      error function:
-        name: ObsFunction/ObsErrorModelStepwiseLinear
-        options:
-          xvar:
-            name: MetaData/impactHeightRO
-          scale_factor_var:
-            name: ObsValue/bendingAngle
-          xvals: *gnssroErrorLevels
-          errors: *gnssrobndmoNMidErrors
-  # Tro
-  - filter: Perform Action
-    filter variables:
-    - name: bendingAngle
-    where:
-    - variable:
-        name: MetaData/latitude
-      minvalue: *minTro
-      maxvalue: *maxTro
-    action:
-      name: assign error
-      error function:
-        name: ObsFunction/ObsErrorModelStepwiseLinear
-        options:
-          xvar:
-            name: MetaData/impactHeightRO
-          scale_factor_var:
-            name: ObsValue/bendingAngle
-          xvals: *gnssroErrorLevels
-          errors: *gnssrobndmoTroErrors
-  # SMid
-  - filter: Perform Action
-    filter variables:
-    - name: bendingAngle
-    where:
-    - variable:
-        name: MetaData/latitude
-      minvalue: *minSMid
-      maxvalue: *maxSMid
-    action:
-      name: assign error
-      error function:
-        name: ObsFunction/ObsErrorModelStepwiseLinear
-        options:
-          xvar:
-            name: MetaData/impactHeightRO
-          scale_factor_var:
-            name: ObsValue/bendingAngle
-          xvals: *gnssroErrorLevels
-          errors: *gnssrobndmoSMidErrors
-  # SPol
-  - filter: Perform Action
-    filter variables:
-    - name: bendingAngle
-    where:
-    - variable:
-        name: MetaData/latitude
-      minvalue: *minSPol
-      maxvalue: *maxSPol
-    action:
-      name: assign error
-      error function:
-        name: ObsFunction/ObsErrorModelStepwiseLinear
-        options:
-          xvar:
-            name: MetaData/impactHeightRO
-          scale_factor_var:
-            name: ObsValue/bendingAngle
-          xvals: *gnssroErrorLevels
-          errors: *gnssrobndmoSPolErrors
-
-  - filter: Background Check
-    threshold: 3.0
-    <<: *multiIterationFilter
+#    action:
+#      name: assign error
+#      error function:
+#        name: ObsFunction/ObsErrorModelStepwiseLinear
+#        options:
+#          xvar:
+#            name: MetaData/impactHeightRO
+#          scale_factor_var:
+#            name: ObsValue/bendingAngle
+#          xvals: *gnssroErrorLevels
+#          errors: *gnssrobndmoSPolErrors