Changeset 1637

Timestamp:

Jul 18, 2012, 5:35:21 PM (12 years ago)

Author:

lguez

Message:

Bug fix

File:

• LMDZ5/trunk/libf/bibio/nf95_gw_var_m.F90 (modified) (5 diffs)

LMDZ5/trunk/libf/bibio/nf95_gw_var_m.F90

@@ -200 +200 @@
   !************************************
 
-  subroutine nf95_gw_var_dble_1d(ncid, varid, values)
-
-    ! Double precision, the array has rank 1.
-
-    integer, intent(in):: ncid
-    integer, intent(in):: varid
-    double precision, pointer:: values(:)
+!!$  subroutine nf95_gw_var_dble_1d(ncid, varid, values)
+!!$
+!!$    ! Double precision, the array has rank 1.
+!!$
+!!$    integer, intent(in):: ncid
+!!$    integer, intent(in):: varid
+!!$    double precision, pointer:: values(:)
+!!$
+!!$    ! Variables local to the procedure:
+!!$    integer nclen
+!!$    integer, pointer:: dimids(:)
+!!$
+!!$    !---------------------
+!!$
+!!$    call nf95_inquire_variable(ncid, varid, dimids=dimids)
+!!$
+!!$    if (size(dimids) /= 1) then
+!!$       print *, "nf95_gw_var_dble_1d:"
+!!$       print *, "varid = ", varid
+!!$       print *, "rank of NetCDF variable is ", size(dimids), ", not 1"
+!!$        stop 1
+!!$    end if
+!!$
+!!$    call nf95_inquire_dimension(ncid, dimids(1), nclen=nclen)
+!!$    deallocate(dimids) ! pointer
+!!$
+!!$    allocate(values(nclen))
+!!$    if (nclen /= 0) call NF95_GET_VAR(ncid, varid, values)
+!!$
+!!$  end subroutine nf95_gw_var_dble_1d
+!!$
+!!$  !************************************
+!!$
+!!$  subroutine nf95_gw_var_dble_3d(ncid, varid, values)
+!!$
+!!$    ! Double precision, the array has rank 3.
+!!$
+!!$    integer, intent(in):: ncid
+!!$    integer, intent(in):: varid
+!!$    double precision, pointer:: values(:, :, :)
+!!$
+!!$    ! Variables local to the procedure:
+!!$    integer nclen1, nclen2, nclen3
+!!$    integer, pointer:: dimids(:)
+!!$
+!!$    !---------------------
+!!$
+!!$    call nf95_inquire_variable(ncid, varid, dimids=dimids)
+!!$
+!!$    if (size(dimids) /= 3) then
+!!$       print *, "nf95_gw_var_dble_3d:"
+!!$       print *, "varid = ", varid
+!!$       print *, "rank of NetCDF variable is ", size(dimids), ", not 3"
+!!$       stop 1
+!!$    end if
+!!$
+!!$    call nf95_inquire_dimension(ncid, dimids(1), nclen=nclen1)
+!!$    call nf95_inquire_dimension(ncid, dimids(2), nclen=nclen2)
+!!$    call nf95_inquire_dimension(ncid, dimids(3), nclen=nclen3)
+!!$    deallocate(dimids) ! pointer
+!!$
+!!$    allocate(values(nclen1, nclen2, nclen3))
+!!$    if (nclen1 * nclen2 * nclen3 /= 0) call NF95_GET_VAR(ncid, varid, values)
+!!$
+!!$  end subroutine nf95_gw_var_dble_3d
+!!$
+  !************************************
+
+  subroutine nf95_gw_var_int_1d(ncid, varid, values)
+
+    ! Integer type, the array has rank 1.
+
+    integer, intent(in):: ncid
+    integer, intent(in):: varid
+    integer, pointer:: values(:)
 
     ! Variables local to the procedure:
@@ -217 +285 @@
 
     if (size(dimids) /= 1) then
