Changeset 3306

Timestamp:

Apr 4, 2018, 10:48:33 AM (6 years ago)

Author:

idelkadi

Message:

Corrections des diagnostiques de sorties pour les champs 4D (pour la compatibilite avec DR CMIP6) :

• nomes des axes (pour MISR)
• inversion des axes pour les cfads (lidar et radar)

Location:

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

Files:

• cosp_output_mod.F90 (modified) (2 diffs)
• cosp_output_write_mod.F90 (modified) (4 diffs)
• phys_cosp.F90 (modified) (3 diffs)

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

@@ -342 +342 @@
 ! AI nov 2015
    CALL wxios_add_vaxis("temp", LIDAR_NTEMP, LIDAR_PHASE_TEMP)
-   CALL wxios_add_vaxis("cth16", MISR_N_CTH, MISR_CTH)
+   CALL wxios_add_vaxis("cth", MISR_N_CTH, MISR_CTH)
    CALL wxios_add_vaxis("dbze", DBZE_BINS, dbze_ax) 
    CALL wxios_add_vaxis("scatratio", SR_BINS, sratio_ax)
@@ -390 +390 @@
       CALL histvert(cosp_nidfiles(iff),"temp","temperature","C",LIDAR_NTEMP,LIDAR_PHASE_TEMP,nverttemp(iff))
 
-      CALL histvert(cosp_nidfiles(iff),"cth16","altitude","m",MISR_N_CTH,MISR_CTH,nvertmisr(iff))
+      CALL histvert(cosp_nidfiles(iff),"cth","altitude","m",MISR_N_CTH,MISR_CTH,nvertmisr(iff))
   
       CALL histvert(cosp_nidfiles(iff),"ReffIce","Effective_particle_size_Ice","microns",numMODISReffIceBins, reffICE_binCenters, &

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

@@ -51 +51 @@
   integer               :: itau_wcosp, iff
   real, dimension(Npoints,PARASOL_NREFL) :: parasolcrefl, Ncref
+
+! Variables locals intermidiaires pour inverser les axes des champs 4D
+! Compatibilite avec sorties CMIP
+  real, dimension(Npoints,Nlevout,SR_BINS) :: tmp_fi4da_cfadL
+  real, dimension(Npoints,Nlevout,DBZE_BINS) :: tmp_fi4da_cfadR
+  real, dimension(Npoints,MISR_N_CTH,7) :: tmp_fi4da_misr
 
 #ifdef CPP_XIOS
@@ -158 +164 @@
 
 #ifdef CPP_XIOS
-   if (cfg%LcfadLidarsr532) CALL histwrite4d_cosp(o_cfad_lidarsr532,stlidar%cfad_sr)
+   do icl=1,SR_BINS
+      tmp_fi4da_cfadL(:,:,icl)=stlidar%cfad_sr(:,icl,:)
+   enddo
+!   if (cfg%LcfadLidarsr532) CALL histwrite4d_cosp(o_cfad_lidarsr532,stlidar%cfad_sr)
+   if (cfg%LcfadLidarsr532) CALL histwrite4d_cosp(o_cfad_lidarsr532,tmp_fi4da_cfadL)
    if (cfg%LprofSR) CALL histwrite4d_cosp(o_profSR,stlidar%profSR)                              !TIBO
 #else
@@ -210 +220 @@
    where(stradar%cfad_ze == R_UNDEF) stradar%cfad_ze = missing_val
 #ifdef CPP_XIOS
+   do icl=1,DBZE_BINS
+     tmp_fi4da_cfadR(:,:,icl)=stradar%cfad_ze(:,icl,:)
+   enddo
    if (cfg%Ldbze94) CALL histwrite4d_cosp(o_dbze94,sgradar%Ze_tot)
-   if (cfg%LcfadDbze94) CALL histwrite4d_cosp(o_cfadDbze94,stradar%cfad_ze)
+!   if (cfg%LcfadDbze94) CALL histwrite4d_cosp(o_cfadDbze94,stradar%cfad_ze)
+   if (cfg%LcfadDbze94) CALL histwrite4d_cosp(o_cfadDbze94,tmp_fi4da_cfadR)
 #else
    if (cfg%Ldbze94) then
@@ -275 +289 @@
 
 #ifdef CPP_XIOS
-   if (cfg%LclMISR) CALL histwrite4d_cosp(o_clMISR,misr%fq_MISR)
+   do icl=1,MISR_N_CTH
+      tmp_fi4da_misr(:,icl,:)=misr%fq_MISR(:,:,icl)
+   enddo
+!   if (cfg%LclMISR) CALL histwrite4d_cosp(o_clMISR,misr%fq_MISR)
+   if (cfg%LclMISR) CALL histwrite4d_cosp(o_clMISR,tmp_fi4da_misr)
 #else
    if (cfg%LclMISR) then

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

@@ -343 +343 @@
 
 !+++++++++++++ Open output files and define output files axis !+++++++++++++
-    if (debut_cosp) then
+!    if (debut_cosp) then
 
       !$OMP MASTER
@@ -354 +354 @@
         debut_cosp=.false.
 !      endif ! debut_cosp
-    else
+!    else
 !+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
         ! Call simulator
@@ -375 +375 @@
                                cfg, gbx, vgrid, sglidar, sgradar, stlidar, stradar, & 
                                isccp, misr, modis)
-    endif !debut_cosp
+!    endif !debut_cosp
 !+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
         ! Deallocate memory in derived types