<p><b>duda</b> 2011-08-15 17:30:26 -0600 (Mon, 15 Aug 2011)</p><p>BRANCH COMMIT<br>
<br>
The gfortran compiler objects when a module has the same name<br>
as a type defined in that module. So, rename the 'bitarray' type<br>
to 'bitarray_type', and rename the 'queue' type to 'queue_type',<br>
while keeping the names of the modules as they are; this more<br>
closely matches the loose convention adopted elsewhere in MPAS.<br>
<br>
<br>
M src/core_init_nhyd_atmos/module_hinterp.F<br>
M src/core_init_nhyd_atmos/module_bitarray.F<br>
M src/core_init_nhyd_atmos/module_queue.F<br>
</p><hr noshade><pre><font color="gray">Modified: branches/atmos_physics/src/core_init_nhyd_atmos/module_bitarray.F
===================================================================
--- branches/atmos_physics/src/core_init_nhyd_atmos/module_bitarray.F        2011-08-12 23:27:01 UTC (rev 939)
+++ branches/atmos_physics/src/core_init_nhyd_atmos/module_bitarray.F        2011-08-15 23:30:26 UTC (rev 940)
@@ -6,12 +6,12 @@
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
module bitarray
- type bitarray
+ type bitarray_type
integer, pointer, dimension(:,:) :: iarray ! Storage array
integer :: nx, ny ! Number of bits in the x and y directions
integer :: x_int_dim, y_int_dim ! Number of integers in the x and y directions
integer :: integer_size ! Number of bits in an integer
- end type bitarray
+ end type bitarray_type
contains
@@ -26,7 +26,7 @@
! Arguments
integer, intent(in) :: i, j
- type (bitarray), intent(out) :: b
+ type (bitarray_type), intent(out) :: b
b%integer_size = bit_size(b%integer_size)
@@ -53,8 +53,8 @@
implicit none
! Arguments
- type (bitarray), intent(in) :: src
- type (bitarray), intent(out) :: dst
+ type (bitarray_type), intent(in) :: src
+ type (bitarray_type), intent(out) :: dst
dst%integer_size = src%integer_size
@@ -81,7 +81,7 @@
! Arguments
integer, intent(in) :: i, j
- type (bitarray), intent(inout) :: b
+ type (bitarray_type), intent(inout) :: b
! Local variables
integer :: n_integer, n_bit
@@ -105,7 +105,7 @@
! Arguments
integer, intent(in) :: i, j
- type (bitarray), intent(inout) :: b
+ type (bitarray_type), intent(inout) :: b
! Local variables
integer :: n_integer, n_bit
@@ -129,7 +129,7 @@
! Arguments
integer, intent(in) :: i, j
- type (bitarray), intent(in) :: b
+ type (bitarray_type), intent(in) :: b
! Local variables
logical :: bitarray_test
@@ -156,7 +156,7 @@
implicit none
! Arguments
- type (bitarray), intent(inout) :: b1, b2
+ type (bitarray_type), intent(inout) :: b1, b2
! Local variables
integer :: i, j
@@ -184,7 +184,7 @@
implicit none
! Arguments
- type (bitarray), intent(inout) :: b
+ type (bitarray_type), intent(inout) :: b
if (associated(b%iarray)) then
deallocate(b%iarray)
Modified: branches/atmos_physics/src/core_init_nhyd_atmos/module_hinterp.F
===================================================================
--- branches/atmos_physics/src/core_init_nhyd_atmos/module_hinterp.F        2011-08-12 23:27:01 UTC (rev 939)
+++ branches/atmos_physics/src/core_init_nhyd_atmos/module_hinterp.F        2011-08-15 23:30:26 UTC (rev 940)
@@ -314,8 +314,8 @@
integer :: i, j
real (kind=RKIND) :: distance
logical :: found_valid
- type (bitarray) :: b
- type (queue) :: q
+ type (bitarray_type) :: b
+ type (queue_type) :: q
type (q_data) :: qdata
! We only search if the starting point is within the array
Modified: branches/atmos_physics/src/core_init_nhyd_atmos/module_queue.F
===================================================================
--- branches/atmos_physics/src/core_init_nhyd_atmos/module_queue.F        2011-08-12 23:27:01 UTC (rev 939)
+++ branches/atmos_physics/src/core_init_nhyd_atmos/module_queue.F        2011-08-15 23:30:26 UTC (rev 940)
@@ -17,10 +17,10 @@
type (q_item), pointer :: next
end type q_item
- type queue ! The queue object, defined by a head and tail pointer
+ type queue_type ! The queue object, defined by a head and tail pointer
type (q_item), pointer :: head, tail
integer :: length
- end type queue
+ end type queue_type
contains
@@ -36,7 +36,7 @@
implicit none
! Arguments
- type (queue), intent(inout) :: q
+ type (queue_type), intent(inout) :: q
nullify(q%head)
nullify(q%tail)
@@ -55,7 +55,7 @@
implicit none
! Arguments
- type (queue), intent(inout) :: q
+ type (queue_type), intent(inout) :: q
type (q_data), intent(in) :: qitem
! Local variables
@@ -87,7 +87,7 @@
implicit none
! Arguments
- type (queue), intent(in) :: q
+ type (queue_type), intent(in) :: q
! Local variables
logical :: q_isdata
@@ -112,7 +112,7 @@
implicit none
! Arguments
- type (queue), intent(in) :: q
+ type (queue_type), intent(in) :: q
! Local variables
type (q_data) :: q_peek
@@ -136,7 +136,7 @@
implicit none
! Arguments
- type (queue), intent(in) :: q
+ type (queue_type), intent(in) :: q
! Local variables
! type (q_item), pointer :: cursor
@@ -168,7 +168,7 @@
implicit none
! Arguments
- type (queue), intent(inout) :: q
+ type (queue_type), intent(inout) :: q
! Local variables
type (q_data) :: q_remove
@@ -205,7 +205,7 @@
implicit none
! Arguments
- type (queue), intent(inout) :: q
+ type (queue_type), intent(inout) :: q
! Local variables
type (q_item), pointer :: cursor
</font>
</pre>