Changeset 1707 for LMDZ5/branches/testing/libf/dyn3dpar/conf_gcm.F

Timestamp:

Jan 11, 2013, 10:19:19 AM (11 years ago)

Author:

Laurent Fairhead

Message:

Version testing basée sur la r1706

---

Testing release based on r1706

Location:

LMDZ5/branches/testing

Files:

• . (modified) (1 prop)
• libf/dyn3dpar/conf_gcm.F (modified) (11 diffs)

LMDZ5/branches/testing/libf/dyn3dpar/conf_gcm.F

@@ -6 +6 @@
       SUBROUTINE conf_gcm( tapedef, etatinit, clesphy0 )
 c
+      USE control_mod
 #ifdef CPP_IOIPSL
       use IOIPSL
@@ -16 +17 @@
       use mod_hallo, ONLY : use_mpi_alloc
       use parallel, ONLY : omp_chunk
-      USE control_mod
       USE infotrac, ONLY : type_trac
+      use assert_m, only: assert
+
       IMPLICIT NONE
 c-----------------------------------------------------------------------
@@ -43 +45 @@
 #include "serre.h"
 #include "comdissnew.h"
-!#include "clesphys.h"
-#include "iniprint.h"
 #include "temps.h"
 #include "comconst.h"
 
 ! FH 2008/05/09 On elimine toutes les clefs physiques dans la dynamique
+! #include "clesphys.h"
+#include "iniprint.h"
 c
 c
@@ -105 +107 @@
         OPEN(UNIT=lunout,FILE='lmdz.out_0000',ACTION='write', 
      &          STATUS='unknown',FORM='formatted')
-
       ENDIF
 
@@ -185 +186 @@
 
 !Config  Key  = nsplit_phys
-!Config  Desc = nombre d'iteration de la physique
-!Config  Def  = 240 
-!Config  Help = nombre d'itration de la physique
-!
        nsplit_phys = 1 
        CALL getin('nsplit_phys',nsplit_phys)
@@ -325 +322 @@
        CALL getin('tau_top_bound',tau_top_bound)
 
-!
 !Config  Key  = coefdis
 !Config  Desc = coefficient pour gamdissip
@@ -608 +604 @@
       type_trac = 'lmdz'
       CALL getin('type_trac',type_trac)
-
 
 !Config  Key  = config_inca
@@ -830 +825 @@
 
 !Config  Key  = ok_dynzon 
-!Config  Desc = calcul et sortie des transports 
+!Config  Desc = sortie des transports zonaux dans la dynamique
 !Config  Def  = n 
 !Config  Help = Permet de mettre en route le calcul des transports 
@@ -865 +860 @@
         write(lunout,*)"Le zoom en longitude est incompatible",
      &                 " avec l'utilisation du filtre FFT ",
-     &                 "---> filtre FFT désactivé "
+     &                 "---> FFT filter not active"
        use_filtre_fft=.FALSE.
       ENDIF
@@ -898 +893 @@
       ok_strato=.FALSE.
       CALL getin('ok_strato',ok_strato)
+
+      vert_prof_dissip = merge(1, 0, ok_strato .and. llm==39)
+      CALL getin('vert_prof_dissip', vert_prof_dissip)
+      call assert(vert_prof_dissip == 0 .or. vert_prof_dissip ==  1,
+     $     "bad value for vert_prof_dissip")
 
 !Config  Key  = ok_gradsfile
@@ -968 +968 @@
       write(lunout,*)' type_trac = ', type_trac
       write(lunout,*)' config_inca = ', config_inca
-      write(lunout,*)' ok_dynzon = ', ok_dynzon 
+      write(lunout,*)' ok_dynzon = ', ok_dynzon
       write(lunout,*)' ok_dyn_ins = ', ok_dyn_ins 
       write(lunout,*)' ok_dyn_ave = ', ok_dyn_ave