Changeset 4727 for LMDZ6/branches/LMDZ_ECRad/libf/phylmd/cosp2/cosp_output_mod.F90

Timestamp:

Oct 19, 2023, 4:02:57 PM (11 months ago)

Author:

idelkadi

Message:

Merged trunk changes -r4488:4726 LMDZ_ECRad branch

Location:

LMDZ6/branches/LMDZ_ECRad

Files:

• . (modified) (1 prop)
• libf/phylmd/cosp2/cosp_output_mod.F90 (modified) (4 diffs)

LMDZ6/branches/LMDZ_ECRad/libf/phylmd/cosp2/cosp_output_mod.F90

@@ -246 +246 @@
   USE time_phylmdz_mod, ONLY: day_ref, annee_ref, day_ini, start_time, itau_phy
   USE print_control_mod, ONLY: lunout
-
-#ifdef CPP_XIOS
     ! ug Pour les sorties XIOS
-    USE wxios
-#endif
+  USE wxios
 
   IMPLICIT NONE
@@ -275 +272 @@
 !!! Variables d'entree
 
-#ifdef CPP_XIOS
-    ! ug Variables utilisées pour récupérer le calendrier pour xios
-    INTEGER :: x_an, x_mois, x_jour
-    REAL :: x_heure
-    INTEGER :: ini_an, ini_mois, ini_jour
-    REAL :: ini_heure
-#endif
+! ug Variables utilisées pour récupérer le calendrier pour xios
+  INTEGER :: x_an, x_mois, x_jour
+  REAL :: x_heure
+  INTEGER :: ini_an, ini_mois, ini_jour
+  REAL :: ini_heure
 
     WRITE(lunout,*) 'Debut cosp_output_mod.F90'
@@ -328 +323 @@
     CALL ymds2ju(annee_ref, 1, day_ini, start_time, zjulian_start)
 
-#ifdef CPP_XIOS
-    
-! recuperer la valeur indefine Xios
-!    CALL xios_get_field_attr("clcalipso",default_value=Cosp_fill_value)
-!         Cosp_fill_value=missing_val
-          Cosp_fill_value=0.
-         print*,'Cosp_fill_value=',Cosp_fill_value
-
-    CALL wxios_add_vaxis("height", vgrid%Nlvgrid, vgrid%z)
-    print*,'wxios_add_vaxis vgrid%Nlvgrid, vgrid%z',vgrid%Nlvgrid,vgrid%z
-
-    WRITE(lunout,*) 'wxios_add_vaxis height_mlev, Nlevlmdz vgrid%mz ', &
+    IF (using_xios) THEN
+
+  ! recuperer la valeur indefine Xios
+  !    CALL xios_get_field_attr("clcalipso",default_value=Cosp_fill_value)
+  !         Cosp_fill_value=missing_val
+      Cosp_fill_value=0.
+      print*,'Cosp_fill_value=',Cosp_fill_value
+
+      CALL wxios_add_vaxis("height", vgrid%Nlvgrid, vgrid%z)
+      print*,'wxios_add_vaxis vgrid%Nlvgrid, vgrid%z',vgrid%Nlvgrid,vgrid%z
+
+      WRITE(lunout,*) 'wxios_add_vaxis height_mlev, Nlevlmdz vgrid%mz ', &
                      Nlevlmdz,vgrid%mz
-    CALL wxios_add_vaxis("height_mlev", Nlevlmdz, vgrid%mz)
-
-    WRITE(lunout,*) 'wxios_add_vaxis sza, PARASOL_NREFL ', &
-                     PARASOL_NREFL, PARASOL_SZA
-    CALL wxios_add_vaxis("sza", PARASOL_NREFL, PARASOL_SZA)
-
-    WRITE(lunout,*) 'wxios_add_vaxis pressure2 ',7,pres_binCenters
-    CALL wxios_add_vaxis("pressure2", 7, pres_binCenters)
-
-    WRITE(lunout,*) 'wxios_add_vaxis column ',Ncolumns,column_ax
-    CALL wxios_add_vaxis("column", Ncolumns, column_ax)
-
-   WRITE(lunout,*) 'wxios_add_vaxis temp LIDAR_NTEMP, LIDAR_PHASE_TEMP ', &
+      CALL wxios_add_vaxis("height_mlev", Nlevlmdz, vgrid%mz)
+
+      WRITE(lunout,*) 'wxios_add_vaxis sza, PARASOL_NREFL ', &
+                       PARASOL_NREFL, PARASOL_SZA
+      CALL wxios_add_vaxis("sza", PARASOL_NREFL, PARASOL_SZA)
+
+      WRITE(lunout,*) 'wxios_add_vaxis pressure2 ',7,pres_binCenters
+      CALL wxios_add_vaxis("pressure2", 7, pres_binCenters)
+
+      WRITE(lunout,*) 'wxios_add_vaxis column ',Ncolumns,column_ax
+      CALL wxios_add_vaxis("column", Ncolumns, column_ax)
+
+      WRITE(lunout,*) 'wxios_add_vaxis temp LIDAR_NTEMP, LIDAR_PHASE_TEMP ', &
                     LIDAR_NTEMP, LIDAR_PHASE_TEMP
