enh: removed all realloc-lhs assignments

Signed-off-by: Nick Papior <[email protected]>

Author: zerothi

fdict

@@ -83,7 +83,7 @@ for v in ${vars[@]} ; do
 	if [ $d -eq 0 ]; then
 	    _psnl "#define DIMS"
 	else
-	    _psnl "#define DIMS , dimension$(dim_to_size $d)"
+	    _psnl "#define DIMS $(dim_to_size $d)"
 	fi
 	_psnl "#define VAR $v$d"
 	_psnl "#define DIM $d"

src/ncdf.sh

@@ -3,7 +3,7 @@
 subroutine ROUTINE2(put_gatt,VAR)(this, name, att)
   type(hNCDF), intent(inout) :: this
   character(len=*), intent(in) :: name
-  VAR_TYPE, intent(in)DIMS :: att
+  VAR_TYPE, intent(in) :: att DIMS
   if ( .not. ncdf_participate(this) ) return
   if (this%define > -1 ) call ncdf_redef(this)
   call ncdf_err(nf90_put_att(this%id, NF90_GLOBAL, name, att), &
@@ -13,7 +13,7 @@ end subroutine ROUTINE2(put_gatt,VAR)
 subroutine ROUTINE2(put_att,VAR)(this, var, name, att)
   type(hNCDF), intent(inout) :: this
   character(len=*), intent(in) :: var, name
-  VAR_TYPE, intent(in)DIMS :: att
+  VAR_TYPE, intent(in) :: att DIMS
   integer :: id
   if ( .not. ncdf_participate(this) ) return
   if (this%define > -1 ) call ncdf_redef(this)
@@ -26,7 +26,7 @@ end subroutine ROUTINE2(put_att,VAR)
 subroutine ROUTINE2(get_att,VAR)(this, var, name, att)
   type(hNCDF), intent(inout) :: this
   character(len=*), intent(in) :: var, name
-  VAR_TYPE, intent(out)DIMS :: att
+  VAR_TYPE, intent(out) :: att DIMS
   integer :: id
   if ( .not. ncdf_participate(this) ) return
   call ncdf_err(nf90_inq_varid(this%id, trim(var), id), &
@@ -38,7 +38,7 @@ end subroutine ROUTINE2(get_att,VAR)
 subroutine ROUTINE2(get_gatt,VAR)(this, name, att)
   type(hNCDF), intent(inout) :: this
   character(len=*), intent(in) :: name
-  VAR_TYPE, intent(out)DIMS :: att
+  VAR_TYPE, intent(out) :: att DIMS
   if ( .not. ncdf_participate(this) ) return
   call ncdf_err(nf90_get_att(this%id, NF90_GLOBAL, name, att), &
        'Saving global (VAR) attribute: '/ /trim(name)/ /' in file: '/ /this)

src/netcdf_ncdf_att_inc.inc

@@ -436,7 +436,7 @@ recursive subroutine ncdf_crt(this,dic)
     type(var) :: v
     character(len=DICT_KEY_LENGTH) :: key
     character(len=NF90_MAX_NAME) :: name, char
-    character(len=50), allocatable :: dims(:)
+    character(len=64), allocatable :: dims(:)
     integer, pointer :: chunks(:) => null()
     integer :: d_n, type, i, n_d, j
     ! Type declarations
@@ -2016,34 +2016,36 @@ subroutine ncdf_print(this)
       else if ( this%define == 1 ) then
         write(*,"(a20,a)") "In define-mode:     ","False"
       end if
-      call ncdf_inq(this, dims=ndims, vars=nvars, atts=ngatts, &
-          grps=ngrps, format=file_format)
-      select case ( file_format ) 
-      case ( NF90_FORMAT_CLASSIC )
-        write(*,"(a20,a)") "File format:        ","Classic"
-      case ( NF90_FORMAT_64BIT )
-        write(*,"(a20,a)") "File format:        ","Classic 64Bit"
-      case ( NF90_FORMAT_NETCDF4 )
-        write(*,"(a20,a)") "File format:        ","NetCDF4"
-        write(*,"(a20,i7)")"Default compression:",this%comp_lvl
-      case ( NF90_FORMAT_NETCDF4_CLASSIC )
-        write(*,"(a20,a)") "File format:        ","NetCDF4 Classic format"
-        write(*,"(a22,i7)")"Default compression:  ",this%comp_lvl
-      case default
-        write(*,"(a20,a)") "File format:        ","Could not be determined"
-      end select
-      write(*,"(a20,i7)") "Number of dimensions:  ",ndims
-      write(*,"(a20,i7)") "Number of variables:   ",nvars
-      write(*,"(a20,i7)") "Number of attributes:  ",ngatts
-      if ( ngrps >= 0 ) then
-        write(*,"(a20,i7)") "Number of groups:      ",ngrps
+      if ( this%f_id >= 0 ) then
+        call ncdf_inq(this, dims=ndims, vars=nvars, atts=ngatts, &
+            grps=ngrps, format=file_format)
+        select case ( file_format ) 
+        case ( NF90_FORMAT_CLASSIC )
+          write(*,"(a20,a)") "File format:        ","Classic"
+        case ( NF90_FORMAT_64BIT )
+          write(*,"(a20,a)") "File format:        ","Classic 64Bit"
+        case ( NF90_FORMAT_NETCDF4 )
+          write(*,"(a20,a)") "File format:        ","NetCDF4"
+          write(*,"(a20,i7)")"Default compression:",this%comp_lvl
+        case ( NF90_FORMAT_NETCDF4_CLASSIC )
+          write(*,"(a20,a)") "File format:        ","NetCDF4 Classic format"
+          write(*,"(a22,i7)")"Default compression:  ",this%comp_lvl
+        case default
+          write(*,"(a20,a)") "File format:        ","Could not be determined"
+        end select
+        write(*,"(a20,i7)") "Number of dimensions:  ",ndims
+        write(*,"(a20,i7)") "Number of variables:   ",nvars
+        write(*,"(a20,i7)") "Number of attributes:  ",ngatts
+        if ( ngrps >= 0 ) then
+          write(*,"(a20,i7)") "Number of groups:      ",ngrps
+        end if
       end if
-      if ( iand(NF90_WRITE,this%mode) == NF90_WRITE ) &
-          write(*,"(a20,a)") "NetCDF mode:        ","NF90_WRITE"
-      if ( iand(NF90_NOCLOBBER,this%mode) == NF90_NOCLOBBER ) then
-        write(*,"(a20,a)") "NetCDF mode:        ","NF90_NOCLOBBER"
-      else
-        write(*,"(a20,a)") "NetCDF mode:        ","NF90_CLOBBER"
+        if ( iand(NF90_WRITE,this%mode) == NF90_WRITE ) &
+            write(*,"(a20,a)") "NetCDF mode:        ","NF90_WRITE"
+        if ( iand(NF90_NOCLOBBER,this%mode) == NF90_NOCLOBBER ) then
+          write(*,"(a20,a)") "NetCDF mode:        ","NF90_NOCLOBBER"
+        else
+          write(*,"(a20,a)") "NetCDF mode:        ","NF90_CLOBBER"
       end if
       if ( iand(NF90_NOFILL,this%mode) == NF90_NOFILL ) &
           write(*,"(a20,a)") "NetCDF mode:        ","NF90_NOFILL"

src/netcdf_ncdf_pp.F90

@@ -2,12 +2,12 @@
 subroutine ROUTINE3(put_var,VAR,name)(this,name,var,start,count)
   type(hNCDF), intent(inout) :: this
   character(len=*), intent(in) :: name
-  VAR_TYPE, intent(in)DIMS :: var
+  VAR_TYPE, intent(in) :: var DIMS
   integer, intent(in), optional :: start(:)
   integer, intent(in), optional :: count(:)
   integer :: id
 #ifdef IS_COMPLEX
-  REAL_TYPE, allocatable DIMS :: r
+  REAL_TYPE, allocatable :: r DIMS
 #endif
 
 #if DIM == 0
@@ -18,12 +18,12 @@ subroutine ROUTINE3(put_var,VAR,name)(this,name,var,start,count)
   if ( this%define > -1 ) call ncdf_enddef(this)
 #ifdef IS_COMPLEX
   ALLOC(r,var)
-  r = real(var)
+  r DIMS = real(var)
   call ncdf_inq_var(this,'Re'/ /name,id=id)
   call ncdf_err(nf90_put_var(this%id, id, r,start=start,count=count), &
      "Saving variable (VAR) Re"/ /trim(name)/ /' in file: '/ /this)
   call ncdf_inq_var(this,'Im'/ /name,id=id)
-  r = aimag(var)
+  r DIMS = aimag(var)
   call ncdf_err(nf90_put_var(this%id, id, r,start=start,count=count), &
        'Saving variable (VAR) Im'/ /trim(name)/ /' in file: '/ /this)
   deallocate(r)
@@ -39,14 +39,14 @@ end subroutine ROUTINE3(put_var,VAR,name)
 subroutine ROUTINE3(get_var,VAR,name)(this, name, var, start, count, stride)
   type(hNCDF), intent(inout) :: this
   character(len=*), intent(in) :: name
-  VAR_TYPE, intent(out)DIMS :: var
+  VAR_TYPE, intent(out) :: var DIMS
   integer, intent(in), optional :: start(:)
   integer, intent(in), optional :: count(:)
   integer, intent(in), optional :: stride(:)
 #if DIM > 0 
   integer :: id
 #ifdef IS_COMPLEX
-  REAL_TYPE, allocatable DIMS :: r,i
+  REAL_TYPE, allocatable :: r DIMS , i DIMS
 #endif
 #endif
 #if DIM == 0
@@ -65,7 +65,7 @@ subroutine ROUTINE3(get_var,VAR,name)(this, name, var, start, count, stride)
   call ncdf_inq_var(this,'Im'/ /name,id=id)
   call ncdf_err(nf90_get_var(this%id, id, i,start=start,count=count,stride=stride), &
        'Retrieving variable (VAR) Im'/ /trim(name)/ /' in file: '/ /this)
-  var = cmplx(r,i)
+  var DIMS = cmplx(r,i)
   deallocate(r,i)
 #else
   call ncdf_inq_var(this,name,id=id)