Changeset 1572 for trunk/LMDZ.COMMON/libf/dyn3dpar

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

Location:

trunk/LMDZ.COMMON/libf/dyn3dpar

Files:

• conf_gcm.F90 (modified) (2 diffs)
• groupe_p.F (modified) (2 diffs)
• groupeun_p.F (modified) (5 diffs)

trunk/LMDZ.COMMON/libf/dyn3dpar/conf_gcm.F90

@@ -21 +21 @@
   USE comconst_mod, ONLY: dissip_factz,dissip_deltaz,dissip_zref,               &
                 dissip_fac_mid,dissip_fac_up,dissip_hdelta,dissip_pupstart,     &
-                mode_top_bound,tau_top_bound,iflag_top_bound
+                mode_top_bound,tau_top_bound,iflag_top_bound,ngroup
   USE logic_mod, ONLY: tidal,purmats,ok_guide,read_start,iflag_phys,iflag_trac, &
                 ok_strato,ok_gradsfile,ok_limit,ok_etat0,moyzon_mu,moyzon_ch,   &
@@ -428 +428 @@
   tetasponge=50000.0
   call getin("tetasponge",tetasponge)
+
+! ngroup: to group longitudinaly near the pole (groupe/groupeun routines)
+!        (implies that iim has to be a multiple of 2**ngroup)
+  ngroup=3
+  CALL getin('ngroup',ngroup)
 
 ! FOR TITAN: tidal forces

trunk/LMDZ.COMMON/libf/dyn3dpar/groupe_p.F

@@ -1 +1 @@
       subroutine groupe_p(pext,pbaru,pbarv,pbarum,pbarvm,wm)
       USE parallel_lmdz
+      USE comconst_mod, ONLY: ngroup
       implicit none
 
@@ -18 +19 @@
 #include "comgeom2.h"
 
-      integer ngroup
-      parameter (ngroup=3)
+!      integer ngroup
+!      parameter (ngroup=3)
 
 

trunk/LMDZ.COMMON/libf/dyn3dpar/groupeun_p.F

@@ -1 +1 @@
       SUBROUTINE groupeun_p(jjmax,llmax,jjb,jje,q)
       USE parallel_lmdz
+      USE comconst_mod, ONLY: ngroup
       USE Write_Field_p
       IMPLICIT NONE
@@ -11 +12 @@
       REAL q(iip1,jjmax,llmax)
 
-      INTEGER ngroup
-      PARAMETER (ngroup=3)
+!      INTEGER ngroup
+!      PARAMETER (ngroup=3)
 
       REAL airecn,qn
@@ -37 +38 @@
       LOGICAL, SAVE :: first = .TRUE.
 !$OMP THREADPRIVATE(first)
-      INTEGER,SAVE :: i_index(iim,ngroup)
+!      INTEGER,SAVE :: i_index(iim,ngroup)
       INTEGER      :: offset
-      REAL         :: qsum(iim/ngroup)
+!      REAL         :: qsum(iim/ngroup)
 
       IF (first) THEN
@@ -135 +136 @@
 
       USE parallel_lmdz
+      USE comconst_mod, ONLY: ngroup
       IMPLICIT NONE
 
@@ -141 +143 @@
 #include "comgeom2.h"
 
-      INTEGER ngroup
-      PARAMETER (ngroup=3)
+!      INTEGER ngroup
+!      PARAMETER (ngroup=3)
 
       REAL airen,airecn