Changeset 1608 for LMDZ5/trunk/libf/phy1d/1DUTILS.h_with_writelim

Timestamp:

Jan 10, 2012, 2:33:09 PM (13 years ago)

Author:

lguez

Message:

In "phy1d/*", replaced obsolete calls to "lnblnk" by calls to "trim".

In "lmdz1d.F", use collector module "ioipsl" rather than specific
module "calendar", which is an internal module of IOIPSL. Removed line
containing only "#" (causes compilation error). Bug fix in call to
"init_phys_lmdz".

File:

• LMDZ5/trunk/libf/phy1d/1DUTILS.h_with_writelim (modified) (9 diffs)

LMDZ5/trunk/libf/phy1d/1DUTILS.h_with_writelim

@@ -735 +735 @@
 !   local
  
-      integer im,jm,lm,i,j,l,lnblnk,iv,iii,iji,iif,ijf
+      integer im,jm,lm,i,j,l,iv,iii,iji,iif,ijf
  
       logical writectl
@@ -769 +769 @@
             nvar(if)=ivar(if)
             var(ivar(if),if)=name
-            tvar(ivar(if),if)=titlevar(1:lnblnk(titlevar))
+            tvar(ivar(if),if)=trim(titlevar)
             nld(ivar(if),if)=nl
             print*,'initialisation ecriture de ',var(ivar(if),if)
@@ -810 +810 @@
       file=fichier(if)
 !   WARNING! on reecrase le fichier .ctl a chaque ecriture
-      open(unit(if),file=file(1:lnblnk(file))//'.ctl',
+      open(unit(if),file=trim(file)//'.ctl',
      &         form='formatted',status='unknown')
       write(unit(if),'(a5,1x,a40)')
-     &       'DSET ','^'//file(1:lnblnk(file))//'.dat'
+     &       'DSET ','^'//trim(file)//'.dat'
  
       write(unit(if),'(a12)') 'UNDEF 1.0E30'
@@ -848 +848 @@
       implicit none
  
-      integer if,im,jm,lm,i,j,l,lnblnk
+      integer if,im,jm,lm,i,j,l
       real x(im),y(jm),z(lm),fx,fy,fz,dt
       real xmin,xmax,ymin,ymax
@@ -868 +868 @@
       ivar(if)=0
  
-      fichier(if)=file(1:lnblnk(file))
+      fichier(if)=trim(file)
  
       firsttime(if)=.true.
@@ -898 +898 @@
  
       print*,4*(ifd(if)-iid(if))*(jfd(if)-jid(if))
-      print*,file(1:lnblnk(file))//'.dat'
- 
-      OPEN (unit(if)+1,FILE=file(1:lnblnk(file))//'.dat',
+      print*,trim(file)//'.dat'
+ 
+      OPEN (unit(if)+1,FILE=trim(file)//'.dat',
      s   FORM='UNFORMATTED',
      s   ACCESS='DIRECT'
@@ -1483 +1483 @@
       integer iy,im,id,ih
       
-      INTEGER, EXTERNAL :: lnblnk
-
        real plev_min
 
        plev_min = 55.  ! pas de tendance de vap. d eau au-dessus de 55 hPa
 
-      open(21,file=fich_toga(:lnblnk(fich_toga)),form='formatted')
+      open(21,file=trim(fich_toga),form='formatted')
       read(21,'(a)') 
       do ip = 1, nt_toga
@@ -2041 +2039 @@
 
       
-      INTEGER, EXTERNAL :: lnblnk
-
       print*,fich_rico
-      open(21,file=fich_rico(:lnblnk(fich_rico)),form='formatted')
+      open(21,file=trim(fich_rico),form='formatted')
         do k=1,llm
       zlay(k)=0.
@@ -2195 +2191 @@
       integer iy,im,id,ih,in
 
-      INTEGER, EXTERNAL :: lnblnk
-
-      open(21,file=fich_armcu(:lnblnk(fich_armcu)),form='formatted')
+      open(21,file=trim(fich_armcu),form='formatted')
       read(21,'(a)')
       do ip = 1, nt_armcu