Changeset 3185 for LMDZ6/branches/IPSLCM6.0.15/libf

Timestamp:

Feb 5, 2018, 7:04:44 PM (7 years ago)

Author:

idelkadi

Message:

Correction de bogue dans le simulateur Modis (mise a jour dans la version Cosp v1.4.2)

Location:

LMDZ6/branches/IPSLCM6.0.15/libf/phylmd/cosp

Files:

• cosp_simulator.F90 (modified) (1 diff)
• modis_simulator.F90 (modified) (1 diff)

LMDZ6/branches/IPSLCM6.0.15/libf/phylmd/cosp/cosp_simulator.F90

@@ -205 +205 @@
                                                       modis%Optical_Thickness_vs_Cloud_Top_Pressure*100.0
   endif
+  if (cfg%Lcrimodis) then
+     where(modis%Optical_Thickness_vs_ReffICE /= R_UNDEF) modis%Optical_Thickness_vs_ReffICE = &
+                                                      modis%Optical_Thickness_vs_ReffICE*100.0
+  endif
+  if (cfg%Lcrlmodis) then
+     where(modis%Optical_Thickness_vs_ReffLIQ /= R_UNDEF) modis%Optical_Thickness_vs_ReffLIQ = &
+                                                      modis%Optical_Thickness_vs_ReffLIQ*100.0
+  endif
+
   if (cfg%Lcltmodis) then
     where(modis%Cloud_Fraction_Total_Mean /= R_UNDEF) modis%Cloud_Fraction_Total_Mean = modis%Cloud_Fraction_Total_Mean*100.0

LMDZ6/branches/IPSLCM6.0.15/libf/phylmd/cosp/modis_simulator.F90

@@ -863 +863 @@
     tau(:) = ice_tau(:) + water_tau(:) 
     where (tau(:) > 0) 
-      g(:)  = (water_tau(:) * water_g(:)                + ice_tau(:) * ice_g(:)            ) / & 
-              tau(:) 
-      w0(:) = (water_tau(:) * water_g(:) * water_w0(:)  + ice_tau(:) * ice_g(:) * ice_w0(:)) / &
-              (g(:) * tau(:))
+      w0(:) = (water_tau(:) * water_w0(:)  + ice_tau(:) * ice_w0(:)) / &
+              tau(:)
+      g(:) = (water_tau(:) * water_g(:) * water_w0(:)  + ice_tau(:) * ice_g(:) * ice_w0(:)) / &
+             (w0(:) * tau(:))
     end where