Changeset 1441 for trunk/LMDZ.COMMON/libf/dyn3dpar/parallel_lmdz.F90

Timestamp:

Jun 4, 2015, 10:21:20 AM (10 years ago)

Author:

emillour

Message:

Updates in common dynamics (seq and ) to keep up with updates
in LMDZ5 (up to LMDZ5 trunk, rev 2250):

• compilation:
• added test in grid/dimension/makdim to check that # of longitudes is a multiple of 8

• dyn3d_common:

Bug correction concerning zoom (cf LMDZ5 rev 2218)

• coefpoly.F becomes coefpoly_m.F90 (in misc)
• fxhyp.F => fxhyp_m.F90 , fyhyp.F => fyhyp_m.F90
• new routines for zoom: invert_zoom_x_m.F90 and principal_cshift_m.F90
• inigeom.F adapted to new zoom definition routines
• fluxstokenc.F : got rid of calls to initial0()

• dyn3d:
• advtrac.F90 : got rid of calls to initial0()
• conf_gcm.F90 : cosmetic changes and change in default dzoomx,dzoomy values
• guide_mod.F90 : followed updates from Earth Model
• gcm.F is now gcm.F90

• dyn3dpar:
• advtrac_p.F90, covcont_p.F90, mod_hallo.F90 : cosmetic changes
• conf_gcm.F90 : cosmetic and changed in default dzoomx,dzoomy values
• parallel_lmdz.F90 : updates to keep up with Earth model

• misc:
• arth.F90 becomes arth_m.F90
• wxios.F90 updated wrt Earth model changes
• nrtype.F90 and coefpoly_m.F90 added
• ran1.F, sort.F, minmax.F, minmax2.F, juldate.F moved over from dyn3d_common

EM

File:

• trunk/LMDZ.COMMON/libf/dyn3dpar/parallel_lmdz.F90 (modified) (4 diffs)

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

@@ -1 +1 @@
 ! 
-! $Id: parallel.F90 1575 2011-09-21 13:57:48Z jghattas $
+! $Id: parallel.F90 1810 2013-07-24 08:06:39Z emillour $
 !
-  module parallel_lmdz
+  MODULE parallel_lmdz
   USE mod_const_mpi
 #ifdef CPP_IOIPSL
@@ -31 +31 @@
     integer, save :: omp_size  
 !$OMP THREADPRIVATE(omp_rank)
+
+! Ehouarn: add "dummy variables" (which are in dyn3d_mem/parallel_lmdz.F90)
+! so that calfis_loc compiles even if using dyn3dpar
+    integer,save  :: jjb_u
+    integer,save  :: jje_u
+    integer,save  :: jjnb_u
+    integer,save  :: jjb_v
+    integer,save  :: jje_v
+    integer,save  :: jjnb_v    
+
+    integer,save  :: ijb_u
+    integer,save  :: ije_u
+    integer,save  :: ijnb_u    
+    
+    integer,save  :: ijb_v
+    integer,save  :: ije_v
+    integer,save  :: ijnb_v    
 
  contains
@@ -167 +184 @@
 !Config  Desc = taille des blocs openmp
 !Config  Def  = 1
-!Config  Help = defini la taille des packets d'it�ration openmp
+!Config  Help = defini la taille des packets d'it�ration openmp
 !Config         distribue a chaque tache lors de l'entree dans une
 !Config         boucle parallelisee
@@ -624 +641 @@
 !      NewField(ij_be       
 
-  end module parallel_lmdz
+  end MODULE parallel_lmdz