Changeset 2221 for LMDZ5/trunk/libf/dyn3dmem

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/dyn3dmem

Files:

• calfis_loc.F (modified) (3 diffs)
• call_calfis_mod.F90 (modified) (3 diffs)
• ce0l.F90 (modified) (1 diff)
• conf_gcm.F90 (modified) (3 diffs)
• gcm.F (modified) (3 diffs)
• leapfrog_loc.F (modified) (4 diffs)

LMDZ5/trunk/libf/dyn3dmem/calfis_loc.F

@@ -21 +21 @@
      $                  pdq,
      $                  flxw,
-     $                  clesphy0,
      $                  pdufi,
      $                  pdvfi,
@@ -141 +140 @@
       REAL,INTENT(OUT) :: pdqfi(iip1,jjb_u:jje_u,llm,nqtot) ! tendency on tracers
       REAL,INTENT(OUT) :: pdpsfi(iip1,jjb_u:jje_u) ! tendency on surface pressure (Pa/s)
-
-      INTEGER,PARAMETER :: longcles = 20
-      REAL,INTENT(IN) :: clesphy0( longcles ) ! unused
-
 
 #ifdef CPP_PHYS
@@ -674 +669 @@
      .             zphis_omp,
      .             presnivs_omp,
-     .             clesphy0,
      .             zufi_omp,
      .             zvfi_omp,
      .             ztfi_omp,
      .             zqfi_omp,
-c#ifdef INCA
      .             flxwfi_omp,
-c#endif
      .             zdufi_omp,
      .             zdvfi_omp,

LMDZ5/trunk/libf/dyn3dmem/call_calfis_mod.F90

@@ -68 +68 @@
   
   
-  SUBROUTINE call_calfis(itau,lafin,clesphy0,ucov_dyn,vcov_dyn,teta_dyn,masse_dyn,ps_dyn, &
+  SUBROUTINE call_calfis(itau,lafin,ucov_dyn,vcov_dyn,teta_dyn,masse_dyn,ps_dyn, &
                          phis_dyn,q_dyn,flxw_dyn)
   USE dimensions_mod
@@ -91 +91 @@
     INTEGER,INTENT(IN) :: itau ! (time) iteration step number
     LOGICAL,INTENT(IN) :: lafin ! .true. if final time step
-    REAL,INTENT(IN) :: clesphy0( : ) ! not used    
     REAL,INTENT(INOUT) :: ucov_dyn(ijb_u:ije_u,llm) ! covariant zonal wind
     REAL,INTENT(INOUT) :: vcov_dyn(ijb_v:ije_v,llm) ! covariant meridional wind
@@ -231 +230 @@
                      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  )
 
     ijb=ij_begin

LMDZ5/trunk/libf/dyn3dmem/ce0l.F90

@@ -48 +48 @@
 #endif
 
-  INTEGER, PARAMETER            :: longcles=20
   INTEGER                       :: ierr
-  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. )
 
 #ifdef CPP_MPI

LMDZ5/trunk/libf/dyn3dmem/conf_gcm.F90

@@ -2 +2 @@
 ! $Id$
 
-SUBROUTINE conf_gcm( tapedef, etatinit, clesphy0 )
+SUBROUTINE conf_gcm( tapedef, etatinit )
 
   USE control_mod
@@ -27 +27 @@
   !     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 :
@@ -45 +40 @@
   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"
 

LMDZ5/trunk/libf/dyn3dmem/gcm.F

@@ -83 +83 @@
 #endif
 
-      INTEGER         longcles
-      PARAMETER     ( longcles = 20 )
-      REAL  clesphy0( longcles )
-      SAVE  clesphy0
-
-
-
       REAL zdtvr
 
@@ -172 +165 @@
 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
 c
 c
@@ -547 +536 @@
 
 c$OMP PARALLEL DEFAULT(SHARED) COPYIN(/temps/,/logici/,/logicl/)
-      CALL leapfrog_loc(ucov,vcov,teta,ps,masse,phis,q,clesphy0,
-     .              time_0)
+      CALL leapfrog_loc(ucov,vcov,teta,ps,masse,phis,q,time_0)
 c$OMP END PARALLEL
 

LMDZ5/trunk/libf/dyn3dmem/leapfrog_loc.F

@@ -9 +9 @@
 
       SUBROUTINE leapfrog_loc(ucov0,vcov0,teta0,ps0,
-     &                        masse0,phis0,q0,clesphy0,
-     &                        time_0)
+     &                        masse0,phis0,q0,time_0)
 
        USE misc_mod
@@ -82 +81 @@
 !      include "mpif.h"
       
-      INTEGER,PARAMETER :: longcles = 20
-      REAL,INTENT(IN) :: clesphy0( longcles ) ! not used
       REAL,INTENT(IN) :: time_0 ! not used
 
@@ -757 +754 @@
        IF( apphys )  THEN
        
-         CALL call_calfis(itau,lafin,clesphy0,ucov,vcov,teta,masse,ps,  
+         CALL call_calfis(itau,lafin,ucov,vcov,teta,masse,ps,  
      &                     phis,q,flxw)
 ! #ifdef DEBUG_IO    
@@ -882 +879 @@
 !      $               du,dv,dteta,dq,
 !      $               flxw,
-!      $               clesphy0, dufi,dvfi,dtetafi,dqfi,dpfi  )
+!      $               dufi,dvfi,dtetafi,dqfi,dpfi  )
 ! !        CALL FTRACE_REGION_END("calfis")
 ! !        ijb=ij_begin