Changeset 2021 for LMDZ5/trunk/libf/dyn3dmem/call_calfis_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/call_calfis_mod.F90 (modified) (5 diffs)

LMDZ5/trunk/libf/dyn3dmem/call_calfis_mod.F90

@@ -12 +12 @@
 
     REAL,POINTER,SAVE :: p(:,:) 
-    REAL,POINTER,SAVE :: alpha(:,:) 
-    REAL,POINTER,SAVE :: beta(:,:) 
     REAL,POINTER,SAVE :: pks(:) 
     REAL,POINTER,SAVE :: pk(:,:) 
@@ -53 +51 @@
     CALL allocate_u(flxw,llm,d)
     CALL allocate_u(p,llmp1,d)
-    CALL allocate_u(alpha,llm,d)
-    CALL allocate_u(beta,llm,d)
     CALL allocate_u(pks,d)
     CALL allocate_u(pk,llm,d)
@@ -75 +71 @@
                          phis_dyn,q_dyn,flxw_dyn)
   USE dimensions_mod
+  use exner_hyb_loc_m, only: exner_hyb_loc
+  use exner_milieu_loc_m, only: exner_milieu_loc
   USE parallel_lmdz
   USE times
@@ -201 +199 @@
 
   !$OMP BARRIER
-    CALL exner_hyb_loc(  ip1jmp1, ps, p,alpha,beta, pks, pk, pkf )
+    CALL exner_hyb_loc(  ip1jmp1, ps, p, pks, pk, pkf )
   !$OMP BARRIER
     CALL geopot_loc  ( ip1jmp1, teta  , pk , pks,  phis  , phi   )
@@ -343 +341 @@
 !$OMP BARRIER
     if (pressure_exner) then
-      CALL exner_hyb_loc(ijnb_u,ps,p,alpha,beta,pks,pk,pkf)
+      CALL exner_hyb_loc(ijnb_u,ps,p,pks,pk,pkf)
     else 
-      CALL exner_milieu_loc(ijnb_u,ps,p,beta,pks,pk,pkf)
+      CALL exner_milieu_loc(ijnb_u,ps,p,pks,pk,pkf)
     endif
 !$OMP BARRIER