Changeset 3369

Timestamp:

Jul 12, 2018, 12:22:08 PM (6 years ago)

Author:

idelkadi

Message:

Implementation de COSPv2 dans LMDZ (corrections pour tourner avec IOIPSL)

Location:

LMDZ6/trunk/libf/phylmd/cosp2

Files:

• cosp_output_mod.F90 (modified) (5 diffs)
• phys_cosp2.F90 (modified) (1 diff)

LMDZ6/trunk/libf/phylmd/cosp2/cosp_output_mod.F90

@@ -231 +231 @@
   SUBROUTINE cosp_output_open(Nlevlmdz, Ncolumns, presnivs, dtime, freq_cosp, &
                               ok_mensuelCOSP, ok_journeCOSP, ok_hfCOSP, ok_all_xml,  &
-                              ecrit_mth, ecrit_day, ecrit_hf, vgrid)
+                              ecrit_mth, ecrit_day, ecrit_hf, use_vgrid, vgrid)
   use MOD_COSP_INTERFACE_v1p4, only :  cosp_vgrid
 !  use MOD_COSP
@@ -258 +258 @@
   real,dimension(Nlevlmdz) :: presnivs
   real                     :: dtime, freq_cosp, ecrit_day, ecrit_hf, ecrit_mth 
+  logical                  :: use_vgrid
   logical                  :: ok_mensuelCOSP, ok_journeCOSP, ok_hfCOSP, ok_all_xml
   type(cosp_vgrid)   :: vgrid   ! Information on vertical grid of stats
@@ -414 +415 @@
       CALL histvert(cosp_nidfiles(iff),"sza","solar_zenith_angle","degrees",PARASOL_NREFL,PARASOL_SZA,nvertp(iff))
 
-      CALL histvert(cosp_nidfiles(iff),"pressure2","pressure","mb",7,ISCCP_PC,nvertisccp(iff),"down")
+      CALL histvert(cosp_nidfiles(iff),"pressure2","pressure","mb",7,pres_binCenters,nvertisccp(iff),"down")
 
       CALL histvert(cosp_nidfiles(iff),"column","column","count",Ncolumns,column_ax,nvertcol(iff)) !DBUG
@@ -420 +421 @@
       CALL histvert(cosp_nidfiles(iff),"temp","temperature","C",LIDAR_NTEMP,LIDAR_PHASE_TEMP,nverttemp(iff))
 
-      CALL histvert(cosp_nidfiles(iff),"cth","altitude","m",MISR_N_CTH,MISR_CTH,nvertmisr(iff))
+      CALL histvert(cosp_nidfiles(iff),"cth","altitude","m",numMISRHgtBins,misr_histHgtCenters,nvertmisr(iff))
   
       CALL histvert(cosp_nidfiles(iff),"ReffIce","Effective_particle_size_Ice","microns",numMODISReffIceBins, reffICE_binCenters, &
@@ -432 +433 @@
       CALL histvert(cosp_nidfiles(iff),"scatratio","backscattering_ratio","1",SR_BINS,sratio_ax,nvertsratio(iff))
 
-      CALL histvert(cosp_nidfiles(iff),"tau","cloud optical depth","1",7,ISCCP_TAU,nverttau(iff)) 
+      CALL histvert(cosp_nidfiles(iff),"tau","cloud optical depth","1",7,tau_binCenters,nverttau(iff)) 
      
 !!! Valeur indefinie en cas IOIPSL

LMDZ6/trunk/libf/phylmd/cosp2/phys_cosp2.F90

@@ -410 +410 @@
         call cosp_output_open(Nlevlmdz, Ncolumns, presnivs, dtime, freq_cosp, &
                               ok_mensuelCOSP, ok_journeCOSP, ok_hfCOSP, ok_all_xml, &
-                              ecrit_mth, ecrit_day, ecrit_hf, vgrid)
+                              ecrit_mth, ecrit_day, ecrit_hf, use_vgrid, vgrid)
       !$OMP END MASTER
       !$OMP BARRIER