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

Timestamp:

Apr 7, 2009, 6:41:02 PM (15 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/dyn3dpar

Files:

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

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

@@ -556 +556 @@
       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) 
 
 
@@ -593 +601 @@
       write(lunout,*)' offline = ', offline
       write(lunout,*)' config_inca = ', config_inca
+      write(lunout,*)' ok_dynzon = ', ok_dynzon 
 
       RETURN
@@ -717 +726 @@
       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  = use_filtre_fft
@@ -807 +824 @@
       write(lunout,*)' offline = ', offline
       write(lunout,*)' config_inca = ', config_inca
+      write(lunout,*)' ok_dynzon = ', ok_dynzon 
       write(lunout,*)' use_filtre_fft = ', use_filtre_fft
       write(lunout,*)' use_mpi_alloc = ', use_mpi_alloc

LMDZ4/branches/LMDZ4-dev/libf/dyn3dpar/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,        &
@@ -26 +26 @@
       LOGICAL :: output_grads_dyn ! output dynamics diagnostics in
                                   ! binary grads file 'dyn.dat' (y/n)
+      LOGICAL :: ok_dynzon 
 !-----------------------------------------------------------------------

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

@@ -427 +427 @@
      .              t_ops, t_wrt, histid, histvid)
 
-      t_ops = iperiod * time_step
-      t_wrt = periodav * daysec
-      CALL initdynav_p(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_p(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/dyn3dpar/leapfrog_p.F

@@ -1294 +1294 @@
                ENDIF
 #ifdef CPP_IOIPSL
+             IF (ok_dynzon) THEN 
              call Register_Hallo(vcov,ip1jm,llm,1,0,0,1,TestRequest)
              call SendRequest(TestRequest)
@@ -1302 +1303 @@
               CALL writedynav_p(histaveid, itau,vcov ,
      ,                          ucov,teta,pk,phi,q,masse,ps,phis)
-c$OMP END MASTER
-
+
+c ATTENTION!!! bilan_dyn_p ne marche probablement pas avec OpenMP
+              CALL bilan_dyn_p(2,dtvr*iperiod,dtvr*day_step*periodav, 
+     ,             ps,masse,pk,pbaru,pbarv,teta,phi,ucov,vcov,q) 
+c$OMP END MASTER
+              ENDIF !ok_dynzon
 #endif
             ENDIF
@@ -1456 +1461 @@
                ENDIF
 #ifdef CPP_IOIPSL
+               IF (ok_dynzon) THEN
 c$OMP BARRIER
 
@@ -1467 +1473 @@
                CALL writedynav_p(histaveid, itau,vcov ,
      ,                          ucov,teta,pk,phi,q,masse,ps,phis)
-               call bilan_dyn_p (2,dtvr*iperiod,dtvr*day_step*periodav,
+               CALL bilan_dyn_p(2,dtvr*iperiod,dtvr*day_step*periodav,
      ,           ps,masse,pk,pbaru,pbarv,teta,phi,ucov,vcov,q)
 c$OMP END MASTER
+               END IF !ok_dynzon
 #endif
               ENDIF ! of IF(MOD(itau,iperiod).EQ.0 .OR. itau.EQ.itaufin)