Changeset 2221 for LMDZ5/trunk/libf/dyn3d

Timestamp:

Mar 9, 2015, 7:38:03 AM (9 years ago)

Author:

Ehouarn Millour

Message:

Some cleanup: remove (unused) clesph0 from dynamics.
EM

Location:

LMDZ5/trunk/libf/dyn3d

Files:

• calfis.F (modified) (3 diffs)
• ce0l.F90 (modified) (1 diff)
• conf_gcm.F90 (modified) (4 diffs)
• gcm.F (modified) (3 diffs)
• leapfrog.F (modified) (3 diffs)

LMDZ5/trunk/libf/dyn3d/calfis.F

@@ -21 +21 @@
      $                  pdq,
      $                  flxw,
-     $                  clesphy0,
      $                  pdufi,
      $                  pdvfi,
@@ -131 +130 @@
       REAL,INTENT(OUT) :: pdpsfi(iip1,jjp1) ! tendency on surface pressure (Pa/s)
 
-      INTEGER,PARAMETER :: longcles = 20
-      REAL,INTENT(IN) :: clesphy0( longcles ) ! unused
-
 
 c    Local variables :
@@ -465 +461 @@
      .             zphis,
      .             presnivs,
-     .             clesphy0,
      .             zufi,
      .             zvfi,

LMDZ5/trunk/libf/dyn3d/ce0l.F90

@@ -41 +41 @@
 #include "temps.h"
 #include "logic.h"
-  INTEGER, PARAMETER            :: longcles=20
-  REAL,    DIMENSION(longcles)  :: clesphy0
   REAL,    DIMENSION(iip1,jjp1) :: masque
   CHARACTER(LEN=15)             :: calnd
   REAL,    DIMENSION(iip1,jjp1) :: phis ! geopotentiel au sol
 !-------------------------------------------------------------------------------
-  CALL conf_gcm( 99, .TRUE. , clesphy0 )
+  CALL conf_gcm( 99, .TRUE. )
 
   CALL Init_Phys_lmdz(iim,jjp1,llm,1,(/(jjm-1)*iim+2/))

LMDZ5/trunk/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 ...

LMDZ5/trunk/libf/dyn3d/gcm.F

@@ -90 +90 @@
 !#include "indicesol.h"
 #endif
-      INTEGER         longcles
-      PARAMETER     ( longcles = 20 )
-      REAL  clesphy0( longcles )
-      SAVE  clesphy0
-
-
 
       REAL zdtvr
@@ -175 +169 @@
 c  ---------------------------------------
 c
-! Ehouarn: dump possibility of using defrun
-!#ifdef CPP_IOIPSL
-      CALL conf_gcm( 99, .TRUE. , clesphy0 )
+      CALL conf_gcm( 99, .TRUE.)
       if (mod(iphysiq, iperiod) /= 0) call abort_gcm("conf_gcm",
      s "iphysiq must be a multiple of iperiod", 1)
-!#else
-!      CALL defrun( 99, .TRUE. , clesphy0 )
-!#endif
 
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
@@ -530 +519 @@
 
 
-      CALL leapfrog(ucov,vcov,teta,ps,masse,phis,q,clesphy0,
-     .              time_0)
+      CALL leapfrog(ucov,vcov,teta,ps,masse,phis,q,time_0)
 
       END

LMDZ5/trunk/libf/dyn3d/leapfrog.F

@@ -4 +4 @@
 c
 c
-      SUBROUTINE leapfrog(ucov,vcov,teta,ps,masse,phis,q,clesphy0,
-     &                    time_0)
+      SUBROUTINE leapfrog(ucov,vcov,teta,ps,masse,phis,q,time_0)
 
 
@@ -70 +69 @@
 #include "academic.h"
 
-! FH 2008/05/09 On elimine toutes les clefs physiques dans la dynamique
-! #include "clesphys.h"
-
-      INTEGER,PARAMETER :: longcles = 20
-      REAL,INTENT(IN) :: clesphy0( longcles ) ! not used
       REAL,INTENT(IN) :: time_0 ! not used
 
@@ -446 +440 @@
      $               ucov,vcov,teta,q,masse,ps,p,pk,phis,phi ,
      $               du,dv,dteta,dq,
-     $               flxw,
-     $               clesphy0, dufi,dvfi,dtetafi,dqfi,dpfi  )
+     $               flxw,dufi,dvfi,dtetafi,dqfi,dpfi  )
 
 c      ajout des tendances physiques: