Merge pull request #30 from GEOS-ESM/feature/wgu/crtm2.4.0+IRbugfix

Replacing crtm 2.3.0 with 2.4.0 + NCEP minor IR fix + Reconfigured Cloud detection for CrIS-FSR
GEOS-ESM · Mar 22, 2023 · 5dd56af · 5dd56af
2 parents 24223d5 + 275fe82
commit 5dd56af
Show file tree

Hide file tree

Showing 179 changed files with 8,788 additions and 13,020 deletions.
diff --git a/NCEP_crtm/ACCoeff_Binary_IO.f90 b/NCEP_crtm/ACCoeff_Binary_IO.f90
@@ -37,14 +37,11 @@ MODULE ACCoeff_Binary_IO
   PUBLIC :: ACCoeff_Binary_InquireFile
   PUBLIC :: ACCoeff_Binary_ReadFile
   PUBLIC :: ACCoeff_Binary_WriteFile
-  PUBLIC :: ACCoeff_Binary_IOVersion
 
 
   ! -----------------
   ! Module parameters
   ! -----------------
-  CHARACTER(*), PRIVATE, PARAMETER :: MODULE_VERSION_ID = &
-    '$Id$'
   CHARACTER(*), PARAMETER :: WRITE_ERROR_STATUS = 'DELETE'
   ! Default message length
   INTEGER, PARAMETER :: ML = 256
@@ -677,34 +674,4 @@ SUBROUTINE Write_Cleanup()
      END SUBROUTINE Write_Cleanup
 
   END FUNCTION ACCoeff_Binary_WriteFile
-
-
-!--------------------------------------------------------------------------------
-!:sdoc+:
-!
-! NAME:
-!       ACCoeff_Binary_IOVersion
-!
-! PURPOSE:
-!       Subroutine to return the module version information.
-!
-! CALLING SEQUENCE:
-!       CALL ACCoeff_Binary_IOVersion( Id )
-!
-! OUTPUT ARGUMENTS:
-!       Id:   Character string containing the version Id information
-!             for the module.
-!             UNITS:      N/A
-!             TYPE:       CHARACTER(*)
-!             DIMENSION:  Scalar
-!             ATTRIBUTES: INTENT(OUT)
-!
-!:sdoc-:
-!--------------------------------------------------------------------------------
-
-  SUBROUTINE ACCoeff_Binary_IOVersion( Id )
-    CHARACTER(*), INTENT(OUT) :: Id
-    Id = MODULE_VERSION_ID
-  END SUBROUTINE ACCoeff_Binary_IOVersion
-
 END MODULE ACCoeff_Binary_IO
diff --git a/NCEP_crtm/ACCoeff_Define.f90 b/NCEP_crtm/ACCoeff_Define.f90
@@ -44,7 +44,6 @@ MODULE ACCoeff_Define
   PUBLIC :: ACCoeff_Inspect
   PUBLIC :: ACCoeff_ValidRelease
   PUBLIC :: ACCoeff_Info
-  PUBLIC :: ACCoeff_DefineVersion
   PUBLIC :: ACCoeff_Subset
   PUBLIC :: ACCoeff_Concat
   PUBLIC :: ACCoeff_ChannelReindex
@@ -61,9 +60,6 @@ MODULE ACCoeff_Define
   ! -----------------
   ! Module parameters
   ! -----------------
-  ! Version Id for the module
-  CHARACTER(*), PARAMETER :: MODULE_VERSION_ID = &
-  '$Id$'
   ! Literal constants
   REAL(Double), PARAMETER :: ZERO = 0.0_Double
   REAL(Double), PARAMETER :: ONE  = 1.0_Double
@@ -305,11 +301,11 @@ SUBROUTINE ACCoeff_Inspect( ACCoeff )
     WRITE(*,'(10(1x,i5,:))') ACCoeff%Sensor_Channel
     ! Coefficient arrays
     WRITE(*,'(3x,"A_earth    :")')
-    WRITE(*,'(5(1x,es13.6,:))') ACCoeff%A_earth   
+    WRITE(*,'(5(1x,es22.15,:))') ACCoeff%A_earth   
     WRITE(*,'(3x,"A_space    :")')
-    WRITE(*,'(5(1x,es13.6,:))') ACCoeff%A_space   
+    WRITE(*,'(5(1x,es22.15,:))') ACCoeff%A_space   
     WRITE(*,'(3x,"A_platform :")')
-    WRITE(*,'(5(1x,es13.6,:))') ACCoeff%A_platform
+    WRITE(*,'(5(1x,es22.15,:))') ACCoeff%A_platform
 
   END SUBROUTINE ACCoeff_Inspect
 
@@ -439,36 +435,6 @@ SUBROUTINE ACCoeff_Info( ACCoeff, Info )
 
   END SUBROUTINE ACCoeff_Info
 
