Changeset 2408 for LMDZ5/branches/testing/libf/phylmd/cosp

Timestamp:

Dec 14, 2015, 11:43:09 AM (9 years ago)

Author:

Laurent Fairhead

Message:

Merged trunk changes r2298:2396 into testing branch

Location:

LMDZ5/branches/testing

Files:

• . (modified) (1 prop)
• libf/phylmd/cosp/cosp_output_mod.F90 (modified) (5 diffs)
• libf/phylmd/cosp/cosp_output_write_mod.F90 (modified) (27 diffs)
• libf/phylmd/cosp/phys_cosp.F90 (modified) (1 diff)

LMDZ5/branches/testing/libf/phylmd/cosp/cosp_output_mod.F90

@@ -80 +80 @@
            by the ISCCP Simulator","K", (/ ('', i=1, 3) /))
 
-   LOGICAL, SAVE :: cosp_varsdefined = .FALSE. ! ug PAS THREADPRIVATE ET C'EST NORMAL
+  LOGICAL, SAVE :: cosp_varsdefined = .FALSE. ! ug PAS THREADPRIVATE ET C'EST NORMAL
+  REAL, SAVE  :: Cosp_fill_value
+!$OMP THREADPRIVATE(Cosp_fill_value)
+ 
 
 CONTAINS
@@ -97 +100 @@
   USE ioipsl
   USE phys_cal_mod
+  USE time_phylmdz_mod, ONLY: day_ref, annee_ref, day_ini, start_time, itau_phy
+  USE print_control_mod, ONLY: lunout
 
 #ifdef CPP_XIOS
@@ -119 +124 @@
 
 !!! Variables d'entree
-  include "temps.h"
-  INCLUDE 'iniprint.h'
 
 #ifdef CPP_XIOS
@@ -172 +175 @@
 
 #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
     ! ug R\'eglage du calendrier xios
     !Temps julian => an, mois, jour, heure
@@ -230 +239 @@
 
       CALL histvert(cosp_nidfiles(iff),"column","column","count",Ncolumns,column_ax(1:Ncolumns),nvertcol(iff))
+
+!!! Valeur indefinie en cas IOIPSL
+     Cosp_fill_value=0.
+
 #endif
 

LMDZ5/branches/testing/libf/phylmd/cosp/cosp_output_write_mod.F90

@@ -21 +21 @@
 
     USE ioipsl
-    USE control_mod
+    USE time_phylmdz_mod, ONLY: itau_phy, start_time, day_step_phy
+    USE print_control_mod, ONLY: lunout,prt_level
 
 #ifdef CPP_XIOS
@@ -44 +45 @@
   real, dimension(Npoints,PARASOL_NREFL) :: parasolcrefl, Ncref
 
-  include "temps.h"
-  include "iniprint.h"
-
   Nlevout = vgrid%Nlvgrid
   Ncolout = Ncolumns
 
 ! A refaire
-       itau_wcosp = itau_phy + itap + start_time * day_step / iphysiq
+       itau_wcosp = itau_phy + itap + start_time * day_step_phy
         if (prt_level >= 10) then
-             WRITE(lunout,*)'itau_wcosp, itap, start_time, day_step, iphysiq =', & 
-                             itau_wcosp, itap, start_time, day_step, iphysiq
+             WRITE(lunout,*)'itau_wcosp, itap, start_time, day_step_phy =', & 
+                             itau_wcosp, itap, start_time, day_step_phy
         endif
 
@@ -92 +90 @@
      do ip = 1,Npoints
      if(stlidar%lidarcld(ip,k).eq.R_UNDEF)then
-      stlidar%lidarcld(ip,k)=0.
+      stlidar%lidarcld(ip,k)=Cosp_fill_value
      endif
      enddo
@@ -99 +97 @@
       do ip = 1,Npoints
        if(stlidar%cfad_sr(ip,ii,k).eq.R_UNDEF)then
-        stlidar%cfad_sr(ip,ii,k)=0.
+        stlidar%cfad_sr(ip,ii,k)=Cosp_fill_value
        endif
       enddo
@@ -108 +106 @@
    do k = 1,Nlevlmdz
      if(sglidar%beta_mol(ip,k).eq.R_UNDEF)then
-      sglidar%beta_mol(ip,k)=0.
+      sglidar%beta_mol(ip,k)=Cosp_fill_value
      endif
 
      do ii= 1,Ncolumns
        if(sglidar%beta_tot(ip,ii,k).eq.R_UNDEF)then