-   CALL wxios_add_vaxis("temp", LIDAR_NTEMP, LIDAR_PHASE_TEMP)
-
-   WRITE(lunout,*) 'wxios_add_vaxis cth16 numMISRHgtBins, misr_histHgtCenters ', & 
-                    numMISRHgtBins, misr_histHgtCenters 
-   CALL wxios_add_vaxis("cth16", numMISRHgtBins, misr_histHgtCenters)
-
-   WRITE(lunout,*) 'wxios_add_vaxis dbze DBZE_BINS, dbze_ax ', &
-                    DBZE_BINS, dbze_ax
-   CALL wxios_add_vaxis("dbze", DBZE_BINS, dbze_ax) 
-
-   WRITE(lunout,*) 'wxios_add_vaxis scatratio SR_BINS, sratio_ax', &
-                   SR_BINS, sratio_ax
-   CALL wxios_add_vaxis("scatratio", SR_BINS, sratio_ax)
-
-   WRITE(lunout,*) 'wxios_add_vaxis ReffIce numMODISReffIceBins, &
-                   reffICE_binCenters',numMODISReffIceBins, reffICE_binCenters
-   CALL wxios_add_vaxis("ReffIce", numMODISReffIceBins, reffICE_binCenters)
-
-   WRITE(lunout,*) 'wxios_add_vaxis ReffLiq numMODISReffLiqBins, &
+      CALL wxios_add_vaxis("temp", LIDAR_NTEMP, LIDAR_PHASE_TEMP)
+
+      WRITE(lunout,*) 'wxios_add_vaxis cth16 numMISRHgtBins, misr_histHgtCenters ', & 
+                      numMISRHgtBins, misr_histHgtCenters 
+      CALL wxios_add_vaxis("cth16", numMISRHgtBins, misr_histHgtCenters)
+
+      WRITE(lunout,*) 'wxios_add_vaxis dbze DBZE_BINS, dbze_ax ', &
+                       DBZE_BINS, dbze_ax
+      CALL wxios_add_vaxis("dbze", DBZE_BINS, dbze_ax) 
+
+      WRITE(lunout,*) 'wxios_add_vaxis scatratio SR_BINS, sratio_ax', &
+                     SR_BINS, sratio_ax
+      CALL wxios_add_vaxis("scatratio", SR_BINS, sratio_ax)
+
+      WRITE(lunout,*) 'wxios_add_vaxis ReffIce numMODISReffIceBins, &
+                     reffICE_binCenters',numMODISReffIceBins, reffICE_binCenters
+     CALL wxios_add_vaxis("ReffIce", numMODISReffIceBins, reffICE_binCenters)
+
+     WRITE(lunout,*) 'wxios_add_vaxis ReffLiq numMODISReffLiqBins, &
                     reffLIQ_binCenters', numMODISReffLiqBins, reffLIQ_binCenters
-   CALL wxios_add_vaxis("ReffLiq", numMODISReffLiqBins, reffLIQ_binCenters)
-
-   WRITE(lunout,*) 'wxios_add_vaxis 7, tau_binCenters', &
-                    7, tau_binCenters
-   CALL wxios_add_vaxis("tau", 7, tau_binCenters)
-
-#endif
-   
+     CALL wxios_add_vaxis("ReffLiq", numMODISReffLiqBins, reffLIQ_binCenters)
+
+     WRITE(lunout,*) 'wxios_add_vaxis 7, tau_binCenters', &
+                      7, tau_binCenters
+     CALL wxios_add_vaxis("tau", 7, tau_binCenters)
+
+  ENDIF
+
     zdtimemoy_cosp = freq_COSP         ! Frequence ou l on moyenne
 
@@ -394 +389 @@
 !                    nhoricosp(iff),cosp_nidfiles(iff)
 
-#ifdef CPP_XIOS
-        IF (.not. ok_all_xml) then
-         WRITE(lunout,*) 'wxios_add_file ',cosp_outfilenames(iff)
-         CALL wxios_add_file(cosp_outfilenames(iff),chfreq(iff),10)
+        IF(using_xios) THEN
+          IF (.not. ok_all_xml) then
+           WRITE(lunout,*) 'wxios_add_file ',cosp_outfilenames(iff)
+           CALL wxios_add_file(cosp_outfilenames(iff),chfreq(iff),10)
+          ENDIF
         ENDIF
-#endif
 
 #ifndef CPP_IOIPSL_NO_OUTPUT