Changeset 1019 for trunk


Ignore:
Timestamp:
Aug 26, 2013, 9:21:41 AM (12 years ago)
Author:
emillour
Message:

Common dynamics; keep up with updates (seq and ) in LMDZ5 (up tio rev 1845):

  • General stuff:
  • makelmdz_fcm: add options -j # (compile using # threads) and -full, and to keep up

with Earth model, possibility to compile with various versions of orchidee

  • bld.cfg: adaptations to enable compiling using multiple threads
  • build_gcm: adaptations to enable compiling using multiple threads
  • makelmdz: keep up with Earth model: possibility to compile with various versions of orchidee + cosmetic changes + library directory name change
  • bibio:
  • wxios.F90 : Added for possible future use of XIOS library
  • filtrez:
  • mkl_dft_type.f90 & mkl_dfti.f90 : MKL (for MKL FFT) interface definitions
  • filtreg_mod : limit use of FFT to parallel mode
  • mod_filtre_fft.F90 & mod_filtre_fft_lov.F90 : swich to use parallel_lmdz
  • dyn3d:
  • abort_gcm.F : add things for xios
  • advtrac.F90 : minor change in CFL outputs
  • ce0l.F90 : indicesol.h is now module indice_sol_mod
  • comvert.h : cosmetic change on comments
  • gcm.F : add xios and use module indice_sol_mod (for INCA)
  • inigeom.F : move two computations outside loop
  • dyn3dpar:
  • parallel.F90 => parallel_lmdz.F90 : and change all the "use parallel" into "use parallel_lmdz" in all files in dyn3dpar
  • comvert.h : cosmetic change on comments
  • gcm.F : add xios and use module indice_sol_mod (for INCA)
  • leapfrog_p.F : add xios + correction for times in Newtonian case
  • ce0l.F90 : indicesol.h is now module indice_sol_mod
  • inigeom.F : move two computations outside loop

EM

Location:
trunk
Files:
3 added
97 edited
1 moved

Legend:

