SIPS new MVCM support SNPP/N20

src/main/cx_netcdf4_mod.f90

@@ -81,6 +81,7 @@ module CX_NETCDF4_MOD
  public :: WRITE_CLAVRX_NETCDF_GLOBAL_ATTRIBUTES
  public :: pfio_get_gatt_string
  public :: query_varid_and_its_relncid
+ public :: read_netcdf_raw
 
  logical, parameter, private :: debug_nonCF = .TRUE.
  

src/main/mvcm_read_mod.f90

@@ -116,8 +116,18 @@ module MVCM_READ_MOD
     Files => FILE_SEARCH(trim(Image%Level1b_Path),trim(Search_String),count=Num_Files)
 
     if (Num_Files == 0 .or. Num_Files > 1) then
-        print *, EXE_PROMPT, MVCM_PROMPT, "MVCM File Not Found, "
-        return
+        print *, EXE_PROMPT, MVCM_PROMPT, "Old MVCM File Not Found. Try New MVCM "
+        !return
+    !endif
+    
+        Search_String = 'CLDMSK_L2_VIIRS-CRIS_SNPP'//trim(Image%Level1b_Name(9:22))//'*.nc'
+
+        Files => FILE_SEARCH(trim(Image%Level1b_Path),trim(Search_String),count=Num_Files)
+
+        if (Num_Files == 0 .or. Num_Files > 1) then
+            print *, EXE_PROMPT, MVCM_PROMPT, "New MVCM File Not Found "
+            return
+        endif
     endif
 
     Image%Auxiliary_Cloud_Mask_File_Name = Files(1)
@@ -140,8 +150,18 @@ module MVCM_READ_MOD
     Files => FILE_SEARCH(trim(Image%Level1b_Path),trim(Search_String),count=Num_Files)
 
     if (Num_Files == 0 .or. Num_Files > 1) then
-        print *, EXE_PROMPT, MVCM_PROMPT, "NOAA20 MVCM File Not Found, "
-        return
+        print *, EXE_PROMPT, MVCM_PROMPT, "Old NOAA20 MVCM File Not Found. Try New MVCM "
+        !return
+    !endif
+        
+        Search_String = 'CLDMSK_L2_VIIRS-CRIS_NOAA20'//trim(Image%Level1b_Name(9:22))//'*.nc'
+
+        Files => FILE_SEARCH(trim(Image%Level1b_Path),trim(Search_String),count=Num_Files)
+
+        if (Num_Files == 0 .or. Num_Files > 1) then
+            print *, EXE_PROMPT, MVCM_PROMPT, "New MVCM File Not Found "
+            return
+        endif
     endif
 
     Image%Auxiliary_Cloud_Mask_File_Name = Files(1)
@@ -326,7 +346,8 @@ module MVCM_READ_MOD
     if (.not. allocated(I1_Buffer)) allocate(I1_Buffer(Nx_Slab_Count, Ny_Slab_Count),stat=Status_Flag)
 
     ! --- read data
-    call READ_NETCDF(Group_Id, Sds_Start, Sds_Stride, Sds_Edges, trim(Sds_Name), I1_Buffer)
+    call READ_NETCDF_RAW(Group_Id, Sds_Start, Sds_Stride, Sds_Edges, trim(Sds_Name), I1_Buffer)
+    !call READ_NETCDF(Group_Id, Sds_Start, Sds_Stride, Sds_Edges, trim(Sds_Name), I1_Buffer)
 
     !--- close file
     call CLOSE_NETCDF(Sd_Id) 

src/main/viirs_nasa_read_module.f90

@@ -2072,7 +2072,7 @@ subroutine DETERMINE_VIIRS_NASA_FILE_NEW_FUSION(Path_In,File_In,File_Type_In,Fil
       integer(kind=int4):: Num_Files
 
       New_Fusion_Flag = .False.
-       Search_String = trim(File_Type_In)//trim(File_In(9:22))//'*'//File_Type_end//'.nc'
+       Search_String = trim(File_Type_In)//trim(File_In(9:22))//'*'//File_Type_end//'*.nc'
 
       Files => FILE_SEARCH(trim(Path_In),trim(Search_String),count=Num_Files)