Ignore:
Timestamp:
Jun 29, 2018, 12:31:11 PM (6 years ago)
Author:
Laurent Fairhead
Message:

First attempt at merging with trunk

Location:
LMDZ6/branches/DYNAMICO-conv
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • LMDZ6/branches/DYNAMICO-conv

  • LMDZ6/branches/DYNAMICO-conv/libf/phylmd/phys_output_mod.F90

    r3003 r3356  
    3535    USE iophy
    3636    USE dimphy
    37     USE infotrac_phy, ONLY: nqtot, nqo, niadv, tname, ttext
     37    USE infotrac_phy, ONLY: nqtot, nqo, niadv, tname, ttext, type_trac
    3838    USE ioipsl
    3939    USE phys_cal_mod, only : hour, calend
     
    4646    USE vertical_layers_mod, ONLY: ap,bp,preff,presnivs, aps, bps, pseudoalt
    4747    USE time_phylmdz_mod, ONLY: day_ini, itau_phy, start_time, annee_ref, day_ref
     48#ifdef REPROBUS
     49    USE chem_rep, ONLY: nbnas, tnamenas, ttextnas
     50#endif
    4851#ifdef CPP_XIOS
    4952    ! ug Pour les sorties XIOS
     
    137140    REAL :: ini_heure
    138141#endif
     142    INTEGER                         :: ISW
     143    REAL, DIMENSION(NSW)            :: wl1_sun, wl2_sun !wavelength bounds (in um) for SW
     144    REAL, DIMENSION(NSW)            :: wn1_sun, wn2_sun !wavenumber bounds (in m-1) for SW
     145    REAL, DIMENSION(NSW)            :: spectband  !mean wavenumb. of each sp.band
     146    REAL, DIMENSION(NSW,2)          :: spbnds_sun !bounds of spectband
    139147
    140148    WRITE(lunout,*) 'Debut phys_output_mod.F90'
     
    151159    IF (.NOT. ALLOCATED(o_trac)) ALLOCATE(o_trac(nqtot))
    152160    IF (.NOT. ALLOCATED(o_trac_cum)) ALLOCATE(o_trac_cum(nqtot))
     161#ifdef REPROBUS
     162    IF (.NOT. ALLOCATED(o_nas)) ALLOCATE(o_nas(nbnas))
     163#endif
    153164    ALLOCATE(o_dtr_the(nqtot),o_dtr_con(nqtot),o_dtr_lessi_impa(nqtot))
    154165    ALLOCATE(o_dtr_lessi_nucl(nqtot),o_dtr_insc(nqtot),o_dtr_bcscav(nqtot))
     
    354365     CALL wxios_add_vaxis("Alt", &
    355366            levmax(iff) - levmin(iff) + 1, pseudoalt)
     367
     368    IF (NSW.EQ.6) THEN
     369!
     370!wl1_sun: minimum bound of wavelength (in um)
     371!
     372      wl1_sun(1)=0.180
     373      wl1_sun(2)=0.250
     374      wl1_sun(3)=0.440
     375      wl1_sun(4)=0.690
     376      wl1_sun(5)=1.190
     377      wl1_sun(6)=2.380
     378!
     379!wl2_sun: maximum bound of wavelength (in um)
     380!
     381      wl2_sun(1)=0.250
     382      wl2_sun(2)=0.440
     383      wl2_sun(3)=0.690
     384      wl2_sun(4)=1.190
     385      wl2_sun(5)=2.380
     386      wl2_sun(6)=4.000
     387!
     388    ELSE IF(NSW.EQ.2) THEN
     389!
     390!wl1_sun: minimum bound of wavelength (in um)
     391!
     392      wl1_sun(1)=0.250
     393      wl1_sun(2)=0.690
     394!
     395!wl2_sun: maximum bound of wavelength (in um)
     396!
     397      wl2_sun(1)=0.690
     398      wl2_sun(2)=4.000
     399    ENDIF
     400
     401    DO ISW=1, NSW
     402     wn1_sun(ISW)=1.e+6/wl1_sun(ISW)
     403     wn2_sun(ISW)=1.e+6/wl2_sun(ISW)
     404     spbnds_sun(ISW,1)=wn2_sun(ISW)
     405     spbnds_sun(ISW,2)=wn1_sun(ISW)
     406     spectband(ISW)=(wn1_sun(ISW)+wn2_sun(ISW))/2
     407    ENDDO
     408!
     409!!! ajout axe vertical spectband : solar band number
     410    CALL wxios_add_vaxis("spectband", NSW, spectband, positif='down')
    356411   ELSE
    357412    ! NMC files
     
    523578            ENDDO
    524579      ENDIF
     580      IF (type_trac=='repr') THEN
     581#ifdef REPROBUS
     582         DO iiq=1,nbnas
     583            o_nas(iiq) = ctrl_out((/ 4, 5, 5, 5, 10, 10, 11, 11, 11, 11 /), &
     584                 tnamenas(iiq),ttextnas(iiq), "-", &
     585                 (/ '', '', '', '', '', '', '', '', '', '' /))
     586         ENDDO
     587#endif
     588      ENDIF
    525589
    526590   ENDDO !  iff
     
    536600
    537601    IF (prt_level >= 10) THEN
     602      WRITE(lunout,*)'swaerofree_diag=',swaerofree_diag
    538603      WRITE(lunout,*)'swaero_diag=',swaero_diag
    539604      WRITE(lunout,*)'dryaod_diag=',dryaod_diag
Note: See TracChangeset for help on using the changeset viewer.