Changeset 5259 for LMDZ6/trunk/libf


Ignore:
Timestamp:
Oct 22, 2024, 5:32:42 PM (5 hours ago)
Author:
abarral
Message:

Wrap uses of cpp key CPP_INLANDSIS
Symlink inlandsis in iso

Location:
LMDZ6/trunk/libf/phylmd
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • LMDZ6/trunk/libf/phylmd/inlandsis/sisvat_ts2.f90

    r5246 r5259  
    262262  !      IRs__D(ig) = dIRsdT(ig)* Tsf_SV(ig) * 0.75 !TsisSV(ig,isl) * 0.75    !:
    263263      dIRsdT(ig) = Eso_sv(ig)* StefBo   * 4.                        & ! - d(IR)/d(T)
    264             * TsisSV(ig,isl)                     & !
    265             * TsisSV(ig,isl)                     & !
    266             * TsisSV(ig,isl)                     & !
     264            * TsisSV(ig,isl)                     &
     265            * TsisSV(ig,isl)                     &
     266            * TsisSV(ig,isl)
    267267      IRs__D(ig) = dIRsdT(ig)* TsisSV(ig,isl) * 0.75                  !:
    268268     END DO

  • LMDZ6/trunk/libf/phylmd/inlandsis/surf_inlandsis_mod.F90

    r5084 r5259  
    10541054        !    include "dimsoil.h"
    10551055        include "clesphys.h"
    1056         include "thermcell.h"
    10571056        include "compbl.h"
    10581057
    … …  
    12881287
    12891288        include "netcdf.inc"
    1290         !    include "indicesol.h"
    1291         !    include "dimsoil.h"
    12921289        include "clesphys.h"
    1293         include "thermcell.h"
    12941290        include "compbl.h"
    12951291

  • LMDZ6/trunk/libf/phylmd/surf_landice_mod.F90

    r5217 r5259  
    5252    USE lmdz_blowing_snow_ini, ONLY : c_esalt_bs, zeta_bs, pbst_bs, prt_bs, rhoice_bs, rhohard_bs
    5353    USE lmdz_blowing_snow_ini, ONLY : rhofresh_bs, tau_eqsalt_bs, tau_dens0_bs, tau_densmin_bs
    54 #ifdef CPP_INLANDSIS
    5554    USE surf_inlandsis_mod,  ONLY : surf_inlandsis
    56 #endif
    5755
    5856    USE indice_sol_mod
     57    USE lmdz_cppkeys_wrapper, ONLY: CPPKEY_INLANDSIS
    5958
    6059!    INCLUDE "indicesol.h"
    … …  
    265264! CALL to INLANDSIS interface
    266265!****************************************************************************************
    267 #ifdef CPP_INLANDSIS
     266IF (CPPKEY_INLANDSIS) THEN
    268267
    269268#ifdef ISO
    … …  
    342341
    343342
    344 #else
     343ELSE
    345344       abort_message='Pb de coherence: landice_opt = 1  mais CPP_INLANDSIS = .false.'
    346345       CALL abort_physic(modname,abort_message,1)
    347 #endif
     346END IF
    348347
    349348
Note: See TracChangeset for help on using the changeset viewer.