Add HIRAS2 observation type for use in JOPA

deps/ops/stubs/OpsMod_CXGenerate/Ops_GetDefaultCxFields.inc

@@ -313,6 +313,12 @@ SELECT CASE (ObsGroup)
                        StashItem_p,StashItem_p_Surface,StashCode_u10,            &
                        StashCode_v10,StashCode_t2,StashCode_rh2,StashCode_pmsl/)
 
+  CASE (ObsGroupHIRAS2)
+    CxFields(1:14) = (/StashItem_theta,StashItem_q,StashItem_qcf,StashItem_SST,  &
+                       StashItem_SeaIce,StashItem_orog,StashItem_qcl,            &
+                       StashItem_p,StashItem_p_Surface,StashCode_u10,            &
+                       StashCode_v10,StashCode_t2,StashCode_rh2,StashCode_pmsl/)
+
   CASE (ObsGroupGIIRSLW, ObsGroupGIIRSMW)
     CxFields(1:14) = (/StashItem_theta,StashItem_q,StashItem_qcf,StashItem_SST,  &
                        StashItem_SeaIce,StashItem_orog,StashItem_qcl,            &

deps/ops/stubs/OpsMod_Control/Ops_ReadObsGroupSwitches.inc

@@ -102,6 +102,7 @@ Using(ObsGroupGMIlow) = ops_env_is_true ("OPS_GMILOW")
 Using(ObsGroupGMIhigh) = ops_env_is_true ("OPS_GMIHIGH")
 Using(ObsGroupHLOSWIND) = ops_env_is_true ("OPS_HLOSWIND")
 Using(ObsGroupHIRAS) = ops_env_is_true ("OPS_HIRAS")
+Using(ObsGroupHIRAS2) = ops_env_is_true ("OPS_HIRAS2")
 Using(ObsGroupOceanWinds) = ops_env_is_true ("OPS_OCEANWINDS")
 Using(ObsGroupGIIRSLW) = ops_env_is_true ("OPS_GIIRSLW")
 Using(ObsGroupGIIRSMW) = ops_env_is_true ("OPS_GIIRSMW")

deps/ops/stubs/OpsMod_ODB/OpsFn_ObsToReportType.inc

@@ -573,7 +573,7 @@ SELECT CASE (Obs % Header % ObsGroup)
     IF (Obs % Header % Satid % Present) THEN
       DO i = ob_start, ob_end
         IF (Obs % Satid(i) == SatId_FY3D) THEN
-          report_types(i - ob_start + 1) = rep_type_fy3_d_hiras_rad 
+          report_types(i - ob_start + 1) = rep_type_fy3_d_hiras_rad
         ELSE
           found_report_type = .FALSE.
           DO j = 1, SIZE (map, DIM = 1)
@@ -587,6 +587,24 @@ SELECT CASE (Obs % Header % ObsGroup)
         END IF
       END DO
     END IF
+  CASE (ObsGroupHIRAS2)
+    IF (Obs % Header % Satid % Present) THEN
+      DO i = ob_start, ob_end
+        IF (Obs % Satid(i) == SatId_FY3E) THEN
+          report_types(i - ob_start + 1) = rep_type_fy3e_hiras2_rad
+        ELSE
+          found_report_type = .FALSE.
+          DO j = 1, SIZE (map, DIM = 1)
+            IF (map(j,1) == ObsGroupHIRAS2 .AND. map(j,2) == Obs % Satid(i)) THEN
+              report_types(i - ob_start + 1) = map(j,3)
+              found_report_type = .TRUE.
+              EXIT
+            END IF
+          END DO
+          CALL update_unrecognized_satids (Obs % Satid(i))
+        END IF
+      END DO
+    END IF
   CASE (ObsGroupGIIRSLW, ObsGroupGIIRSMW)
     IF (Obs % Header % Satid % Present) THEN
       DO i = ob_start, ob_end

deps/ops/stubs/OpsMod_ODB/OpsODB_InitODBElemDesp.inc

@@ -33,7 +33,8 @@ USE OpsMod_ObsGroupInfo, ONLY: &
     ObsGroupATMS,              &
     ObsGroupCrIS,              &
     ObsGroupHIRAS,             &
-    ObsGroupGIIRSLW,           &    
+    ObsGroupHIRAS2,            &
+    ObsGroupGIIRSLW,           &
     ObsGroupGIIRSMW,           &
     ObsGroupOcean,             &
     ObsGroupSatwind,           &
@@ -407,7 +408,8 @@ ElemDesp2ODBDesp(IndexScanLine) % data_type                      = odb_integer
 ElemDesp2ODBDesp(IndexScanLine) % has_missing                    = c_false
 
 IF (ObsGroup == ObsGroupCrIS .or. ObsGroup == ObsGroupHIRAS .or. &
-    ObsGroup == ObsGroupGIIRSLW .or. ObsGroup == ObsGroupGIIRSMW) THEN
+    ObsGroup == ObsGroupHIRAS2 .or. ObsGroup == ObsGroupGIIRSLW .or. &
+    ObsGroup == ObsGroupGIIRSMW) THEN
   ElemDesp2ODBDesp(IndexPixelNumber) % TableName                 = 'radiance'
   ElemDesp2ODBDesp(IndexPixelNumber) % ColName                   = 'field_of_regard'
   ElemDesp2ODBDesp(IndexPixelNumber) % data_type                 = odb_real