-        sglidar%beta_tot(ip,ii,k)=0.
+        sglidar%beta_tot(ip,ii,k)=Cosp_fill_value
        endif
      enddo
@@ -123 +121 @@
     do ip = 1,Npoints
      if(stlidar%cldlayer(ip,k).eq.R_UNDEF)then
-      stlidar%cldlayer(ip,k)=0.
+      stlidar%cldlayer(ip,k)=Cosp_fill_value
      endif
     enddo
@@ -167 +165 @@
    do ip = 1,Npoints
     if(isccp%totalcldarea(ip).eq.-1.E+30)then
-      isccp%totalcldarea(ip)=0.
+      isccp%totalcldarea(ip)=Cosp_fill_value
     endif
     if(isccp%meanptop(ip).eq.-1.E+30)then
-      isccp%meanptop(ip)=0.
+      isccp%meanptop(ip)=Cosp_fill_value
     endif
     if(isccp%meantaucld(ip).eq.-1.E+30)then
-      isccp%meantaucld(ip)=0.
+      isccp%meantaucld(ip)=Cosp_fill_value
     endif
     if(isccp%meanalbedocld(ip).eq.-1.E+30)then
-      isccp%meanalbedocld(ip)=0.
+      isccp%meanalbedocld(ip)=Cosp_fill_value
     endif
     if(isccp%meantb(ip).eq.-1.E+30)then
-      isccp%meantb(ip)=0.
+      isccp%meantb(ip)=Cosp_fill_value
     endif
     if(isccp%meantbclr(ip).eq.-1.E+30)then
-      isccp%meantbclr(ip)=0.
+      isccp%meantbclr(ip)=Cosp_fill_value
     endif
 
@@ -188 +186 @@
      do ii=1,7
      if(isccp%fq_isccp(ip,ii,k).eq.-1.E+30)then
-      isccp%fq_isccp(ip,ii,k)=0.
+      isccp%fq_isccp(ip,ii,k)=Cosp_fill_value
      endif
      enddo
@@ -195 +193 @@
     do ii=1,Ncolumns
      if(isccp%boxtau(ip,ii).eq.-1.E+30)then
-       isccp%boxtau(ip,ii)=0.
+       isccp%boxtau(ip,ii)=Cosp_fill_value
      endif
     enddo
@@ -201 +199 @@
     do ii=1,Ncolumns
      if(isccp%boxptop(ip,ii).eq.-1.E+30)then
-       isccp%boxptop(ip,ii)=0.
+       isccp%boxptop(ip,ii)=Cosp_fill_value
      endif
     enddo
@@ -268 +266 @@
     use iophy
     USE mod_phys_lmdz_para
+    USE mod_grid_phy_lmdz, ONLY: nbp_lon
+    USE print_control_mod, ONLY: lunout,prt_level
 #ifdef CPP_XIOS
   USE wxios
@@ -274 +274 @@
     IMPLICIT NONE
 
-    INCLUDE "dimensions.h"
-    INCLUDE "temps.h"
     INCLUDE "clesphys.h"
-    include "iniprint.h"
 
     INTEGER                          :: iff
@@ -320 +317 @@
        IF ( var%cles(iff) ) THEN
           CALL histdef (cosp_nidfiles(iff), var%name, var%description, var%unit, &
-               iim,jj_nb,nhoricosp(iff), 1,1,1, -99, 32, &
+               nbp_lon,jj_nb,nhoricosp(iff), 1,1,1, -99, 32, &
                typeecrit, zstophym,zoutm_cosp(iff))
        ENDIF
@@ -332 +329 @@
     use iophy
     USE mod_phys_lmdz_para
+    USE mod_grid_phy_lmdz, ONLY: nbp_lon
+    USE print_control_mod, ONLY: lunout,prt_level
 
 #ifdef CPP_XIOS
@@ -340 +339 @@
     IMPLICIT NONE
 
-    INCLUDE "dimensions.h"
-    INCLUDE "temps.h"
     INCLUDE "clesphys.h"
-    include "iniprint.h"
 
     INTEGER                        :: iff, klevs
@@ -415 +411 @@
        IF ( var%cles(iff) ) THEN
           CALL histdef (cosp_nidfiles(iff), nom, var%description, var%unit, &
-               iim, jj_nb, nhoricosp(iff), klevs, 1, &
+               nbp_lon, jj_nb, nhoricosp(iff), klevs, 1, &
                klevs, nvertsave, 32, typeecrit, &
                zstophym, zoutm_cosp(iff))
@@ -428 +424 @@
   USE ioipsl
   use iophy
