Ignore:
Timestamp:
May 9, 2022, 12:35:40 PM (2 years ago)
Author:
dcugnet
Message:
  • Some variables are renamed or replaced by direct equivalents:
    • iso_indnum -> tracers(:)%iso_iName
    • niso_possibles -> niso
    • iqiso -> iqIsoPha ; index_trac -> itZonIso
    • ok_iso_verif -> isoCheck
    • ntraceurs_zone -> nzone ; ntraciso -> ntiso
    • qperemin -> min_qparent ; masseqmin -> min_qmass ; ratiomin -> min_ratio
  • Some renamed variables are only aliased with the older name (using USE <module>, ONLY: <oldName> => <newName>) in routines where they are repeated many times.
  • Few hard-coded indexes are now computed (examples: ilic, iso, ivap, irneb, iq_vap, iq_liq, iso_H2O, iso_HDO, iso_HTO, iso_O17, iso_O18).
  • The IF(isoCheck) test is now embedded in the check_isotopes_seq and check_isotopes_loc routines (lighter calling).
File:
1 edited

Legend:

Unmodified
Added
Removed

  • LMDZ6/trunk/libf/phylmdiso/isotopes_routines_mod.F90

    r4089 r4143  
    33
    44MODULE isotopes_routines_mod
     5  USE infotrac_phy, ONLY: niso, ntraciso=>ntiso, index_trac=>itZonIso, ntraceurs_zone=>nzone
    56IMPLICIT NONE
    67
    … …  
    1314&            zqs,zq_ancien,zqev_diag,zq)
    1415
    15 USE infotrac_phy, ONLY: ntraciso,niso, &
    16         ntraceurs_zone,index_trac
    1716USE isotopes_mod, ONLY: ridicule, ridicule_rain, thumxt1, no_pce,  &
    1817&       bidouille_anti_divergence, &
    … …  
    846845&    L, xtnu,Pveg)
    847846
    848 USE infotrac_phy, ONLY: niso
    849847USE isotopes_mod, ONLY: ridicule_qsol, ridicule, &
    850848&       ridicule_evap,P_veg,iso_HDO,iso_eau,iso_O17,iso_O18
    … …  
    13011299
    13021300subroutine calcul_kcin(Vsurf,KCIN)
    1303 USE infotrac_phy, ONLY: niso
    13041301USE isotopes_mod, ONLY: tv0cin,tkcin0,tkcin1,tkcin2
    13051302implicit none
    … …  
    13281325
    13291326     subroutine fractcalk(kt, ptin, pxtfra, pfraice)
    1330 !USE infotrac_phy, ONLY: use_iso
    13311327USE isotopes_mod, ONLY: talph1,talph2,talph3,pxtmin,iso_O17, &
    13321328&       fac_coeff_eq17_liq, pxtmelt, &
    … …  
    14571453      subroutine fractcalk_liq(kt, ptin, pxtfra)
    14581454
    1459 !      USE infotrac_phy, ONLY: use_iso
    14601455      USE isotopes_mod, ONLY: pxtmin,talph1,talph2,talph3, &
    14611456&       fac_coeff_eq17_liq, pxtice, &
    … …  
    15221517      subroutine fractcalk_glace(kt, ptin, pfraice)
    15231518
    1524 !      use infotrac_phy, ONLY: use_iso
    15251519      use isotopes_mod, ONLY: talps1,talps2, iso_O17,fac_coeff_eq17_ice, &
    15261520        & pxtmelt,musi, lambda_sursat, tdifrel, &
    … …  
    16311625      subroutine fractcalk_vectall(ptin, pxtfra, pfraice,n)
    16321626
    1633         USE infotrac_phy, ONLY: niso
    16341627        USE isotopes_mod, ONLY: talph1,talph2,talph3,tdifrel,pxtmin, &
    16351628&      iso_O17, iso_HTO, iso_eau, iso_O18, iso_HDO, musi, lambda_sursat, &
    … …  
    18031796      subroutine fractcalk_vectall_liq(ptin, pxtfra, n)
    18041797
    1805       USE infotrac_phy, ONLY: niso
    18061798      USE isotopes_mod, ONLY: pxtmin,talph1,talph2,talph3, &
    18071799&       iso_eau,iso_HDO, iso_O18, iso_O17,iso_HTO,fac_coeff_eq17_liq, &
    … …  
    18821874      subroutine fractcalk_vectall_ice(ptin, pfraice,n)
    18831875
    1884       use infotrac_phy, ONLY: niso
    18851876      use isotopes_mod, ONLY: talps1,talps2, fac_coeff_eq17_ice, &
    18861877        & pxtmelt,musi, lambda_sursat, tdifrel, &
    … …  
    20232014&            i,Rsol,klon)
    20242015
    2025   USE infotrac_phy, ONLY: niso,ntraciso
    20262016  USE isotopes_mod, ONLY: iso_eau, iso_HDO,ridicule, &
    20272017&        ridicule_qsol,iso_O17,iso_O18
    … …  
    22332223&          i,xtevap,klon) 
    22342224
    2235   USE infotrac_phy, ONLY: ntraciso,niso
    22362225  USE isotopes_mod, ONLY: iso_eau, iso_HDO,ridicule,ridicule_rain, &
    22372226        iso_O18,iso_O17
    … …  
    24442433&   )
    24452434
    2446   USE infotrac_phy, ONLY: ntraciso,niso
    24472435  USE isotopes_mod, ONLY: iso_eau, iso_HDO,expb_max,tdifrel,tdifexp, &
    24482436&       ridicule,thumxt1,ridicule_rain,bidouille_anti_divergence, &
    … …  
    45004488&           Tevap)
    45014489
    4502   USE infotrac_phy, ONLY: niso,ntraciso
    45034490  USE isotopes_mod, ONLY: iso_eau, iso_HDO,bidouille_anti_divergence, &
    45044491&       ridicule,ridicule_rain
    … …  
    46584645&           ,fac_ftmr)
    46594646
    4660   USE infotrac_phy, ONLY: niso,ntraciso
    46614647  USE isotopes_mod, ONLY: iso_eau, iso_HDO,bidouille_anti_divergence, &
    46624648&       Rdefault,ridicule,ridicule_rain
    … …  
    49044890     &           Pqiinf_cas,Pqiinf)
    49054891
    4906   USE infotrac_phy, ONLY: niso,ntraciso
    49074892  USE isotopes_mod, ONLY: iso_eau, iso_HDO
    49084893
    … …  
    50665051     &           xtnew_cas,xtnew,Pxtiinf_cas,Pxtiinf)
    50675052
    5068   USE infotrac_phy, ONLY: niso
    50695053  USE isotopes_mod, ONLY: iso_eau, iso_HDO
    50705054#ifdef ISOVERIF
    … …  
    51115095     &           ncum)
    51125096
    5113   USE infotrac_phy, ONLY: niso,ntraciso
    51145097  USE isotopes_mod, ONLY: iso_eau, iso_HDO
    51155098
    … …  
    51765159     &    nloc,ncum,nd,i)
    51775160
    5178   USE infotrac_phy, ONLY: niso, ntraciso
    51795161  USE isotopes_mod, ONLY: iso_eau, iso_HDO
    51805162
    … …  
    52525234     &    nloc,ncum,nd,i)
    52535235
    5254   USE infotrac_phy, ONLY: niso,ntraciso
    52555236  USE isotopes_mod, ONLY: iso_eau, iso_HDO
    52565237
    … …  
    53265307     &    nloc,ncum,nd,i)
    53275308
    5328   USE infotrac_phy, ONLY: niso,ntraciso
    53295309  USE isotopes_mod, ONLY: iso_eau, iso_HDO
    53305310
    … …  
    53965376     &    nloc,ncum,nd,i)
    53975377
    5398   USE infotrac_phy, ONLY: niso,ntraciso
    53995378  USE isotopes_mod, ONLY: iso_eau, iso_HDO,ridicule
    54005379
    … …  
    55665545     &    nloc,ncum,nd,i,frac_sublim)
    55675546
    5568   USE infotrac_phy, ONLY: niso,ntraciso
    55695547  USE isotopes_mod, ONLY: iso_eau, iso_HDO,ridicule
    55705548
    … …  
    57035681     &       zxtrfln_cas,zxt_cas,zxtrfl,zxtrfln,zxt,klon)
    57045682
    5705   USE infotrac_phy, ONLY: niso,ntraciso
    57065683  USE isotopes_mod, ONLY: iso_eau, iso_HDO
    57075684
    … …  
    57395716     &       delP,paprs,k,klon,klev)
    57405717
    5741   USE infotrac_phy, ONLY: niso
    57425718  USE isotopes_mod, ONLY: iso_eau, iso_HDO
    57435719         implicit none
    … …  
    57775753     &       delP,paprs,k,klon,klev)
    57785754
    5779   USE infotrac_phy, ONLY: niso,ntraciso
    57805755  USE isotopes_mod, ONLY: iso_eau, iso_HDO
    57815756         implicit none
    … …  
    58285803     &       delP,paprs,k,klon,klev,frac_sublim)
    58295804
    5830   USE infotrac_phy, ONLY: niso,ntraciso
    58315805  USE isotopes_mod, ONLY: iso_eau, iso_HDO
    58325806#ifdef ISOVERIF
    … …  
    59055879     &          qp0,A,m0,beta,gama,g0) 
    59065880
    5907   USE infotrac_phy, ONLY: niso
    59085881  USE isotopes_mod, ONLY: iso_eau, iso_HDO,ntot
    59095882#ifdef ISOVERIF
    … …  
    61006073 
    61016074
    6102   USE infotrac_phy, ONLY: ntraciso,niso,ntraceurs_zone, &
    6103 &       index_trac
    61046075  USE isotopes_mod, ONLY: iso_eau, iso_HDO,thumxt1, &
    61056076&       bidouille_anti_divergence,ridicule
    … …  
    76807651     &          )   
    76817652
    7682   USE infotrac_phy, ONLY: niso,ntraciso
    76837653  USE isotopes_mod, ONLY: iso_eau, iso_HDO, Rdefault, ridicule
    76847654#ifdef ISOVERIF
    … …  
    80488018     &  )
    80498019
    8050   USE infotrac_phy, ONLY: niso,ntraciso
    80518020  USE isotopes_mod, ONLY: iso_eau, iso_HDO, Rdefault,ridicule
    80528021#ifdef ISOVERIF
    … …  
    82538222     &          )
    82548223
    8255   USE infotrac_phy, ONLY: niso,ntraciso
    82568224  USE isotopes_mod, ONLY: iso_eau, iso_HDO, Rdefault,ridicule
    82578225#ifdef ISOVERIF
    … …  
    83908358     &          ,xtp_cas,xtwater_cas,xtevap_cas)
    83918359
    8392   USE infotrac_phy, ONLY: niso,ntraciso
    83938360  USE isotopes_mod, ONLY: iso_eau, iso_HDO,no_pce, Rdefault,ridicule       
    83948361#ifdef ISOVERIF
    … …  
    89278894     &          ,xtp_cas,xtwater_cas,xtevap_cas)
    89288895
    8929   USE infotrac_phy, ONLY: niso,ntraciso
    89308896  USE isotopes_mod, ONLY: iso_eau, iso_HDO, Rdefault, ridicule
    89318897#ifdef ISOVERIF
    … …  
    93179283 
    93189284
    9319   USE infotrac_phy, ONLY: niso,ntraciso, &
    9320 &       ntraceurs_zone,index_trac
    93219285  USE isotopes_mod, ONLY: iso_eau, iso_HDO,bidouille_anti_divergence, &
    93229286&       thumxt1, ridicule
    … …  
    1102210986     &          )
    1102310987
    11024   USE infotrac_phy, ONLY: niso,ntraciso
    1102510988  USE isotopes_mod, ONLY: iso_eau, iso_HDO,Rdefault,ridicule
    1102610989#ifdef ISOVERIF
    … …  
    1117211135     &          ,xtp_cas,xtwater_cas,xtevap_cas)
    1117311136
    11174   USE infotrac_phy, ONLY: niso,ntraciso
    1117511137  USE isotopes_mod, ONLY: iso_eau, iso_HDO,Rdefault,no_pce,ridicule
    1117611138#ifdef ISOVERIF
    … …  
    1177011732     &          ,xtp_cas,xtwater_cas,xtevap_cas)
    1177111733
    11772   USE infotrac_phy, ONLY: niso,ntraciso
    1177311734  USE isotopes_mod, ONLY: iso_eau, iso_HDO, Rdefault, ridicule
    1177411735#ifdef ISOVERIF
    … …  
    1219812159     &          tcond,zfice,zxtice,zxtliq)
    1219912160
    12200     USE infotrac_phy, ONLY: ntraciso,niso
    1220112161    USE isotopes_mod, ONLY: iso_eau,iso_HDO,essai_convergence, &
    1220212162&       bidouille_anti_divergence,ridicule
    … …  
    1243212392     &          tcond,zfice,zxtice,zxtliq,n)
    1243312393
    12434     USE infotrac_phy, ONLY: ntraciso,niso
    1243512394    USE isotopes_mod, ONLY: iso_eau,iso_HDO,iso_O18,bidouille_anti_divergence, &
    1243612395&       ridicule
    … …  
    1289012849     &          tcond,zfice,zxtice,zxtliq)
    1289112850
    12892     USE infotrac_phy, ONLY: ntraciso
    1289312851    USE isotopes_mod, ONLY: iso_eau,iso_HDO,bidouille_anti_divergence, &
    1289412852&       ridicule,iso_O18
    … …  
    1308813046     &           xt1lay,q1lay,tsurf,t_coup,nisurf,Rland_ice)
    1308913047
    13090     USE infotrac_phy, ONLY: ntraciso,niso
    1309113048    USE isotopes_mod, ONLY: Rdefault,iso_eau,iso_HDO, &
    1309213049&       bidouille_anti_divergence, ridicule,ridicule_snow, &
    … …  
    1365813615     &   )
    1365913616
    13660     USE infotrac_phy, ONLY: ntraciso,niso
    1366113617    USE isotopes_mod, ONLY: iso_eau,iso_HDO,cste_surf_cond, &
    1366213618&       rh_cste_surf_cond,Rdefault,T_cste_surf_cond,iso_O17,iso_O18, &
    … …  
    1398213938     &   )
    1398313939
    13984     USE infotrac_phy, ONLY: ntraciso,niso
    1398513940    USE isotopes_mod, ONLY: tcorr, toce, alpha_liq_sol,ridicule_evap, &
    1398613941        iso_eau,iso_HDO
    … …  
    1423814193     &   )
    1423914194
    14240     USE infotrac_phy, ONLY: ntraciso,niso
    1424114195    USE isotopes_mod, ONLY: h_land_ice, ridicule,ridicule_snow,ridicule_evap, &
    1424214196        iso_eau,iso_HDO,iso_O18
    … …  
    1457314527     &   )
    1457414528
    14575 USE infotrac_phy, ONLY: niso,ntraciso
    1457614529USE isotopes_mod, ONLY: tdifrel,tdifexp_sol, iso_eau, iso_HDO, &
    1457714530&       bidouille_anti_divergence,ruissellement_pluie, Rdefault,Kd, &
    … …  
    1600115954      !USE write_field_phy
    1600215955      USE indice_sol_mod, only: nbsrf 
    16003   USE infotrac_phy, ONLY: ntraciso,niso
    1600415956  USE isotopes_mod, ONLY: initialisation_iso, iso_eau,iso_HDO, &
    1600515957        ridicule_qsol,tnat, P_veg,iso_O18,ridicule, ridicule_snow,iso_O17, &
    … …  
    1618716139      !USE write_field_phy
    1618816140      USE indice_sol_mod, only: nbsrf
    16189   USE infotrac_phy, ONLY: ntraciso,niso
    1619016141  USE isotopes_mod, ONLY: tnat,iso_HDO,iso_O18,iso_HTO, iso_eau,toce, &
    1619116142&       Rdefault,iso_O17,ridicule,ridicule_qsol
    … …  
    1657416525      !USE write_field_phy
    1657516526      USE indice_sol_mod, only: nbsrf 
    16576   USE infotrac_phy, ONLY: ntraciso,niso
    1657716527  USE isotopes_mod, ONLY: striso,iso_HDO,iso_eau
    1657816528#ifdef ISOVERIF
    … …  
    1684916799     &           d_xt_decroiss, &
    1685016800     &           xt_seri)
    16851         USE infotrac_phy, only: ntraciso
    1685216801        USE isotopes_mod, only: iso_HTO,ok_prod_nucl_tritium
    1685316802        USE dimphy, only: klon,klev
    … …  
    1837118320!     &                         prod_nucl_HTO)
    1837218321
    18373         USE infotrac_phy, only: ntraciso
    1837418322        use isotopes_mod, only: nessai, lat_nucl, lon_nucl, &
    1837518323&               zmin_nucl, zmax_nucl, HTO_nucl
    … …  
    1859318541     &                                paprs, &
    1859418542     &                                prod_nucl)
    18595         USE infotrac_phy, only: ntraciso
    1859618543        USE isotopes_mod, ONLY: iso_HTO
    1859718544        use geometry_mod, only: cell_area
    … …  
    1873918686     &           tcond,zfice,zxtice,zxtliq)
    1874018687
    18741     USE infotrac_phy, ONLY: ntraciso,niso,index_trac,ntraceurs_zone
    1874218688    USE isotopes_mod, ONLY: iso_eau,iso_HDO,essai_convergence, &
    1874318689&       bidouille_anti_divergence,ridicule
    … …  
    1886918815     &           tcond,zfice,zxtice,zxtliq,n)
    1887018816
    18871     USE infotrac_phy, ONLY: ntraciso,niso,index_trac,ntraceurs_zone
    1887218817    USE isotopes_mod, ONLY: iso_eau,iso_HDO,iso_O18,bidouille_anti_divergence, &
    1887318818&       ridicule
Note: See TracChangeset for help on using the changeset viewer.