Add TauCoeff inspection utilities for ODPS/ODAS (Binary and NetCDF)

src/CMakeLists.txt

@@ -47,11 +47,16 @@ list( APPEND crtm_src_files
       Coefficients/AerosolCoeff/AerosolCoeff_Define.f90
       Coefficients/AerosolCoeff/AerosolCoeff_netCDF_IO.f90
       Coefficients/AerosolCoeff/AerosolCoeff_IO.f90
+      Coefficients/BeCoeff/BeCoeff_Binary_IO.f90
+      Coefficients/BeCoeff/BeCoeff_Define.f90
+      Coefficients/BeCoeff/BeCoeff_netCDF_IO.f90
+      Coefficients/BeCoeff/BeCoeff_IO.f90
       Coefficients/CloudCoeff/CloudCoeff_Binary_IO.f90
       Coefficients/CloudCoeff/CloudCoeff_Define.f90
       Coefficients/CloudCoeff/CloudCoeff_netCDF_IO.f90
       Coefficients/CloudCoeff/CloudCoeff_IO.f90
       Coefficients/CRTM_AerosolCoeff.f90
+      Coefficients/CRTM_BeCoeff.f90
       Coefficients/CRTM_CloudCoeff.f90
       Coefficients/CRTM_IRiceCoeff.f90
       Coefficients/CRTM_IRlandCoeff.f90

src/Coefficients/BeCoeff/BeCoeff_Binary_IO.f90

@@ -41,7 +41,7 @@ MODULE BeCoeff_Binary_IO
   ! -----------------
   ! Module parameters
   ! -----------------
-  CHARACTER(*), PRIVATE, PARAMETER :: MODULE_VERSION_ID = &
+  CHARACTER(*), PRIVATE, PARAMETER :: MODULE_VERSION_ID = ''
   CHARACTER(*), PARAMETER :: WRITE_ERROR_STATUS = 'DELETE'
   ! Default message length
   INTEGER, PARAMETER :: ML = 256
@@ -471,7 +471,7 @@ FUNCTION BeCoeff_Binary_WriteFile( &
 
 
     ! Open the file for writing
-    err_stat = Open_Binary_File( Filename, fid, For_Output=SET )
+    err_stat = Open_Binary_File( Filename, fid, For_Output=.TRUE. )
     IF ( err_stat /= SUCCESS ) THEN
       msg = 'Error opening '//TRIM(Filename)
       CALL Write_Cleanup(); RETURN

src/Coefficients/BeCoeff/BeCoeff_Define.f90

@@ -61,7 +61,7 @@ MODULE BeCoeff_Define
   ! Module parameters
   ! -----------------
   ! Version Id for the module
-  CHARACTER(*), PARAMETER :: MODULE_VERSION_ID = &
+  CHARACTER(*), PARAMETER :: MODULE_VERSION_ID = ''
   ! Current valid release and version numbers
   INTEGER, PARAMETER :: BeCOEFF_RELEASE = 1  ! This determines object and file formats.
   INTEGER, PARAMETER :: BeCOEFF_VERSION = 1  ! This is just the data version for the release.

src/Coefficients/BeCoeff/BeCoeff_IO.f90

@@ -44,8 +44,8 @@ MODULE BeCoeff_IO
   ! -----------------
   ! Module parameters
   ! -----------------
-  CHARACTER(*), PRIVATE, PARAMETER :: MODULE_VERSION_ID = &
-  
+  CHARACTER(*), PRIVATE, PARAMETER :: MODULE_VERSION_ID = ''
+
 
 CONTAINS
 
@@ -90,9 +90,9 @@ MODULE BeCoeff_IO
 ! OPTIONAL INPUTS:
 !       netCDF:         Set this logical argument to access netCDF format
 !                       BeCoeff datafiles.
-!                       If == .FALSE., file format is BINARY [DEFAULT].
-!                          == .TRUE.,  file format is NETCDF.
-!                       If not specified, default is .FALSE.
+!                       If == .FALSE., file format is BINARY.
+!                          == .TRUE.,  file format is NETCDF [DEFAULT].
+!                       If not specified, default is .TRUE.
 !                       UNITS:      N/A
 !                       TYPE:       LOGICAL
 !                       DIMENSION:  Scalar
@@ -192,7 +192,7 @@ FUNCTION BeCoeff_InquireFile( &
     ! Set up
     err_stat = SUCCESS
     ! ...Check netCDF argument
-    Binary = .TRUE.
+    Binary = .FALSE.
     IF ( PRESENT(netCDF) ) Binary = .NOT. netCDF
 
 
@@ -256,9 +256,9 @@ END FUNCTION BeCoeff_InquireFile
 ! OPTIONAL INPUTS:
 !       netCDF:         Set this logical argument to access netCDF format
 !                       BeCoeff datafiles.
-!                       If == .FALSE., file format is BINARY [DEFAULT].
-!                          == .TRUE.,  file format is NETCDF.
-!                       If not specified, default is .FALSE.
+!                       If == .FALSE., file format is BINARY.
+!                          == .TRUE.,  file format is NETCDF [DEFAULT].
+!                       If not specified, default is .TRUE.
 !                       UNITS:      N/A
 !                       TYPE:       LOGICAL
 !                       DIMENSION:  Scalar
@@ -339,7 +339,7 @@ FUNCTION BeCoeff_ReadFile( &
     ! Set up
     err_stat = SUCCESS
     ! ...Check netCDF argument
-    Binary = .TRUE.
+    Binary = .FALSE.
     IF ( PRESENT(netCDF) ) Binary = .NOT. netCDF
 
     ! Call the appropriate function
@@ -396,9 +396,9 @@ END FUNCTION BeCoeff_ReadFile
 ! OPTIONAL INPUTS:
 !       netCDF:         Set this logical argument to access netCDF format
 !                       BeCoeff datafiles.
-!                       If == .FALSE., file format is BINARY [DEFAULT].
-!                          == .TRUE.,  file format is NETCDF.
-!                       If not specified, default is .FALSE.
+!                       If == .FALSE., file format is BINARY.
+!                          == .TRUE.,  file format is NETCDF [DEFAULT].
+!                       If not specified, default is .TRUE.
 !                       UNITS:      N/A
 !                       TYPE:       LOGICAL
 !                       DIMENSION:  Scalar
@@ -478,7 +478,7 @@ FUNCTION BeCoeff_WriteFile( &
     ! Set up
     err_stat = SUCCESS
     ! ...Check netCDF argument
-    Binary = .TRUE.
+    Binary = .FALSE.
     IF ( PRESENT(netCDF) ) Binary = .NOT. netCDF
 
     ! Call the appropriate function

src/Coefficients/BeCoeff/BeCoeff_netCDF_IO.f90

@@ -49,7 +49,7 @@ MODULE BeCoeff_netCDF_IO
   ! Module parameters
   ! -----------------
   ! Module version
-  CHARACTER(*), PARAMETER :: MODULE_VERSION_ID = &
+  CHARACTER(*), PARAMETER :: MODULE_VERSION_ID = ''
   ! Default msg string length
   INTEGER, PARAMETER :: ML = 1024
 

src/Coefficients/CRTM_BeCoeff.f90

@@ -28,8 +28,8 @@ MODULE CRTM_BeCoeff
   ! ----------------
   ! Module use
   USE Message_Handler  , ONLY: SUCCESS, FAILURE, WARNING, Display_Message
-  USE BeCoeff_Define   , ONLY: BeCoeff_type, BeCoeff_Associated, BeCoeff_Destroy
-  USE BeCoeff_Binary_IO, ONLY: BeCoeff_Binary_ReadFile
+  USE BeCoeff_Define, ONLY: BeCoeff_type, BeCoeff_Associated, BeCoeff_Destroy
+  USE BeCoeff_IO    , ONLY: BeCoeff_ReadFile
   ! Disable all implicit typing
   IMPLICIT NONE
 
@@ -50,7 +50,7 @@ MODULE CRTM_BeCoeff
   ! Module parameters
   ! -----------------
   ! Version Id for the module
-  CHARACTER(*),  PARAMETER :: MODULE_VERSION_ID = &
+  CHARACTER(*),  PARAMETER :: MODULE_VERSION_ID = ''
   ! Message string length
   INTEGER, PARAMETER :: ML = 256
 
@@ -78,12 +78,13 @@ MODULE CRTM_BeCoeff
 !       Error_Status = CRTM_BeCoeff_Load( &
 !                        Filename, &
 !                        File_Path         = File_Path        , &
+!                        netCDF            = netCDF           , &
 !                        Quiet             = Quiet            , &
 !                        Process_ID        = Process_ID       , &
 !                        Output_Process_ID = Output_Process_ID  )
 !
 ! INPUTS:
-!       Filename:           Name of the Binary format BeCoeff file.
+!       Filename:           Name of the BeCoeff file.
 !                           UNITS:      N/A
 !                           TYPE:       CHARACTER(*)
 !                           DIMENSION:  Scalar
@@ -98,6 +99,16 @@ MODULE CRTM_BeCoeff
 !                           DIMENSION:  Scalar
 !                           ATTRIBUTES: INTENT(IN), OPTIONAL
 !
+!       netCDF:             Set this logical argument to access netCDF format
+!                           BeCoeff datafiles.
+!                           If == .FALSE., file format is BINARY.
+!                              == .TRUE.,  file format is NETCDF [DEFAULT].
+!                           If not specified, default is .TRUE.
+!                           UNITS:      N/A
+!                           TYPE:       LOGICAL
+!                           DIMENSION:  Scalar
+!                           ATTRIBUTES: INTENT(IN), OPTIONAL
+!
 !       Quiet:              Set this logical argument to suppress INFORMATION
 !                           messages being printed to stdout
 !                           If == .FALSE., INFORMATION messages are OUTPUT [DEFAULT].
@@ -149,16 +160,18 @@ MODULE CRTM_BeCoeff
   FUNCTION CRTM_BeCoeff_Load( &
     Filename         , &  ! Input
     File_Path        , &  ! Optional input
+    netCDF           , &  ! Optional input
     Quiet            , &  ! Optional input
     Process_ID       , &  ! Optional input
     Output_Process_ID) &  ! Optional input
   RESULT( err_stat )
     ! Arguments
     CHARACTER(*),           INTENT(IN)  :: Filename
     CHARACTER(*), OPTIONAL, INTENT(IN)  :: File_Path
-    LOGICAL     , OPTIONAL, INTENT(IN)  :: Quiet             
-    INTEGER     , OPTIONAL, INTENT(IN)  :: Process_ID        
-    INTEGER     , OPTIONAL, INTENT(IN)  :: Output_Process_ID 
+    LOGICAL     , OPTIONAL, INTENT(IN)  :: netCDF
+    LOGICAL     , OPTIONAL, INTENT(IN)  :: Quiet
+    INTEGER     , OPTIONAL, INTENT(IN)  :: Process_ID
+    INTEGER     , OPTIONAL, INTENT(IN)  :: Output_Process_ID
     ! Function result
     INTEGER :: err_stat
     ! Local parameters
@@ -167,6 +180,7 @@ FUNCTION CRTM_BeCoeff_Load( &
     CHARACTER(ML) :: msg, pid_msg
     CHARACTER(ML) :: BeCoeff_File
     LOGICAL :: noisy
+    LOGICAL :: Binary
 
     ! Setup 
     err_stat = SUCCESS
@@ -187,12 +201,16 @@ FUNCTION CRTM_BeCoeff_Load( &
     ELSE
       pid_msg = ''
     END IF
+    ! ...Check netCDF argument
+    Binary = .FALSE.
+    IF ( PRESENT(netCDF) ) Binary = .NOT. netCDF
 
     ! Read the BeCoeff data file
-    err_stat = BeCoeff_Binary_ReadFile( &
+    err_stat = BeCoeff_ReadFile( &
                  BeCoeff_File, &
                  BeC, &
-                 Quiet = .NOT. noisy )
+                 netCDF = .NOT. Binary, &
+                 Quiet  = .NOT. noisy )
     IF ( err_stat /= SUCCESS ) THEN
       WRITE( msg,'("Error reading BeCoeff file ",a)') TRIM(BeCoeff_File)
       CALL Display_Message( ROUTINE_NAME,TRIM(msg)//TRIM(pid_msg),err_stat )