Changeset 2258 for LMDZ5/branches/testing/libf/dyn3d/conf_gcm.F90

Timestamp:

Apr 13, 2015, 10:21:09 AM (9 years ago)

Author:

Laurent Fairhead

Message:

Merged trunk changes 2216:2237 into testing branch

Location:

LMDZ5/branches/testing

Files:

• . (modified) (1 prop)
• libf/dyn3d/conf_gcm.F90 (modified) (6 diffs)

LMDZ5/branches/testing/libf/dyn3d/conf_gcm.F90

@@ -2 +2 @@
 ! $Id$
 
-SUBROUTINE conf_gcm( tapedef, etatinit, clesphy0 )
+SUBROUTINE conf_gcm( tapedef, etatinit )
 
   USE control_mod
@@ -23 +23 @@
   !     etatinit  :     = TRUE   , on ne  compare pas les valeurs des para- 
   !     -metres  du zoom  avec  celles lues sur le fichier start .
-  !      clesphy0 :  sortie  .
-
-  LOGICAL etatinit
-  INTEGER tapedef
-
-  INTEGER        longcles
-  PARAMETER(     longcles = 20 )
-  REAL clesphy0( longcles )
+
+  LOGICAL,INTENT(IN) :: etatinit
+  INTEGER,INTENT(IN) :: tapedef
 
   !   Declarations :
@@ -41 +36 @@
   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"
 
@@ -381 +373 @@
   ip_ebil_dyn = 0
   CALL getin('ip_ebil_dyn',ip_ebil_dyn)
-
-  DO i = 1, longcles
-     clesphy0(i) = 0.
-  ENDDO
 
   !cc  ....   P. Le Van , ajout  le 7/03/95 .pour le zoom ...
@@ -734 +722 @@
      !Config  Help = extension en longitude  de la zone du zoom  
      !Config         ( fraction de la zone totale)
-     dzoomx = 0.0
+     dzoomx = 0.2
      CALL getin('dzoomx',dzoomx)
+     call assert(dzoomx < 1, "conf_gcm: dzoomx must be < 1")
 
      !Config  Key  = dzoomy
@@ -742 +731 @@
      !Config  Help = extension en latitude de la zone  du zoom  
      !Config         ( fraction de la zone totale)
-     dzoomy = 0.0
+     dzoomy = 0.2
      CALL getin('dzoomy',dzoomy)
+     call assert(dzoomy< 1, "conf_gcm: dzoomy must be < 1")
 
      !Config  Key  = taux