Changeset 2228 for LMDZ5/trunk/libf/bibio

Timestamp:

Mar 12, 2015, 2:15:18 PM (10 years ago)

Author:

lguez

Message:

Correcting a problem from revision 2218. The type double precision
with option "-fdefault-real-8" of gfortran is promoted to 16-byte
precision and there is no specific procedure in arth with this
precision. Could not add a specific procedure in arth with double
precision because, with ifort, the option "-real-size 64" does not
promote the double precision, so that would make two identical
specific procedures in arth.

In module nrtype, replaced double precision by a parameterized real
kind so that the effective precision does not depend on a compiler
option.

In coefpoly, fxhyp, fyhyp and invert_zoom_x, use the parameterized
real kind defined in nrtype, instead of double precision.

Also, in module nrtype, removed unused derived types sprs2_sp and
sprs2_dp.

Location:

LMDZ5/trunk/libf/bibio

Files:

• arth.F90 (modified) (5 diffs)
• nrtype.F90 (modified) (2 diffs)

LMDZ5/trunk/libf/bibio/arth.F90

@@ -7 +7 @@
   INTERFACE arth
      ! Returns an arithmetic progression, given a first term "first", an
-     ! increment and a number of terms "n".
+     ! increment and a number of terms "n" (including "first").
 
      MODULE PROCEDURE arth_r, arth_i
-     ! The difference between the procedures is the type of
-     ! arguments "first" and "increment" and of function result.
+     ! The difference between the procedures is the kind and type of
+     ! arguments first and increment and of function result.
   END INTERFACE
 
@@ -22 +22 @@
     REAL, INTENT(IN) :: first,increment
     INTEGER, INTENT(IN) :: n
-    REAL, DIMENSION(n) :: arth_r
+    REAL arth_r(n)
 
-    ! Variables local to the procedure:
-
+    ! Local:
     INTEGER :: k,k2
     REAL :: temp
@@ -50 +49 @@
        end do
     end if
+
   END FUNCTION arth_r
 
@@ -57 +57 @@
 
     INTEGER, INTENT(IN) :: first,increment,n
-    INTEGER, DIMENSION(n) :: arth_i
+    INTEGER arth_i(n)
+
+    ! Local:
     INTEGER :: k,k2,temp
+
+    !---------------------------------------
+
     if (n > 0) arth_i(1)=first
     if (n <= NPAR_ARTH) then
@@ -78 +83 @@
        end do
     end if
+
   END FUNCTION arth_i
 

LMDZ5/trunk/libf/bibio/nrtype.F90

@@ -3 +3 @@
   implicit none
 
-  integer, parameter:: wp = kind(0.) ! working precision for real type
+  integer, parameter:: k8 = selected_real_kind(13)
 
   ! Frequently used mathematical constants (with precision to spare):
@@ -13 +13 @@
   REAL, PARAMETER :: EULER=0.5772156649015328606065120900824024310422
 
-  DOUBLE PRECISION, PARAMETER:: &
-       PI_D = 3.141592653589793238462643383279502884197d0
-  DOUBLE PRECISION, PARAMETER:: &
-       PIO2_D=1.57079632679489661923132169163975144209858d0
-  DOUBLE PRECISION, PARAMETER:: &
-       TWOPI_D=6.283185307179586476925286766559005768394d0
-
-  ! Derived data types for sparse matrices, single and double
-  ! precision (see use in Chapter B2):
-
-  TYPE sprs2_sp
-     INTEGER :: n,len
-     REAL, DIMENSION(:), POINTER :: val
-     INTEGER, DIMENSION(:), POINTER :: irow
-     INTEGER, DIMENSION(:), POINTER :: jcol
-  END TYPE sprs2_sp
-
-  TYPE sprs2_dp
-     INTEGER :: n,len
-     DOUBLE PRECISION, DIMENSION(:), POINTER :: val
-     INTEGER, DIMENSION(:), POINTER :: irow
-     INTEGER, DIMENSION(:), POINTER :: jcol
-  END TYPE sprs2_dp
+  REAL(K8), PARAMETER:: &
+       PI_D = 3.141592653589793238462643383279502884197_k8
+  REAL(K8), PARAMETER:: &
+       PIO2_D=1.57079632679489661923132169163975144209858_k8
+  REAL(K8), PARAMETER:: &
+       TWOPI_D=6.283185307179586476925286766559005768394_k8
 
 END MODULE nrtype