Changeset 1563 for LMDZ5/trunk


Ignore:
Timestamp:
Aug 29, 2011, 3:32:52 PM (13 years ago)
Author:
jghattas
Message:
  • Added reading of paramter type_trac from *.def file : type_trac=lmdz(default), inca or repr(soon). While running with INCA, 2 parameters are now necessare in .def : type_trac=inca and config_inca=aero/chem. If type_trac=lmdz or repr, config_inca will not be used.
  • Removed print of ecrit_mth, ecrit_day etc in physiq.F. Removed the variable ecrit_hf2mth which is no longer used.
Location:
LMDZ5/trunk/libf
Files:
13 edited

Legend:

Unmodified
Added
Removed
  • LMDZ5/trunk/libf/dyn3d/ce0l.F90

    r1511 r1563  
    6767#endif
    6868
    69   IF (config_inca /= 'none') THEN
     69  IF (type_trac == 'inca') THEN
    7070#ifdef INCA
    7171    CALL init_const_lmdz(nbtr,anneeref,dayref,iphysiq,day_step,nday)
  • LMDZ5/trunk/libf/dyn3d/conf_gcm.F

    r1502 r1563  
    1313      use ioipsl_getincom
    1414#endif
     15      USE infotrac, ONLY : type_trac
    1516      IMPLICIT NONE
    1617c-----------------------------------------------------------------------
     
    571572       offline = .FALSE.
    572573       CALL getin('offline',offline)
     574     
     575!Config  Key  = type_trac
     576!Config  Desc = Choix de couplage avec model de chimie INCA ou REPROBUS
     577!Config  Def  = lmdz
     578!Config  Help =
     579!Config         'lmdz' = pas de couplage, pur LMDZ
     580!Config         'inca' = model de chime INCA
     581!Config         'repr' = model de chime REPROBUS
     582      type_trac = 'lmdz'
     583      CALL getin('type_trac',type_trac)
    573584
    574585!Config  Key  = config_inca
     
    643654      write(lunout,*)' tauyy = ', tauyy
    644655      write(lunout,*)' offline = ', offline
     656      write(lunout,*)' type_trac = ', type_trac
    645657      write(lunout,*)' config_inca = ', config_inca
    646658      write(lunout,*)' ok_dynzon = ', ok_dynzon
     
    761773       offline = .FALSE.
    762774       CALL getin('offline',offline)
     775
     776!Config  Key  = type_trac
     777!Config  Desc = Choix de couplage avec model de chimie INCA ou REPROBUS
     778!Config  Def  = lmdz
     779!Config  Help =
     780!Config         'lmdz' = pas de couplage, pur LMDZ
     781!Config         'inca' = model de chime INCA
     782!Config         'repr' = model de chime REPROBUS
     783      type_trac = 'lmdz'
     784      CALL getin('type_trac',type_trac)
    763785
    764786!Config  Key  = config_inca
     
    886908      write(lunout,*)' tauy = ', tauy
    887909      write(lunout,*)' offline = ', offline
     910      write(lunout,*)' type_trac = ', type_trac
    888911      write(lunout,*)' config_inca = ', config_inca
    889912      write(lunout,*)' ok_dynzon = ', ok_dynzon
  • LMDZ5/trunk/libf/dyn3d/dynredem.F

    r1403 r1563  
    641641#endif
    642642
    643       IF (config_inca /= 'none') THEN
     643      IF (type_trac == 'inca') THEN
    644644! Ajout Anne pour lecture valeurs traceurs dans un fichier start_trac.nc
    645645         ierr_file = NF_OPEN ("start_trac.nc", NF_NOWRITE,nid_trac)
     
    654654      do iq=1,nqtot
    655655
    656          IF (config_inca == 'none') THEN
     656         IF (type_trac /= 'inca') THEN
    657657            ierr = NF_INQ_VARID(nid, tname(iq), nvarid)
    658658            IF (ierr .NE. NF_NOERR) THEN
     
    666666            ierr = NF_PUT_VAR_REAL (nid,nvarid,q(1,1,iq))
    667667#endif
    668         ELSE ! config_inca = 'chem' ou 'aero'
     668        ELSE ! type_trac = inca
    669669! lecture de la valeur du traceur dans start_trac.nc
    670670           IF (ierr_file .ne. 2) THEN
     
    730730#endif
    731731          ENDIF ! (ierr_file .ne. 2)
    732        END IF   ! config_inca
     732       END IF   !type_trac
    733733     
    734734      ENDDO
  • LMDZ5/trunk/libf/dyn3d/gcm.F

    r1529 r1563  
    212212c-----------------------------------------------------------------------
    213213
    214       IF (config_inca /= 'none') THEN
     214      IF (type_trac == 'inca') THEN
    215215#ifdef INCA
    216216      call init_const_lmdz(nbtr,anneeref,dayref,iphysiq,day_step,nday,
     
    263263      endif ! of if (read_start)
    264264
    265       IF (config_inca /= 'none') THEN
     265      IF (type_trac == 'inca') THEN
    266266#ifdef INCA
    267267         call init_inca_dim(klon,llm,iim,jjm,
  • LMDZ5/trunk/libf/dyn3d/infotrac.F90

    r1454 r1563  
    3232  SUBROUTINE infotrac_init
    3333    USE control_mod
     34
    3435    IMPLICIT NONE
    3536!=======================================================================
     
    8586   
    8687
    87     IF (config_inca=='none') THEN
    88        type_trac='lmdz'
     88    ! Coherence test between parameter type_trac and config_inca
     89    IF (type_trac=='inca') THEN
     90       WRITE(lunout,*) 'You have choosen to couple with INCA chemestry model : type_trac=', &
     91            type_trac,' config_inca=',config_inca
     92       IF (config_inca/='aero' .AND. config_inca/='chem') THEN
     93          WRITE(lunout,*) 'Incoherence between type_trac and config_inca. Model stops. Modify run.def'
     94          CALL abort_gcm('infotrac_init','Incoherence between type_trac and config_inca',1)
     95       END IF
     96    ELSE IF (type_trac == 'lmdz') THEN
     97       WRITE(lunout,*) 'Tracers are treated in LMDZ only : type_trac=', type_trac
    8998    ELSE
    90        type_trac='inca'
    91     END IF
     99       WRITE(lunout,*) 'type_trac=',type_trac,' not possible. Model stops'
     100       CALL abort_gcm('infotrac_init','bad parameter',1)
     101    END IF
     102
     103
     104    ! Test if config_inca is other then none for run without INCA
     105    IF (type_trac/='inca' .AND. config_inca/='none') THEN
     106       WRITE(lunout,*) 'config_inca will now be changed to none as you do not couple with INCA model'
     107       config_inca='none'
     108    END IF
     109
    92110
    93111!-----------------------------------------------------------------------
     
    119137         nbtr=nqtrue
    120138       endif
    121     ELSE
    122        ! nbtr has been read from INCA by init_cont_lmdz() in gcm.F
     139    ELSE ! type_trac=inca
     140       ! nbtr has been read from INCA by init_const_lmdz() in gcm.F
    123141       nqtrue=nbtr+2
    124142    END IF
     
    128146       CALL abort_gcm('infotrac_init','Not enough tracers',1)
    129147    END IF
     148   
     149       
    130150!
    131151! Allocate variables depending on nqtrue and nbtr
  • LMDZ5/trunk/libf/dyn3dpar/ce0l.F90

    r1531 r1563  
    7878#endif
    7979
    80   IF (config_inca /= 'none') THEN
     80  IF (type_trac == 'inca') THEN
    8181#ifdef INCA
    8282      CALL init_const_lmdz( &
  • LMDZ5/trunk/libf/dyn3dpar/conf_gcm.F

    r1502 r1563  
    1717      use parallel, ONLY : omp_chunk
    1818      USE control_mod
     19      USE infotrac, ONLY : type_trac
    1920      IMPLICIT NONE
    2021c-----------------------------------------------------------------------
     
    588589       END IF
    589590       
     591!Config  Key  = type_trac
     592!Config  Desc = Choix de couplage avec model de chimie INCA ou REPROBUS
     593!Config  Def  = lmdz
     594!Config  Help =
     595!Config         'lmdz' = pas de couplage, pur LMDZ
     596!Config         'inca' = model de chime INCA
     597!Config         'repr' = model de chime REPROBUS
     598      type_trac = 'lmdz'
     599      CALL getin('type_trac',type_trac)
     600
     601
    590602!Config  Key  = config_inca
    591603!Config  Desc = Choix de configuration de INCA
     
    659671      write(lunout,*)' tauyy = ', tauyy
    660672      write(lunout,*)' offline = ', offline
     673      write(lunout,*)' type_trac = ', type_trac
    661674      write(lunout,*)' config_inca = ', config_inca
    662675      write(lunout,*)' ok_dynzon = ', ok_dynzon
     
    785798     &         'only the file phystoke.nc will still be created '
    786799       END IF
     800
     801!Config  Key  = type_trac
     802!Config  Desc = Choix de couplage avec model de chimie INCA ou REPROBUS
     803!Config  Def  = lmdz
     804!Config  Help =
     805!Config         'lmdz' = pas de couplage, pur LMDZ
     806!Config         'inca' = model de chime INCA
     807!Config         'repr' = model de chime REPROBUS
     808      type_trac = 'lmdz'
     809      CALL getin('type_trac',type_trac)
    787810
    788811!Config  Key  = config_inca
     
    933956      write(lunout,*)' tauy = ', tauy
    934957      write(lunout,*)' offline = ', offline
     958      write(lunout,*)' type_trac = ', type_trac
    935959      write(lunout,*)' config_inca = ', config_inca
    936960      write(lunout,*)' ok_dynzon = ', ok_dynzon
  • LMDZ5/trunk/libf/dyn3dpar/dynredem.F

    r1403 r1563  
    641641#endif
    642642
    643       IF (config_inca /= 'none') THEN
     643      IF (type_trac == 'inca') THEN
    644644! Ajout Anne pour lecture valeurs traceurs dans un fichier start_trac.nc
    645645         ierr_file = NF_OPEN ("start_trac.nc", NF_NOWRITE,nid_trac)
     
    654654      do iq=1,nqtot
    655655
    656          IF (config_inca == 'none') THEN
     656         IF (type_trac /= 'inca') THEN
    657657            ierr = NF_INQ_VARID(nid, tname(iq), nvarid)
    658658            IF (ierr .NE. NF_NOERR) THEN
     
    666666            ierr = NF_PUT_VAR_REAL (nid,nvarid,q(1,1,iq))
    667667#endif
    668         ELSE ! config_inca = 'chem' ou 'aero'
     668        ELSE ! type_trac=inca
    669669! lecture de la valeur du traceur dans start_trac.nc
    670670           IF (ierr_file .ne. 2) THEN
     
    730730#endif
    731731          ENDIF ! (ierr_file .ne. 2)
    732        END IF   ! config_inca
     732       END IF   ! type_trac
    733733     
    734734      ENDDO
  • LMDZ5/trunk/libf/dyn3dpar/dynredem_p.F

    r1403 r1563  
    650650#endif
    651651
    652       IF (config_inca /= 'none') THEN
     652      IF (type_trac == 'inca') THEN
    653653! Ajout Anne pour lecture valeurs traceurs dans un fichier start_trac.nc
    654654         inquire(FILE="start_trac.nc", EXIST=exist_file)
     
    667667      do iq=1,nqtot
    668668
    669          IF (config_inca == 'none') THEN
     669         IF (type_trac /= 'inca') THEN
    670670            ierr = NF_INQ_VARID(nid, tname(iq), nvarid)
    671671            IF (ierr .NE. NF_NOERR) THEN
     
    678678            ierr = NF_PUT_VAR_REAL (nid,nvarid,q(1,1,iq))
    679679#endif
    680         ELSE ! config_inca = 'chem' ou 'aero'
     680        ELSE ! type_trac = inca
    681681! lecture de la valeur du traceur dans start_trac.nc
    682682           IF (ierr_file .ne. 2) THEN
     
    732732#endif
    733733          ENDIF ! (ierr_file .ne. 2)
    734        END IF   ! config_inca
     734       END IF   ! type_trac
    735735     
    736736      ENDDO
  • LMDZ5/trunk/libf/dyn3dpar/gcm.F

    r1520 r1563  
    240240#endif
    241241
    242       IF (config_inca /= 'none') THEN
     242      IF (type_trac == 'inca') THEN
    243243#ifdef INCA
    244244         call init_const_lmdz(
     
    459459c   Initialisation des dimensions d'INCA :
    460460c   --------------------------------------
    461       IF (config_inca /= 'none') THEN
     461      IF (type_trac == 'inca') THEN
    462462!$OMP PARALLEL
    463463#ifdef INCA
  • LMDZ5/trunk/libf/dyn3dpar/infotrac.F90

    r1454 r1563  
    3232  SUBROUTINE infotrac_init
    3333    USE control_mod
     34
    3435    IMPLICIT NONE
    3536!=======================================================================
     
    8586   
    8687
    87     IF (config_inca=='none') THEN
    88        type_trac='lmdz'
     88    ! Coherence test between parameter type_trac and config_inca
     89    IF (type_trac=='inca') THEN
     90       WRITE(lunout,*) 'You have choosen to couple with INCA chemestry model : type_trac=', &
     91            type_trac,' config_inca=',config_inca
     92       IF (config_inca/='aero' .AND. config_inca/='chem') THEN
     93          WRITE(lunout,*) 'Incoherence between type_trac and config_inca. Model stops. Modify run.def'
     94          CALL abort_gcm('infotrac_init','Incoherence between type_trac and config_inca',1)
     95       END IF
     96    ELSE IF (type_trac == 'lmdz') THEN
     97       WRITE(lunout,*) 'Tracers are treated in LMDZ only : type_trac=', type_trac
    8998    ELSE
    90        type_trac='inca'
    91     END IF
     99       WRITE(lunout,*) 'type_trac=',type_trac,' not possible. Model stops'
     100       CALL abort_gcm('infotrac_init','bad parameter',1)
     101    END IF
     102
     103
     104    ! Test if config_inca is other then none for run without INCA
     105    IF (type_trac/='inca' .AND. config_inca/='none') THEN
     106       WRITE(lunout,*) 'config_inca will now be changed to none as you do not couple with INCA model'
     107       config_inca='none'
     108    END IF
     109
    92110
    93111!-----------------------------------------------------------------------
     
    119137         nbtr=nqtrue
    120138       endif
    121     ELSE
    122        ! nbtr has been read from INCA by init_cont_lmdz() in gcm.F
     139    ELSE ! type_trac=inca
     140       ! nbtr has been read from INCA by init_const_lmdz() in gcm.F
    123141       nqtrue=nbtr+2
    124142    END IF
     
    128146       CALL abort_gcm('infotrac_init','Not enough tracers',1)
    129147    END IF
     148   
     149       
    130150!
    131151! Allocate variables depending on nqtrue and nbtr
  • LMDZ5/trunk/libf/phylmd/clesphys.h

    r1539 r1563  
    6666       LOGICAL ok_isccp, ok_regdyn
    6767       REAL lonmin_ins, lonmax_ins, latmin_ins, latmax_ins
    68        REAL ecrit_ins, ecrit_hf, ecrit_hf2mth, ecrit_day
     68       REAL ecrit_ins, ecrit_hf, ecrit_day
    6969       REAL ecrit_mth, ecrit_tra, ecrit_reg
    7070       REAL ecrit_LES
     
    9393     &     , ok_mensuelCOSP,ok_journeCOSP,ok_hfCOSP                     &
    9494     &     , lonmin_ins, lonmax_ins, latmin_ins, latmax_ins             &
    95      &     , ecrit_ins, ecrit_hf, ecrit_hf2mth, ecrit_day               &
     95     &     , ecrit_ins, ecrit_hf, ecrit_day               &
    9696     &     , ecrit_mth, ecrit_tra, ecrit_reg                            &
    9797     &     , freq_ISCCP, ecrit_ISCCP, freq_COSP, ip_ebil_phy            &
  • LMDZ5/trunk/libf/phylmd/physiq.F

    r1539 r1563  
    13551355         tau_overturning_th(:)=0.
    13561356
    1357          IF (config_inca /= 'none') THEN
     1357         IF (type_trac == 'inca') THEN
    13581358            ! jg : initialisation jusqu'au ces variables sont dans restart
    13591359            ccm(:,:,:) = 0.
     
    16191619#endif
    16201620
    1621          ecrit_hf2mth = ecrit_mth/ecrit_hf
    16221621
    16231622         ecrit_hf = ecrit_hf * un_jour
     
    16331632         ecrit_LES = ecrit_LES * un_jour
    16341633c
    1635          PRINT*,'physiq ecrit_ hf day mth reg tra ISCCP hf2mth',
    1636      .   ecrit_hf,ecrit_day,ecrit_mth,ecrit_reg,ecrit_tra,ecrit_ISCCP,
    1637      .   ecrit_hf2mth
    16381634
    16391635cXXXPB Positionner date0 pour initialisation de ORCHIDEE
     
    16521648cc         ENDDO
    16531649c
    1654       IF (config_inca /= 'none') THEN
     1650      IF (type_trac == 'inca') THEN
    16551651#ifdef INCA
    16561652         CALL VTe(VTphysiq)
     
    31503146      ENDDO
    31513147
    3152       IF (config_inca /= 'none') THEN
     3148      IF (type_trac == 'inca') THEN
    31533149#ifdef INCA
    31543150         CALL VTe(VTphysiq)
     
    32043200         CALL VTb(VTphysiq)
    32053201#endif
    3206       END IF !config_inca /= 'none'
     3202      END IF !type_trac = inca
    32073203c     
    32083204c Calculer les parametres optiques des nuages et quelques
     
    38603856#include "calcul_divers.h"
    38613857c
    3862       IF (config_inca /= 'none') THEN
     3858      IF (type_trac == 'inca') THEN
    38633859#ifdef INCA
    38643860         CALL VTe(VTphysiq)
Note: See TracChangeset for help on using the changeset viewer.