Changeset 4800 for LMDZ6/branches


Ignore:
Timestamp:
Feb 2, 2024, 5:11:05 PM (4 months ago)
Author:
nfevrier
Message:

First save of N. Février's modifications

Location:
LMDZ6/branches/SETHET_DECOUPLE
Files:
9 edited

Legend:

Unmodified
Added
Removed

  • LMDZ6/branches/SETHET_DECOUPLE/DefLists/field_def_lmdz.xml

    r3854 r4800  
    590590        <field id="ozone"    long_name="Ozone mole fraction"    unit="-" />
    591591        <field id="ozone_daylight"    long_name="Daylight ozone mole fraction"    unit="-" />
     592         <field id="dAIBCM_vdf"    long_name="Boundary layer of AIBCM"    unit="kg/kg/s" />
     593         <field id="dASBCM_vdf"    long_name="Boundary layer of ASBCM"    unit="kg/kg/s" />
     594         <field id="dASAPp1a_vdf"    long_name="Boundary layer"    unit="kg/kg/s" />
     595         <field id="dASAPp2a_vdf"    long_name="Boundary layer"    unit="kg/kg/s" />
     596         <field id="dASARp1a_vdf"    long_name="Boundary layer"    unit="kg/kg/s" />
     597         <field id="dASARp2a_vdf"    long_name="Boundary layer"    unit="kg/kg/s" />
     598         <field id="dAIPOMM_vdf"    long_name="Boundary layer"    unit="kg/kg/s" />
     599         <field id="dASPOMM_vdf"    long_name="Boundary layer"    unit="kg/kg/s" />
     600         <field id="dCIDUSTM_vdf"    long_name="Boundary layer"    unit="kg/kg/s" />
     601         <field id="dASSSM_vdf"    long_name="Boundary layer"    unit="kg/kg/s" />
     602         <field id="dCSSSM_vdf"    long_name="Boundary layer"    unit="kg/kg/s" />
     603         <field id="dSSSSM_vdf"    long_name="Boundary layer"    unit="kg/kg/s" />
     604
    592605        <field id="upwd"    long_name="saturated updraft"    unit="kg/m2/s" />
    593606        <field id="ep"    long_name="ep"    unit="su" />

  • LMDZ6/branches/SETHET_DECOUPLE/DefLists/file_def_histday_lmdz.xml

    r3854 r4800  
    615615                <field field_ref="l_mixmin_sic" level="10" />
    616616                <field field_ref="ozone_daylight" level="10" />
     617                <field field_ref="dAIBCM_vdf" level="5" />
     618                <field field_ref="dASBCM_vdf" level="5" />
     619                <field field_ref="dASAPp1a_vdf" level="5" />
     620                <field field_ref="dASAPp2a_vdf" level="5" />
     621                <field field_ref="dASARp1a_vdf" level="5" />
     622                <field field_ref="dASARp2a_vdf" level="5" />
     623                <field field_ref="dASPOMM_vdf" level="5" />
     624                <field field_ref="dAIPOMM_vdf" level="5" />
     625                <field field_ref="dCIDUSTM_vdf" level="5" />
     626                <field field_ref="dASSSM_vdf" level="5" />
     627                <field field_ref="dCSSSM_vdf" level="5" />
     628                <field field_ref="dSSSSM_vdf" level="5" />
     629               
    617630            </field_group>
    618631            <field_group operation="average" grid_ref="grid_out_presinter">

  • LMDZ6/branches/SETHET_DECOUPLE/DefLists/file_def_histmth_lmdz.xml

    r3854 r4800  
    550550                <field field_ref="ozone" level="3" />
    551551                <field field_ref="ozone_daylight" level="2" />
     552                 <field field_ref="dAIBCM_vdf" level="5" />
     553                 <field field_ref="dASBCM_vdf" level="5" />
     554                 <field field_ref="dASAPp1a_vdf" level="5" />
     555                 <field field_ref="dASAPp2a_vdf" level="5" />
     556                 <field field_ref="dASARp1a_vdf" level="5" />
     557                 <field field_ref="dASARp2a_vdf" level="5" />
     558                 <field field_ref="dASPOMM_vdf" level="5" />
     559                 <field field_ref="dAIPOMM_vdf" level="5" />
     560                 <field field_ref="dCIDUSTM_vdf" level="5" />
     561                 <field field_ref="dASSSM_vdf" level="5" />
     562                 <field field_ref="dCSSSM_vdf" level="5" />
     563                 <field field_ref="dSSSSM_vdf" level="5" />
     564
    552565                <field field_ref="upwd" level="7" />
    553566                <field field_ref="ep" level="7" />

  • LMDZ6/branches/SETHET_DECOUPLE/arch/arch-X64_IRENE.fcm

    r3435 r4800  
    1414%MPI_FFLAGS
    1515%OMP_FFLAGS          -qopenmp
    16 %BASE_LD             -i4 -r8 -auto -L/ccc/products/mkl-17.0.4.196/intel--17.0.4.196__openmpi--2.0.2/default/17.0.4.196/mkl/lib/intel64 -lmkl_intel_lp64 -lmkl_core -lmkl_sequential -lpthread
     16%BASE_LD -i4 -r8 -auto -L/ccc/products/mkl-20.0.0/system/default/20.0.0/mkl/lib/intel64 -lmkl_intel_lp64 -lmkl_core -lmkl_sequential -lpthread
    1717%MPI_LD
    1818%OMP_LD              -qopenmp

  • LMDZ6/branches/SETHET_DECOUPLE/libf/dyn3dmem/dynredem_loc.F90

    r2622 r4800  
    1111  USE infotrac
    1212  USE netcdf, ONLY: NF90_CREATE, NF90_DEF_DIM, NF90_INQ_VARID, NF90_GLOBAL,    &
    13                     NF90_CLOSE,  NF90_PUT_ATT, NF90_UNLIMITED, NF90_CLOBBER
     13                    NF90_CLOSE,  NF90_PUT_ATT, NF90_UNLIMITED, NF90_CLOBBER, &
     14                    NF90_64BIT_OFFSET
    1415  USE dynredem_mod, ONLY: cre_var, put_var, err, modname, fil
    1516  USE comvert_mod, ONLY: ap,bp,aps,bps,presnivs,pseudoalt,pa,preff, &
    … …  
    110111
    111112!--- File creation
    112   CALL err(NF90_CREATE(fichnom,NF90_CLOBBER,nid))
     113  CALL err(NF90_CREATE(fichnom,IOR(NF90_CLOBBER,NF90_64BIT_OFFSET),nid))
    113114
    114115!--- Some global attributes

  • LMDZ6/branches/SETHET_DECOUPLE/libf/phylmd/conf_phys_m.F90

    r3630 r4800  
    23152315    flag_aerosol=flag_aerosol_omp
    23162316    flag_aerosol_strat=flag_aerosol_strat_omp
    2317     flag_aer_feedback=flag_aer_feedback_omp
     2317    !flag_aer_feedback=flag_aer_feedback_omp
     2318    flag_aer_feedback=.FALSE. !Nicolas Février
    23182319    flag_bc_internal_mixture=flag_bc_internal_mixture_omp
    23192320    aer_type = aer_type_omp

  • LMDZ6/branches/SETHET_DECOUPLE/libf/phylmd/phys_output_mod.F90

    r3853 r4800  
    501501                           tname(iiq),'Tracer '//ttext(iiq), "-",  &
    502502                           (/ '', '', '', '', '', '', '', '', '', '' /))
    503             o_dtr_vdf(iq-nqo) = ctrl_out((/ 4, 7, 7, 7, 10, 10, 11, 11, 11, 11 /), &
     503            o_dtr_vdf(iq-nqo) = ctrl_out((/ 5, 5, 5, 5, 10, 10, 11, 11, 11, 11 /), &
    504504                              'd'//trim(tname(iq))//'_vdf',  &
    505505                              'Tendance tracer '//ttext(iiq), "-" , &
    … …  
    566566                                 (/ '', '', '', '', '', '', '', '', '', '' /))
    567567
    568             o_dtr_dry(iq-nqo) = ctrl_out((/ 7, 7, 7, 7, 10, 10, 11, 11, 11, 11 /), &
     568            o_dtr_dry(iq-nqo) = ctrl_out((/ 5, 5, 5, 5, 10, 10, 11, 11, 11, 11 /), &
    569569                              'cum'//'d'//trim(tname(iq))//'_dry', &
    570570                              'tracer tendency dry deposition'//ttext(iiq), "-", &

  • LMDZ6/branches/SETHET_DECOUPLE/libf/phylmd/phys_output_write_mod.F90

    r3842 r4800  
    413413    ! Local
    414414    INTEGER :: itau_w
    415     INTEGER :: i, iinit, iinitend=1, iff, iq, iiq, nsrf, k, ll, naero
     415    INTEGER :: i, iinit, iinitend=1, iff, iq, iiq, nsrf, k, ll, naero, j
    416416    REAL, DIMENSION (klon) :: zx_tmp_fi2d, zpt_conv2d, wind100m
    417417    REAL, DIMENSION (klon,klev) :: zx_tmp_fi3d, zpt_conv
    … …  
    446446    REAL,DIMENSION(klon,klev) :: z, dz
    447447    REAL,DIMENSION(klon)      :: zrho, zt
     448
     449    INTEGER,DIMENSION(2) :: index_bc=[106,116]
    448450
    449451    ! On calcul le nouveau tau:
    … …  
    23682370             CALL histwrite_phy(o_dtr_uscav(iq-nqo),d_tr_uscav(:,:,iq-nqo))
    23692371            !--2D fields
    2370              CALL histwrite_phy(o_dtr_dry(iq-nqo), flux_tr_dry(:,iq-nqo))
     2372             !CALL histwrite_phy(o_dtr_dry(iq-nqo), flux_tr_dry(:,iq-nqo))
    23712373             zx_tmp_fi2d=0.
    23722374             IF (vars_defined) THEN
    … …  
    23782380           ENDDO !--iq
    23792381         ENDIF   !--type_trac
     2382
     2383         ! Pour bilan
     2384         DO j=1,size(index_bc)
     2385             iq=index_bc(j)
     2386            ! WRITE(lunout,*) "WRITE_TEST_1"," / iq=",iq
     2387             CALL histwrite_phy(o_dtr_vdf(iq-nqo),d_tr_cl(:,:,iq-nqo))
     2388             !WRITE(lunout,*) "WRITE_TEST_2"
     2389         END DO
     2390         
    23802391!
    23812392         IF (type_trac == 'co2i') THEN

  • LMDZ6/branches/SETHET_DECOUPLE/libf/phylmd/radlwsw_m.F90

    r3666 r4800  
    873873         ZTOPLWAIAERO,ZSOLLWAIAERO, &
    874874         ZLWADAERO, & !--NL
    875          ok_ade, ok_aie, ok_volcan, flag_aerosol,flag_aerosol_strat, flag_aer_feedback) ! flags aerosols
     875         !ok_ade, ok_aie, ok_volcan, flag_aerosol,flag_aerosol_strat, flag_aer_feedback) ! flags aerosols
     876         ok_ade, ok_aie, ok_volcan, flag_aerosol,flag_aerosol_strat, .FALSE.) !Nicolas Février
    876877           
    877878!        print *,'RADLWSW: apres RECMWF'
Note: See TracChangeset for help on using the changeset viewer.