deps/ops/stubs/OpsMod_ODB/OpsODB_InitODBElemDesp_Body.inc

@@ -27,6 +27,7 @@ USE OpsMod_ObsGroupInfo, ONLY: &
     ObsGroupCOMSMIClr,         &
     ObsGroupCrIS,              &
     ObsGroupHIRAS,             &
+    ObsGroupHIRAS2,            &
     ObsGroupMWSFY3B,           &
     ObsGroupGeoCloud,          &
     ObsGroupGIIRSLW,           &
@@ -359,6 +360,24 @@ IF (ObsGroup == ObsGroupHIRAS) THEN
   ElemDesp2ODBDesp(IndexHIRASBrightnessTemp) % Varno             = ops_odb_getval (h, "$rawbt")
 END IF
 
+IF (ObsGroup == ObsGroupHIRAS2) THEN
+  ElemDesp2ODBDesp(IndexRadiance) % TableName         = 'body'
+  ElemDesp2ODBDesp(IndexRadiance) % ColName           = 'initial_obsvalue'
+  ElemDesp2ODBDesp(IndexRadiance) % Varno             = ops_odb_getval (h, "$rawsca")
+  ElemDesp2ODBDesp(IndexRadiance) % also_do(1:7)      = (/IndexPstar,           &
+                                                          IndexSkinTemperature, &
+                                                          IndexRH,              &
+                                                          IndexTemp,            &
+                                                          IndexRH2,             &
+                                                          IndexT2,              &
+                                                          IndexHIRAS2BrightnessTemp/)
+  ElemDesp2ODBDesp(IndexRadiance) % also_do_levels(1:7)       = (/1,1,43,43,1,1,431/)
+
+  ElemDesp2ODBDesp(IndexHIRAS2BrightnessTemp) % TableName         = 'body'
+  ElemDesp2ODBDesp(IndexHIRAS2BrightnessTemp) % ColName           = 'initial_obsvalue'
+  ElemDesp2ODBDesp(IndexHIRAS2BrightnessTemp) % Varno             = ops_odb_getval (h, "$rawbt")
+END IF
+
 IF (ObsGroup == ObsGroupGIIRSLW .or. ObsGroup == ObsGroupGIIRSMW) THEN
   ElemDesp2ODBDesp(IndexRadiance) % TableName    = 'body'
   ElemDesp2ODBDesp(IndexRadiance) % ColName      = 'initial_obsvalue'
@@ -1333,7 +1352,7 @@ IF (ObsGroup == ObsGroupGMIlow .OR. ObsGroup == ObsGroupGMIhigh) THEN
   ElemDesp2ODBDesp(IndexGMIBrightnessTemp) % TableName    = 'body'
   ElemDesp2ODBDesp(IndexGMIBrightnessTemp) % ColName      = 'initial_obsvalue'
   ElemDesp2ODBDesp(IndexGMIBrightnessTemp) % Varno        = ops_odb_getval (h, "$rawbt")  ! brightness temperature