Unmodified
Added
Removed

  • trunk/DOC/chantiers/commit_importants.log

    r1017 r1019  
    12481248  in the Venus physics).
    12491249
     1250**********************
     1251**** commit_v1019 ****
     1252**********************
     1253Ehouarn: Updates in the dynamics (seq and //) to keep up with updates
     1254in LMDZ5 (up to LMDZ5 trunk, rev 1845):
     1255* General stuff:
     1256- makelmdz_fcm: add options -j # (compile using # threads) and -full, and to keep up
     1257   with Earth model, possibility to compile with various versions of orchidee
     1258- bld.cfg: adaptations to enable compiling using multiple threads
     1259- build_gcm: adaptations to enable compiling using multiple threads
     1260- makelmdz: keep up with Earth model: possibility to compile with various versions of orchidee + cosmetic changes + library directory name change
     1261
     1262* bibio:
     1263- wxios.F90 : Added for possible future use of XIOS library
     1264
     1265* filtrez:
     1266- mkl_dft_type.f90 & mkl_dfti.f90 : MKL (for MKL FFT) interface definitions
     1267- filtreg_mod : limit use of FFT to parallel mode
     1268- mod_filtre_fft.F90 & mod_filtre_fft_lov.F90 : swich to use parallel_lmdz
     1269
     1270* dyn3d:
     1271- abort_gcm.F : add things for xios
     1272- advtrac.F90 : minor change in CFL outputs
     1273- ce0l.F90 : indicesol.h is now module indice_sol_mod
     1274- comvert.h : cosmetic change on comments
     1275- gcm.F : add xios and use module indice_sol_mod (for INCA)
     1276- inigeom.F : move two computations outside loop
     1277
     1278* dyn3dpar:
     1279- parallel.F90 => parallel_lmdz.F90 : and change all the "use parallel" into
     1280  "use parallel_lmdz" in all files in dyn3dpar
     1281- comvert.h : cosmetic change on comments
     1282- gcm.F : add xios and use module indice_sol_mod (for INCA)
     1283- leapfrog_p.F : add xios + correction for times in Newtonian case
     1284- ce0l.F90 : indicesol.h is now module indice_sol_mod
     1285- inigeom.F : move two computations outside loop
     1286

  • trunk/LMDZ.COMMON/bld.cfg

    r895 r1019  
    3232src::chem    %CHEM
    3333
    34 bld::lib::dyn      %DYN
    35 bld::lib::phys     %PHYS
    36 bld::lib::grid      grid
    37 bld::lib::filtrez   filtrez
    38 bld::lib::bibio     bibio
    39 bld::lib::cosp      cosp
    40 bld::lib::chem      %CHEM
     34bld::lib            lmdz
    4135
    4236
    4337bld::outfile_ext::exe    %SUFF_NAME.e
    44 bld::target              lib%{DYN}.a lib%{PHYS}.a libgrid.a libfiltrez.a libbibio.a libcosp.a lib%{CHEM}.a
     38bld::target              liblmdz.a
    4539bld::target              %EXEC%SUFF_NAME.e
    46 bld::exe_dep             %{DYN} %{PHYS} grid filtrez bibio cosp %{CHEM}
     40bld::exe_dep             
    4741
    4842
    … …  
    6862bld::tool::fppkeys   %CPP_KEY %FPP_DEF
    6963
    70 
     64# Example of how to set specific compiling options for a specific file
     65# -> this can be including in the arch.opt file
    7166#bld::tool::fflags::phys::readaerosol         %BASE_FFLAGS %PROD_FFLAGS  %INCDIR -C hopt -pi auto
    72 #bld::tool::fflags::phys::aeropt_2bands       %BASE_FFLAGS %PROD_FFLAGS  %INCDIR
    73 #bld::tool::fflags::phys::radiation_AR4       %BASE_FFLAGS %PROD_FFLAGS1 %INCDIR -C hopt -Wf,-O,extendreorder
    74 #bld::tool::fflags::phys::radiation_AR4_param %BASE_FFLAGS %PROD_FFLAGS1 %INCDIR -C hopt -f3
    75 #bld::tool::fflags::phys::fisrtilp            %BASE_FFLAGS %PROD_FFLAGS  %INCDIR -C hopt
    76 #bld::tool::fflags::phys::cv30_routines       %BASE_FFLAGS %PROD_FFLAGS  %INCDIR -Wf,-O,extendreorder
    77 #bld::tool::fflags::phys::cvltr               %BASE_FFLAGS %PROD_FFLAGS  %INCDIR -C hopt
    78 #bld::tool::fflags::phys::clouds_gno          %BASE_FFLAGS %PROD_FFLAGS  %INCDIR -C hopt
    79 #bld::tool::fflags::dyn::vlsplt_p             %BASE_FFLAGS %PROD_FFLAGS  %INCDIR -C hopt
    80 #bld::tool::fflags::dyn::groupeun_p           %BASE_FFLAGS %PROD_FFLAGS  %INCDIR -C hopt
    8167
    8268
    … …  
    9985bld::excl_dep        use::mod_prism_get_proto
    10086bld::excl_dep        use::mod_prism_put_proto
    101 bld::excl_dep        use::mkl_dfti
    10287
    10388# Don't generate interface files

  • trunk/LMDZ.COMMON/build_gcm

    r979 r1019  
    2929fi
    3030
     31job=1
    3132dirname="" #path to where the fcm command will be found
    3233if (( $# >= 1 )) ; then
    … …  
    3940  # add a trailing "/" to $dirname
    4041  dirname=${dirname}"/"
     42  shift;
    4143fi
    4244
    4345# run "fcm build" command
    44 ${dirname}fcm build
     46${dirname}fcm build $*
    4547
    4648# cleanup

  • trunk/LMDZ.COMMON/libf/dyn3d/advtrac.F90

    r270 r1019  
    203203     if (countcfl==day_step) then
    204204        do l=1,llm
    205            write(lunout,*) 'L, CFLmax ' &
    206                 ,l,maxval(cflx(:,l)),maxval(cfly(:,l)),maxval(cflz(:,l))
     205           write(lunout,*) 'L, CFL[xyz]max:', l, cflxmax(l), cflymax(l), &
     206                cflzmax(l)
    207207        enddo
    208208        countcfl=0

  • trunk/LMDZ.COMMON/libf/dyn3d/ce0l.F90

    r776 r1019  
    2020  USE comgeomphy
    2121  USE infotrac
     22  USE indice_sol_mod
    2223
    2324#ifdef CPP_IOIPSL
    … …  
    3637#include "dimensions.h"
    3738#include "paramet.h"
    38 #include "indicesol.h"
     39!#include "indicesol.h"
    3940#include "iniprint.h"
    4041#include "temps.h"

  • trunk/LMDZ.COMMON/libf/dyn3d/comvert.h

    r841 r1019  
    2323      real bps    ! hybrid sigma contribution at mid-layers
    2424      real scaleheight ! atmospheric (reference) scale height (km)
    25       real pseudoalt ! for planets
     25      real pseudoalt ! pseudo-altitude of model levels (km), based on presnivs(),
     26                     ! preff and scaleheight
    2627
    2728      integer disvert_type ! type of vertical discretization:

  • trunk/LMDZ.COMMON/libf/dyn3d/gcm.F

    r1017 r1019  
    1313#endif
    1414
     15
     16#ifdef CPP_XIOS
     17    ! ug Pour les sorties XIOS
     18        USE wxios
     19#endif
     20
    1521      USE filtreg_mod
    1622      USE infotrac
    1723      USE control_mod
    1824      use cpdet_mod, only: ini_cpdet
     25
     26#ifdef INCA
     27! Only INCA needs these informations (from the Earth's physics)
     28      USE indice_sol_mod
     29#endif
    1930
    2031!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
    … …  
    8192#ifdef INCA
    8293! Only INCA needs these informations (from the Earth's physics)
    83 #include "indicesol.h"
     94!#include "indicesol.h"
    8495#endif
    8596
    … …  
    173184!      CALL defrun( 99, .TRUE. , clesphy0 )
    174185!#endif
     186
     187!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
     188! Initialisation de XIOS
     189!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
     190
     191#ifdef CPP_XIOS
     192        CALL wxios_init("LMDZ")
     193#endif
     194
    175195
    176196!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!

  • trunk/LMDZ.COMMON/libf/dyn3d/inigeom.F

    r1 r1019  
    426426         radclatm = 0.5* rad * coslatm
    427427c
     428         ai14            = un4rad2 * coslatp * yprp
     429         ai23            = un4rad2 * coslatm * yprm
    428430         DO 32 i = 1,iim
    429431         xprp            = xprimp025( i )
    430432         xprm            = xprimm025( i )
    431433     
    432          ai14            = un4rad2 * coslatp * yprp
    433          ai23            = un4rad2 * coslatm * yprm
    434434         aireij1 ( i,j ) = ai14 * xprp
    435435         aireij2 ( i,j ) = ai23 * xprp

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

    r979 r1019  
    1212      USE ioipsl_getincom
    1313#endif
    14       USE parallel
     14      USE parallel_lmdz
    1515#include "iniprint.h"
    1616 

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

    r108 r1019  
    55     S          pucov, pvcov, pteta, pq   , pps ,
    66     S          pdufi, pdvfi, pdhfi,pdqfi, pdpfi  )
    7       USE parallel
     7      USE parallel_lmdz
    88      USE infotrac, ONLY : nqtot
    99      USE control_mod, ONLY : planet_type

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

    r1 r1019  
    44      SUBROUTINE advect_new_p(ucov,vcov,teta,w,massebx,masseby,
    55     &                        du,dv,dteta)
    6       USE parallel
     6      USE parallel_lmdz
    77      USE write_field_p
    88      IMPLICIT NONE

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

    r1 r1019  
    33!
    44      SUBROUTINE advect_p(ucov,vcov,teta,w,massebx,masseby,du,dv,dteta)
    5       USE parallel
     5      USE parallel_lmdz
    66      USE write_field_p
    77      IMPLICIT NONE

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

    r953 r1019  
    1010  !            M.A Filiberti (04/2002)
    1111  !
    12   USE parallel
     12  USE parallel_lmdz
    1313  USE Write_Field_p
    1414  USE Bands

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

    r776 r1019  
    1919 
    2020  subroutine AllocateBands
    21     use parallel
     21    use parallel_lmdz
    2222    implicit none
    2323   
    … …  
    3333 
    3434  subroutine Read_distrib
    35     use parallel
     35    use parallel_lmdz
    3636    implicit none
    3737
    … …  
    9292   
    9393   SUBROUTINE  Set_Bands
    94      USE parallel
     94     USE parallel_lmdz
    9595#ifdef CPP_PHYS
    9696! Ehouarn: what follows is only related to // physics
    … …  
    134134    subroutine AdjustBands_caldyn
    135135      use times
    136       use parallel
     136      use parallel_lmdz
    137137      implicit none
    138138
    … …  
    199199    subroutine AdjustBands_vanleer
    200200      use times
    201       use parallel
     201      use parallel_lmdz
    202202      implicit none
    203203
    … …  
    265265    subroutine AdjustBands_dissip
    266266      use times
    267       use parallel
     267      use parallel_lmdz
    268268      implicit none
    269269
    … …  
    335335      USE mod_phys_lmdz_para, only : klon_mpi_para_nb
    336336#endif
    337       USE parallel
     337      USE parallel_lmdz
    338338      implicit none
    339339
    … …  
    385385
    386386    subroutine WriteBands
    387     USE parallel
     387    USE parallel_lmdz
    388388    implicit none
    389389    include "dimensions.h"

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

    r1 r1019  
    11      SUBROUTINE bernoui_p (ngrid,nlay,pphi,pecin,pbern)
    2       USE parallel
     2      USE parallel_lmdz
    33      IMPLICIT NONE
    44

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

    r270 r1019  
    1313      USE IOIPSL
    1414#endif
    15       USE parallel
     15      USE parallel_lmdz
    1616      USE mod_hallo
    1717      use misc_mod

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

    r8 r1019  
    1010     $ (itau,ucov,vcov,teta,ps,masse,pk,pkf,tsurpk,phis ,
    1111     $  phi,conser,du,dv,dteta,dp,w,pbaru,pbarv,time )
    12       USE parallel
     12      USE parallel_lmdz
    1313      USE Write_Field_p
    1414     

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

    r1017 r1019  
    3333      USE IOPHY
    3434#endif
    35       USE parallel, ONLY : omp_chunk, using_mpi
     35      USE parallel_lmdz, ONLY : omp_chunk, using_mpi
    3636      USE Write_Field
    3737      Use Write_field_p

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

    r776 r1019  
    2222  USE mod_const_mpi
    2323  USE infotrac
    24   USE parallel, ONLY: finalize_parallel
     24  USE parallel_lmdz, ONLY: finalize_parallel
     25  USE indice_sol_mod
    2526
    2627#ifdef CPP_IOIPSL
    … …  
    3940#include "dimensions.h"
    4041#include "paramet.h"
    41 #include "indicesol.h"
     42!#include "indicesol.h"
    4243#include "iniprint.h"
    4344#include "temps.h"

  • trunk/LMDZ.COMMON/libf/dyn3dpar/comvert.h

    r841 r1019  
    2323      real bps    ! hybrid sigma contribution at mid-layers
    2424      real scaleheight ! atmospheric (reference) scale height (km)
    25       real pseudoalt ! for planets
     25      real pseudoalt ! pseudo-altitude of model levels (km), based on presnivs(),
     26                     ! preff and scaleheight
    2627
    2728      integer disvert_type ! type of vertical discretization:

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

    r1017 r1019  
    1515      use mod_filtre_fft, ONLY : use_filtre_fft
    1616      use mod_hallo, ONLY : use_mpi_alloc
    17       use parallel, ONLY : omp_chunk
     17      use parallel_lmdz, ONLY : omp_chunk
    1818      USE control_mod
    1919      USE infotrac, ONLY : type_trac

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

    r1 r1019  
    1515c     nbniv   est le nombre de niveaux vert. de  xflu et de yflu .
    1616c
    17       USE parallel
     17      USE parallel_lmdz
    1818      IMPLICIT NONE
    1919c

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

    r1 r1019  
    11      SUBROUTINE convmas1_p (pbaru, pbarv, convm )
    22c
    3       USE parallel
     3      USE parallel_lmdz
    44      IMPLICIT NONE
    55

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

    r1 r1019  
    11      SUBROUTINE convmas2_p ( convm )
    22c
    3       USE parallel
     3      USE parallel_lmdz
    44      IMPLICIT NONE
    55

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

    r1 r1019  
    11      SUBROUTINE convmas_p (pbaru, pbarv, convm )
    22c
    3       USE parallel
     3      USE parallel_lmdz
    44      IMPLICIT NONE
    55

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

    r1 r1019  
    11      SUBROUTINE covcont_p (klevel,ucov, vcov, ucont, vcont )
    2       USE parallel
     2      USE parallel_lmdz
    33      IMPLICIT NONE
    44

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

    r1 r1019  
    33!
    44      SUBROUTINE covnat_p(klevel,ucov, vcov, unat, vnat )
    5       USE parallel
     5      USE parallel_lmdz
    66      IMPLICIT NONE
    77

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

    r1017 r1019  
    141141! Parallel version of t2tpot, over the full dynamics (scalar) grid
    142142! (more efficient than multiple calls to t2tpot_p() with slices of data)
    143       USE parallel, only : jj_begin,jj_end
     143      USE parallel_lmdz, only : jj_begin,jj_end
    144144      USE control_mod, only : planet_type
    145145      IMPLICIT none
    … …  
    254254! Parallel version of tpot2t, over the full dynamics (scalar) grid
    255255! (more efficient than multiple calls to tpot2t_p() with slices of data)
    256       USE parallel, only : jj_begin,jj_end
     256      USE parallel_lmdz, only : jj_begin,jj_end
    257257      USE control_mod, only : planet_type
    258258      IMPLICIT none

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

    r1 r1019  
    11      SUBROUTINE dissip_p( vcov,ucov,teta,p, dv,du,dh )
    22c
    3       USE parallel
     3      USE parallel_lmdz
    44      USE write_field_p
    55      IMPLICIT NONE

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

    r1 r1019  
    99c              x et y  etant des composantes covariantes   ...
    1010c  *********************************************************************
    11       USE parallel
     11      USE parallel_lmdz
    1212      IMPLICIT NONE
    1313c

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

    r1 r1019  
    88c              x et y  etant des composantes covariantes   ...
    99c  *********************************************************************
    10       USE parallel
     10      USE parallel_lmdz
    1111      IMPLICIT NONE
    1212c

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

    r1 r1019  
    88c              x et y  etant des composantes covariantes   ...
    99c  *********************************************************************
    10       USE PARALLEL
     10      USE parallel_lmdz
    1111      IMPLICIT NONE
    1212c

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

    r1 r1019  
    1010c         divgra     est  un argument  de sortie pour le s-prg
    1111c
    12       USE parallel
     12      USE parallel_lmdz
    1313      USE times
    1414      USE mod_hallo

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

    r1 r1019  
    11      SUBROUTINE divgrad_p (klevel,h, lh, divgra_out )
    2       USE parallel
     2      USE parallel_lmdz
    33      USE times
    44      IMPLICIT NONE

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

    r1 r1019  
    11      SUBROUTINE dteta1_p ( teta, pbaru, pbarv, dteta)
    2       USE parallel
     2      USE parallel_lmdz
    33      USE write_field_p
    44      IMPLICIT NONE

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

    r1 r1019  
    11      SUBROUTINE dudv1_p ( vorpot, pbaru, pbarv, du, dv )
    2       USE parallel
     2      USE parallel_lmdz
    33      IMPLICIT NONE
    44c

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

    r1 r1019  
    11      SUBROUTINE dudv2_p ( teta, pkf, bern, du, dv  )
    2       USE parallel
     2      USE parallel_lmdz
    33      IMPLICIT NONE
    44c

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

    r907 r1019  
    77      USE IOIPSL
    88#endif
    9       USE parallel
     9      USE parallel_lmdz
    1010      USE infotrac
    1111      use netcdf95, only: NF95_PUT_VAR
    … …  
    580580      SUBROUTINE dynredem1_p(fichnom,time,
    581581     .                     vcov,ucov,teta,q,masse,ps)
    582       USE parallel
     582      USE parallel_lmdz
    583583      USE infotrac
    584584      USE control_mod, only : planet_type

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

    r1 r1019  
    11      SUBROUTINE enercin_p ( vcov, ucov, vcont, ucont, ecin )
    2       USE parallel
     2      USE parallel_lmdz
    33      IMPLICIT NONE
    44

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

    r776 r1019  
    2929c
    3030c
    31       USE parallel
     31      USE parallel_lmdz
    3232      IMPLICIT NONE
    3333c

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

    r776 r1019  
    2626c    ( voir note de Fr.Hourdin )  ,
    2727c
    28       USE parallel
     28      USE parallel_lmdz
    2929      IMPLICIT NONE
    3030c

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

    r843 r1019  
    33      SUBROUTINE filtreg_p ( champ, ibeg, iend, nlat, nbniv,
    44     &     ifiltre, iaire, griscal ,iter)
    5       USE Parallel, only : OMP_CHUNK
     5      USE parallel_lmdz, only : OMP_CHUNK
    66      USE mod_filtre_fft
    77      USE timer_filtre

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

    r1 r1019  
    11      SUBROUTINE flumass_p(massebx,masseby, vcont, ucont, pbaru, pbarv)
    2       USE parallel
     2      USE parallel_lmdz
    33      IMPLICIT NONE
    44

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

    r66 r1019  
    88
    99       USE IOIPSL
    10        USE parallel
     10       USE parallel_lmdz
    1111       USE misc_mod
    1212       USE mod_hallo

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

    r66 r1019  
    44c=======================================================================
    55      SUBROUTINE friction_p(ucov,vcov,pdt)
    6       USE parallel
     6      USE parallel_lmdz
    77      USE control_mod
    88#ifdef CPP_IOIPSL

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

    r1017 r1019  
    1010#endif
    1111
     12
     13#ifdef CPP_XIOS
     14    ! ug Pour les sorties XIOS
     15        USE wxios
     16#endif
     17
    1218      USE mod_const_mpi, ONLY: init_const_mpi
    13       USE parallel
     19      USE parallel_lmdz
    1420      USE infotrac
    1521      USE mod_interface_dyn_phys
    … …  
    2026      USE control_mod
    2127      use cpdet_mod, only: ini_cpdet
     28
     29
     30#ifdef INCA
     31! Only INCA needs these informations (from the Earth's physics)
     32      USE indice_sol_mod
     33#endif
    2234
    2335! Ehouarn: the following are needed with (parallel) physics:
    … …  
    207219
    208220!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
     221! Initialisation de XIOS
     222!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
     223
     224#ifdef CPP_XIOS
     225        CALL wxios_init("LMDZ")
     226#endif
     227
    209228c
    210229c Initialisations pour Cp(T) Venus

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

    r1 r1019  
    11      SUBROUTINE geopot_p ( ngrid, teta, pk, pks, phis, phi )
    2       USE parallel
     2      USE parallel_lmdz
    33      IMPLICIT NONE
    44     

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

    r1 r1019  
    1818CONTAINS
    1919  SUBROUTINE ini_getparam(fichier)
    20   USE parallel
     20  USE parallel_lmdz
    2121    !
    2222    IMPLICIT NONE
    … …  
    2828
    2929  SUBROUTINE fin_getparam
    30   USE parallel
     30  USE parallel_lmdz
    3131    !
    3232    IMPLICIT NONE
    … …  
    3737
    3838  SUBROUTINE getparamr(TARGET,def_val,ret_val,comment)
    39   USE parallel
     39  USE parallel_lmdz
    4040    !
    4141    IMPLICIT NONE
    … …  
    6363
    6464  SUBROUTINE getparami(TARGET,def_val,ret_val,comment)
    65   USE parallel
     65  USE parallel_lmdz
    6666    !
    6767    IMPLICIT NONE
    … …  
    9090
    9191  SUBROUTINE getparaml(TARGET,def_val,ret_val,comment)
    92   USE parallel
     92  USE parallel_lmdz
    9393    !
    9494    IMPLICIT NONE

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

    r776 r1019  
    77      USE mod_interface_dyn_phys
    88      USE dimphy
    9       USE PARALLEL
     9      USE parallel_lmdz
    1010      IMPLICIT NONE
    1111c=======================================================================

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

    r776 r1019  
    77      USE mod_interface_dyn_phys
    88      USE dimphy
    9       use parallel
     9      use parallel_lmdz
    1010      IMPLICIT NONE
    1111c=======================================================================

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

    r1 r1019  
    2525c
    2626c=======================================================================
    27       USE parallel
     27      USE parallel_lmdz
    2828      IMPLICIT NONE
    2929c-----------------------------------------------------------------------

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

    r1 r1019  
    2525c
    2626c=======================================================================
    27       USE parallel
     27      USE parallel_lmdz
    2828      IMPLICIT NONE
    2929c-----------------------------------------------------------------------

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

    r1 r1019  
    1010c       pgx  et  pgy    sont des arguments de sortie pour le s-prog
    1111c
    12       USE parallel
     12      USE parallel_lmdz
    1313      IMPLICIT NONE
    1414c

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

    r1 r1019  
    1313c
    1414c
    15       USE parallel
     15      USE parallel_lmdz
    1616      USE times
    1717      USE Write_field_p

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

    r1 r1019  
    1414c
    1515c     
    16       USE parallel
     16      USE parallel_lmdz
    1717      USE times
    1818      IMPLICIT NONE

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

    r841 r1019  
    11      subroutine groupe_p(pext,pbaru,pbarv,pbarum,pbarvm,wm)
    2       USE parallel
     2      USE parallel_lmdz
    33      implicit none
    44

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

    r1 r1019  
    11      SUBROUTINE groupeun_p(jjmax,llmax,jjb,jje,q)
    2       USE parallel
     2      USE parallel_lmdz
    33      USE Write_Field_p
    44      IMPLICIT NONE
    … …  
    135135      SUBROUTINE INIT_GROUPEUN_P(airen_tab, aires_tab)
    136136
    137       USE parallel
     137      USE parallel_lmdz
    138138      IMPLICIT NONE
    139139

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

    r979 r1019  
    292292!=======================================================================
    293293  SUBROUTINE guide_main(itau,ucov,vcov,teta,q,masse,ps)
    294     use parallel
     294    use parallel_lmdz
    295295    USE control_mod
    296296   
    … …  
    653653!=======================================================================
    654654  SUBROUTINE guide_interp(psi,teta)
    655   USE parallel
     655  USE parallel_lmdz
    656656  USE mod_hallo
    657657  USE Bands
    … …  
    16361636!=======================================================================
    16371637  SUBROUTINE guide_out(varname,hsize,vsize,field,factt)
    1638     USE parallel
     1638    USE parallel_lmdz
    16391639    IMPLICIT NONE
    16401640

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

    r1 r1019  
    426426         radclatm = 0.5* rad * coslatm
    427427c
     428         ai14            = un4rad2 * coslatp * yprp
     429         ai23            = un4rad2 * coslatm * yprm
    428430         DO 32 i = 1,iim
    429431         xprp            = xprimp025( i )
    430432         xprm            = xprimm025( i )
    431433     
    432          ai14            = un4rad2 * coslatp * yprp
    433          ai23            = un4rad2 * coslatm * yprm
    434434         aireij1 ( i,j ) = ai14 * xprp
    435435         aireij2 ( i,j ) = ai23 * xprp

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

    r1 r1019  
    88       USE IOIPSL
    99#endif
    10        use parallel
     10       use parallel_lmdz
    1111       use Write_field
    1212       use misc_mod

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

    r7 r1019  
    1010       USE IOIPSL
    1111#endif
    12        use parallel
     12       use parallel_lmdz
    1313       use Write_field
    1414       use misc_mod

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

    r1 r1019  
    99       USE IOIPSL
    1010#endif
    11        use parallel
     11       use parallel_lmdz
    1212       use Write_field
    1313       use misc_mod

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

    r907 r1019  
    55     $  (  nq,vcovm1,ucovm1,tetam1,psm1,massem1,
    66     $     dv,du,dteta,dq,dp,vcov,ucov,teta,q,ps0,masse,phis) !,finvmaold)
    7       USE parallel
     7      USE parallel_lmdz
    88      USE control_mod, only : planet_type
    99      IMPLICIT NONE

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

    r1 r1019  
    1111c      divgra     est  un argument  de sortie pour le s-prog
    1212c
    13       USE parallel
     13      USE parallel_lmdz
    1414      IMPLICIT NONE
    1515c

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

    r1 r1019  
    99c      divgra     est  un argument  de sortie pour le s-prog
    1010c
    11       USE parallel
     11      USE parallel_lmdz
    1212      IMPLICIT NONE
    1313c

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

    r1 r1019  
    1010c      rotout           est  un argument  de sortie pour le s-prog
    1111c
    12       USE parallel
     12      USE parallel_lmdz
    1313      IMPLICIT NONE
    1414c

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

    r1 r1019  
    99c      divgra     est  un argument  de sortie pour le s-prog
    1010c
    11       USE parallel
     11      USE parallel_lmdz
    1212      IMPLICIT NONE
    1313c

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

    r1018 r1019  
    99
    1010       USE misc_mod
    11        USE parallel
     11       USE parallel_lmdz
    1212       USE times
    1313       USE mod_hallo
    … …  
    2424       use sponge_mod_p, only: callsponge,mode_sponge,sponge_p
    2525
     26#ifdef CPP_XIOS
     27    ! ug Pour les sorties XIOS
     28        USE wxios
     29#endif
    2630      IMPLICIT NONE
    2731
    … …  
    10971101!   Academic case : Simple friction and Newtonan relaxation
    10981102!   -------------------------------------------------------
     1103c$OMP MASTER
     1104         if (FirstPhysic) then
     1105           ok_start_timer=.TRUE.
     1106           FirstPhysic=.false.
     1107         endif
     1108c$OMP END MASTER
     1109
    10991110       ijb=ij_begin
    11001111       ije=ij_end
    … …  
    15171528
    15181529c$OMP MASTER
     1530
     1531#ifdef CPP_XIOS
     1532    !Fermeture propre de XIOS
     1533      CALL wxios_close()
     1534#endif
    15191535              call fin_getparam
    15201536              call finalize_parallel

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

    r1 r1019  
    1313c     
    1414c
    15       USE parallel
     15      USE parallel_lmdz
    1616      IMPLICIT NONE
    1717c

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

    r1 r1019  
    11      SUBROUTINE massbarxy_p(  masse, massebxy )
    2       USE parallel
     2      USE parallel_lmdz
    33      implicit none
    44c **********************************************************************

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

    r1 r1019  
    11      SUBROUTINE massdair_p( p, masse )
    2       USE parallel
     2      USE parallel_lmdz
    33c
    44c *********************************************************************

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

    r1 r1019  
    11module mod_Hallo
    2 USE parallel
     2USE parallel_lmdz
    33implicit none
    44  logical,save :: use_mpi_alloc

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

    r1 r1019  
    99c       x  et y    sont des arguments de sortie pour le s-prog
    1010c
    11       USE parallel
     11      USE parallel_lmdz
    1212      IMPLICIT NONE
    1313c

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

    r1 r1019  
    99c       x  et y    sont des arguments de sortie pour le s-prog
    1010c
    11       USE parallel
     11      USE parallel_lmdz
    1212      IMPLICIT NONE
    1313c

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

    r1 r1019  
    1313c
    1414      USE write_Field_p
    15       USE parallel
     15      USE parallel_lmdz
    1616      USE times
    1717      USE mod_hallo

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

    r1 r1019  
    1313c
    1414c
    15       USE parallel
     15      USE parallel_lmdz
    1616      USE times
    1717      USE write_field_p

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

    r1016 r1019  
    22! $Id: parallel.F90 1575 2011-09-21 13:57:48Z jghattas $
    33!
    4   module parallel
     4  module parallel_lmdz
    55  USE mod_const_mpi
    66   
    … …  
    587587!      NewField(ij_be       
    588588
    589   end module parallel
     589  end module parallel_lmdz

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

    r1 r1019  
    11      SUBROUTINE pression_p( ngrid, ap, bp, ps, p )
    2       USE parallel
     2      USE parallel_lmdz
    33c
    44

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

    r1 r1019  
    11      SUBROUTINE qminimum_p( q,nq,deltap )
    2       USE parallel
     2      USE parallel_lmdz
    33      IMPLICIT none
    44c

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

    r1 r1019  
    1010c        rot          est  un argument  de sortie pour le s-prog
    1111c
    12       USE parallel
     12      USE parallel_lmdz
    1313      IMPLICIT NONE
    1414c

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

    r1 r1019  
    1010c        rot          est  un argument  de sortie pour le s-prog
    1111c
    12       USE parallel
     12      USE parallel_lmdz
    1313      IMPLICIT NONE
    1414c

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

    r1 r1019  
    1010c        rot          est  un argument  de sortie pour le s-prog
    1111c
    12       USE parallel
     12      USE parallel_lmdz
    1313      IMPLICIT NONE
    1414c

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

    r1017 r1019  
    3131
    3232      USE Write_Field_p
    33       use parallel, only: pole_sud,pole_nord,jj_begin,jj_end
     33      use parallel_lmdz, only: pole_sud,pole_nord,jj_begin,jj_end
    3434      implicit none
    3535#include "dimensions.h"

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

    r1 r1019  
    2525 
    2626  subroutine init_timer
    27     use parallel
     27    use parallel_lmdz
    2828    implicit none
    2929#include "dimensions.h"
    … …  
    101101
    102102  subroutine stop_timer(no_timer)
    103     use parallel
     103    use parallel_lmdz
    104104    implicit none
    105105    integer :: no_timer
    … …  
    136136   
    137137  subroutine allgather_timer
    138     use parallel
     138    use parallel_lmdz
    139139    implicit none
    140140#ifdef CPP_MPI   
    … …  
    171171 
    172172  subroutine allgather_timer_average
    173     use parallel
     173    use parallel_lmdz
    174174    implicit none
    175175#ifdef CPP_MPI

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

    r1012 r1019  
    33!
    44      SUBROUTINE top_bound_p(vcov,ucov,teta,masse,dt,ducov)
    5       USE parallel
     5      USE parallel_lmdz
    66      IMPLICIT NONE
    77c

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

    r1 r1019  
    11      SUBROUTINE tourpot_p ( vcov, ucov, massebxy, vorpot )
    2       USE parallel
     2      USE parallel_lmdz
    33      IMPLICIT NONE
    44

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

    r1 r1019  
    11      SUBROUTINE vitvert_p ( convm , w )
    22c
    3       USE parallel
     3      USE parallel_lmdz
    44      IMPLICIT NONE
    55

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

    r109 r1019  
    1414c
    1515c   --------------------------------------------------------------------
    16       USE parallel
     16      USE parallel_lmdz
    1717      USE mod_hallo
    1818      USE Vampir
    … …  
    199199c
    200200c   --------------------------------------------------------------------
    201       USE Parallel
     201      USE Parallel_lmdz
    202202      IMPLICIT NONE
    203203c
    … …  
    534534c
    535535c   --------------------------------------------------------------------
    536       USE parallel
     536      USE parallel_lmdz
    537537      IMPLICIT NONE
    538538c
    … …  
    923923c
    924924c   --------------------------------------------------------------------
    925       USE Parallel
     925      USE Parallel_lmdz
    926926      IMPLICIT NONE
    927927c

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

    r1 r1019  
    2222c     pk exner au milieu des couches necessaire pour calculer Qsat
    2323c   --------------------------------------------------------------------
    24       USE parallel
     24      USE parallel_lmdz
    2525      USE mod_hallo
    2626      USE Write_Field_p

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

    r1017 r1019  
    2222c     pk exner au milieu des couches necessaire pour calculer Qsat
    2323c   --------------------------------------------------------------------
    24       USE parallel
     24      USE parallel_lmdz
    2525      USE mod_hallo
    2626      USE VAMPIR
    … …  
    240240c
    241241c   --------------------------------------------------------------------
    242       USE parallel
     242      USE parallel_lmdz
    243243      IMPLICIT NONE
    244244c
    … …  
    592592c
    593593c   --------------------------------------------------------------------
    594       USE parallel
     594      USE parallel_lmdz
    595595      IMPLICIT NONE
    596596c

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

    r1 r1019  
    99 
    1010  subroutine write_field1D_p(name,Field)
    11     USE parallel
     11    USE parallel_lmdz
    1212    USE write_field
    1313    implicit none
    … …  
    3030
    3131  subroutine write_field2D_p(name,Field)
    32     USE parallel
     32    USE parallel_lmdz
    3333    USE write_field
    3434    implicit none
    … …  
    5151 
    5252  subroutine write_field3D_p(name,Field)
    53     USE parallel
     53    USE parallel_lmdz
    5454    USE write_field
    5555    implicit none

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

    r1 r1019  
    99      USE ioipsl
    1010#endif
    11       USE parallel
     11      USE parallel_lmdz
    1212      USE misc_mod
    1313      USE infotrac

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

    r1 r1019  
    99      USE ioipsl
    1010#endif
    11       USE parallel
     11      USE parallel_lmdz
    1212      USE misc_mod
    1313      USE infotrac

  • trunk/LMDZ.COMMON/libf/filtrez/filtreg_mod.F90

    r979 r1019  
    1010
    1111  SUBROUTINE inifilr
     12#ifdef CPP_PARA
    1213  USE mod_filtre_fft, ONLY : use_filtre_fft,Init_filtre_fft
    1314  USE mod_filtre_fft_loc, ONLY : Init_filtre_fft_loc=>Init_filtre_fft    !
     15#endif
    1416    !    ... H. Upadhyaya, O.Sharma   ...
    1517    !
    … …  
    538540    ENDDO ! of DO j = jfiltsu, jjm
    539541
     542#ifdef CPP_PARA
    540543    IF (use_filtre_fft) THEN
    541544       CALL Init_filtre_fft(coefilu,modfrstu,jfiltnu,jfiltsu,  &
    … …  
    544547                           coefilv,modfrstv,jfiltnv,jfiltsv)
    545548    ENDIF
    546 
     549#endif
    547550    !   ...................................................................
    548551

  • trunk/LMDZ.COMMON/libf/filtrez/mod_filtre_fft.F90

    r1 r1019  
    118118    USE mod_fft
    119119#ifdef CPP_PARA
    120     USE parallel,ONLY : OMP_CHUNK
     120    USE parallel_lmdz,ONLY : OMP_CHUNK
    121121#endif
    122122    IMPLICIT NONE
    … …  
    179179    USE mod_fft
    180180#ifdef CPP_PARA
    181     USE parallel,ONLY : OMP_CHUNK
     181    USE parallel_lmdz,ONLY : OMP_CHUNK
    182182#endif
    183183    IMPLICIT NONE
    … …  
    241241    USE mod_fft
    242242#ifdef CPP_PARA
    243     USE parallel,ONLY : OMP_CHUNK
     243    USE parallel_lmdz,ONLY : OMP_CHUNK
    244244#endif
    245245    IMPLICIT NONE

  • trunk/LMDZ.COMMON/libf/filtrez/mod_filtre_fft_loc.F90

    r979 r1019  
    107107    USE mod_fft
    108108#ifdef CPP_PARA
    109     USE parallel,ONLY : OMP_CHUNK
     109    USE parallel_lmdz,ONLY : OMP_CHUNK
    110110#endif
    111111    IMPLICIT NONE
    … …  
    187187    USE mod_fft
    188188#ifdef CPP_PARA
    189     USE parallel,ONLY : OMP_CHUNK
     189    USE parallel_lmdz,ONLY : OMP_CHUNK
    190190#endif
    191191    IMPLICIT NONE
    … …  
    250250    USE mod_fft
    251251#ifdef CPP_PARA
    252     USE parallel,ONLY : OMP_CHUNK
     252    USE parallel_lmdz,ONLY : OMP_CHUNK
    253253#endif
    254254    IMPLICIT NONE

  • trunk/LMDZ.COMMON/makelmdz

    r979 r1019  
    118118[-prod / -dev / -debug]    : compilation mode production (default) / developement / debug .
    119119[-c false/MPI1/MPI2]       : (Earth) coupling with ocean model : MPI1/MPI2/false (default: false)
    120 [-v false/true]            : (Earth) with or without vegetation (default: false)
     120[-v false/orchidee2.0/orchidee1.9/true] : version of the vegetation model to include (default: false)
     121          false       : no vegetation model
     122          orchidee2.0 : compile using ORCHIDEE 2.0 (or more recent version)
     123          orchidee1.9 : compile using ORCHIDEE up to the version including OpenMP in ORCHIDEE : tag 1.9-1.9.5(version AR5)-1.9.6
     124          true        : (obsolete; for backward compatibility) use ORCHIDEE tag 1.9-1.9.6
     125
    121126[-chimie INCA/false]       : (Earth) with INCA chemistry model or without (default: false)
    122127[-cosp cosp/false]         : (Earth) add the cosp model (default: false)
    … …  
    292297LIB="$LIB  ${archfileopt}"
    293298
     299#NB some -I... might be located in the %FPP_FLAGS section of the arch file
     300archfileline=$( grep -i '^%FPP_FLAGS' arch.fcm )
     301archfileopt=$( echo "-I"${archfileline##*-I} ) ## to be improved...
     302INCLUDE="$INCLUDE ${archfileopt}"
     303
    294304if [[ "$physique" != "nophys" ]]
    295305then
    … …  
    338348  FLAG_PARA=''
    339349else
    340   FLAG_PARA="par"
     350  FLAG_PARA="$paramem"
    341351fi
    342352
    … …  
    383393fi
    384394
    385 if [[ "$veget" == "true" ]]
    386 then
     395if [ "$veget" = "true" -o "$veget" = "orchidee1.9" -o "$veget" = "orchidee2.0" ]
     396then
     397
     398   INCLUDE="${INCLUDE} -I${ORCH_INCDIR}"
    387399   CPP_KEY="$CPP_KEY CPP_VEGET"
    388    INCLUDE="${INCLUDE} -I${ORCH_INCDIR}"
    389    LIB="${LIB} -L${ORCH_LIBDIR} -l${LIBPREFIX}sechiba -l${LIBPREFIX}parameters -l${LIBPREFIX}stomate -l${LIBPREFIX}parallel -l${LIBPREFIX}orglob"
     400# temporary, for Orchidee versions 1.9.* (before openmp activation)
     401   if [[ "$veget" == "orchidee1.9" ]] ; then
     402      CPP_KEY="$CPP_KEY ORCHIDEE_NOOPENMP"
     403   fi
     404   if [[ "$veget" == "orchidee2.0" ]] ; then
     405      orch_libs="sechiba parameters stomate parallel orglob orchidee"
     406   else
     407      orch_libs="sechiba parameters stomate parallel orglob"
     408   fi
     409   LIB="${LIB} -L${ORCH_LIBDIR}"
     410   for lib in ${orch_libs} ; do
     411      if [ -f ${ORCH_LIBDIR}/lib${LIBPREFIX}$lib.a ] ; then
     412         LIB="${LIB} -l${LIBPREFIX}$lib "
     413      fi
     414   done
     415elif [[ "$veget" != "false" ]] ; then
     416   echo "Option -v $veget does not exist"
     417   echo "Use ./makelmdz -h for more information"
     418   exit
    390419fi
    391420
    … …  
    406435   INCLUDE="$INCLUDE"' -I$(LIBF)/cosp'
    407436fi
     437
    408438
    409439INCLUDE="$INCLUDE ${NETCDF_INCDIR}"
    … …  
    535565fi
    536566
    537 if [[ $veget == "true" ]]
     567if [[ $veget != "false" ]]
    538568then
    539569  SUFF_NAME=${SUFF_NAME}_orch
    … …  
    645675
    646676# library directory name:
    647 if [[ "$parallel" == "none" ]]
    648 then
    649   nomlib=${arch}_${physique}_${dim_full}_${grille}_${compil_mod}
    650 else
    651   nomlib=${arch}_${physique}_${dim_full}_${grille}_${compil_mod}_${FLAG_PARA}
    652 fi
     677nomlib=`echo ${arch}_${physique}_${dim_full}_${grille}_${compil_mod}_parall${parallel}_${CPP_KEY}_${FLAG_PARA} | sed -e 's/ //g' -e 's/-//g ' | sed -e 's/CPP_//g'`
     678echo $nomlib
    653679
    654680if [[ ! -d "${LIBOGCM}/${nomlib}" ]]

  • trunk/LMDZ.COMMON/makelmdz_fcm

    r979 r1019  
    3232bands=""
    3333scatterers=""
     34job=1
     35full=''
    3436
    3537LMDGCM=`/bin/pwd`
    … …  
    4042CHEM_PATH=$LMDGCM/.void_dir
    4143# Path to fcm utility:
    42 fcm_path=$LMDGCM/tools/fcm/bin
     44##fcm_path=$LMDGCM/tools/fcm/bin
     45fcm_path=$(dirname $(which fcm))
    4346
    4447########################################################################
    … …  
    7275[-prod / -dev / -debug]    : compilation mode production (default) / developement / debug .
    7376[-c false/MPI1/MPI2]       : (Earth) coupling with ocean model : MPI1/MPI2/false (default: false)
    74 [-v false/true]            : (Earth) with or without vegetation (default: false)
     77[-v false/orchidee2.0/orchidee1.9/true] : version of the vegetation model to include (default: false)
     78          false       : no vegetation model
     79          orchidee2.0 : compile using ORCHIDEE 2.0 (or more recent version)
     80          orchidee1.9 : compile using ORCHIDEE up to the version including OpenMP in ORCHIDEE : tag 1.9-1.9.5(version AR5)-1.9.6
     81          true        : (obsolete; for backward compatibility) use ORCHIDEE tag 1.9-1.9.6
    7582[-chimie INCA/false]       : (Earth) with INCA chemistry model or without (default: false)
    7683[-cosp cosp/false]         : (Earth) add the cosp model (default: false)
    … …  
    8491[-filtre NOMFILTRE]        : use filtre from libf/NOMFILTRE (default: filtrez)
    8592[-link LINKS]              : additional links with other libraries
     93[-j n]                     : active parallel compiling on ntask
     94[-full]                    : full recompiling
    8695[-fcm_path path]           : path to the fcm tool (default: tools/fcm/bin)
    8796[-ext_src path]            : path to an additional set of routines to compile with the model
    … …  
    158167      "-ext_src")
    159168          EXT_SRC=$2 ; shift ; shift ;;
     169
     170      "-j")
     171          job=$2 ; shift ; shift ;;
     172
     173      "-full")
     174          full="-full" ; shift ;;
    160175
    161176      "-arch")
    … …  
    259274fi
    260275
    261 if [[ "$veget" == "true" ]]
    262 then
     276if [ "$veget" = "true" -o "$veget" = "orchidee1.9" -o "$veget" = "orchidee2.0" ]
     277then
     278#NB: option 'true': for backward compatibility. To be used with ORCHIDEE tag 1.9-1.9.6
     279#    For this case, cpp flag ORCHIDEE_NOOPENMP must be added to the makelmdz_fcm arguments
     280#    option orchidee1.9 : Compile with ORCHIDEE version up to the inclusion of OpenMP in ORCHIDEE : tag 1.9-1.9.5(version AR5)-1.9.6
     281   INCLUDE="${INCLUDE} -I${ORCH_INCDIR}"
    263282   CPP_KEY="$CPP_KEY CPP_VEGET"
    264    INCLUDE="${INCLUDE} -I${ORCH_INCDIR}"
    265    LIB="${LIB} -L${ORCH_LIBDIR} -l${LIBPREFIX}sechiba -l${LIBPREFIX}parameters -l${LIBPREFIX}stomate -l${LIBPREFIX}parallel -l${LIBPREFIX}orglob"
     283# temporary, for Orchidee versions 1.9.* (before openmp activation)
     284   if [[ "$veget" == "orchidee1.9" ]] ; then
     285      CPP_KEY="$CPP_KEY ORCHIDEE_NOOPENMP"
     286   fi
     287   if [[ "$veget" == "orchidee2.0" ]] ; then
     288      orch_libs=orchidee
     289   else
     290      orch_libs="sechiba parameters stomate parallel orglob"
     291   fi
     292   LIB="${LIB} -L${ORCH_LIBDIR}"
     293   for lib in ${orch_libs} ; do
     294      if [ -f ${ORCH_LIBDIR}/lib${LIBPREFIX}$lib.a ] ; then
     295         LIB="${LIB} -l${LIBPREFIX}$lib "
     296      fi
     297   done
     298elif [[ "$veget" != "false" ]] ; then
     299   echo "Option -v $veget does not exist"
     300   echo "Use ./makelmdz_fcm -h for more information"
     301   exit
    266302fi
    267303
    … …  
    444480fi
    445481
    446 if [[ $veget == "true" ]]
     482if [[ $veget != "false" ]]
    447483then
    448484  SUFF_NAME=${SUFF_NAME}_orch
    … …  
    497533
    498534rm -f $LIBOGCM/${arch}${SUFF_NAME}/.config/fcm.bld.lock
    499 ./build_gcm
     535./build_gcm ${fcm_path} -j $job $full
    500536
    501537rm -rf tmp_src
Note: See TracChangeset for help on using the changeset viewer.