Changeset 1368 for LMDZ4

Timestamp:

Apr 22, 2010, 12:46:16 PM (14 years ago)

Author:

idelkadi

Message:

• Rajout des cles logiques pour activer les sorties COSP par frequence
• Reglages des niveaux de sorties pour les variables CFMIP

Location:

LMDZ4/trunk/libf

Files:

• cosp/phys_cosp.F90 (modified) (4 diffs)
• phylmd/clesphys.h (modified) (2 diffs)
• phylmd/conf_phys.F90 (modified) (4 diffs)
• phylmd/phys_output_mod.F90 (modified) (1 diff)
• phylmd/physiq.F (modified) (2 diffs)

LMDZ4/trunk/libf/cosp/phys_cosp.F90

@@ -4 +4 @@
 
 
-  subroutine phys_cosp( itap,dtime,freq_cosp,ecrit_mth,ecrit_day,ecrit_hf, &
-                        overlaplmdz,Nptslmdz,Nlevlmdz,lon,lat, presnivs, &
+  subroutine phys_cosp( itap,dtime,freq_cosp, &
+                        ok_mensuelCOSP,ok_journeCOSP,ok_hfCOSP, &
+                        ecrit_mth,ecrit_day,ecrit_hf, &
+                        Nptslmdz,Nlevlmdz,lon,lat, presnivs,overlaplmdz, &
                         ref_liq,ref_ice,fracTerLic,u_wind,v_wind,phi,ph,p,skt,t, &
                         sh,rh,tca,cca,mr_lsliq,mr_lsice,fl_lsrainI,fl_lssnowI, &
@@ -117 +119 @@
   integer :: ii,idayref
   real    :: zjulian,zstoday,zstomth,zstohf,zout,ecrit_day,ecrit_hf,ecrit_mth
+  logical :: ok_mensuelCOSP,ok_journeCOSP,ok_hfCOSP
   integer :: nhori,nvert,nvertp,nvertisccp,nvertm,nvertcol
   integer, save :: nid_day_cosp,nid_mth_cosp,nid_hf_cosp
@@ -326 +329 @@
         enddo
 
+ if (ok_mensuelCOSP) then
      include "ini_histmthCOSP.h"
+ endif
+ if (ok_journeCOSP) then
      include "ini_histdayCOSP.h"
+ endif
+ if (ok_hfCOSP) then
      include "ini_histhfCOSP.h"
-
+ endif
 
 !   print*,'Fin Initialisation des sorties COSP, debut_cosp =',debut_cosp 
@@ -446 +454 @@
    enddo
 
+ if (ok_mensuelCOSP) then
   include "write_histmthCOSP.h"
+ endif
+ if (ok_journeCOSP) then
   include "write_histdayCOSP.h"
+ endif
+ if (ok_hfCOSP ) then
   include "write_histhfCOSP.h"
-
+ endif
 
 !+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

LMDZ4/trunk/libf/phylmd/clesphys.h

@@ -63 +63 @@
        REAL freq_ISCCP, ecrit_ISCCP
        REAL freq_COSP
-       LOGICAL :: ok_cosp
+       LOGICAL :: ok_cosp,ok_mensuelCOSP,ok_journeCOSP,ok_hfCOSP
        INTEGER :: ip_ebil_phy, iflag_rrtm
        LOGICAL :: ok_strato
@@ -79 +79 @@
      &     , pasphys, freq_outNMC, freq_calNMC                          &
      &     , type_run, ok_isccp, ok_regdyn, ok_cosp                     &
+     &     , ok_mensuelCOSP,ok_journeCOSP,ok_hfCOSP                     &
      &     , lonmin_ins, lonmax_ins, latmin_ins, latmax_ins             &
      &     , ecrit_ins, ecrit_hf, ecrit_hf2mth, ecrit_day               &

LMDZ4/trunk/libf/phylmd/conf_phys.F90

@@ -143 +143 @@
   LOGICAL,SAVE :: ok_isccp_omp
   LOGICAL,SAVE :: ok_cosp_omp
+  LOGICAL,SAVE :: ok_mensuelCOSP_omp,ok_journeCOSP_omp,ok_hfCOSP_omp
   REAL,SAVE :: lonmin_ins_omp, lonmax_ins_omp, latmin_ins_omp, latmax_ins_omp
   REAL,SAVE :: ecrit_hf_omp, ecrit_day_omp, ecrit_mth_omp, ecrit_reg_omp
@@ -1139 +1140 @@
   ok_cosp_omp = .false.
   call getin('ok_cosp',ok_cosp_omp)
+
+!
+!Config Key  = ok_mensuelCOSP
+!Config Desc =
+!Config Def  = .true.
+!Config Help =
+!
+  ok_mensuelCOSP_omp = .true.
+  call getin('ok_mensuelCOSP',ok_mensuelCOSP_omp)
+
+!
+!Config Key  = ok_journeCOSP
+!Config Desc =
+!Config Def  = .true.
+!Config Help = 
+!
+  ok_journeCOSP_omp = .true.
+  call getin('ok_journeCOSP',ok_journeCOSP_omp)
+
+!
+!Config Key  = ok_hfCOSP
+!Config Desc =
+!Config Def  = .false.
+!Config Help =
+!
+  ok_hfCOSP_omp = .false.
+  call getin('ok_hfCOSP',ok_hfCOSP_omp)
 
 !
@@ -1493 +1521 @@
     ok_isccp = ok_isccp_omp
     ok_cosp = ok_cosp_omp
+    ok_mensuelCOSP = ok_mensuelCOSP_omp
+    ok_journeCOSP = ok_journeCOSP_omp
+    ok_hfCOSP = ok_hfCOSP_omp
     seuil_inversion=seuil_inversion_omp
     lonmin_ins = lonmin_ins_omp
@@ -1642 +1673 @@
   write(numout,*)' ok_isccp = ',ok_isccp 
   write(numout,*)' ok_cosp = ',ok_cosp
+  write(numout,*)' ok_mensuelCOSP = ',ok_mensuelCOSP
+  write(numout,*)' ok_journeCOSP = ',ok_journeCOSP
+  write(numout,*)' ok_hfCOSP =',ok_hfCOSP
   write(numout,*)' solarlong0 = ', solarlong0
   write(numout,*)' qsol0 = ', qsol0

LMDZ4/trunk/libf/phylmd/phys_output_mod.F90

@@ -470 +470 @@
   type(ctrl_out),save :: o_dnwd         = ctrl_out((/ 4, 10, 10, 10, 10 /),'dnwd')
   type(ctrl_out),save :: o_dnwd0        = ctrl_out((/ 4, 10, 10, 10, 10 /),'dnwd0')
-  type(ctrl_out),save :: o_mc           = ctrl_out((/ 4, 10, 10, 10, 10 /),'mc')
+  type(ctrl_out),save :: o_mc           = ctrl_out((/ 4, 5, 10, 10, 10 /),'mc')
   type(ctrl_out),save :: o_ftime_con    = ctrl_out((/ 4, 10, 10, 10, 10 /),'ftime_con')
   type(ctrl_out),save :: o_dtdyn        = ctrl_out((/ 4, 10, 10, 10, 1 /),'dtdyn')

LMDZ4/trunk/libf/phylmd/physiq.F

@@ -2143 +2143 @@
 
           ELSE ! ok_cvl
+
 c MAF conema3 ne contient pas les traceurs
           CALL conema3 (dtime,
@@ -3245 +3246 @@
 !     s        ref_liq,ref_ice
           call phys_cosp(itap,dtime,freq_cosp,
-     $                 ecrit_mth,ecrit_day,ecrit_hf,overlap,
-     $                   klon,klev,rlon,rlat,presnivs,
+     $                   ok_mensuelCOSP,ok_journeCOSP,ok_hfCOSP,
+     $                   ecrit_mth,ecrit_day,ecrit_hf,
+     $                   klon,klev,rlon,rlat,presnivs,overlap,
      $                   ref_liq,ref_ice,
      $                   pctsrf(:,is_ter)+pctsrf(:,is_lic),