-  ElemDesp2ODBDesp(IndexGMIBrightnessTemp) % also_do(1:5) = (/IndexSkinTemperature, & 
+  ElemDesp2ODBDesp(IndexGMIBrightnessTemp) % also_do(1:5) = (/IndexSkinTemperature, &
                                                               IndexRH,              &
                                                               IndexTemp,            &
                                                               IndexRH2,             &

deps/ops/stubs/OpsMod_Varobs/Ops_GetDefaultVarfields.inc

@@ -119,6 +119,12 @@ SELECT CASE (ObsGroup)
                         Varfield_numchans,Varfield_channum,Varfield_britemp, &
                         Varfield_emissivity,Varfield_solzenith, &
                         Varfield_qcinfo/)
+  CASE (ObsGroupHIRAS2)
+    Varfields(1:12) = (/Varfield_tskin,Varfield_tcozone,Varfield_satzenith, &
+                        Varfield_surface,Varfield_stratt,Varfield_satid, &
+                        Varfield_numchans,Varfield_channum,Varfield_britemp, &
+                        Varfield_emissivity,Varfield_solzenith, &
+                        Varfield_qcinfo/)
     IF (.NOT. RTTOV_CloudSwitch) THEN
       Varfields(13:14) = (/Varfield_cloudtopp, Varfield_cloudfrac/)
     END IF

deps/ops/stubs/OpsMod_Varobs/Ops_SetupVarobsLevDepC.inc

@@ -75,6 +75,7 @@ USE OpsMod_ObsGroupInfo, ONLY: &
     ObsGroupGMIhigh,           &
     ObsGroupHLOSWIND,          &
     ObsGroupHIRAS,             &
+    ObsGroupHIRAS2,            &
     ObsGroupOceanWinds,        &
     ObsGroupGIIRSLW,           &
     ObsGroupGIIRSMW,           &
@@ -323,7 +324,7 @@ SELECT CASE (Observations % header % ObsGroup)
     NumLevelLevs = 1
 
   CASE (ObsGroupHLOSWIND)
-  
+
       ObsLevelType = 0.0
       NumLevelLevs = NumObLev
 
@@ -332,6 +333,10 @@ SELECT CASE (Observations % header % ObsGroup)
     ObsLevelType = 0.0
     NumLevelLevs = 1
 
+  CASE (ObsGroupHIRAS2)
+    ObsLevelType = 0.0
+    NumLevelLevs = 1
+
   CASE (ObsGroupOceanWinds)
 
     ObsLevelType = 0.0
@@ -341,12 +346,12 @@ SELECT CASE (Observations % header % ObsGroup)
 
     ObsLevelType = 0.0
     NumLevelLevs = 1
-  
+
   CASE (ObsGroupSternaMWR)
 
     ObsLevelType = 0.0
     NumLevelLevs = 1
-  
+
   CASE (ObsGroupEPSMWS)
 
     ObsLevelType = 0.0

deps/ops/stubs/Ops_Constants/OpsFn_IsSatRadGroup.inc

@@ -28,6 +28,7 @@ IF (obsgroup == ObsGroupABIClr .OR. &
     obsgroup == ObsGroupFCIClr .OR. &
     obsgroup == ObsGroupFCIASR .OR. &
     obsgroup == ObsGroupHIRAS .OR. &
+    obsgroup == ObsGroupHIRAS2 .OR. &
     obsgroup == ObsGroupGeoCloud .OR. &
     obsgroup == ObsGroupGOESImClr .OR. &
     obsgroup == ObsGroupIASI .OR. &

deps/ops/stubs/Ops_Constants/OpsFn_ObsGroupNameToNum.inc

@@ -50,6 +50,8 @@ SELECT CASE (ObsGroupName)
     OpsFn_ObsGroupNameToNum = ObsGroupFCIClr
   CASE ("HIRAS")
     OpsFn_ObsGroupNameToNum = ObsGroupHIRAS
+  CASE ("HIRAS2")
+    OpsFn_ObsGroupNameToNum = ObsGroupHIRAS2
   CASE ("MWSFY3B")
     OpsFn_ObsGroupNameToNum = ObsGroupMWSFY3B
   CASE ("GeoCloud")

deps/ops/stubs/Ops_Constants/OpsFn_ObsGroupNumToName.inc

@@ -27,6 +27,8 @@ SELECT CASE (ObsGroup)
     OpsFn_ObsGroupNumToName = "AIRS"
   CASE (ObsGroupHIRAS)
     OpsFn_ObsGroupNumToName = "HIRAS"
+  CASE (ObsGroupHIRAS2)
+    OpsFn_ObsGroupNumToName = "HIRAS2"
   CASE (ObsGroupHLOSwind)
     OpsFn_ObsGroupNumToName = "HLOSwind"
   CASE (ObsGroupAltim)

deps/ops/stubs/Ops_Constants/OpsMod_ObsGroupInfo.f90

@@ -68,7 +68,7 @@ MODULE OpsMod_ObsGroupInfo
 INTEGER, PARAMETER :: ObsGroupGMIhigh      =  57 ! => GMI high freq channels
 INTEGER, PARAMETER :: ObsGroupHLOSwind     =  58 ! => ALADIN-AEOLUS HLOS wind
 INTEGER, PARAMETER :: ObsGroupOceanColour  =  59 ! => Ocean Colour Data
-INTEGER, PARAMETER :: ObsGroupHIRAS        =  60 ! => HIRAS 
+INTEGER, PARAMETER :: ObsGroupHIRAS        =  60 ! => HIRAS
 INTEGER, PARAMETER :: ObsGroupOceanWinds   =  61 ! => Satellite wind speeds
 INTEGER, PARAMETER :: ObsGroupGIIRSLW      =  62 ! => GIIRS LW radiances
 INTEGER, PARAMETER :: ObsGroupGIIRSMW      =  63 ! => GIIRS MW radiances
@@ -79,9 +79,10 @@ MODULE OpsMod_ObsGroupInfo
 INTEGER, PARAMETER :: ObsGroupFCIASR         =  68 ! => FCI all-sky radiances
 INTEGER, PARAMETER :: ObsGroupFCIClr         =  69 ! => FCI clear-sky radiances
 INTEGER, PARAMETER :: ObsGroupSternaMWR      =  70 ! => AWS & Sterna microwave radiances
-INTEGER, PARAMETER :: ObsGroupEPSMWS         =  71 ! => EPS SG MWS 
+INTEGER, PARAMETER :: ObsGroupEPSMWS         =  71 ! => EPS SG MWS
 INTEGER, PARAMETER :: ObsGroupMWSFY3E        =  72 ! => FY3E microwave sounder data
-INTEGER, PARAMETER :: max_obs_group_num      =  72 ! Number of observation groups
+INTEGER, PARAMETER :: ObsGroupHIRAS2         =  74 ! => HIRAS Radiances
+INTEGER, PARAMETER :: max_obs_group_num      =  74 ! Number of observation groups
 
 CONTAINS
 

deps/ops/stubs/Ops_Constants/OpsMod_ObsTypes.f90

@@ -285,15 +285,16 @@ MODULE OpsMod_ObsTypes
 INTEGER, PARAMETER :: ObsTypeGMIlow       = 29100   ! => GMI low freq channels
 INTEGER, PARAMETER :: ObsTypeGMIhigh      = 29200   ! => GMI high freq channels
 
-INTEGER, PARAMETER :: ObsTypeHIRAS        = 29300   ! => HIRAS 
-INTEGER, PARAMETER :: ObsTypeHIRASFSR     = 29301   ! => HIRAS FSR 
+INTEGER, PARAMETER :: ObsTypeHIRAS        = 29300   ! => HIRAS
+INTEGER, PARAMETER :: ObsTypeHIRASFSR     = 29301   ! => HIRAS FSR
 INTEGER, PARAMETER :: ObsTypeHIRASHR      = 29302   ! => HIRAS (UK)
 INTEGER, PARAMETER :: ObsTypeHIRASFSRHR   = 29303   ! => HIRAS FSR (UK)
+INTEGER, PARAMETER :: ObsTypeHIRAS2       = 29310   ! => HIRAS2
 
 INTEGER, PARAMETER :: ObsTypeGIIRS        = 29400   ! => GIIRS
 
 INTEGER, PARAMETER :: ObsTypeAWS          = 29600   ! => Arctic weather satellite radiances
- 
+
 INTEGER, PARAMETER :: ObsTypeMWSSG        = 29700   ! => EPSSG MWS radiances
 
 ! Aircraft data

deps/ops/stubs/Ops_Constants/Ops_SubTypeNameToNum.inc

@@ -116,7 +116,7 @@ SELECT CASE (name)
     num = ObsTypeESAUWI
   CASE ("FCIASR")
     num = ObsTypeFCIEUMASR
-  CASE ("FCIRADUK") 
+  CASE ("FCIRADUK")
     num = ObsTypeFCIAUTOUK
   CASE ("GAUGE")
     num = ObsTypeGauge

deps/ops/stubs/Ops_Constants/Ops_SubTypeNumToName.inc

@@ -97,6 +97,8 @@ SELECT CASE (num)
     name = "CRIMSS"
   CASE (ObsTypeHIRASHR, ObsTypeHIRASFSRHR)
     name = "CRIMSSHR"
+  CASE (ObsTypeHIRAS2)
+    name = "CRIMSF"
   CASE (ObsTypeDropsonde)
     name = "DROPSOND"
   CASE (ObsTypeRadwind)

etc/global/cx/HIRAS2.nl

@@ -0,0 +1,3 @@
+&CXControlNL
+CxFields=4,10,12,24,31,33,254,266,267,268,407,409,3209,3210,3236,3245,16222
+/

etc/global/varobs/HIRAS2.nl

@@ -0,0 +1,3 @@
+&VarobsControlNL
+Varfields=10,11,18,19,21,28,31,35,36,54,55,57,80
+/