-
-!--------------------------------------------------------------------------------
-!:sdoc+:
-!
-! NAME:
-!       ACCoeff_DefineVersion
-!
-! PURPOSE:
-!       Subroutine to return the module version information.
-!
-! CALLING SEQUENCE:
-!       CALL ACCoeff_DefineVersion( Id )
-!
-! OUTPUTS:
-!       Id:    Character string containing the version Id information
-!              for the module.
-!              UNITS:      N/A
-!              TYPE:       CHARACTER(*)
-!              DIMENSION:  Scalar
-!              ATTRIBUTES: INTENT(OUT)
-!
-!:sdoc-:
-!--------------------------------------------------------------------------------
-
-  SUBROUTINE ACCoeff_DefineVersion( Id )
-    CHARACTER(*), INTENT(OUT) :: Id
-    Id = MODULE_VERSION_ID
-  END SUBROUTINE ACCoeff_DefineVersion
-
-
 !--------------------------------------------------------------------------------
 !:sdoc+:
 !

diff --git a/NCEP_crtm/ADA_Module.f90 b/NCEP_crtm/ADA_Module.f90
@@ -38,9 +38,6 @@ MODULE ADA_Module
   ! -----------------
   ! Module parameters
   ! -----------------
-  ! Version Id for the module
-  CHARACTER(*),  PARAMETER :: MODULE_VERSION_ID = &
-  '$Id$'
 
 CONTAINS
 
@@ -126,6 +123,7 @@ SUBROUTINE CRTM_ADA(n_Layers, & ! Input  number of atmospheric layers
     !    CALL  multiple-stream algorithm for computing layer       !
     !    transmission, reflection, and source functions.           !
     !  ----------------------------------------------------------- !
+
     CALL CRTM_AMOM_layer( &
            RTV%n_Streams,            &
            RTV%n_Angles,k,w(k),      &

diff --git a/NCEP_crtm/AOvar_Define.f90 b/NCEP_crtm/AOvar_Define.f90
@@ -43,7 +43,6 @@ MODULE AOvar_Define
   PUBLIC :: AOvar_Inspect
   PUBLIC :: AOvar_ValidRelease
   PUBLIC :: AOvar_Info
-  PUBLIC :: AOvar_DefineVersion
   PUBLIC :: AOvar_InquireFile
   PUBLIC :: AOvar_ReadFile
   PUBLIC :: AOvar_WriteFile
@@ -56,12 +55,9 @@ MODULE AOvar_Define
     MODULE PROCEDURE AOvar_Equal
   END INTERFACE OPERATOR(==)
 
-
   ! -----------------
   ! Module parameters
   ! -----------------
-  CHARACTER(*), PARAMETER :: MODULE_VERSION_ID = &
-    '$Id$'
   ! Release and version
   INTEGER, PARAMETER :: AOVAR_RELEASE = 1  ! This determines structure and file formats.
   INTEGER, PARAMETER :: AOVAR_VERSION = 1  ! This is just the default data version.
@@ -161,13 +157,13 @@ SUBROUTINE AOvar_Inspect( self)
     IF ( .NOT. AOvar_Associated(self) ) RETURN
 
     ! Data
-    WRITE(*,'(3x,"Total transmittance :",1x,es13.6)') self%transmittance
+    WRITE(*,'(3x,"Total transmittance :",1x,es22.15)') self%transmittance
     WRITE(*,'(3x,"Optical depth (sigma) :")')
-    WRITE(*,'(5(1x,es13.6,:))') self%optical_depth
+    WRITE(*,'(5(1x,es22.15,:))') self%optical_depth
     WRITE(*,'(3x,"Volume scattering coefficient (bs) :")')
-    WRITE(*,'(5(1x,es13.6,:))') self%bs
+    WRITE(*,'(5(1x,es22.15,:))') self%bs
     WRITE(*,'(3x,"Single scatter albedo (w) :")')
-    WRITE(*,'(5(1x,es13.6,:))') self%w
+    WRITE(*,'(5(1x,es22.15,:))') self%w
   END SUBROUTINE AOvar_Inspect
 
 
@@ -228,13 +224,6 @@ SUBROUTINE AOvar_Info( self, Info )
     Info = Long_String(1:MIN(LEN(Info), LEN_TRIM(Long_String)))
   END SUBROUTINE AOvar_Info
 
-
-  SUBROUTINE AOvar_DefineVersion( Id )
-    CHARACTER(*), INTENT(OUT) :: Id
-    Id = MODULE_VERSION_ID
-  END SUBROUTINE AOvar_DefineVersion
-
-
   FUNCTION AOvar_InquireFile( &
     Filename, &  ! Input
     n_Layers, &  ! Optional output  
@@ -607,7 +596,7 @@ FUNCTION AOvar_WriteFile( &
     ! Write the global attributes
     err_stat = WriteGAtts_Binary_File( &
                  fid, &
-                 Write_Module = MODULE_VERSION_ID, &
+                 Write_Module = 'Unknown', &
                  Title        = Title  , &
                  History      = History, &
                  Comment      = Comment  )