Merge branch 'develop' into release/REL-3.1.1

JCSDA · Aug 30, 2024 · c5c521f · c5c521f
2 parents cee839f + 068e306
commit c5c521f
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/src/Coefficients/SpcCoeff/SpcCoeff_Binary_IO.f90 b/src/Coefficients/SpcCoeff/SpcCoeff_Binary_IO.f90
@@ -418,7 +418,7 @@ FUNCTION SpcCoeff_Binary_ReadFile( &
     END IF
 
     ! ...Read the channel data
-    IF( dummy%Version > 2 ) THEN
+    IF( dummy%Version > 3 ) THEN
       ! Binary coefficient version 3 introduced for TROPICS instrument.
       ! The SpcCoeff coefficients contain 'PolAngle' as an additional
       ! array.
@@ -435,7 +435,7 @@ FUNCTION SpcCoeff_Binary_ReadFile( &
         SpcCoeff%Band_C2                   , &
         SpcCoeff%Cosmic_Background_Radiance, &
         SpcCoeff%Solar_Irradiance
-    ELSE IF( dummy%Version < 3 ) THEN
+    ELSE IF( dummy%Version < 4 ) THEN
       ! Version 2 is the default binary SpcCoeff version for 
       ! REL-2.4.0 and older.
       READ ( fid, IOSTAT=io_stat, IOMSG=io_msg ) &

diff --git a/src/Coefficients/SpcCoeff/SpcCoeff_NC2BIN/SpcCoeff_NC2BIN.f90 b/src/Coefficients/SpcCoeff/SpcCoeff_NC2BIN/SpcCoeff_NC2BIN.f90
@@ -60,8 +60,8 @@ PROGRAM SpcCoeff_NC2BIN
     CALL Display_Message( PROGRAM_NAME, msg, FAILURE ); STOP
   END IF
 
-  ! Perform the conversion
-  err_stat = SpcCoeff_netCDF_to_Binary( nc_filename, bin_filename, Version = version )
+  ! Perform the conversion (no change to version)
+  err_stat = SpcCoeff_netCDF_to_Binary( nc_filename, bin_filename )
   IF ( err_stat /= SUCCESS ) THEN
     msg = 'SpcCoeff netCDF -> Binary conversion failed!'
     CALL Display_Message( PROGRAM_NAME, msg, FAILURE ); STOP