Changeset 1143 for LMDZ4/branches/LMDZ4-dev/libf/dyn3d

Timestamp:

Apr 7, 2009, 6:41:02 PM (16 years ago)

Author:

jghattas

Message:

Recuperation des developpements fait uniquement sur la branche LMDZ4_V4_patches :

• ajoute de la nouvelle flag ok_dynzon
• ajoute du parametre aer_type
• optimisation : isccp_cloud_types.F

+ bug pour le slab dans conf_phys.F90

Location:

LMDZ4/branches/LMDZ4-dev/libf/dyn3d

Files:

• conf_gcm.F (modified) (4 diffs)
• control.h (modified) (2 diffs)
• gcm.F (modified) (1 diff)
• leapfrog.F (modified) (2 diffs)

LMDZ4/branches/LMDZ4-dev/libf/dyn3d/conf_gcm.F

@@ -546 +546 @@
       CALL getin('config_inca',config_inca)
 
+
+!Config  Key  = ok_dynzon 
+!Config  Desc = calcul et sortie des transports 
+!Config  Def  = n 
+!Config  Help = Permet de mettre en route le calcul des transports 
+!Config          
+      ok_dynzon = .FALSE. 
+      CALL getin('ok_dynzon',ok_dynzon) 
 
       write(lunout,*)' #########################################'
@@ -583 +591 @@
       write(lunout,*)' offline = ', offline
       write(lunout,*)' config_inca = ', config_inca
+      write(lunout,*)' ok_dynzon = ', ok_dynzon 
 
       RETURN
@@ -707 +716 @@
       config_inca = 'none'
       CALL getin('config_inca',config_inca)
+
+!Config  Key  = ok_dynzon 
+!Config  Desc = calcul et sortie des transports 
+!Config  Def  = n 
+!Config  Help = Permet de mettre en route le calcul des transports 
+!Config          
+       ok_dynzon = .FALSE.
+       CALL getin('ok_dynzon',ok_dynzon) 
 
 !Config key = ok_strato
@@ -760 +777 @@
       write(lunout,*)' offline = ', offline
       write(lunout,*)' config_inca = ', config_inca
+      write(lunout,*)' ok_dynzon = ', ok_dynzon
       write(lunout,*)' ok_strato = ', ok_strato
       write(lunout,*)' ok_gradsfile = ', ok_gradsfile

LMDZ4/branches/LMDZ4-dev/libf/dyn3d/control.h

@@ -15 +15 @@
      &              periodav,iecrimoy,dayref,anneeref,                  &
      &              raz_date,offline,ip_ebil_dyn,config_inca,           &
-     &              planet_type,output_grads_dyn
+     &              planet_type,output_grads_dyn,ok_dynzon
 
       INTEGER   nday,day_step,iperiod,iapp_tracvl,iconser,iecri,        &
@@ -21 +21 @@
      &          ,ip_ebil_dyn
       REAL periodav
-      logical offline
+      LOGICAL offline
       CHARACTER (len=4) :: config_inca
       CHARACTER(len=10) :: planet_type ! planet type ('earth','mars',...)
       LOGICAL :: output_grads_dyn ! output dynamics diagnostics in
                                   ! binary grads file 'dyn.dat' (y/n)
+      LOGICAL :: ok_dynzon
 !-----------------------------------------------------------------------

LMDZ4/branches/LMDZ4-dev/libf/dyn3d/gcm.F

@@ -404 +404 @@
      .              t_ops, t_wrt, histid, histvid)
 
-      t_ops = iperiod * time_step
-      t_wrt = periodav * daysec
-      CALL initdynav(dynhistave_file,day_ref,annee_ref,time_step,
-     .              t_ops, t_wrt, histaveid)
-
+      IF (ok_dynzon) THEN 
+         t_ops = iperiod * time_step
+         t_wrt = periodav * daysec
+         CALL initdynav(dynhistave_file,day_ref,annee_ref,time_step,
+     .        t_ops, t_wrt, histaveid)
+      END IF
       dtav = iperiod*dtvr/daysec
       endif

LMDZ4/branches/LMDZ4-dev/libf/dyn3d/leapfrog.F

@@ -540 +540 @@
                   iav=0
                ENDIF
+               
+               IF (ok_dynzon) THEN
 #ifdef CPP_IOIPSL
-              CALL writedynav(histaveid, itau,vcov ,
-     ,                          ucov,teta,pk,phi,q,masse,ps,phis)
-               call bilan_dyn (2,dtvr*iperiod,dtvr*day_step*periodav,
-     ,           ps,masse,pk,pbaru,pbarv,teta,phi,ucov,vcov,q)
-#endif
+                  CALL writedynav(histaveid, itau,vcov ,
+     ,                 ucov,teta,pk,phi,q,masse,ps,phis)
+                  CALL bilan_dyn (2,dtvr*iperiod,dtvr*day_step*periodav,
+     ,                 ps,masse,pk,pbaru,pbarv,teta,phi,ucov,vcov,q)
+#endif
+               END IF
 
             ENDIF
@@ -651 +654 @@
                   iav=0
                ENDIF
+
+               IF (ok_dynzon) THEN 
 #ifdef CPP_IOIPSL
-               CALL writedynav(histaveid, itau,vcov ,
-     ,                          ucov,teta,pk,phi,q,masse,ps,phis)
-               call bilan_dyn (2,dtvr*iperiod,dtvr*day_step*periodav,
-     ,           ps,masse,pk,pbaru,pbarv,teta,phi,ucov,vcov,q)
-#endif
+                  CALL writedynav(histaveid, itau,vcov ,
+     ,                 ucov,teta,pk,phi,q,masse,ps,phis)
+                  CALL bilan_dyn (2,dtvr*iperiod,dtvr*day_step*periodav,
+     ,                 ps,masse,pk,pbaru,pbarv,teta,phi,ucov,vcov,q)
+#endif
+               END IF
 
               ENDIF ! of IF(MOD(itau,iperiod).EQ.0 .OR. itau.EQ.itaufin)