+  USE mod_grid_phy_lmdz, ONLY: nbp_lon
+  USE print_control_mod, ONLY: lunout,prt_level
 
 #ifdef CPP_XIOS
@@ -434 +432 @@
 
   IMPLICIT NONE
-  INCLUDE 'dimensions.h'
-  INCLUDE 'iniprint.h'
   INCLUDE 'clesphys.h'
 
@@ -445 +441 @@
     REAL,DIMENSION(klon_mpi) :: buffer_omp
     INTEGER, allocatable, DIMENSION(:) :: index2d
-    REAL :: Field2d(iim,jj_nb)
+    REAL :: Field2d(nbp_lon,jj_nb)
     CHARACTER(LEN=20) ::  nomi, nom
     character(len=2) :: str2
@@ -467 +463 @@
     !Et sinon on.... écrit
     IF (SIZE(field)/=klon) &
-  CALL abort_gcm('iophy::histwrite2d_cosp','Field first DIMENSION not equal to klon',1) 
+  CALL abort_physic('iophy::histwrite2d_cosp','Field first DIMENSION not equal to klon',1) 
 
     CALL Gather_omp(field,buffer_omp)
@@ -477 +473 @@
       DO iff=1, 3
            IF (var%cles(iff) .AND. cosp_outfilekeys(iff)) THEN
-                ALLOCATE(index2d(iim*jj_nb))
+                ALLOCATE(index2d(nbp_lon*jj_nb))
 #ifndef CPP_IOIPSL_NO_OUTPUT
-        CALL histwrite(cosp_nidfiles(iff),var%name,itau_iocosp,Field2d,iim*jj_nb,index2d) 
+        CALL histwrite(cosp_nidfiles(iff),var%name,itau_iocosp,Field2d,nbp_lon*jj_nb,index2d) 
 #endif
                 deallocate(index2d)
@@ -517 +513 @@
   USE ioipsl
   use iophy
+  USE mod_grid_phy_lmdz, ONLY: nbp_lon
+  USE print_control_mod, ONLY: lunout,prt_level
 
 #ifdef CPP_XIOS
@@ -524 +522 @@
 
   IMPLICIT NONE
-  INCLUDE 'dimensions.h'
-  INCLUDE 'iniprint.h'
   INCLUDE 'clesphys.h'
 
@@ -536 +532 @@
 
     REAL,DIMENSION(klon_mpi,SIZE(field,2)) :: buffer_omp
-    REAL :: Field3d(iim,jj_nb,SIZE(field,2))
+    REAL :: Field3d(nbp_lon,jj_nb,SIZE(field,2))
     INTEGER :: ip, n, nlev
     INTEGER, ALLOCATABLE, DIMENSION(:) :: index3d
@@ -568 +564 @@
     !Et sinon on.... écrit
     IF (SIZE(field,1)/=klon) &
-   CALL abort_gcm('iophy::histwrite3d','Field first DIMENSION not equal to klon',1)                                  
+   CALL abort_physic('iophy::histwrite3d','Field first DIMENSION not equal to klon',1)                                  
     nlev=SIZE(field,2)
 
@@ -580 +576 @@
      DO iff=1, 3
         IF (var%cles(iff) .AND. cosp_outfilekeys(iff)) THEN
-           ALLOCATE(index3d(iim*jj_nb*nlev))
+           ALLOCATE(index3d(nbp_lon*jj_nb*nlev))
 #ifndef CPP_IOIPSL_NO_OUTPUT
-    CALL histwrite(cosp_nidfiles(iff),nom,itau_iocosp,Field3d,iim*jj_nb*nlev,index3d) 
+    CALL histwrite(cosp_nidfiles(iff),nom,itau_iocosp,Field3d,nbp_lon*jj_nb*nlev,index3d) 
 #endif
 
@@ -613 +609 @@
     !   en utilisant les routines getin de IOIPSL  
     use ioipsl
+    USE print_control_mod, ONLY: lunout,prt_level
 
     IMPLICIT NONE
-    include 'iniprint.h'
 
    CHARACTER(LEN=20)               :: nam_var, nnam_var

LMDZ5/branches/testing/libf/phylmd/cosp/phys_cosp.F90

@@ -124 +124 @@
 !$OMP THREADPRIVATE(debut_cosp)
 
-  include "dimensions.h"
-  
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! Input variables from LMDZ-GCM
   integer                         :: overlaplmdz   !  overlap type: 1=max, 2=rand, 3=max/rand ! cosp input (output lmdz)