Changeset 1572 for trunk/LMDZ.COMMON/libf/dyn3d/leapfrog.F

Timestamp:

Jul 11, 2016, 9:35:35 AM (8 years ago)

Author:

emillour

Message:

All GCMs:
Further adaptations to keep up with changes in LMDZ5 concerning
physics/dynamics separation (up to rev r2500 of LMDZ5)

• arch:
• remove ifort debug option '-check all', replace it with '-check bounds,format,output_conversion,pointers,uninit' (i.e. get it to stop complaining about copying into temporary arrays)

• dyn3d_common:
• comconst_mod.F90 : add ngroup

• dyn3d:
• gcm.F90 : minor bug fix (arguments to a call_abort())
• leapfrog.F90 : recompute geopotential for bilan_dyn outputs
• conf_gcm.F90 : read "ngroup" from run.def
• groupe.F , groupeun.F : ngroup no longer a local parameter

• dyn3d_par:
• conf_gcm.F90 : read "ngroup" from run.def
• groupe_p.F , groupeun_p.F : ngroup no longer a local parameter

• misc:
• regr1_step_av_m.F90 : removed (not used)

• phy_common:
• mod_phys_lmdz_mpi_transfert.F90 , mod_phys_lmdz_mpi_data.F90 : change is_north_pole and is_south_pole to is_north_pole_dyn and is_south_pole_dyn
• mod_phys_lmdz_omp_data.F90 : introduce is_nort_pole_phy and is_south_pole_phy

• dynphy_lonlat:
• mod_interface_dyn_phys.F90 : use is_north_pole_dyn and is_south_pole_dyn
• calfis_p.F : use is_north_pole_dyn and is_south_pole_dyn

• phyvenus:
• physiq_mod , write_hist*.h : use is_north_pole_phy and is_south_pole_phy to correctly compute mesh area at poles to send to hist*nc files.

• phytitan:
• physiq_mod , write_hist*.h : use is_north_pole_phy and is_south_pole_phy to correctly compute mesh area at poles to send to hist*nc files.

EM

File:

• trunk/LMDZ.COMMON/libf/dyn3d/leapfrog.F (modified) (10 diffs)

trunk/LMDZ.COMMON/libf/dyn3d/leapfrog.F

@@ -98 +98 @@
       REAL tsurpk(ip1jmp1,llm)               ! cpp*T/pk  
 
-      real zqmin,zqmax
+!      real zqmin,zqmax
 
 c variables dynamiques intermediaire pour le transport
@@ -130 +130 @@
 
 c   variables pour le fichier histoire
-      REAL dtav      ! intervalle de temps elementaire
+!      REAL dtav      ! intervalle de temps elementaire
 
       REAL tppn(iim),tpps(iim),tpn,tps
@@ -144 +144 @@
       LOGICAL :: lafin=.false.
       INTEGER ij,iq,l
-      INTEGER ik
-
-      real time_step, t_wrt, t_ops
+!      INTEGER ik
+
+!      real time_step, t_wrt, t_ops
 
       REAL rdaym_ini
@@ -152 +152 @@
 ! jH_cur: heure julienne courante
       REAL :: jD_cur, jH_cur
-      INTEGER :: an, mois, jour
-      REAL :: secondes
+!      INTEGER :: an, mois, jour
+!      REAL :: secondes
 
       LOGICAL first,callinigrads
@@ -159 +159 @@
       save first
       data first/.true./
-      real dt_cum
-      character*10 infile
-      integer zan, tau0, thoriid
-      integer nid_ctesGCM
-      save nid_ctesGCM
-      real degres
-      real rlong(iip1), rlatg(jjp1)
-      real zx_tmp_2d(iip1,jjp1)
-      integer ndex2d(iip1*jjp1)
+!      real dt_cum
+!      character*10 infile
+!      integer zan, tau0, thoriid
+!      integer nid_ctesGCM
+!      save nid_ctesGCM
+!      real degres
+!      real rlong(iip1), rlatg(jjp1)
+!      real zx_tmp_2d(iip1,jjp1)
+!      integer ndex2d(iip1*jjp1)
       logical ok_sync
       parameter (ok_sync = .true.) 
@@ -175 +175 @@
       character*10 string10
 
-      REAL alpha(ip1jmp1,llm),beta(ip1jmp1,llm)
+!      REAL alpha(ip1jmp1,llm),beta(ip1jmp1,llm)
       REAL :: flxw(ip1jmp1,llm)  ! flux de masse verticale
 
@@ -186 +186 @@
       REAL vcont(ip1jm,llm),ucont(ip1jmp1,llm)
       REAL vnat(ip1jm,llm),unat(ip1jmp1,llm)
-      REAL      d_h_vcol, d_qt, d_qw, d_ql, d_ec
+!      REAL      d_h_vcol, d_qt, d_qw, d_ql, d_ec
       CHARACTER*15 ztit
 !IM   INTEGER   ip_ebil_dyn  ! PRINT level for energy conserv. diag.
@@ -193 +193 @@
 c-jld 
 
-      integer :: itau_w ! for write_paramLMDZ_dyn.h
-
-      character*80 dynhist_file, dynhistave_file
+!      integer :: itau_w ! for write_paramLMDZ_dyn.h
+
+!      character*80 dynhist_file, dynhistave_file
       character(len=*),parameter :: modname="leapfrog"
       character*80 abort_message
@@ -802 +802 @@
                ENDIF
                
+!              ! Ehouarn: re-compute geopotential for outputs
+               CALL geopot(ip1jmp1,teta,pk,pks,phis,phi)
+
                IF (ok_dynzon) THEN
 #ifdef CPP_IOIPSL
@@ -943 +946 @@
                ENDIF
 
+!              ! Ehouarn: re-compute geopotential for outputs
+               CALL geopot(ip1jmp1,teta,pk,pks,phis,phi)
+
                IF (ok_dynzon) THEN 
 #ifdef CPP_IOIPSL