merge origin/double-precision

Author: rouson

src/intrinsic_array_m.F90

@@ -7,23 +7,26 @@ module intrinsic_array_m
   public :: intrinsic_array_t
 
   type, extends(characterizable_t) :: intrinsic_array_t
-    complex,          allocatable :: complex_1D(:)
-    integer,          allocatable :: integer_1D(:)
-    logical,          allocatable :: logical_1D(:)
-    real,             allocatable :: real_1D(:)
-    double precision, allocatable :: double_precision_1D(:)
+    complex,             allocatable :: complex_1D(:)
+    complex(kind(1.D0)), allocatable :: complex_double_1D(:)
+    integer,             allocatable :: integer_1D(:)
+    logical,             allocatable :: logical_1D(:)
+    real,                allocatable :: real_1D(:)
+    double precision,    allocatable :: double_precision_1D(:)
 
-    complex,          allocatable :: complex_2D(:,:)
-    integer,          allocatable :: integer_2D(:,:)
-    logical,          allocatable :: logical_2D(:,:)
-    real,             allocatable :: real_2D(:,:)
-    double precision, allocatable :: double_precision_2D(:,:)
+    complex,             allocatable :: complex_2D(:,:)
+    complex(kind(1.D0)), allocatable :: complex_double_2D(:,:)
+    integer,             allocatable :: integer_2D(:,:)
+    logical,             allocatable :: logical_2D(:,:)
+    real,                allocatable :: real_2D(:,:)
+    double precision,    allocatable :: double_precision_2D(:,:)
 
-    complex,          allocatable :: complex_3D(:,:,:)
-    integer,          allocatable :: integer_3D(:,:,:)
-    logical,          allocatable :: logical_3D(:,:,:)
-    real,             allocatable :: real_3D(:,:,:)
-    double precision, allocatable :: double_precision_3D(:,:,:)
+    complex,             allocatable :: complex_3D(:,:,:)
+    complex(kind(1.D0)), allocatable :: complex_double_3D(:,:,:)
+    integer,             allocatable :: integer_3D(:,:,:)
+    logical,             allocatable :: logical_3D(:,:,:)
+    real,                allocatable :: real_3D(:,:,:)
+    double precision,    allocatable :: double_precision_3D(:,:,:)
   contains
     procedure :: as_character
   end type

src/intrinsic_array_s.F90

@@ -6,7 +6,7 @@
   module procedure construct
 
 #ifndef NAGFOR
-    select rank(array)
+  select rank(array)
     rank(1)
 #endif
       select type(array)
@@ -67,13 +67,20 @@
     integer, parameter :: single_number_width=32
 
     if (1 /= count( & 
-      [ allocated(self%complex_1D), allocated(self%integer_1D), allocated(self%logical_1D), allocated(self%real_1D) & 
-       ,allocated(self%complex_2D), allocated(self%integer_2D), allocated(self%logical_2D), allocated(self%real_2D) &
+      [ allocated(self%complex_1D), allocated(self%complex_double_1D), allocated(self%integer_1D), &
+        allocated(self%logical_1D), allocated(self%real_1D), &
+        allocated(self%complex_2D), allocated(self%complex_double_2D), allocated(self%integer_2D), &
+        allocated(self%logical_2D), allocated(self%real_2D), &
+        allocated(self%complex_3D), allocated(self%complex_double_3D), allocated(self%integer_3D), &
+        allocated(self%logical_3D), allocated(self%real_3D) &
       ])) error stop "intrinsic_array_t as_character: ambiguous component allocation status."
 
     if (allocated(self%complex_1D)) then
       character_self = repeat(" ", ncopies = single_number_width*size(self%complex_1D))
       write(character_self, *) self%complex_1D
+    else if (allocated(self%complex_double_1D)) then
+      character_self = repeat(" ", ncopies = single_number_width*size(self%complex_double_1D))
+      write(character_self, *) self%complex_double_1D
     else if (allocated(self%integer_1D)) then
       character_self = repeat(" ", ncopies = single_number_width*size(self%integer_1D))
       write(character_self, *) self%integer_1D
@@ -89,6 +96,9 @@
     else if (allocated(self%complex_2D)) then
       character_self = repeat(" ", ncopies = single_number_width*size(self%complex_2D))
       write(character_self, *) self%complex_2D
+    else if (allocated(self%complex_double_2D)) then
+      character_self = repeat(" ", ncopies = single_number_width*size(self%complex_double_2D))
+      write(character_self, *) self%complex_double_2D
     else if (allocated(self%integer_2D)) then
       character_self = repeat(" ", ncopies = single_number_width*size(self%integer_2D))
       write(character_self, *) self%integer_2D
@@ -101,9 +111,12 @@
     else if (allocated(self%double_precision_2D)) then
       character_self = repeat(" ", ncopies = single_number_width*size(self%double_precision_2D))
       write(character_self, *) self%double_precision_2D
-    else if (allocated(self%complex_2D)) then
+    else if (allocated(self%complex_3D)) then
       character_self = repeat(" ", ncopies = single_number_width*size(self%complex_3D))
       write(character_self, *) self%complex_3D
+    else if (allocated(self%complex_double_3D)) then
+      character_self = repeat(" ", ncopies = single_number_width*size(self%complex_double_3D))
+      write(character_self, *) self%complex_double_3D
     else if (allocated(self%integer_3D)) then
       character_self = repeat(" ", ncopies = single_number_width*size(self%integer_3D))
       write(character_self, *) self%integer_3D