Changeset 2021 for LMDZ5/trunk/libf/dyn3dmem/guide_loc_mod.F90

Timestamp:

Apr 25, 2014, 12:20:14 PM (11 years ago)

Author:

lguez

Message:

Removed unused variables pks, pk, pkf from main program unit gcm.

Encapsulated procedures exner_hyb, exner_hyb_p, exner_hyb_loc,
exner_milieu, exner_milieu_p and exner_milieu_loc into
modules. (Compulsory to allow optional arguments.)

In the procedures exner_hyb, exner_hyb_p, exner_hyb_loc, donwgraded
arguments alpha and beta to local variables. In exner_milieu,
exner_milieu_p and exner_milieu_loc, removed beta altogether. In the
six procedures exner_*, made pkf an optional argument. Made some
cosmetic modifications in order to keep the six procedures exner_* as
close as possible.

In the six procedures exner_*, removed the averaging of pks at the
poles: this is not useful because ps is already the same at all
longitudes at the poles. This modification changes the results of the
program. Motivation: had to do this for exner_hyb because we call it
from test_disvert with a few surface pressure values.

In all the procedures calling exner_*, removed the variables alpha and
beta. Also removed variables alpha and beta from module leapfrog_mod
and from module call_calfis_mod.

Removed actual argument pkf in call to exner_hyb* and exner_milieu*
from guide_interp, guide_main, iniacademic and iniacademic_loc (pkf
was not used in those procedures).

Argument workvar of startget_dyn is used only if varname is tpot or

17. When varname is tpot or q, the actual argument associated to

workvar in etat0_netcdf is not y. So y in etat0_netcdf is a
place-holder, never used. So we remove optional argument y in the
calls to exner_hyb and exner_milieu from etat0_netcdf.

Created procedure test_disvert, called only by etat0_netcdf. This
procedure tests the order of pressure values at half-levels and full
levels.

File:

• LMDZ5/trunk/libf/dyn3dmem/guide_loc_mod.F90 (modified) (8 diffs)

LMDZ5/trunk/libf/dyn3dmem/guide_loc_mod.F90

@@ -329 +329 @@
 !=======================================================================
   SUBROUTINE guide_main(itau,ucov,vcov,teta,q,masse,ps)
+    use exner_hyb_loc_m, only: exner_hyb_loc
+    use exner_milieu_loc_m, only: exner_milieu_loc
     USE parallel_lmdz
     USE control_mod
@@ -353 +355 @@
     REAL, ALLOCATABLE, SAVE, DIMENSION (:,:) :: f_addv ! var aux: champ de guidage
     ! Variables pour fonction Exner (P milieu couche)
-    REAL, ALLOCATABLE, SAVE, DIMENSION (:,:,:)    :: pk, pkf
-    REAL, ALLOCATABLE, SAVE, DIMENSION (:,:,:)    :: alpha, beta
+    REAL, ALLOCATABLE, SAVE, DIMENSION (:,:,:)    :: pk
     REAL, ALLOCATABLE, SAVE, DIMENSION (:,:)        :: pks    
     REAL                               :: unskap
@@ -399 +400 @@
         ALLOCATE(f_addv(ijb_v:ije_v,llm) ) 
         ALLOCATE(pk(iip1,jjb_u:jje_u,llm)  ) 
-        ALLOCATE(pkf(iip1,jjb_u:jje_u,llm)  ) 
-        ALLOCATE(alpha(iip1,jjb_u:jje_u,llm)  ) 
-        ALLOCATE(beta(iip1,jjb_u:jje_u,llm)  ) 
         ALLOCATE(pks(iip1,jjb_u:jje_u)  ) 
         ALLOCATE(p(ijb_u:ije_u,llmp1) ) 
@@ -539 +537 @@
         CALL pression_loc( ijnb_u, ap, bp, ps, p )
         if (pressure_exner) then
-          CALL exner_hyb_loc(ip1jmp1,ps,p,alpha,beta,pks,pk,pkf)
+          CALL exner_hyb_loc(ip1jmp1,ps,p,pks,pk)
         else
-          CALL exner_milieu_loc(ip1jmp1,ps,p,beta,pks,pk,pkf)
+          CALL exner_milieu_loc(ip1jmp1,ps,p,pks,pk)
         endif
 !$OMP BARRIER        
@@ -894 +892 @@
 !=======================================================================
   SUBROUTINE guide_interp(psi,teta)
+    use exner_hyb_loc_m, only: exner_hyb_loc
+    use exner_milieu_loc_m, only: exner_milieu_loc
   USE parallel_lmdz
   USE mod_hallo
@@ -919 +919 @@
   REAL, ALLOCATABLE, SAVE,DIMENSION (:,:,:)     :: pbary 
   ! Variables pour fonction Exner (P milieu couche)
-  REAL, ALLOCATABLE, SAVE,DIMENSION (:,:,:)    :: pk, pkf
-  REAL, ALLOCATABLE, SAVE, DIMENSION (:,:,:)    :: alpha, beta
+  REAL, ALLOCATABLE, SAVE,DIMENSION (:,:,:)    :: pk
   REAL ,ALLOCATABLE, SAVE, DIMENSION (:,:)        :: pks    
   REAL                               :: unskap
@@ -949 +948 @@
       ALLOCATE(pbary(iip1,jjb_v:jje_v,llm) )    
       ALLOCATE(pk(iip1,jjb_u:jje_u,llm) )    
-      ALLOCATE(pkf(iip1,jjb_u:jje_u,llm)  )    
-      ALLOCATE(alpha(iip1,jjb_u:jje_u,llm) )    
-      ALLOCATE(beta(iip1,jjb_u:jje_u,llm) )    
       ALLOCATE(pks (iip1,jjb_u:jje_u) )    
       ALLOCATE(qsat(ijb_u:ije_u,llm) )    
@@ -1032 +1028 @@
         CALL pression_loc( ijnb_u, ap, bp, psi, p )
         if (disvert_type==1) then
-          CALL exner_hyb_loc(ijnb_u,psi,p,alpha,beta,pks,pk,pkf)
+          CALL exner_hyb_loc(ijnb_u,psi,p,pks,pk)
         else ! we assume that we are in the disvert_type==2 case
-          CALL exner_milieu_loc(ijnb_u,psi,p,beta,pks,pk,pkf)
+          CALL exner_milieu_loc(ijnb_u,psi,p,pks,pk)
         endif
         unskap=1./kappa