Rebase "feature/trop-prs-in-satdiagn" atop PR #2399

This rebase brings the "feature/trop-prs-in-satdiagn" branch (which contains
an update by @eamarais to add tropopause pressure to the SatDiagn collection)
into the "dev/no-diff-to-benchmark" branch atop PR #2399.  The original update
was based off version 14.1.0.

This merge brings PR # ( , by @) into

Signed-off-by: Bob Yantosca <[email protected]>

GeosCore/diagnostics_mod.F90

@@ -1518,6 +1518,13 @@ SUBROUTINE Do_Archive_SatDiagn( Input_Opt,  State_Chm,  State_Diag,        &
           State_Diag%SatDiagnTROPP(I,:) = State_Met%TROPP(I,:) * good
        ENDIF
 
+       !---------------------------------------------------------------------
+       ! Tropopause level [unitless]:
+       !---------------------------------------------------------------------
+       IF ( State_Diag%Archive_SatDiagnTropLev ) THEN
+          State_Diag%SatDiagnTropLev(I,:) = State_Met%TropLev(I,:) * good
+       ENDIF
+
        !---------------------------------------------------------------------
        ! PBL Height [m]:
        !---------------------------------------------------------------------

Headers/state_diag_mod.F90

@@ -945,6 +945,9 @@ MODULE State_Diag_Mod
      REAL(f8),           POINTER :: SatDiagnTROPP(:,:)
      LOGICAL                     :: Archive_SatDiagnTROPP
 
+     REAL(f8),           POINTER :: SatDiagnTropLev(:,:)
+     LOGICAL                     :: Archive_SatDiagnTropLev
+
      REAL(f8),           POINTER :: SatDiagnPBLHeight(:,:)
      LOGICAL                     :: Archive_SatDiagnPBLHeight
 
@@ -2409,6 +2412,9 @@ SUBROUTINE Zero_State_Diag( State_Diag, RC )
     State_Diag%SatDiagnTROPP                       => NULL()
     State_Diag%Archive_SatDiagnTROPP               = .FALSE.
 
+    State_Diag%SatDiagnTropLev                     => NULL()
+    State_Diag%Archive_SatDiagnTropLev             = .FALSE.
+
     State_Diag%SatDiagnPBLHeight                   => NULL()
     State_Diag%Archive_SatDiagnPBLHeight           = .FALSE.
 
@@ -4893,6 +4899,28 @@ SUBROUTINE Init_State_Diag( Input_Opt, State_Chm,       State_Grid,        &
        RETURN
     ENDIF
 
+    !------------------------------------------------------------------------
+    ! Satellite diagnostic: Tropopause level (TropLev)
+    !------------------------------------------------------------------------
+    diagId  = 'SatDiagnTropLev'
+    CALL Init_and_Register(                                                  &
+         Input_Opt      = Input_Opt,                                         &
+         State_Chm      = State_Chm,                                         &
+         State_Diag     = State_Diag,                                        &
+         State_Grid     = State_Grid,                                        &
+         DiagList       = Diag_List,                                         &
+         TaggedDiagList = TaggedDiag_List,                                   &
+         Ptr2Data       = State_Diag%SatDiagnTropLev,                        &
+         archiveData    = State_Diag%Archive_SatDiagnTropLev,                &
+         diagId         = diagId,                                            &
+         RC             = RC                                                )
+
+    IF ( RC /= GC_SUCCESS ) THEN
+       errMsg = TRIM( errMsg_ir ) // TRIM( diagId )
+       CALL GC_Error( errMsg, RC, thisLoc )
+       RETURN
+    ENDIF
+
     !------------------------------------------------------------------------
     ! Satellite diagnostic: PBL Height (m)
     !------------------------------------------------------------------------
@@ -5190,6 +5218,12 @@ SUBROUTINE Init_State_Diag( Input_Opt, State_Chm,       State_Grid,        &
          State_Diag%Archive_SatDiagnConc                                .or. &
          State_Diag%Archive_SatDiagnDryDep                              .or. &
          State_Diag%Archive_SatDiagnDryDepVel                           .or. &
+         State_Diag%Archive_SatDiagnPEdge                               .or. &
+         State_Diag%Archive_SatDiagnTROPP                               .or. &
+         State_Diag%Archive_SatDiagnTropLev                             .or. &
+         State_Diag%Archive_SatDiagnPBLHeight                           .or. &
+         State_Diag%Archive_SatDiagnPBLTop                              .or. &
+         State_Diag%Archive_SatDiagnTAir                                .or. &
          State_Diag%Archive_SatDiagnGWETROOT                            .or. &
          State_Diag%Archive_SatDiagnGWETTOP                             .or. &
          State_Diag%Archive_SatDiagnJval                                .or. &
@@ -12999,6 +13033,11 @@ SUBROUTINE Cleanup_State_Diag( State_Diag, RC )
                    RC       = RC                                            )
     IF ( RC /= GC_SUCCESS ) RETURN
 
+    CALL Finalize( diagId   = 'SatDiagnTropLev',                           &
+                   Ptr2Data = State_Diag%SatDiagnTropLev,                  &
+                   RC       = RC                                            )
+    IF ( RC /= GC_SUCCESS ) RETURN
+
     CALL Finalize( diagId   = 'SatDiagnPBLHeight',                         &
                    Ptr2Data = State_Diag%SatDiagnPBLHeight,                &
                    RC       = RC                                            )
@@ -15146,6 +15185,11 @@ SUBROUTINE Get_Metadata_State_Diag( am_I_Root,  metadataID, Found,         &
        IF ( isUnits   ) Units = 'hPa'
        IF ( isRank    ) Rank  = 2
 
+    ELSE IF ( TRIM( Name_AllCaps ) == 'SATDIAGNTROPLEV' ) THEN
+       IF ( isDesc    ) Desc  = 'Tropopause level'
+       IF ( isUnits   ) Units = 'unitless'
+       IF ( isRank    ) Rank  = 2
+
     ELSE IF ( TRIM( Name_AllCaps ) == 'SATDIAGNPBLHEIGHT' ) THEN
        IF ( isDesc    ) Desc  = 'PBL Height'
        IF ( isUnits   ) Units = 'm'