Merge branch 'develop' of https://gitlab.ssec.wisc.edu/clavrx/clavrx-dev into develop

cx_dncomp/src/dcomp_array_loop_sub.f90

@@ -321,6 +321,16 @@ subroutine dcomp_array_loop ( input, output , debug_mode_user)
          ! - apriori
          state_apriori (1) = 0.7 * ( 100. * obs_vec(1) ) ** (0.9)
          state_apriori(1) = log10 ( max ( 0.1 , state_apriori(1) ) ) 
+         
+         ! use acha as apriori if cirrus
+         if ( input % tau_acha(elem_idx, line_idx) .gt. 0.01 &
+              .and. input % tau_acha(elem_idx, line_idx) .lt. 8.01 &
+              .and. input % cloud_type(elem_idx, line_idx) .eq. 7  ) then
+              
+            state_apriori(1) = log10 ( max ( 0.001 , input % tau_acha(elem_idx, line_idx) ) )    
+           
+         end if
+         
          state_apriori (2) = 1.3
          if  (water_phase_array ( elem_idx, line_idx) ) state_apriori(2) = 1.0
          

main_src/Makefile

@@ -782,6 +782,8 @@ dcomp_ifort:
 dcomp_ifort_clean:
 	$(MAKE) clean -C ../cx_sds_io/Release_ifort/
 	$(MAKE) clean -C ../cx_dncomp/Release_ifort/
+rttov_clean:
+	$(MAKE) clean -C ../rttov/
 muri_gfortran:
 	$(MAKE) all -C ../cx_sds_io/Release_gfortran/
 	$(MAKE) all -C ../muri/Release_gfortran/

rttov/Makefile

@@ -79,14 +79,6 @@ cx_rttov_bridge_mod.o \
 cx_rttov_test.o \
 cx_rttov_mapping_mod.o
 
-OBJS_RTTOV = cx_pfaast_coef_mod.o \
-cx_pfaast_rttov_test.o \
-cx_string_tools_mod.o \
-cx_pfaast_mod.o \
-cx_pfaast_tools_mod.o \
-cx_pfaast_constants_mod.o \
-cx_rttov_bridge_mod.o
-
 .PHONY: cx_rttov clean
   
 
@@ -122,6 +114,4 @@ cx_rttov_mapping_mod$(EXT_OBJ)::cx_rttov_mapping_mod.f90
 
 clean:
 	rm -f *.o *.mod
-	rm test_pfaast
-	rm test_rtm
-	rm test_rttov
+	rm -f test_rttov

rttov/cx_rttov_bridge_mod.f90

@@ -143,7 +143,7 @@ subroutine compute_transmission_rttov ( &
  
  
  
-   lll  = channel_map (sensor,kban_in , coef_filename,cld_coef_filename)
+   lll  = channel_map (sensor,ancil_data_path, kban_in , coef_filename,cld_coef_filename)
    
   
   nprof = size(temp(1,:))

rttov/cx_rttov_mapping_mod.f90

 module cx_rttov_mapping_mod
-use PIXEL_COMMON_MOD, only: Ancil_Data_Dir
+
 contains
   !
   !
   !
-  function channel_map (sensor, chn,coef_filename,cld_coef_filename) result (list)
+  function channel_map (sensor,ancil_data_path, chn,coef_filename,cld_coef_filename) result (list)
 
 #define STRINGIFY(x) x
 
     implicit none
     character(len = *) :: sensor
+    character(len = * ) :: ancil_data_path  
     integer :: chn
     integer :: list
     integer, allocatable:: chn_list(:)
@@ -30,7 +31,7 @@ contains
    stop
 #endif  
 
-    path = trim(Ancil_Data_Dir) // "static/rttov/"
+    path = trim(ancil_data_path) // "static/rttov/"
     rttov_version_string = '9'
     ! -- 
     !  the mapping translates one channel infot
@@ -86,7 +87,7 @@ contains
       
       chn_list = [6,9,3,4,10,14,15,1,2,-1,-1,-1,-1,-1,7,-1,-1,-1,-1,17,-1,18,-1,-1,-1,12,-1,-1,19,-1,20,22]
       list = chn_list(chn)
-      sensor_string = 'jpss_noaa_20_viirs'
+      sensor_string = 'noaa_20_viirs'
       
     case ('AHI8')
       chn_list(20:38) = [7,-1,-1,-1,-1,-1,-1,9,10,11,12,14,15,16,-1,-1,-1,8,13]
@@ -208,6 +209,9 @@ contains
    if ( list .eq. 0) list = -1
     !print*,'Sensor rttov mapping: ',sensor,chn,list
     deallocate(chn_list)
+    
+    
+   
 
 end function channel_map 
 

rttov/cx_rttov_sfc_emiss.f90

@@ -164,7 +164,7 @@ CONTAINS
     atlas_type = atlas_type_ir ! IR atlas
 
 !  atlas_id
-   Use_Land_IR_emiss = 2
+   Use_Land_IR_emiss = 4
  
    if (Use_Land_IR_emiss == 2)  atlasid=1_jpim   ! UWHSREMIS
    if (Use_Land_IR_emiss == 3)  atlasid=2_jpim   ! CAMEL