Ignore:
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

Location:
trunk/LMDZ.COMMON/libf/dyn3dpar
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • trunk/LMDZ.COMMON/libf/dyn3dpar/advtrac_p.F90

    r1422 r1441  
    1010  !            M.A Filiberti (04/2002)
    1111  !
    12   USE parallel_lmdz
    13   USE Write_Field_p
    14   USE Bands
     12  USE parallel_lmdz, ONLY: ij_begin,ij_end,OMP_CHUNK,pole_nord,pole_sud,&
     13                           setdistrib
     14  USE Write_Field_p, ONLY: WriteField_p
     15  USE Bands, ONLY: jj_Nb_Caldyn,jj_Nb_vanleer
    1516  USE mod_hallo
    1617  USE Vampir

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

    r1422 r1441  
    3939!     -metres  du zoom  avec  celles lues sur le fichier start .
    4040!
    41   LOGICAL etatinit
    42   INTEGER tapedef
     41  LOGICAL,INTENT(IN) :: etatinit
     42  INTEGER,INTENT(IN) :: tapedef
    4343
    4444!   Declarations :
    … …  
    4848  include "comdissnew.h"
    4949  include "iniprint.h"
    50 
    51 ! FH 2008/05/09 On elimine toutes les clefs physiques dans la dynamique
    52 ! #include "clesphys.h"
    5350!
    5451!
    … …  
    905902     !Config  Help = extension en longitude  de la zone du zoom 
    906903     !Config         ( fraction de la zone totale)
    907      dzoomx = 0.0
     904     dzoomx = 0.2
    908905     CALL getin('dzoomx',dzoomx)
    909906
    … …  
    913910     !Config  Help = extension en latitude de la zone  du zoom 
    914911     !Config         ( fraction de la zone totale)
    915      dzoomy = 0.0
     912     dzoomy = 0.2
    916913     CALL getin('dzoomy',dzoomy)
    917914

  • trunk/LMDZ.COMMON/libf/dyn3dpar/covcont_p.F

    r1019 r1441  
    11      SUBROUTINE covcont_p (klevel,ucov, vcov, ucont, vcont )
    2       USE parallel_lmdz
     2      USE parallel_lmdz, ONLY: ij_begin,ij_end,OMP_CHUNK,
     3     &                         pole_nord, pole_sud
    34      IMPLICIT NONE
    45

  • trunk/LMDZ.COMMON/libf/dyn3dpar/mod_hallo.F90

    r1019 r1441  
    11module mod_Hallo
    2 USE parallel_lmdz
     2USE mod_const_mpi, ONLY: COMM_LMDZ,MPI_REAL_LMDZ
     3USE parallel_lmdz, ONLY: using_mpi, mpi_size, mpi_rank, omp_chunk, omp_rank, &
     4                         pole_nord, pole_sud, jj_begin, jj_end, &
     5                         jj_begin_para, jj_end_para
    36implicit none
    47  logical,save :: use_mpi_alloc

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

    r1302 r1441  
    11!
    2 ! $Id: parallel.F90 1575 2011-09-21 13:57:48Z jghattas $
     2! $Id: parallel.F90 1810 2013-07-24 08:06:39Z emillour $
    33!
    4   module parallel_lmdz
     4  MODULE parallel_lmdz
    55  USE mod_const_mpi
    66#ifdef CPP_IOIPSL
    … …  
    3131    integer, save :: omp_size 
    3232!$OMP THREADPRIVATE(omp_rank)
     33
     34! Ehouarn: add "dummy variables" (which are in dyn3d_mem/parallel_lmdz.F90)
     35! so that calfis_loc compiles even if using dyn3dpar
     36    integer,save  :: jjb_u
     37    integer,save  :: jje_u
     38    integer,save  :: jjnb_u
     39    integer,save  :: jjb_v
     40    integer,save  :: jje_v
     41    integer,save  :: jjnb_v   
     42
     43    integer,save  :: ijb_u
     44    integer,save  :: ije_u
     45    integer,save  :: ijnb_u   
     46   
     47    integer,save  :: ijb_v
     48    integer,save  :: ije_v
     49    integer,save  :: ijnb_v   
    3350
    3451 contains
    … …  
    167184!Config  Desc = taille des blocs openmp
    168185!Config  Def  = 1
    169 !Config  Help = defini la taille des packets d'it�ration openmp
     186!Config  Help = defini la taille des packets d'it�ration openmp
    170187!Config         distribue a chaque tache lors de l'entree dans une
    171188!Config         boucle parallelisee
    … …  
    624641!      NewField(ij_be       
    625642
    626   end module parallel_lmdz
     643  end MODULE parallel_lmdz
Note: See TracChangeset for help on using the changeset viewer.