Ignore:
Timestamp:
Dec 6, 2022, 12:01:16 AM (22 months ago)
Author:
lguez
Message:

Sync latest trunk changes to Ocean_skin

Location:
LMDZ6/branches/Ocean_skin
Files:
8 edited

Legend:

Unmodified
Added
Removed

  • LMDZ6/branches/Ocean_skin

  • LMDZ6/branches/Ocean_skin/libf/phylmd/rrtm/abor1.intfb.h

    r1990 r4368  
    11INTERFACE
    22SUBROUTINE ABOR1(CDTEXT)
    3 CHARACTER(LEN=*) :: CDTEXT
     3CHARACTER(LEN=*), INTENT(IN) :: CDTEXT
    44END SUBROUTINE ABOR1
    55END INTERFACE

  • LMDZ6/branches/Ocean_skin/libf/phylmd/rrtm/aeropt_6bands_rrtm.F90

    r3605 r4368  
    318318   ! Dust insoluble
    319319  0.894, 0.902, 0.937, 0.980, 0.993, 0.967, &
    320    ! BC insoluble
     320   ! BC insoluble
     321  0.480, 0.469, 0.456, 0.427, 0.349, 0.196, &
     322   ! POM insoluble
     323  0.956, 0.965, 0.969, 0.953, 0.892, 0.826, &
     324   ! Nitrate insoluble
     325  1.000, 1.000, 1.000, 1.000, 0.999, 0.707 /
     326
     327  DATA cg_aeri_6bands/ &
     328   ! Dust insoluble
     329  0.756, 0.737, 0.713, 0.701, 0.696, 0.672, &
     330   ! BC insoluble
    321331  0.820, 0.760, 0.695, 0.603, 0.469, 0.276, &
    322332   ! POM insoluble
    323333  0.687, 0.685, 0.673, 0.637, 0.553, 0.340, &
    324    ! Nitrate insoluble
    325   1.000, 1.000, 1.000, 1.000, 0.999, 0.707 /
    326 
    327   DATA cg_aeri_6bands/ &
    328    ! Dust insoluble
    329   0.756, 0.737, 0.713, 0.701, 0.696, 0.672, &
    330    ! BC insoluble
    331   0.480, 0.469, 0.456, 0.427, 0.349, 0.196, &
    332    ! POM insoluble
    333   0.956, 0.965, 0.969, 0.953, 0.892, 0.826, &
    334334   ! Nitrate insoluble
    335335  0.765, 0.754, 0.743, 0.737, 0.739, 0.651 /

  • LMDZ6/branches/Ocean_skin/libf/phylmd/rrtm/lwu.F90

    r3798 r4368  
    7676#ifdef REPROBUS
    7777USE chem_rep, ONLY: rch42d, rn2o2d, rcfc112d, rcfc122d, ok_rtime2d
    78 USE infotrac_phy, ONLY : type_trac
     78USE infotrac_phy, ONLY : types_trac
    7979#endif
    8080
    … …  
    321321      PABCU(JL,18,IC)=PABCU(JL,18,ICP1)+ ZUAER(JL,5)    *ZDUC(JL,IC)*ZDIFF
    322322#ifdef REPROBUS
    323         IF (type_trac=='repr'.and. ok_rtime2d) THEN
     323        IF (ANY(types_trac=='repr').and. ok_rtime2d) THEN
    324324!- CH4
    325325      PABCU(JL,19,IC)=PABCU(JL,19,ICP1)&

  • LMDZ6/branches/Ocean_skin/libf/phylmd/rrtm/readaerosol_optic_rrtm.F90

    r3798 r4368  
    2020       load_tmp8,load_tmp9,load_tmp10
    2121
    22   USE infotrac_phy
     22  USE infotrac_phy, ONLY: tracers, nqtot, nbtr
    2323  USE YOMCST
    2424
    … …  
    9191  integer :: id_ASBCM, id_ASPOMM, id_ASSO4M, id_ASMSAM, id_CSSO4M, id_CSMSAM, id_SSSSM
    9292  integer :: id_CSSSM, id_ASSSM, id_CIDUSTM, id_AIBCM, id_AIPOMM, id_ASNO3M, id_CSNO3M, id_CINO3M
    93   INTEGER :: k, i
     93  INTEGER :: k, i, iq, itr
    9494
    9595  !--air density
    … …  
    107107     !--convert to ug m-3 unit for consistency with offline fields
    108108     !
    109      DO i=1,nbtr
    110         SELECT CASE(trim(solsym(i)))
    111            CASE ("ASBCM")
    112               id_ASBCM = i
    113            CASE ("ASPOMM")
    114               id_ASPOMM = i
    115            CASE ("ASSO4M")
    116               id_ASSO4M = i
    117            CASE ("ASMSAM")
    118               id_ASMSAM = i
    119            CASE ("CSSO4M")
    120               id_CSSO4M = i
    121            CASE ("CSMSAM")
    122               id_CSMSAM = i
    123            CASE ("SSSSM")
    124               id_SSSSM = i
    125            CASE ("CSSSM")
    126               id_CSSSM = i
    127            CASE ("ASSSM")
    128               id_ASSSM = i
    129            CASE ("CIDUSTM")
    130               id_CIDUSTM = i
    131            CASE ("AIBCM")
    132               id_AIBCM = i
    133            CASE ("AIPOMM")
    134               id_AIPOMM = i
    135            CASE ("ASNO3M")
    136               id_ASNO3M = i
    137            CASE ("CSNO3M")
    138               id_CSNO3M = i
    139            CASE ("CINO3M")
    140               id_CINO3M = i
    141            END SELECT
    142      ENDDO
     109     itr = 0
     110     DO iq = 1,nqtot
     111        IF(.NOT. tracers(iq)%isInPhysics) CYCLE
     112        itr = itr+1
     113        SELECT CASE(trim(tracers(iq)%name))
     114           CASE ("ASBCM");  id_ASBCM  = itr
     115           CASE ("ASPOMM"); id_ASPOMM = itr
     116           CASE ("ASSO4M"); id_ASSO4M = itr
     117           CASE ("ASMSAM"); id_ASMSAM = itr
     118           CASE ("CSSO4M"); id_CSSO4M = itr
     119           CASE ("CSMSAM"); id_CSMSAM = itr
     120           CASE ("SSSSM");  id_SSSSM  = itr
     121           CASE ("CSSSM");  id_CSSSM  = itr
     122           CASE ("ASSSM");  id_ASSSM  = itr
     123           CASE ("CIDUSTM");id_CIDUSTM= itr
     124           CASE ("AIBCM");  id_AIBCM  = itr
     125           CASE ("AIPOMM"); id_AIPOMM = itr
     126           CASE ("ASNO3M"); id_ASNO3M = itr
     127           CASE ("CSNO3M"); id_CSNO3M = itr
     128           CASE ("CINO3M"); id_CINO3M = itr
     129        END SELECT
     130     END DO
    143131
    144132     bcsol(:,:)        =   tr_seri(:,:,id_ASBCM)                         *zrho(:,:)*1.e9  ! ASBCM

  • LMDZ6/branches/Ocean_skin/libf/phylmd/rrtm/rrtm_taumol2.F90

    r2871 r4368  
    2222 & FORREF   ,SELFREF , REFPARAM 
    2323USE YOERRTBG2, ONLY : CORR1  ,CORR2
     24
     25USE print_control_mod, ONLY: mydebug=>debug , lunout, prt_level, &
     26 & alert_first_call, call_alert, prt_alerte
    2427
    2528!  Input
    … …  
    6568!      EQUIVALENCE (TAUAERL(1,2),TAUAER)
    6669
     70    CHARACTER (LEN=20) :: modname='rrtm_taumol2'
     71    CHARACTER*80 message
     72
    6773!     Compute the optical depth by interpolating in ln(pressure) and
    6874!     temperature.  Below LAYTROP, the water vapor self-continuum is
    … …  
    115121! C'est evidemment une correction suspecte
    116122  IF (IFP>200) THEN
     123   IF (call_alert) THEN
     124      message='WARNING IFP='
     125      CALL prt_alerte(message,modname,1)
    117126      PRINT*,'WARNING IFP=',IFP,' 2.E2_JPRB*Z_FP+0.5_JPRB avec Z_FP=',Z_FP
    118       IFP=200
     127   ENDIF
     128   IFP=200
    119129  ENDIF
    120130
    … …  
    156166  IF (IFP <= 0) IFP=0
    157167  IF (IFP>200) THEN
     168   IF (call_alert) THEN
     169      message='WARNING IFP='
     170      CALL prt_alerte(message,modname,1)
    158171      PRINT*,'WARNING IFP=',IFP,' 2.E2_JPRB*Z_FP+0.5_JPRB avec Z_FP=',Z_FP
    159       IFP=200
     172   ENDIF
     173   IFP=200
    160174  ENDIF
    161175

  • LMDZ6/branches/Ocean_skin/libf/phylmd/rrtm/suecrad.F90

    r3115 r4368  
    243243!      ----------------------------------------------------------------
    244244
     245#include "clesphys.h"
    245246#include "naerad.h"
    246247#include "namrgri.h"
    247248!MPL/IM 20160915 on prend GES de phylmd
    248 #include "clesphys.h"
    249249
    250250!*         1.       INITIALIZE NEUROFLUX LONGWAVE RADIATION

  • LMDZ6/branches/Ocean_skin/libf/phylmd/rrtm/tpm_fft.F90

    r2010 r4368  
    77
    88TYPE FFT_TYPE
    9   REAL(KIND=JPRB)   ,POINTER :: TRIGS(:,:)
    10   INTEGER(KIND=JPIM),POINTER :: NFAX(:,:)
     9  REAL(KIND=JPRB)   ,ALLOCATABLE :: TRIGS(:,:)
     10  INTEGER(KIND=JPIM),ALLOCATABLE :: NFAX(:,:)
    1111END TYPE FFT_TYPE
    1212
Note: See TracChangeset for help on using the changeset viewer.