Ignore:
Timestamp:
Jul 23, 2024, 7:00:20 AM (2 months ago)
Author:
abarral
Message:

Remove CPP_1D key. It was used once in a single file to wrap a whole internal module -> can't even compile if key is enabled.
(lint) Set NF90_* to lowercase

Location:
LMDZ6/branches/Amaury_dev/libf/dyn3dmem
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • LMDZ6/branches/Amaury_dev/libf/dyn3dmem/dynetat0_loc.F90

    r5099 r5100  
    99  USE infotrac,    ONLY: nqtot, tracers, niso, iqIsoPha, iH2O, isoName
    1010  USE strings_mod, ONLY: maxlen, msg, strStack, real2str, int2str, strIdx
    11   USE netcdf,      ONLY: NF90_OPEN,  NF90_NOWRITE, nf90_inquire_dimension, NF90_INQ_VARID, &
    12                          NF90_CLOSE, nf90_get_var, NF90_INQUIRE_VARIABLE,  nf90_noerr
     11  USE netcdf,      ONLY: nf90_open,  nf90_nowrite, nf90_inquire_dimension, NF90_INQ_VARID, &
     12                         nf90_close, nf90_get_var, NF90_INQUIRE_VARIABLE,  nf90_noerr
    1313  USE readTracFiles_mod, ONLY: new2oldH2O, newHNO3, oldHNO3, getKey
    1414  USE control_mod, ONLY: planet_type
    … …  
    5555!--- Initial state file opening
    5656  var=fichnom
    57   CALL err(NF90_OPEN(var,NF90_NOWRITE,fID),"open",var)
     57  CALL err(nf90_open(var,nf90_nowrite,fID),"open",var)
    5858  CALL get_var1("controle",tab_cntrl)
    5959
    … …  
    215215  END DO
    216216  DEALLOCATE(q_glo)
    217   CALL err(NF90_CLOSE(fID),"close",fichnom)
     217  CALL err(nf90_close(fID),"close",fichnom)
    218218  day_ini=day_ini+INT(time)
    219219  time=time-INT(time)

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

    r5099 r5100  
    1111  USE strings_mod, ONLY: maxlen
    1212  USE infotrac, ONLY: nqtot, tracers
    13   USE netcdf, ONLY: NF90_CREATE, NF90_DEF_DIM, NF90_INQ_VARID, NF90_GLOBAL,    &
    14                     NF90_CLOSE,  NF90_PUT_ATT, NF90_UNLIMITED, NF90_CLOBBER,   &
    15                     NF90_64BIT_OFFSET
     13  USE netcdf, ONLY: nf90_create, nf90_def_dim, NF90_INQ_VARID, nf90_global,    &
     14                    nf90_close,  nf90_put_att, nf90_unlimited, nf90_clobber,   &
     15                    nf90_64bit_offset
    1616  USE dynredem_mod, ONLY: cre_var, put_var, err, modname, fil
    1717  USE comvert_mod,  ONLY: ap, bp, presnivs, pa, preff, nivsig, nivsigs,&
    … …  
    112112
    113113!--- File creation
    114   CALL err(NF90_CREATE(fichnom,IOR(NF90_CLOBBER,NF90_64BIT_OFFSET),nid))
     114  CALL err(nf90_create(fichnom,IOR(nf90_clobber,nf90_64bit_offset),nid))
    115115
    116116!--- Some global attributes
    117   CALL err(NF90_PUT_ATT(nid,NF90_GLOBAL,"title","Fichier demarrage dynamique"))
     117  CALL err(nf90_put_att(nid,nf90_global,"title","Fichier demarrage dynamique"))
    118118
    119119!--- Dimensions
    120   CALL err(NF90_DEF_DIM(nid,"index", length, indexID))
    121   CALL err(NF90_DEF_DIM(nid,"rlonu", iip1,   rlonuID))
    122   CALL err(NF90_DEF_DIM(nid,"rlatu", jjp1,   rlatuID))
    123   CALL err(NF90_DEF_DIM(nid,"rlonv", iip1,   rlonvID))
    124   CALL err(NF90_DEF_DIM(nid,"rlatv", jjm,    rlatvID))
    125   CALL err(NF90_DEF_DIM(nid,"sigs",  llm,        sID))
    126   CALL err(NF90_DEF_DIM(nid,"sig",   llmp1,    sigID))
    127   CALL err(NF90_DEF_DIM(nid,"temps", NF90_UNLIMITED, timID))
     120  CALL err(nf90_def_dim(nid,"index", length, indexID))
     121  CALL err(nf90_def_dim(nid,"rlonu", iip1,   rlonuID))
     122  CALL err(nf90_def_dim(nid,"rlatu", jjp1,   rlatuID))
     123  CALL err(nf90_def_dim(nid,"rlonv", iip1,   rlonvID))
     124  CALL err(nf90_def_dim(nid,"rlatv", jjm,    rlatvID))
     125  CALL err(nf90_def_dim(nid,"sigs",  llm,        sID))
     126  CALL err(nf90_def_dim(nid,"sig",   llmp1,    sigID))
     127  CALL err(nf90_def_dim(nid,"temps", nf90_unlimited, timID))
    128128
    129129!--- Define and save invariant fields
    … …  
    156156  CALL cre_var(nid,"masse","Masse d air"    ,[rlonvID,rlatuID,sID,timID])
    157157  CALL cre_var(nid,"ps"   ,"Pression au sol",[rlonvID,rlatuID    ,timID])
    158   CALL err(NF90_CLOSE (nid))
     158  CALL err(nf90_close (nid))
    159159
    160160  WRITE(lunout,*)TRIM(modname)//': iim,jjm,llm,iday_end',iim,jjm,llm,iday_end
    … …  
    178178  USE infotrac, ONLY: nqtot, tracers, type_trac
    179179  USE control_mod
    180   USE netcdf,   ONLY: NF90_OPEN,  NF90_NOWRITE, nf90_get_var, NF90_INQ_VARID,  &
    181                       NF90_CLOSE, NF90_WRITE,   NF90_PUT_VAR, nf90_noerr
     180  USE netcdf,   ONLY: nf90_open,  nf90_nowrite, nf90_get_var, NF90_INQ_VARID,  &
     181                      nf90_close, NF90_WRITE,   nf90_put_var, nf90_noerr
    182182  USE dynredem_mod, ONLY: dynredem_write_u, dynredem_write_v, dynredem_read_u, &
    183183                          err, modname, fil, msg
    … …  
    213213  IF(mpi_rank==0) THEN !++++++++++++++++++++++++++++++++++++++++++++++++++++++++
    214214  modname='dynredem1_loc'; fil=fichnom
    215   CALL err(NF90_OPEN(fil,NF90_WRITE,nid),"open",fil)
     215  CALL err(nf90_open(fil,NF90_WRITE,nid),"open",fil)
    216216
    217217!--- Write/extend time coordinate
    … …  
    219219  var="temps"
    220220  CALL err(NF90_INQ_VARID(nid,var,vID),"inq",var)
    221   CALL err(NF90_PUT_VAR(nid,vID,[time]),"put",var)
     221  CALL err(nf90_put_var(nid,vID,[time]),"put",var)
    222222  WRITE(lunout,*)TRIM(modname)//": Saving for ", nb, time
    223223
    … …  
    228228  tab_cntrl(31)=DBLE(itau_dyn + itaufin)
    229229  CALL err(NF90_INQ_VARID(nid,var,vID),"inq",var)
    230   CALL err(NF90_PUT_VAR(nid,vID,tab_cntrl),"put",var)
     230  CALL err(nf90_put_var(nid,vID,tab_cntrl),"put",var)
    231231  END IF               !++++++++++++++++++++++++++++++++++++++++++++++++++++++++
    232232!$OMP END MASTER
    … …  
    244244  fil="start_trac.nc"
    245245  IF(ANY(type_trac == ['inca','inco'])) INQUIRE(FILE=fil,EXIST=lread_inca)
    246   IF(lread_inca) CALL err(NF90_OPEN(fil,NF90_NOWRITE,nid_trac),"open")
     246  IF(lread_inca) CALL err(nf90_open(fil,nf90_nowrite,nid_trac),"open")
    247247!$OMP END MASTER
    248248!$OMP BARRIER
    … …  
    266266!$OMP MASTER
    267267  IF(mpi_rank==0) THEN !++++++++++++++++++++++++++++++++++++++++++++++++++++++++
    268   CALL err(NF90_CLOSE(nid),"close")
     268  CALL err(nf90_close(nid),"close")
    269269  fil="start_trac.nc"
    270   IF(lread_inca) CALL err(NF90_CLOSE(nid_trac),"close")
     270  IF(lread_inca) CALL err(nf90_close(nid_trac),"close")
    271271  END IF               !++++++++++++++++++++++++++++++++++++++++++++++++++++++++
    272272!$OMP END MASTER

  • LMDZ6/branches/Amaury_dev/libf/dyn3dmem/dynredem_mod.F90

    r5099 r5100  
    5252    !$OMP MASTER
    5353      start(3)=l
    54       CALL err(NF90_PUT_VAR(ncid,nvarid,var_glo,start,count),"put",id)
     54      CALL err(nf90_put_var(ncid,nvarid,var_glo,start,count),"put",id)
    5555    !$OMP END MASTER
    5656    END IF
    … …  
    102102    !$OMP MASTER
    103103      start(3)=l
    104       CALL err(NF90_PUT_VAR(ncid,nvarid,var_glo,start,count),"put",id)
     104      CALL err(nf90_put_var(ncid,nvarid,var_glo,start,count),"put",id)
    105105    !$OMP END MASTER
    106106    END IF
    … …  
    182182  CHARACTER(LEN=*), OPTIONAL, INTENT(IN) :: units
    183183!===============================================================================
    184   CALL err(NF90_DEF_VAR(ncid,var,nf90_format,did,nvarid),"inq",var)
    185   IF(title/="")      CALL err(NF90_PUT_ATT(ncid,nvarid,"title",title),var)
    186   IF(PRESENT(units)) CALL err(NF90_PUT_ATT(ncid,nvarid,"units",units),var)
     184  CALL err(nf90_def_var(ncid,var,nf90_format,did,nvarid),"inq",var)
     185  IF(title/="")      CALL err(nf90_put_att(ncid,nvarid,"title",title),var)
     186  IF(PRESENT(units)) CALL err(nf90_put_att(ncid,nvarid,"units",units),var)
    187187
    188188END SUBROUTINE cre_var
    … …  
    208208  IF(     PRESENT(units)) CALL cre_var(ncid,var,title,did,units)
    209209  IF(.NOT.PRESENT(units)) CALL cre_var(ncid,var,title,did)
    210   CALL err(NF90_ENDDEF(ncid))
     210  CALL err(nf90_enddef(ncid))
    211211  nd=SIZE(did)
    212212  DO k=1,nd; CALL err(nf90_inquire_dimension(ncid,did(k),len=nn(k))); END DO
    213   IF(nd==1) CALL err(NF90_PUT_VAR(ncid,nvarid,RESHAPE(v,nn(1:1))),var)
    214   IF(nd==2) CALL err(NF90_PUT_VAR(ncid,nvarid,RESHAPE(v,nn(1:2))),var)
     213  IF(nd==1) CALL err(nf90_put_var(ncid,nvarid,RESHAPE(v,nn(1:1))),var)
     214  IF(nd==2) CALL err(nf90_put_var(ncid,nvarid,RESHAPE(v,nn(1:2))),var)
    215215  CALL err(NF90_REDEF(ncid))
    216216END SUBROUTINE put_var

  • LMDZ6/branches/Amaury_dev/libf/dyn3dmem/guide_loc_mod.F90

    r5099 r5100  
    175175    if (guide_plevs==1) then
    176176       if (ncidpl==-99) then
    177           rcod=nf90_open('apbp.nc',Nf90_NOWRITe, ncidpl)
     177          rcod=nf90_open('apbp.nc',nf90_nowrite, ncidpl)
    178178          if (rcod/=nf90_noerr) THEN
    179179             abort_message=' Nudging error -> no file apbp.nc'
    … …  
    183183    elseif (guide_plevs==2) then
    184184       if (ncidpl==-99) then
    185           rcod=nf90_open('P.nc',Nf90_NOWRITe,ncidpl)
     185          rcod=nf90_open('P.nc',nf90_nowrite,ncidpl)
    186186          if (rcod/=nf90_noerr) THEN
    187187             abort_message=' Nudging error -> no file P.nc'
    … …  
    192192    elseif (guide_u) then
    193193       if (ncidpl==-99) then
    194           rcod=nf90_open('u.nc',Nf90_NOWRITe,ncidpl)
     194          rcod=nf90_open('u.nc',nf90_nowrite,ncidpl)
    195195          if (rcod/=nf90_noerr) THEN
    196196             abort_message=' Nudging error -> no file u.nc'

  • LMDZ6/branches/Amaury_dev/libf/dyn3dmem/iniacademic_loc.F90

    r5099 r5100  
    2323  USE ener_mod, ONLY: etot0,ptot0,ztot0,stot0,ang0
    2424  USE readTracFiles_mod, ONLY: addPhase
    25   use netcdf, only : NF90_NOWRITE,NF90_OPEN,nf90_noerr,NF90_INQ_VARID,NF90_CLOSE, nf90_get_var
     25  use netcdf, only : nf90_nowrite,nf90_open,nf90_noerr,NF90_INQ_VARID,nf90_close, nf90_get_var
    2626
    2727  !   Author:    Frederic Hourdin      original: 15/01/93
    … …  
    152152
    153153     relief=0.
    154      ierr = NF90_OPEN ('relief_in.nc', NF90_NOWRITE,nid_relief)
     154     ierr = nf90_open ('relief_in.nc', nf90_nowrite,nid_relief)
    155155     if (ierr==nf90_noerr) THEN
    156156         ierr=NF90_INQ_VARID(nid_relief,'RELIEF',varid)
    … …  
    162162         endif
    163163     endif
    164      ierr = NF90_CLOSE (nid_relief)
     164     ierr = nf90_close (nid_relief)
    165165
    166166
Note: See TracChangeset for help on using the changeset viewer.