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/phylmd
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • 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.