Changeset 2247 for LMDZ5/trunk/libf/dyn3d/conf_gcm.F90

Timestamp:

Mar 25, 2015, 6:24:15 PM (10 years ago)

Author:

lguez

Message:

We want to keep the same "*.def" files with programs ce0l and gcm. But
there is only a sequential version of program ce0l, which has not the
FFT filter. So we have to ignore the setting of use_filtre_fft in
program ce0l. Moved the test on use_filtre_fft from procedure conf_gcm
to main units ce0l and gcm.

File:

• LMDZ5/trunk/libf/dyn3d/conf_gcm.F90 (modified) (4 diffs)

LMDZ5/trunk/libf/dyn3d/conf_gcm.F90

@@ -46 +46 @@
   LOGICAL  fxyhypbb, ysinuss
   INTEGER i
-  LOGICAL use_filtre_fft
 
   !  -------------------------------------------------------------------
@@ -89 +88 @@
 
   !Config  Key  = prt_level
-  !Config  Desc = niveau d'impressions de débogage
+  !Config  Desc = niveau d'impressions de d\'ebogage
   !Config  Def  = 0
-  !Config  Help = Niveau d'impression pour le débogage
+  !Config  Help = Niveau d'impression pour le d\'ebogage
   !Config         (0 = minimum d'impression)
   prt_level = 0
@@ -733 +732 @@
      dzoomy = 0.2
      CALL getin('dzoomy',dzoomy)
-     call assert(dzoomy< 1, "conf_gcm: dzoomy must be < 1")
+     call assert(dzoomy < 1, "conf_gcm: dzoomy must be < 1")
 
      !Config  Key  = taux
@@ -810 +809 @@
      CALL getin('ok_dyn_ave',ok_dyn_ave) 
 
-     !Config  Key  = use_filtre_fft
-     !Config  Desc = flag d'activation des FFT pour le filtre
-     !Config  Def  = false
-     !Config  Help = permet d'activer l'utilisation des FFT pour effectuer
-     !Config         le filtrage aux poles.
-     ! Le filtre fft n'est pas implemente dans dyn3d 
-     use_filtre_fft=.FALSE.
-     CALL getin('use_filtre_fft',use_filtre_fft)
-
-     IF (use_filtre_fft) THEN
-        write(lunout,*)'STOP !!!'
-        write(lunout,*)'use_filtre_fft n est pas implemente dans dyn3d'
-        STOP 1
-     ENDIF
-
      !Config key = ok_strato
      !Config  Desc = activation de la version strato
      !Config  Def  = .FALSE.
-     !Config  Help = active la version stratosphérique de LMDZ de F. Lott
+     !Config  Help = active la version stratosph\'erique de LMDZ de F. Lott
 
      ok_strato=.FALSE.