-       print *, "nf95_gw_var_dble_1d:"
+       print *, "nf95_gw_var_int_1d:"
        print *, "varid = ", varid
        print *, "rank of NetCDF variable is ", size(dimids), ", not 1"
-        stop 1
+       stop 1
     end if
 
@@ -229 +297 @@
     if (nclen /= 0) call NF95_GET_VAR(ncid, varid, values)
 
-  end subroutine nf95_gw_var_dble_1d
-
-  !************************************
-
-  subroutine nf95_gw_var_dble_3d(ncid, varid, values)
-
-    ! Double precision, the array has rank 3.
-
-    integer, intent(in):: ncid
-    integer, intent(in):: varid
-    double precision, pointer:: values(:, :, :)
+  end subroutine nf95_gw_var_int_1d
+
+  !************************************
+
+  subroutine nf95_gw_var_int_3d(ncid, varid, values)
+
+    ! Integer type, the array has rank 3.
+
+    integer, intent(in):: ncid
+    integer, intent(in):: varid
+    integer, pointer:: values(:, :, :)
 
     ! Variables local to the procedure:
@@ -250 +318 @@
 
     if (size(dimids) /= 3) then
-       print *, "nf95_gw_var_dble_3d:"
+       print *, "nf95_gw_var_int_3d:"
        print *, "varid = ", varid
        print *, "rank of NetCDF variable is ", size(dimids), ", not 3"
@@ -264 +332 @@
     if (nclen1 * nclen2 * nclen3 /= 0) call NF95_GET_VAR(ncid, varid, values)
 
-  end subroutine nf95_gw_var_dble_3d
-
-  !************************************
-
-  subroutine nf95_gw_var_int_1d(ncid, varid, values)
-
-    ! Integer type, the array has rank 1.
-
-    integer, intent(in):: ncid
-    integer, intent(in):: varid
-    integer, pointer:: values(:)
-
-    ! Variables local to the procedure:
-    integer nclen
-    integer, pointer:: dimids(:)
-
-    !---------------------
-
-    call nf95_inquire_variable(ncid, varid, dimids=dimids)
-
-    if (size(dimids) /= 1) then
-       print *, "nf95_gw_var_int_1d:"
-       print *, "varid = ", varid
-       print *, "rank of NetCDF variable is ", size(dimids), ", not 1"
-       stop 1
-    end if
-
-    call nf95_inquire_dimension(ncid, dimids(1), nclen=nclen)
-    deallocate(dimids) ! pointer
-
-    allocate(values(nclen))
-    if (nclen /= 0) call NF95_GET_VAR(ncid, varid, values)
-
-  end subroutine nf95_gw_var_int_1d
-
-  !************************************
-
-  subroutine nf95_gw_var_int_3d(ncid, varid, values)
-
-    ! Integer type, the array has rank 3.
-
-    integer, intent(in):: ncid
-    integer, intent(in):: varid
-    integer, pointer:: values(:, :, :)
-
-    ! Variables local to the procedure:
-    integer nclen1, nclen2, nclen3
-    integer, pointer:: dimids(:)
-
-    !---------------------
-
-    call nf95_inquire_variable(ncid, varid, dimids=dimids)
-
-    if (size(dimids) /= 3) then
-       print *, "nf95_gw_var_int_3d:"
-       print *, "varid = ", varid
-       print *, "rank of NetCDF variable is ", size(dimids), ", not 3"
-       stop 1
-    end if
-
-    call nf95_inquire_dimension(ncid, dimids(1), nclen=nclen1)
-    call nf95_inquire_dimension(ncid, dimids(2), nclen=nclen2)
-    call nf95_inquire_dimension(ncid, dimids(3), nclen=nclen3)
-    deallocate(dimids) ! pointer
-
-    allocate(values(nclen1, nclen2, nclen3))
-    if (nclen1 * nclen2 * nclen3 /= 0) call NF95_GET_VAR(ncid, varid, values)
-
   end subroutine nf95_gw_var_int_3d