Changeset 6 for trunk/SOURCES/readinput.f90

Timestamp:

10/22/14 10:49:32 (10 years ago)

Author:

sleclech

Message:

Modification initialisation pointeurs lecture NetCDF pour compatibilité avec ifort 13

File:

• trunk/SOURCES/readinput.f90 (modified) (8 diffs)

trunk/SOURCES/readinput.f90

@@ -23 +23 @@
   integer  :: lx,ly              !< nxx, nyy read in the file
   real,dimension(3) :: a         !< working tab
-  logical,SAVE :: init
+  logical,save :: init
   integer ncid1,status1
   character(len=20),dimension(2) :: dimnames2d        !< dimensions pour netcdf pour tableau 2d
@@ -29 +29 @@
   if ((index(filename,'no') .eq. 0)) then
 
-     if (.NOT. init) then
-        status1  = nf90_create(TRIM(fil_sortie),NF90_WRITE,ncid1)    ! ouverture du fichier
+     if (.not. init) then
+        status1  = nf90_create(trim(fil_sortie),NF90_WRITE,ncid1)    ! ouverture du fichier
         status1  = nf90_close(ncid1)                                 ! fermeture
         call init_ncdf(nxx,nyy,fil_sortie,dimnames2d)
-        init= .TRUE.
+        init= .true.
      end if
 
@@ -44 +44 @@
         write(6,*) 'in the file',lx,ly
         write(6,*) 'should be',nxx,nyy
-        STOP
+        stop
      end if
 
      if (numcol .eq. 1) then
-        Allocate(Tab1(nxx,nyy))
+        allocate(Tab1(nxx,nyy))
         do j=1,nyy
            do i=1,nxx
@@ -55 +55 @@
            end do
         end do
-        base_name1= Trim(base_name)//'_1'
-        CALL Write_Ncdf_var(base_name1,dimnames2d,TRIM(fil_sortie),Tab1,'double')
-        Deallocate(Tab1)
+        base_name1= trim(base_name)//'_1'
+        call Write_Ncdf_var(base_name1,dimnames2d,trim(fil_sortie),Tab1,'double')
+        deallocate(Tab1)
      endif
 
      if (numcol .eq. 2) then
-        Allocate(Tab1(nxx,nyy),Tab2(nxx,nyy))
+        allocate(Tab1(nxx,nyy),Tab2(nxx,nyy))
         do j=1,nyy
            do i=1,nxx
@@ -69 +69 @@
            end do
         end do
-        base_name1= Trim(base_name)//'_1'
-        CALL Write_Ncdf_var(base_name1,dimnames2d,TRIM(fil_sortie),Tab1,'double')
-        base_name1=Trim(base_name)//'_2'
-        CALL Write_Ncdf_var(base_name1,dimnames2d,TRIM(fil_sortie),Tab2,'double')
-        Deallocate(Tab1,Tab2)
+        base_name1= trim(base_name)//'_1'
+        call Write_Ncdf_var(base_name1,dimnames2d,trim(fil_sortie),Tab1,'double')
+        base_name1=trim(base_name)//'_2'
+        call Write_Ncdf_var(base_name1,dimnames2d,trim(fil_sortie),Tab2,'double')
+        deallocate(Tab1,Tab2)
      endif
 
      if (numcol .eq. 3) then
-        Allocate(Tab1(nxx,nyy),Tab2(nxx,nyy),Tab3(nxx,nyy))
+        allocate(Tab1(nxx,nyy),Tab2(nxx,nyy),Tab3(nxx,nyy))
         do j=1,nyy
            do i=1,nxx
@@ -86 +86 @@
            end do
         end do
-        base_name1= Trim(base_name)//'_1'
-        CALL Write_Ncdf_var(base_name1,dimnames2d,TRIM(fil_sortie),Tab1,'double')
-        base_name1=Trim(base_name)//'_2'
-        CALL Write_Ncdf_var(base_name1,dimnames2d,TRIM(fil_sortie),Tab2,'double')
-        base_name1=Trim(base_name)//'_3'
-        CALL Write_Ncdf_var(base_name1,dimnames2d,TRIM(fil_sortie),Tab3,'double')
-        Deallocate(Tab1,Tab2,Tab3)
+        base_name1= trim(base_name)//'_1'
+        call Write_Ncdf_var(base_name1,dimnames2d,trim(fil_sortie),Tab1,'double')
+        base_name1=trim(base_name)//'_2'
+        call Write_Ncdf_var(base_name1,dimnames2d,trim(fil_sortie),Tab2,'double')
+        base_name1=trim(base_name)//'_3'
+        call Write_Ncdf_var(base_name1,dimnames2d,trim(fil_sortie),Tab3,'double')
+        deallocate(Tab1,Tab2,Tab3)
      endif
 
@@ -138 +138 @@
   real,dimension(:,:),intent(inout) :: Tab    !< Array to read in
   character(*),intent(in) :: filename         !< File to read from
-  Real*8, dimension(:,:), pointer :: tabvar
+  real*8, dimension(:,:), pointer :: tabvar
+
 
   if(.not. associated(tabvar)) then
-     Allocate(tabvar(size(Tab,1),size(Tab,2)))  
+     allocate(tabvar(size(Tab,1),size(Tab,2))) 
+  else  ! to nullify the pointer if undefined 
+    if (any(shape(tabvar).ne.(/size(Tab,1),size(Tab,2)/)) ) then 
+        tabvar => null()
+    end if
   end if
+
 
   call read_ncdf_var(varname,filename,tabvar)
@@ -178 +184 @@
        real,dimension(:,:),intent(inout) :: Tab
        character(*),intent(in) :: filename
-       Real*8, dimension(:,:), pointer :: tabvar
+       real*8, dimension(:,:), pointer :: tabvar
      end subroutine lect_ncfile
   end interface !<<<<<<<<<<<<<<<<<<<
 
 
-  Character(1)  xcol
-  Write( xcol,'(i1)')  col
-
-  if (index(filename,'.dat')  .NE.0) then    ! file in is a .dat
+  character(1)  xcol
+  write( xcol,'(i1)')  col
+
+  if (index(filename,'.dat')  .ne.0) then    ! file in is a .dat
+
      call dat2netcdf(size(tabvar,1),size(tabvar,2),numcol,basename,filename,ncfileout)
      call lect_ncfile(trim(basename)//'_'//xcol,tabvar,ncfileout)               
   else
-     if(index(filename,'.grd') .NE.0) then   ! file in is a .grd
+ 
+     if(index(filename,'.grd') .ne.0) then   ! file in is a .grd
+ 
         call lect_ncfile('z',tabvar,filename)
-     else                                    ! file in is a .nc
-        if(index(filename,'.nc') .NE.0) then
+     else
+                            ! file in is a .nc
+        if(index(filename,'.nc') .ne.0) then
            call lect_ncfile(basename,tabvar,filename)
         endif