<p><b>duda</b> 2012-04-24 16:38:28 -0600 (Tue, 24 Apr 2012)</p><p>BRANCH COMMIT<br>
<br>
Comment out debugging write statements in IO-related code.<br>
<br>
<br>
M registry/gen_inc.c<br>
M framework/mpas_io_input.F<br>
M framework/add_field_indices.inc<br>
M framework/mpas_io_streams.F<br>
M framework/mpas_io.F<br>
</p><hr noshade><pre><font color="gray">Modified: branches/omp_blocks/io/src/framework/add_field_indices.inc
===================================================================
--- branches/omp_blocks/io/src/framework/add_field_indices.inc 2012-04-24 18:18:26 UTC (rev 1800)
+++ branches/omp_blocks/io/src/framework/add_field_indices.inc 2012-04-24 22:38:28 UTC (rev 1801)
@@ -2,7 +2,7 @@
totalDimSize = 0
field_ptr => field
if (trim(field % dimNames(idim)) == 'nCells') then
-write(0,*) '... outer dimension is nCells'
+!write(0,*) '... outer dimension is nCells'
allocate(indices(0))
do while (associated(field_ptr))
call mergeArrays(indices, field_ptr % block % mesh % indexToCellID % array(1:field_ptr % block % mesh % nCellsSolve))
@@ -12,7 +12,7 @@
call mpas_dmpar_sum_int(field % block % domain % dminfo, totalDimSize, globalDimSize)
isDecomposed = .true.
else if (trim(field % dimNames(idim)) == 'nEdges') then
-write(0,*) '... outer dimension is nEdges'
+!write(0,*) '... outer dimension is nEdges'
allocate(indices(0))
do while (associated(field_ptr))
call mergeArrays(indices, field_ptr % block % mesh % indexToEdgeID % array(1:field_ptr % block % mesh % nEdgesSolve))
@@ -22,7 +22,7 @@
call mpas_dmpar_sum_int(field % block % domain % dminfo, totalDimSize, globalDimSize)
isDecomposed = .true.
else if (trim(field % dimNames(idim)) == 'nVertices') then
-write(0,*) '... outer dimension is nVertices'
+!write(0,*) '... outer dimension is nVertices'
allocate(indices(0))
do while (associated(field_ptr))
call mergeArrays(indices, field_ptr % block % mesh % indexToVertexID % array(1:field_ptr % block % mesh % nVerticesSolve))
Modified: branches/omp_blocks/io/src/framework/mpas_io.F
===================================================================
--- branches/omp_blocks/io/src/framework/mpas_io.F 2012-04-24 18:18:26 UTC (rev 1800)
+++ branches/omp_blocks/io/src/framework/mpas_io.F 2012-04-24 22:38:28 UTC (rev 1801)
@@ -193,12 +193,12 @@
integer, intent(in) :: io_task_stride
integer, intent(out), optional :: ierr
- write(0,*) 'Called MPAS_io_init()'
+! write(0,*) 'Called MPAS_io_init()'
if (present(ierr)) ierr = MPAS_IO_NOERR
local_dminfo = dminfo
-write(0,*) 'MGD PIO_init'
+!write(0,*) 'MGD PIO_init'
call PIO_init(local_dminfo % my_proc_id, & ! comp_rank
local_dminfo % comm, & ! comp_comm
io_task_count, & ! num_iotasks
@@ -224,7 +224,7 @@
integer :: pio_iotype
integer :: pio_ierr
- write(0,*) 'Called MPAS_io_open()'
+! write(0,*) 'Called MPAS_io_open()'
if (present(ierr)) ierr = MPAS_IO_NOERR
@@ -255,10 +255,10 @@
end if
if (mode == MPAS_IO_WRITE) then
-write(0,*) 'MGD PIO_createfile'
+!write(0,*) 'MGD PIO_createfile'
pio_ierr = PIO_createfile(pio_iosystem, MPAS_io_open % pio_file, pio_iotype, trim(filename), PIO_64BIT_OFFSET)
else
-write(0,*) 'MGD PIO_openfile'
+!write(0,*) 'MGD PIO_openfile'
pio_ierr = PIO_openfile(pio_iosystem, MPAS_io_open % pio_file, pio_iotype, trim(filename), PIO_nowrite)
endif
if (pio_ierr /= PIO_noerr) then
@@ -267,9 +267,9 @@
end if
if (mode == MPAS_IO_READ) then
-MPAS_io_open % pio_unlimited_dimid = 44
+!MPAS_io_open % pio_unlimited_dimid = 44
pio_ierr = PIO_inquire(MPAS_io_open % pio_file, unlimitedDimID=MPAS_io_open % pio_unlimited_dimid)
-write(0,*) 'Found unlimited dim ', MPAS_io_open % pio_unlimited_dimid
+!write(0,*) 'Found unlimited dim ', MPAS_io_open % pio_unlimited_dimid
if (pio_ierr /= PIO_noerr) then
if (present(ierr)) ierr = MPAS_IO_ERR_PIO
return
@@ -293,7 +293,7 @@
integer :: pio_ierr
- write(0,*) 'Called MPAS_io_inq_unlimited_dim()'
+! write(0,*) 'Called MPAS_io_inq_unlimited_dim()'
if (present(ierr)) ierr = MPAS_IO_NOERR
! Sanity checks
@@ -329,7 +329,7 @@
type (dimlist_type), pointer :: dim_cursor
integer :: pio_ierr
- write(0,*) 'Called MPAS_io_inq_dim()'
+! write(0,*) 'Called MPAS_io_inq_dim()'
if (present(ierr)) ierr = MPAS_IO_NOERR
! Sanity checks
@@ -410,7 +410,7 @@
type (dimlist_type), pointer :: new_dimlist_node
type (dimlist_type), pointer :: dim_cursor
- write(0,*) 'Called MPAS_io_def_dim()'
+! write(0,*) 'Called MPAS_io_def_dim()'
if (present(ierr)) ierr = MPAS_IO_NOERR
! Sanity checks
@@ -474,15 +474,15 @@
! Keep dimension information
if (.not. associated(handle % dimlist_head)) then
handle % dimlist_head => new_dimlist_node
-write(0,*) 'Assigning head for '//trim(dimname)
+!write(0,*) 'Assigning head for '//trim(dimname)
end if
if (.not. associated(handle % dimlist_tail)) then
handle % dimlist_tail => new_dimlist_node
-write(0,*) 'Assigning tail for '//trim(dimname)
+!write(0,*) 'Assigning tail for '//trim(dimname)
else
handle % dimlist_tail % next => new_dimlist_node
handle % dimlist_tail => handle % dimlist_tail % next
-write(0,*) 'Extending tail for '//trim(dimname)
+!write(0,*) 'Extending tail for '//trim(dimname)
end if
end subroutine MPAS_io_def_dim
@@ -509,7 +509,7 @@
logical :: found
integer :: pio_ierr
- write(0,*) 'Called MPAS_io_inq_var()'
+! write(0,*) 'Called MPAS_io_inq_var()'
if (present(ierr)) ierr = MPAS_IO_NOERR
! Sanity checks
@@ -526,7 +526,7 @@
field_cursor => handle % fieldlist_head
do while (associated(field_cursor))
if (trim(fieldname) == trim(field_cursor % fieldhandle % fieldname)) then
-write(0,*) 'Already found variable in fieldlist'
+!write(0,*) 'Already found variable in fieldlist'
found = .true.
exit
end if
@@ -553,7 +553,7 @@
deallocate(new_fieldlist_node)
return
end if
-write(0,*) 'Inquired about variable ID', new_fieldlist_node % fieldhandle % fieldid
+!write(0,*) 'Inquired about variable ID', new_fieldlist_node % fieldhandle % fieldid
! Get field type
pio_ierr = PIO_inq_vartype(handle % pio_file, new_fieldlist_node % fieldhandle % fieldid, new_fieldlist_node % fieldhandle % field_type)
@@ -563,7 +563,7 @@
deallocate(new_fieldlist_node)
return
end if
-write(0,*) 'Inquired about variable type', new_fieldlist_node % fieldhandle % field_type
+!write(0,*) 'Inquired about variable type', new_fieldlist_node % fieldhandle % field_type
! Convert to MPAS type
if (new_fieldlist_node % fieldhandle % field_type == PIO_double) then
@@ -585,7 +585,7 @@
deallocate(new_fieldlist_node)
return
end if
-write(0,*) 'Inquired about number of dimensions ', new_fieldlist_node % fieldhandle % ndims
+!write(0,*) 'Inquired about number of dimensions ', new_fieldlist_node % fieldhandle % ndims
allocate(dimids(new_fieldlist_node % fieldhandle % ndims))
@@ -599,7 +599,7 @@
deallocate(dimids)
return
end if
-write(0,*) 'Inquired about dimension IDs ', dimids
+!write(0,*) 'Inquired about dimension IDs ', dimids
end if
allocate(new_fieldlist_node % fieldhandle % dims(new_fieldlist_node % fieldhandle % ndims))
@@ -620,7 +620,7 @@
deallocate(dimids)
return
end if
-write(0,*) 'Inquired about dimension size ', new_fieldlist_node % fieldhandle % dims(i) % dimsize
+!write(0,*) 'Inquired about dimension size ', new_fieldlist_node % fieldhandle % dims(i) % dimsize
pio_ierr = PIO_inq_dimname(handle % pio_file, dimids(i), new_fieldlist_node % fieldhandle % dims(i) % dimname)
if (pio_ierr /= PIO_noerr) then
@@ -630,7 +630,7 @@
deallocate(dimids)
return
end if
-write(0,*) 'Inquired about dimension name ', trim(new_fieldlist_node % fieldhandle % dims(i) % dimname)
+!write(0,*) 'Inquired about dimension name ', trim(new_fieldlist_node % fieldhandle % dims(i) % dimname)
end do
@@ -639,15 +639,15 @@
! Keep variable information for future reference
if (.not. associated(handle % fieldlist_head)) then
handle % fieldlist_head => new_fieldlist_node
-write(0,*) 'Assigning head for '//trim(fieldname)
+!write(0,*) 'Assigning head for '//trim(fieldname)
end if
if (.not. associated(handle % fieldlist_tail)) then
handle % fieldlist_tail => new_fieldlist_node
-write(0,*) 'Assigning tail for '//trim(fieldname)
+!write(0,*) 'Assigning tail for '//trim(fieldname)
else
handle % fieldlist_tail % next => new_fieldlist_node
handle % fieldlist_tail => handle % fieldlist_tail % next
-write(0,*) 'Extending tail for '//trim(fieldname)
+!write(0,*) 'Extending tail for '//trim(fieldname)
end if
! Keep dimension information for any new dimensions that were encountered
@@ -656,7 +656,7 @@
dim_cursor => handle % dimlist_head
do while (associated(dim_cursor))
if (trim(dim_cursor % dimhandle % dimname) == trim(new_fieldlist_node % fieldhandle % dims(i) % dimname)) then
-write(0,*) 'Already have dimension '//trim(new_fieldlist_node % fieldhandle % dims(i) % dimname)//' in our list...'
+!write(0,*) 'Already have dimension '//trim(new_fieldlist_node % fieldhandle % dims(i) % dimname)//' in our list...'
found = .true.
exit
end if
@@ -670,15 +670,15 @@
new_dimlist_node % dimhandle = new_fieldlist_node % fieldhandle % dims(i)
if (.not. associated(handle % dimlist_head)) then
handle % dimlist_head => new_dimlist_node
-write(0,*) 'Assigning head for '//trim(new_dimlist_node % dimhandle % dimname)
+!write(0,*) 'Assigning head for '//trim(new_dimlist_node % dimhandle % dimname)
end if
if (.not. associated(handle % dimlist_tail)) then
handle % dimlist_tail => new_dimlist_node
-write(0,*) 'Assigning tail for '//trim(new_dimlist_node % dimhandle % dimname)
+!write(0,*) 'Assigning tail for '//trim(new_dimlist_node % dimhandle % dimname)
else
handle % dimlist_tail % next => new_dimlist_node
handle % dimlist_tail => handle % dimlist_tail % next
-write(0,*) 'Extending tail for '//trim(new_dimlist_node % dimhandle % dimname)
+!write(0,*) 'Extending tail for '//trim(new_dimlist_node % dimhandle % dimname)
end if
end if
end do
@@ -726,7 +726,7 @@
type (dimlist_type), pointer :: dim_cursor
integer, dimension(:), pointer :: dimids
- write(0,*) 'Called MPAS_io_def_var()'
+! write(0,*) 'Called MPAS_io_def_var()'
if (present(ierr)) ierr = MPAS_IO_NOERR
! Sanity checks
@@ -748,7 +748,7 @@
! Check whether this field has already been defined
!
ndims = size(dimnames)
-write(0,*) 'Defining variable with ',ndims,' dimensions'
+!write(0,*) 'Defining variable with ',ndims,' dimensions'
field_cursor => handle % fieldlist_head
do while (associated(field_cursor))
if (trim(fieldname) == trim(field_cursor % fieldhandle % fieldname)) then
@@ -792,7 +792,7 @@
dimids(i) = dim_cursor % dimhandle % dimid
if (dim_cursor % dimhandle % is_unlimited_dim) new_fieldlist_node % fieldhandle % has_unlimited_dim = .true.
new_fieldlist_node % fieldhandle % dims(i) = dim_cursor % dimhandle
-write(0,*) 'Found dimension '//trim(new_fieldlist_node % fieldhandle % dims(i) % dimname)//' for field '//trim(fieldname)
+!write(0,*) 'Found dimension '//trim(new_fieldlist_node % fieldhandle % dims(i) % dimname)//' for field '//trim(fieldname)
else
if (present(ierr)) ierr = MPAS_IO_ERR_UNDEFINED_DIM
deallocate(new_fieldlist_node % fieldhandle % dims)
@@ -838,15 +838,15 @@
! Keep variable information for future use
if (.not. associated(handle % fieldlist_head)) then
handle % fieldlist_head => new_fieldlist_node
-write(0,*) 'Assigning head for '//trim(fieldname)
+!write(0,*) 'Assigning head for '//trim(fieldname)
end if
if (.not. associated(handle % fieldlist_tail)) then
handle % fieldlist_tail => new_fieldlist_node
-write(0,*) 'Assigning tail for '//trim(fieldname)
+!write(0,*) 'Assigning tail for '//trim(fieldname)
else
handle % fieldlist_tail % next => new_fieldlist_node
handle % fieldlist_tail => handle % fieldlist_tail % next
-write(0,*) 'Extending tail for '//trim(fieldname)
+!write(0,*) 'Extending tail for '//trim(fieldname)
end if
end subroutine MPAS_io_def_var
@@ -863,7 +863,7 @@
type (fieldlist_type), pointer :: field_cursor
- write(0,*) 'Called MPAS_io_get_var_indices()'
+! write(0,*) 'Called MPAS_io_get_var_indices()'
if (present(ierr)) ierr = MPAS_IO_NOERR
! Sanity checks
@@ -887,7 +887,7 @@
if (present(ierr)) ierr = MPAS_IO_ERR_UNDEFINED_VAR
return
end if
-write(0,*) trim(fieldname), ' has been defined'
+!write(0,*) trim(fieldname), ' has been defined'
if (.not. associated(field_cursor % fieldhandle % decomp)) then
if (present(ierr)) ierr = MPAS_IO_ERR_NO_DECOMP
@@ -916,7 +916,7 @@
integer, dimension(:), pointer :: dimlist, compdof
type (decomplist_type), pointer :: decomp_cursor, new_decomp
- write(0,*) 'Called MPAS_io_set_var_indices()'
+! write(0,*) 'Called MPAS_io_set_var_indices()'
if (present(ierr)) ierr = MPAS_IO_NOERR
! Sanity checks
@@ -925,7 +925,7 @@
return
end if
- write(0,*) 'Assigning ', size(indices), ' indices for ', trim(fieldname)
+! write(0,*) 'Assigning ', size(indices), ' indices for ', trim(fieldname)
!
@@ -942,7 +942,7 @@
if (present(ierr)) ierr = MPAS_IO_ERR_UNDEFINED_VAR
return
end if
-write(0,*) trim(fieldname), ' has been defined'
+!write(0,*) trim(fieldname), ' has been defined'
!
! If this is a scalar field, just return
@@ -950,7 +950,7 @@
if (field_cursor % fieldhandle % ndims == 0 .or. &
(field_cursor % fieldhandle % ndims == 1 .and. field_cursor % fieldhandle % has_unlimited_dim) .or. &
field_cursor % fieldhandle % field_type == MPAS_IO_CHAR) then
-write(0,*) 'No need to create a decomposition for a 0d field...'
+!write(0,*) 'No need to create a decomposition for a 0d field...'
return
end if
@@ -959,13 +959,13 @@
! Check whether a suitable decomposition already exists
!
decomp_cursor => decomp_list
-if (.not. associated(decomp_cursor)) write(0,*) 'No existing decompositions to check...'
+!if (.not. associated(decomp_cursor)) write(0,*) 'No existing decompositions to check...'
DECOMP_LOOP: do while (associated(decomp_cursor))
if (decomp_cursor % decomphandle % field_type == field_cursor % fieldhandle % field_type) then
if (size(decomp_cursor % decomphandle % dims) == field_cursor % fieldhandle % ndims) then
-write(0,*) 'Number of dimensions matches...'
+!write(0,*) 'Number of dimensions matches...'
do i=1,field_cursor % fieldhandle % ndims
-write(0,*) 'Checking dimension ', decomp_cursor % decomphandle % dims(i), field_cursor % fieldhandle % dims(i) % dimsize
+!write(0,*) 'Checking dimension ', decomp_cursor % decomphandle % dims(i), field_cursor % fieldhandle % dims(i) % dimsize
if (decomp_cursor % decomphandle % dims(i) /= field_cursor % fieldhandle % dims(i) % dimsize) then
decomp_cursor => decomp_cursor % next
cycle DECOMP_LOOP
@@ -973,14 +973,14 @@
end do
if (size(decomp_cursor % decomphandle % indices) /= size(indices)) then
-write(0,*) 'We do not have the same number of indices in this decomposition...'
+!write(0,*) 'We do not have the same number of indices in this decomposition...'
decomp_cursor => decomp_cursor % next
cycle DECOMP_LOOP
end if
do i=1,size(decomp_cursor % decomphandle % indices)
if (indices(i) /= decomp_cursor % decomphandle % indices(i)) then
-write(0,*) 'One of the indices does not match... ', i
+!write(0,*) 'One of the indices does not match... ', i
decomp_cursor => decomp_cursor % next
cycle DECOMP_LOOP
end if
@@ -988,15 +988,15 @@
! OK, we have a match... just use this decomposition for the field and return
field_cursor % fieldhandle % decomp => decomp_cursor % decomphandle
-write(0,*) 'Found a matching decomposition that we can use'
+!write(0,*) 'Found a matching decomposition that we can use'
return
else if ((size(decomp_cursor % decomphandle % dims) == field_cursor % fieldhandle % ndims - 1) &
.and. field_cursor % fieldhandle % has_unlimited_dim &
) then
-write(0,*) 'Number of non-record dimensions matches...'
+!write(0,*) 'Number of non-record dimensions matches...'
do i=1,field_cursor % fieldhandle % ndims
if (field_cursor % fieldhandle % dims(i) % is_unlimited_dim) cycle
-write(0,*) 'Checking dimension ', decomp_cursor % decomphandle % dims(i), field_cursor % fieldhandle % dims(i) % dimsize
+!write(0,*) 'Checking dimension ', decomp_cursor % decomphandle % dims(i), field_cursor % fieldhandle % dims(i) % dimsize
if (decomp_cursor % decomphandle % dims(i) /= field_cursor % fieldhandle % dims(i) % dimsize) then
decomp_cursor => decomp_cursor % next
cycle DECOMP_LOOP
@@ -1007,14 +1007,14 @@
! OK, we have a match... just use this decomposition for the field and return
field_cursor % fieldhandle % decomp => decomp_cursor % decomphandle
-write(0,*) 'Found a matching decomposition that we can use (aside from record dimension)'
+!write(0,*) 'Found a matching decomposition that we can use (aside from record dimension)'
return
end if
end if
decomp_cursor => decomp_cursor % next
end do DECOMP_LOOP
-write(0,*) 'Creating a new decomposition'
+!write(0,*) 'Creating a new decomposition'
!
@@ -1120,19 +1120,19 @@
! Add new decomposition to the list
if (.not. associated(decomp_list)) then
decomp_list => new_decomp
-write(0,*) 'Adding first item to the decomp_list'
+!write(0,*) 'Adding first item to the decomp_list'
else
new_decomp % next => decomp_list
decomp_list => new_decomp
-write(0,*) 'Adding new decomp to the head of the list'
+!write(0,*) 'Adding new decomp to the head of the list'
end if
-write(0,*) 'Setting decomp in fieldhandle'
+!write(0,*) 'Setting decomp in fieldhandle'
field_cursor % fieldhandle % decomp => new_decomp % decomphandle
deallocate(compdof)
deallocate(dimlist)
-write(0,*) 'All finished.'
+!write(0,*) 'All finished.'
end subroutine MPAS_io_set_var_indices
@@ -1172,12 +1172,12 @@
return
end if
- write(0,*) 'Reading ', trim(fieldname)
+! write(0,*) 'Reading ', trim(fieldname)
!
! Check whether the field has been defined
!
- write(0,*) 'Checking if field is define'
+! write(0,*) 'Checking if field is define'
field_cursor => handle % fieldlist_head
do while (associated(field_cursor))
if (trim(fieldname) == trim(field_cursor % fieldhandle % fieldname)) then
@@ -1194,7 +1194,7 @@
!
! Check that we have a decomposition for this field
!
- write(0,*) 'Checking for decomposition'
+! write(0,*) 'Checking for decomposition'
if (.not.present(intVal) .and. .not.present(realVal) .and. .not.present(charVal)) then
if (.not. associated(field_cursor % fieldhandle % decomp)) then
if (present(ierr)) ierr = MPAS_IO_ERR_NO_DECOMP
@@ -1204,7 +1204,7 @@
!!!! Assume array was already allocated by the user
- write(0,*) 'Checking for unlimited dim'
+! write(0,*) 'Checking for unlimited dim'
if (field_cursor % fieldhandle % has_unlimited_dim) then
call PIO_setframe(field_cursor % fieldhandle % field_desc, handle % frame_number)
start1(1) = handle % frame_number
@@ -1215,23 +1215,23 @@
count2(2) = 1
end if
- write(0,*) 'Checking for real, int, char, etc'
+! write(0,*) 'Checking for real, int, char, etc'
if (present(realVal)) then
- write (0,*) ' value is real'
+! write (0,*) ' value is real'
if (field_cursor % fieldhandle % has_unlimited_dim) then
pio_ierr = PIO_get_var(handle % pio_file, field_cursor % fieldhandle % field_desc, start1, realVal)
else
pio_ierr = PIO_get_var(handle % pio_file, field_cursor % fieldhandle % field_desc, realVal)
end if
else if (present(intVal)) then
- write (0,*) ' value is int'
+! write (0,*) ' value is int'
if (field_cursor % fieldhandle % has_unlimited_dim) then
pio_ierr = PIO_get_var(handle % pio_file, field_cursor % fieldhandle % field_desc, start1, intVal)
else
pio_ierr = PIO_get_var(handle % pio_file, field_cursor % fieldhandle % field_desc, intVal)
end if
else if (present(charVal)) then
- write (0,*) ' value is char'
+! write (0,*) ' value is char'
if (field_cursor % fieldhandle % has_unlimited_dim) then
count2(1) = field_cursor % fieldhandle % dims(1) % dimsize
pio_ierr = PIO_get_var(handle % pio_file, field_cursor % fieldhandle % fieldid, start2, count2, tempchar)
@@ -1240,40 +1240,40 @@
pio_ierr = PIO_get_var(handle % pio_file, field_cursor % fieldhandle % field_desc, charVal)
end if
else if (present(realArray1d)) then
- write (0,*) ' value is real1'
+! write (0,*) ' value is real1'
call PIO_read_darray(handle % pio_file, field_cursor % fieldhandle % field_desc, field_cursor % fieldhandle % decomp % pio_iodesc, &
realArray1d, pio_ierr)
else if (present(realArray2d)) then
- write (0,*) ' value is real2'
+! write (0,*) ' value is real2'
call PIO_read_darray(handle % pio_file, field_cursor % fieldhandle % field_desc, field_cursor % fieldhandle % decomp % pio_iodesc, &
realArray2d, pio_ierr)
else if (present(realArray3d)) then
- write (0,*) ' value is real3'
+! write (0,*) ' value is real3'
call PIO_read_darray(handle % pio_file, field_cursor % fieldhandle % field_desc, field_cursor % fieldhandle % decomp % pio_iodesc, &
realArray3d, pio_ierr)
else if (present(realArray4d)) then
- write (0,*) ' value is real4'
+! write (0,*) ' value is real4'
call PIO_read_darray(handle % pio_file, field_cursor % fieldhandle % field_desc, field_cursor % fieldhandle % decomp % pio_iodesc, &
realArray4d, pio_ierr)
else if (present(intArray1d)) then
- write (0,*) ' value is int1'
+! write (0,*) ' value is int1'
call PIO_read_darray(handle % pio_file, field_cursor % fieldhandle % field_desc, field_cursor % fieldhandle % decomp % pio_iodesc, &
intArray1d, pio_ierr)
else if (present(intArray2d)) then
- write (0,*) ' value is int2'
+! write (0,*) ' value is int2'
call PIO_read_darray(handle % pio_file, field_cursor % fieldhandle % field_desc, field_cursor % fieldhandle % decomp % pio_iodesc, &
intArray2d, pio_ierr)
else if (present(intArray3d)) then
- write (0,*) ' value is int3'
+! write (0,*) ' value is int3'
call PIO_read_darray(handle % pio_file, field_cursor % fieldhandle % field_desc, field_cursor % fieldhandle % decomp % pio_iodesc, &
intArray3d, pio_ierr)
else if (present(intArray4d)) then
- write (0,*) ' value is int4'
+! write (0,*) ' value is int4'
call PIO_read_darray(handle % pio_file, field_cursor % fieldhandle % field_desc, field_cursor % fieldhandle % decomp % pio_iodesc, &
intArray4d, pio_ierr)
end if
- write (0,*) 'Checking for error'
+! write (0,*) 'Checking for error'
if (pio_ierr /= PIO_noerr) then
if (present(ierr)) ierr = MPAS_IO_ERR_PIO
return
@@ -1295,7 +1295,7 @@
integer, dimension(1) :: start
type (fieldlist_type), pointer :: field_cursor
- write(0,*) 'Called MPAS_io_get_var_int0d()'
+! write(0,*) 'Called MPAS_io_get_var_int0d()'
if (present(ierr)) ierr = MPAS_IO_NOERR
call MPAS_io_get_var_generic(handle, fieldname, intVal=val, ierr=ierr)
@@ -1315,7 +1315,7 @@
integer :: pio_ierr
type (fieldlist_type), pointer :: field_cursor
- write(0,*) 'Called MPAS_io_get_var_int1d()'
+! write(0,*) 'Called MPAS_io_get_var_int1d()'
if (present(ierr)) ierr = MPAS_IO_NOERR
call MPAS_io_get_var_generic(handle, fieldname, intArray1d=array, ierr=ierr)
@@ -1335,7 +1335,7 @@
integer :: pio_ierr
type (fieldlist_type), pointer :: field_cursor
- write(0,*) 'Called MPAS_io_get_var_int2d()'
+! write(0,*) 'Called MPAS_io_get_var_int2d()'
if (present(ierr)) ierr = MPAS_IO_NOERR
call MPAS_io_get_var_generic(handle, fieldname, intArray2d=array, ierr=ierr)
@@ -1355,7 +1355,7 @@
integer :: pio_ierr
type (fieldlist_type), pointer :: field_cursor
- write(0,*) 'Called MPAS_io_get_var_int3d()'
+! write(0,*) 'Called MPAS_io_get_var_int3d()'
if (present(ierr)) ierr = MPAS_IO_NOERR
call MPAS_io_get_var_generic(handle, fieldname, intArray3d=array, ierr=ierr)
@@ -1375,7 +1375,7 @@
integer :: pio_ierr
type (fieldlist_type), pointer :: field_cursor
- write(0,*) 'Called MPAS_io_get_var_int4d()'
+! write(0,*) 'Called MPAS_io_get_var_int4d()'
if (present(ierr)) ierr = MPAS_IO_NOERR
call MPAS_io_get_var_generic(handle, fieldname, intArray4d=array, ierr=ierr)
@@ -1396,7 +1396,7 @@
integer, dimension(1) :: start
type (fieldlist_type), pointer :: field_cursor
- write(0,*) 'Called MPAS_io_get_var_real0d()'
+! write(0,*) 'Called MPAS_io_get_var_real0d()'
if (present(ierr)) ierr = MPAS_IO_NOERR
call MPAS_io_get_var_generic(handle, fieldname, realVal=val, ierr=ierr)
@@ -1416,7 +1416,7 @@
integer :: pio_ierr
type (fieldlist_type), pointer :: field_cursor
- write(0,*) 'Called MPAS_io_get_var_real1d()'
+! write(0,*) 'Called MPAS_io_get_var_real1d()'
if (present(ierr)) ierr = MPAS_IO_NOERR
call MPAS_io_get_var_generic(handle, fieldname, realArray1d=array, ierr=ierr)
@@ -1436,7 +1436,7 @@
integer :: pio_ierr
type (fieldlist_type), pointer :: field_cursor
- write(0,*) 'Called MPAS_io_get_var_real2d()'
+! write(0,*) 'Called MPAS_io_get_var_real2d()'
if (present(ierr)) ierr = MPAS_IO_NOERR
call MPAS_io_get_var_generic(handle, fieldname, realArray2d=array, ierr=ierr)
@@ -1456,7 +1456,7 @@
integer :: pio_ierr
type (fieldlist_type), pointer :: field_cursor
- write(0,*) 'Called MPAS_io_get_var_real3d()'
+! write(0,*) 'Called MPAS_io_get_var_real3d()'
if (present(ierr)) ierr = MPAS_IO_NOERR
call MPAS_io_get_var_generic(handle, fieldname, realArray3d=array, ierr=ierr)
@@ -1476,7 +1476,7 @@
integer :: pio_ierr
type (fieldlist_type), pointer :: field_cursor
- write(0,*) 'Called MPAS_io_get_var_real4d()'
+! write(0,*) 'Called MPAS_io_get_var_real4d()'
if (present(ierr)) ierr = MPAS_IO_NOERR
call MPAS_io_get_var_generic(handle, fieldname, realArray4d=array, ierr=ierr)
@@ -1496,7 +1496,7 @@
integer :: pio_ierr
type (fieldlist_type), pointer :: field_cursor
- write(0,*) 'Called MPAS_io_get_var_char0d()'
+! write(0,*) 'Called MPAS_io_get_var_char0d()'
if (present(ierr)) ierr = MPAS_IO_NOERR
call MPAS_io_get_var_generic(handle, fieldname, charVal=val, ierr=ierr)
@@ -1548,7 +1548,7 @@
end if
end if
- write(0,*) 'Writing ', trim(fieldname)
+! write(0,*) 'Writing ', trim(fieldname)
!
@@ -1655,7 +1655,7 @@
integer, dimension(1) :: start
type (fieldlist_type), pointer :: field_cursor
- write(0,*) 'Called MPAS_io_put_var_int0d()'
+! write(0,*) 'Called MPAS_io_put_var_int0d()'
if (present(ierr)) ierr = MPAS_IO_NOERR
call MPAS_io_put_var_generic(handle, fieldname, intVal=val, ierr=ierr)
@@ -1675,7 +1675,7 @@
integer :: pio_ierr
type (fieldlist_type), pointer :: field_cursor
- write(0,*) 'Called MPAS_io_put_var_int1d()'
+! write(0,*) 'Called MPAS_io_put_var_int1d()'
if (present(ierr)) ierr = MPAS_IO_NOERR
call MPAS_io_put_var_generic(handle, fieldname, intArray1d=array, ierr=ierr)
@@ -1695,7 +1695,7 @@
integer :: pio_ierr
type (fieldlist_type), pointer :: field_cursor
- write(0,*) 'Called MPAS_io_put_var_int2d()'
+! write(0,*) 'Called MPAS_io_put_var_int2d()'
if (present(ierr)) ierr = MPAS_IO_NOERR
call MPAS_io_put_var_generic(handle, fieldname, intArray2d=array, ierr=ierr)
@@ -1715,7 +1715,7 @@
integer :: pio_ierr
type (fieldlist_type), pointer :: field_cursor
- write(0,*) 'Called MPAS_io_put_var_int3d()'
+! write(0,*) 'Called MPAS_io_put_var_int3d()'
if (present(ierr)) ierr = MPAS_IO_NOERR
call MPAS_io_put_var_generic(handle, fieldname, intArray3d=array, ierr=ierr)
@@ -1735,7 +1735,7 @@
integer :: pio_ierr
type (fieldlist_type), pointer :: field_cursor
- write(0,*) 'Called MPAS_io_put_var_int4d()'
+! write(0,*) 'Called MPAS_io_put_var_int4d()'
if (present(ierr)) ierr = MPAS_IO_NOERR
call MPAS_io_put_var_generic(handle, fieldname, intArray4d=array, ierr=ierr)
@@ -1756,7 +1756,7 @@
integer, dimension(1) :: start
type (fieldlist_type), pointer :: field_cursor
- write(0,*) 'Called MPAS_io_put_var_real0d()'
+! write(0,*) 'Called MPAS_io_put_var_real0d()'
if (present(ierr)) ierr = MPAS_IO_NOERR
call MPAS_io_put_var_generic(handle, fieldname, realVal=val, ierr=ierr)
@@ -1776,7 +1776,7 @@
integer :: pio_ierr
type (fieldlist_type), pointer :: field_cursor
- write(0,*) 'Called MPAS_io_put_var_real1d()'
+! write(0,*) 'Called MPAS_io_put_var_real1d()'
if (present(ierr)) ierr = MPAS_IO_NOERR
call MPAS_io_put_var_generic(handle, fieldname, realArray1d=array, ierr=ierr)
@@ -1796,7 +1796,7 @@
integer :: pio_ierr
type (fieldlist_type), pointer :: field_cursor
- write(0,*) 'Called MPAS_io_put_var_real2d()'
+! write(0,*) 'Called MPAS_io_put_var_real2d()'
if (present(ierr)) ierr = MPAS_IO_NOERR
call MPAS_io_put_var_generic(handle, fieldname, realArray2d=array, ierr=ierr)
@@ -1816,7 +1816,7 @@
integer :: pio_ierr
type (fieldlist_type), pointer :: field_cursor
- write(0,*) 'Called MPAS_io_put_var_real3d()'
+! write(0,*) 'Called MPAS_io_put_var_real3d()'
if (present(ierr)) ierr = MPAS_IO_NOERR
call MPAS_io_put_var_generic(handle, fieldname, realArray3d=array, ierr=ierr)
@@ -1836,7 +1836,7 @@
integer :: pio_ierr
type (fieldlist_type), pointer :: field_cursor
- write(0,*) 'Called MPAS_io_put_var_real4d()'
+! write(0,*) 'Called MPAS_io_put_var_real4d()'
if (present(ierr)) ierr = MPAS_IO_NOERR
call MPAS_io_put_var_generic(handle, fieldname, realArray4d=array, ierr=ierr)
@@ -1856,7 +1856,7 @@
integer :: pio_ierr
type (fieldlist_type), pointer :: field_cursor
- write(0,*) 'Called MPAS_io_put_var_char0d()'
+! write(0,*) 'Called MPAS_io_put_var_char0d()'
if (present(ierr)) ierr = MPAS_IO_NOERR
call MPAS_io_put_var_generic(handle, fieldname, charVal=val, ierr=ierr)
@@ -1880,7 +1880,7 @@
type (fieldlist_type), pointer :: field_cursor
type (attlist_type), pointer :: att_cursor, new_att_node
- write(0,*) 'Called MPAS_io_get_att_int0d()'
+! write(0,*) 'Called MPAS_io_get_att_int0d()'
if (present(ierr)) ierr = MPAS_IO_NOERR
! Sanity checks
@@ -1912,7 +1912,7 @@
do while (associated(att_cursor))
if (trim(att_cursor % atthandle % attName) == trim(attName)) then
if (att_cursor % atthandle % attType == ATT_INT) then
-write(0,*) 'Using cached attribute'
+!write(0,*) 'Using cached attribute'
attValue = att_cursor % atthandle % attValueInt
else
if (present(ierr)) ierr=MPAS_IO_ERR_WRONG_ATT_TYPE
@@ -1929,7 +1929,7 @@
do while (associated(att_cursor))
if (trim(att_cursor % atthandle % attName) == trim(attName)) then
if (att_cursor % atthandle % attType == ATT_INT) then
-write(0,*) 'Using cached attribute'
+!write(0,*) 'Using cached attribute'
attValue = att_cursor % atthandle % attValueInt
else
if (present(ierr)) ierr=MPAS_IO_ERR_WRONG_ATT_TYPE
@@ -1970,28 +1970,28 @@
if (present(fieldname)) then
if (.not. associated(field_cursor % fieldhandle % attlist_head)) then
field_cursor % fieldhandle % attlist_head => new_att_node
-write(0,*) 'Assigning att head for '//trim(attName)
+!write(0,*) 'Assigning att head for '//trim(attName)
end if
if (.not. associated(field_cursor % fieldhandle % attlist_tail)) then
field_cursor % fieldhandle % attlist_tail => new_att_node
-write(0,*) 'Assigning att tail for '//trim(attName)
+!write(0,*) 'Assigning att tail for '//trim(attName)
else
field_cursor % fieldhandle % attlist_tail % next => new_att_node
field_cursor % fieldhandle % attlist_tail => field_cursor % fieldhandle % attlist_tail % next
-write(0,*) 'Extending att tail for '//trim(attName)
+!write(0,*) 'Extending att tail for '//trim(attName)
end if
else
if (.not. associated(handle % attlist_head)) then
handle % attlist_head => new_att_node
-write(0,*) 'Assigning att head for '//trim(attName)
+!write(0,*) 'Assigning att head for '//trim(attName)
end if
if (.not. associated(handle % attlist_tail)) then
handle % attlist_tail => new_att_node
-write(0,*) 'Assigning att tail for '//trim(attName)
+!write(0,*) 'Assigning att tail for '//trim(attName)
else
handle % attlist_tail % next => new_att_node
handle % attlist_tail => handle % attlist_tail % next
-write(0,*) 'Extending att tail for '//trim(attName)
+!write(0,*) 'Extending att tail for '//trim(attName)
end if
end if
@@ -2014,8 +2014,7 @@
type (fieldlist_type), pointer :: field_cursor
type (attlist_type), pointer :: att_cursor, new_att_node
-!MGD
- write(0,*) 'Called MPAS_io_get_att_int1d()'
+! write(0,*) 'Called MPAS_io_get_att_int1d()'
if (present(ierr)) ierr = MPAS_IO_NOERR
! Sanity checks
@@ -2046,9 +2045,8 @@
att_cursor => field_cursor % fieldhandle % attlist_head
do while (associated(att_cursor))
if (trim(att_cursor % atthandle % attName) == trim(attName)) then
-!MGD
if (att_cursor % atthandle % attType == ATT_INTA) then
-write(0,*) 'Using cached attribute'
+!write(0,*) 'Using cached attribute'
allocate(attValue(size(att_cursor % atthandle % attValueIntA)))
attValue = att_cursor % atthandle % attValueIntA
else
@@ -2065,9 +2063,8 @@
att_cursor => handle % attlist_head
do while (associated(att_cursor))
if (trim(att_cursor % atthandle % attName) == trim(attName)) then
-!MGD
if (att_cursor % atthandle % attType == ATT_INTA) then
-write(0,*) 'Using cached attribute'
+!write(0,*) 'Using cached attribute'
allocate(attValue(size(att_cursor % atthandle % attValueIntA)))
attValue = att_cursor % atthandle % attValueIntA
else
@@ -2087,7 +2084,7 @@
if (present(ierr)) ierr = MPAS_IO_ERR_PIO
return
end if
-!MGD
+
if (xtype /= PIO_int) then
if (present(ierr)) ierr=MPAS_IO_ERR_WRONG_ATT_TYPE
return
@@ -2111,7 +2108,6 @@
nullify(new_att_node % next)
allocate(new_att_node % atthandle)
new_att_node % atthandle % attName = attName
-!MGD
new_att_node % atthandle % attType = ATT_INTA
allocate(new_att_node % atthandle % attValueIntA(attlen))
new_att_node % atthandle % attValueIntA = attValue
@@ -2119,28 +2115,28 @@
if (present(fieldname)) then
if (.not. associated(field_cursor % fieldhandle % attlist_head)) then
field_cursor % fieldhandle % attlist_head => new_att_node
-write(0,*) 'Assigning att head for '//trim(attName)
+!write(0,*) 'Assigning att head for '//trim(attName)
end if
if (.not. associated(field_cursor % fieldhandle % attlist_tail)) then
field_cursor % fieldhandle % attlist_tail => new_att_node
-write(0,*) 'Assigning att tail for '//trim(attName)
+!write(0,*) 'Assigning att tail for '//trim(attName)
else
field_cursor % fieldhandle % attlist_tail % next => new_att_node
field_cursor % fieldhandle % attlist_tail => field_cursor % fieldhandle % attlist_tail % next
-write(0,*) 'Extending att tail for '//trim(attName)
+!write(0,*) 'Extending att tail for '//trim(attName)
end if
else
if (.not. associated(handle % attlist_head)) then
handle % attlist_head => new_att_node
-write(0,*) 'Assigning att head for '//trim(attName)
+!write(0,*) 'Assigning att head for '//trim(attName)
end if
if (.not. associated(handle % attlist_tail)) then
handle % attlist_tail => new_att_node
-write(0,*) 'Assigning att tail for '//trim(attName)
+!write(0,*) 'Assigning att tail for '//trim(attName)
else
handle % attlist_tail % next => new_att_node
handle % attlist_tail => handle % attlist_tail % next
-write(0,*) 'Extending att tail for '//trim(attName)
+!write(0,*) 'Extending att tail for '//trim(attName)
end if
end if
@@ -2163,7 +2159,7 @@
type (fieldlist_type), pointer :: field_cursor
type (attlist_type), pointer :: att_cursor, new_att_node
- write(0,*) 'Called MPAS_io_get_att_real0d()'
+! write(0,*) 'Called MPAS_io_get_att_real0d()'
if (present(ierr)) ierr = MPAS_IO_NOERR
! Sanity checks
@@ -2195,7 +2191,7 @@
do while (associated(att_cursor))
if (trim(att_cursor % atthandle % attName) == trim(attName)) then
if (att_cursor % atthandle % attType == ATT_REAL) then
-write(0,*) 'Using cached attribute'
+!write(0,*) 'Using cached attribute'
attValue = att_cursor % atthandle % attValueReal
else
if (present(ierr)) ierr=MPAS_IO_ERR_WRONG_ATT_TYPE
@@ -2212,7 +2208,7 @@
do while (associated(att_cursor))
if (trim(att_cursor % atthandle % attName) == trim(attName)) then
if (att_cursor % atthandle % attType == ATT_REAL) then
-write(0,*) 'Using cached attribute'
+!write(0,*) 'Using cached attribute'
attValue = att_cursor % atthandle % attValueReal
else
if (present(ierr)) ierr=MPAS_IO_ERR_WRONG_ATT_TYPE
@@ -2253,28 +2249,28 @@
if (present(fieldname)) then
if (.not. associated(field_cursor % fieldhandle % attlist_head)) then
field_cursor % fieldhandle % attlist_head => new_att_node
-write(0,*) 'Assigning att head for '//trim(attName)
+!write(0,*) 'Assigning att head for '//trim(attName)
end if
if (.not. associated(field_cursor % fieldhandle % attlist_tail)) then
field_cursor % fieldhandle % attlist_tail => new_att_node
-write(0,*) 'Assigning att tail for '//trim(attName)
+!write(0,*) 'Assigning att tail for '//trim(attName)
else
field_cursor % fieldhandle % attlist_tail % next => new_att_node
field_cursor % fieldhandle % attlist_tail => field_cursor % fieldhandle % attlist_tail % next
-write(0,*) 'Extending att tail for '//trim(attName)
+!write(0,*) 'Extending att tail for '//trim(attName)
end if
else
if (.not. associated(handle % attlist_head)) then
handle % attlist_head => new_att_node
-write(0,*) 'Assigning att head for '//trim(attName)
+!write(0,*) 'Assigning att head for '//trim(attName)
end if
if (.not. associated(handle % attlist_tail)) then
handle % attlist_tail => new_att_node
-write(0,*) 'Assigning att tail for '//trim(attName)
+!write(0,*) 'Assigning att tail for '//trim(attName)
else
handle % attlist_tail % next => new_att_node
handle % attlist_tail => handle % attlist_tail % next
-write(0,*) 'Extending att tail for '//trim(attName)
+!write(0,*) 'Extending att tail for '//trim(attName)
end if
end if
@@ -2297,8 +2293,7 @@
type (fieldlist_type), pointer :: field_cursor
type (attlist_type), pointer :: att_cursor, new_att_node
-!MGD
- write(0,*) 'Called MPAS_io_get_att_real1d()'
+! write(0,*) 'Called MPAS_io_get_att_real1d()'
if (present(ierr)) ierr = MPAS_IO_NOERR
! Sanity checks
@@ -2329,9 +2324,8 @@
att_cursor => field_cursor % fieldhandle % attlist_head
do while (associated(att_cursor))
if (trim(att_cursor % atthandle % attName) == trim(attName)) then
-!MGD
if (att_cursor % atthandle % attType == ATT_REALA) then
-write(0,*) 'Using cached attribute'
+!write(0,*) 'Using cached attribute'
allocate(attValue(size(att_cursor % atthandle % attValueRealA)))
attValue = att_cursor % atthandle % attValueRealA
else
@@ -2348,9 +2342,8 @@
att_cursor => handle % attlist_head
do while (associated(att_cursor))
if (trim(att_cursor % atthandle % attName) == trim(attName)) then
-!MGD
if (att_cursor % atthandle % attType == ATT_REALA) then
-write(0,*) 'Using cached attribute'
+!write(0,*) 'Using cached attribute'
allocate(attValue(size(att_cursor % atthandle % attValueRealA)))
attValue = att_cursor % atthandle % attValueRealA
else
@@ -2370,7 +2363,7 @@
if (present(ierr)) ierr = MPAS_IO_ERR_PIO
return
end if
-!MGD
+
if (xtype /= PIO_double) then
if (present(ierr)) ierr=MPAS_IO_ERR_WRONG_ATT_TYPE
return
@@ -2394,7 +2387,6 @@
nullify(new_att_node % next)
allocate(new_att_node % atthandle)
new_att_node % atthandle % attName = attName
-!MGD
new_att_node % atthandle % attType = ATT_REALA
allocate(new_att_node % atthandle % attValueRealA(attlen))
new_att_node % atthandle % attValueRealA = attValue
@@ -2402,28 +2394,28 @@
if (present(fieldname)) then
if (.not. associated(field_cursor % fieldhandle % attlist_head)) then
field_cursor % fieldhandle % attlist_head => new_att_node
-write(0,*) 'Assigning att head for '//trim(attName)
+!write(0,*) 'Assigning att head for '//trim(attName)
end if
if (.not. associated(field_cursor % fieldhandle % attlist_tail)) then
field_cursor % fieldhandle % attlist_tail => new_att_node
-write(0,*) 'Assigning att tail for '//trim(attName)
+!write(0,*) 'Assigning att tail for '//trim(attName)
else
field_cursor % fieldhandle % attlist_tail % next => new_att_node
field_cursor % fieldhandle % attlist_tail => field_cursor % fieldhandle % attlist_tail % next
-write(0,*) 'Extending att tail for '//trim(attName)
+!write(0,*) 'Extending att tail for '//trim(attName)
end if
else
if (.not. associated(handle % attlist_head)) then
handle % attlist_head => new_att_node
-write(0,*) 'Assigning att head for '//trim(attName)
+!write(0,*) 'Assigning att head for '//trim(attName)
end if
if (.not. associated(handle % attlist_tail)) then
handle % attlist_tail => new_att_node
-write(0,*) 'Assigning att tail for '//trim(attName)
+!write(0,*) 'Assigning att tail for '//trim(attName)
else
handle % attlist_tail % next => new_att_node
handle % attlist_tail => handle % attlist_tail % next
-write(0,*) 'Extending att tail for '//trim(attName)
+!write(0,*) 'Extending att tail for '//trim(attName)
end if
end if
@@ -2446,7 +2438,7 @@
type (fieldlist_type), pointer :: field_cursor
type (attlist_type), pointer :: att_cursor, new_att_node
- write(0,*) 'Called MPAS_io_get_att_text()'
+! write(0,*) 'Called MPAS_io_get_att_text()'
if (present(ierr)) ierr = MPAS_IO_NOERR
! Sanity checks
@@ -2478,7 +2470,7 @@
do while (associated(att_cursor))
if (trim(att_cursor % atthandle % attName) == trim(attName)) then
if (att_cursor % atthandle % attType == ATT_TEXT) then
-write(0,*) 'Using cached attribute'
+!write(0,*) 'Using cached attribute'
attValue = att_cursor % atthandle % attValueText
else
if (present(ierr)) ierr=MPAS_IO_ERR_WRONG_ATT_TYPE
@@ -2495,7 +2487,7 @@
do while (associated(att_cursor))
if (trim(att_cursor % atthandle % attName) == trim(attName)) then
if (att_cursor % atthandle % attType == ATT_TEXT) then
-write(0,*) 'Using cached attribute'
+!write(0,*) 'Using cached attribute'
attValue = att_cursor % atthandle % attValueText
else
if (present(ierr)) ierr=MPAS_IO_ERR_WRONG_ATT_TYPE
@@ -2536,28 +2528,28 @@
if (present(fieldname)) then
if (.not. associated(field_cursor % fieldhandle % attlist_head)) then
field_cursor % fieldhandle % attlist_head => new_att_node
-write(0,*) 'Assigning att head for '//trim(attName)
+!write(0,*) 'Assigning att head for '//trim(attName)
end if
if (.not. associated(field_cursor % fieldhandle % attlist_tail)) then
field_cursor % fieldhandle % attlist_tail => new_att_node
-write(0,*) 'Assigning att tail for '//trim(attName)
+!write(0,*) 'Assigning att tail for '//trim(attName)
else
field_cursor % fieldhandle % attlist_tail % next => new_att_node
field_cursor % fieldhandle % attlist_tail => field_cursor % fieldhandle % attlist_tail % next
-write(0,*) 'Extending att tail for '//trim(attName)
+!write(0,*) 'Extending att tail for '//trim(attName)
end if
else
if (.not. associated(handle % attlist_head)) then
handle % attlist_head => new_att_node
-write(0,*) 'Assigning att head for '//trim(attName)
+!write(0,*) 'Assigning att head for '//trim(attName)
end if
if (.not. associated(handle % attlist_tail)) then
handle % attlist_tail => new_att_node
-write(0,*) 'Assigning att tail for '//trim(attName)
+!write(0,*) 'Assigning att tail for '//trim(attName)
else
handle % attlist_tail % next => new_att_node
handle % attlist_tail => handle % attlist_tail % next
-write(0,*) 'Extending att tail for '//trim(attName)
+!write(0,*) 'Extending att tail for '//trim(attName)
end if
end if
@@ -2579,7 +2571,7 @@
type (fieldlist_type), pointer :: field_cursor
type (attlist_type), pointer :: attlist_cursor, new_attlist_node
- write(0,*) 'Called MPAS_io_put_att_int0d()'
+! write(0,*) 'Called MPAS_io_put_att_int0d()'
if (present(ierr)) ierr = MPAS_IO_NOERR
! Sanity checks
@@ -2617,7 +2609,7 @@
attlist_cursor => field_cursor % fieldhandle % attlist_head
do while (associated(attlist_cursor))
if (trim(attName) == trim(attlist_cursor % atthandle % attName)) then
-write(0,*) 'Attribute already defined'
+!write(0,*) 'Attribute already defined'
if (attlist_cursor % atthandle % attType /= ATT_INT .or. &
attlist_cursor % atthandle % attValueInt /= attValue) then
if (present(ierr)) ierr = MPAS_IO_ERR_REDEF_ATT
@@ -2644,15 +2636,15 @@
! Add attribute to field attribute list
if (.not. associated(field_cursor % fieldhandle % attlist_head)) then
field_cursor % fieldhandle % attlist_head => new_attlist_node
-write(0,*) 'Assigning att head for '//trim(attname)
+!write(0,*) 'Assigning att head for '//trim(attname)
end if
if (.not. associated(field_cursor % fieldhandle % attlist_tail)) then
field_cursor % fieldhandle % attlist_tail => new_attlist_node
-write(0,*) 'Assigning att tail for '//trim(attname)
+!write(0,*) 'Assigning att tail for '//trim(attname)
else
field_cursor % fieldhandle % attlist_tail % next => new_attlist_node
field_cursor % fieldhandle % attlist_tail => field_cursor % fieldhandle % attlist_tail % next
-write(0,*) 'Extending att tail for '//trim(attname)
+!write(0,*) 'Extending att tail for '//trim(attname)
end if
else
@@ -2661,7 +2653,7 @@
attlist_cursor => handle % attlist_head
do while (associated(attlist_cursor))
if (trim(attName) == trim(attlist_cursor % atthandle % attName)) then
-write(0,*) 'Attribute already defined'
+!write(0,*) 'Attribute already defined'
if (attlist_cursor % atthandle % attType /= ATT_INT .or. &
attlist_cursor % atthandle % attValueInt /= attValue) then
if (present(ierr)) ierr = MPAS_IO_ERR_REDEF_ATT
@@ -2678,15 +2670,15 @@
! Add attribute to global attribute list
if (.not. associated(handle % attlist_head)) then
handle % attlist_head => new_attlist_node
-write(0,*) 'Assigning att head for '//trim(attname)
+!write(0,*) 'Assigning att head for '//trim(attname)
end if
if (.not. associated(handle % attlist_tail)) then
handle % attlist_tail => new_attlist_node
-write(0,*) 'Assigning att tail for '//trim(attname)
+!write(0,*) 'Assigning att tail for '//trim(attname)
else
handle % attlist_tail % next => new_attlist_node
handle % attlist_tail => handle % attlist_tail % next
-write(0,*) 'Extending att tail for '//trim(attname)
+!write(0,*) 'Extending att tail for '//trim(attname)
end if
end if
@@ -2716,8 +2708,7 @@
type (fieldlist_type), pointer :: field_cursor
type (attlist_type), pointer :: attlist_cursor, new_attlist_node
-!MGD
- write(0,*) 'Called MPAS_io_put_att_int1d()'
+! write(0,*) 'Called MPAS_io_put_att_int1d()'
if (present(ierr)) ierr = MPAS_IO_NOERR
! Sanity checks
@@ -2739,7 +2730,6 @@
nullify(new_attlist_node % next)
allocate(new_attlist_node % attHandle)
new_attlist_node % attHandle % attName = attName
-!MGD
new_attlist_node % attHandle % attType = ATT_INTA
allocate(new_attlist_node % attHandle % attValueIntA(size(attValue)))
new_attlist_node % attHandle % attValueIntA = attValue
@@ -2757,8 +2747,7 @@
attlist_cursor => field_cursor % fieldhandle % attlist_head
do while (associated(attlist_cursor))
if (trim(attName) == trim(attlist_cursor % atthandle % attName)) then
-write(0,*) 'Attribute already defined'
-!MGD
+!write(0,*) 'Attribute already defined'
if (attlist_cursor % atthandle % attType /= ATT_INTA .or. &
size(attlist_cursor % atthandle % attValueIntA) /= size(attValue)) then
if (present(ierr)) ierr = MPAS_IO_ERR_REDEF_ATT
@@ -2789,15 +2778,15 @@
! Add attribute to field attribute list
if (.not. associated(field_cursor % fieldhandle % attlist_head)) then
field_cursor % fieldhandle % attlist_head => new_attlist_node
-write(0,*) 'Assigning att head for '//trim(attname)
+!write(0,*) 'Assigning att head for '//trim(attname)
end if
if (.not. associated(field_cursor % fieldhandle % attlist_tail)) then
field_cursor % fieldhandle % attlist_tail => new_attlist_node
-write(0,*) 'Assigning att tail for '//trim(attname)
+!write(0,*) 'Assigning att tail for '//trim(attname)
else
field_cursor % fieldhandle % attlist_tail % next => new_attlist_node
field_cursor % fieldhandle % attlist_tail => field_cursor % fieldhandle % attlist_tail % next
-write(0,*) 'Extending att tail for '//trim(attname)
+!write(0,*) 'Extending att tail for '//trim(attname)
end if
else
@@ -2806,8 +2795,7 @@
attlist_cursor => handle % attlist_head
do while (associated(attlist_cursor))
if (trim(attName) == trim(attlist_cursor % atthandle % attName)) then
-write(0,*) 'Attribute already defined'
-!MGD
+!write(0,*) 'Attribute already defined'
if (attlist_cursor % atthandle % attType /= ATT_INTA .or. &
size(attlist_cursor % atthandle % attValueIntA) /= size(attValue)) then
if (present(ierr)) ierr = MPAS_IO_ERR_REDEF_ATT
@@ -2828,15 +2816,15 @@
! Add attribute to global attribute list
if (.not. associated(handle % attlist_head)) then
handle % attlist_head => new_attlist_node
-write(0,*) 'Assigning att head for '//trim(attname)
+!write(0,*) 'Assigning att head for '//trim(attname)
end if
if (.not. associated(handle % attlist_tail)) then
handle % attlist_tail => new_attlist_node
-write(0,*) 'Assigning att tail for '//trim(attname)
+!write(0,*) 'Assigning att tail for '//trim(attname)
else
handle % attlist_tail % next => new_attlist_node
handle % attlist_tail => handle % attlist_tail % next
-write(0,*) 'Extending att tail for '//trim(attname)
+!write(0,*) 'Extending att tail for '//trim(attname)
end if
end if
@@ -2866,7 +2854,7 @@
type (fieldlist_type), pointer :: field_cursor
type (attlist_type), pointer :: attlist_cursor, new_attlist_node
- write(0,*) 'Called MPAS_io_put_att_real0d()'
+! write(0,*) 'Called MPAS_io_put_att_real0d()'
if (present(ierr)) ierr = MPAS_IO_NOERR
! Sanity checks
@@ -2904,7 +2892,7 @@
attlist_cursor => field_cursor % fieldhandle % attlist_head
do while (associated(attlist_cursor))
if (trim(attName) == trim(attlist_cursor % atthandle % attName)) then
-write(0,*) 'Attribute already defined'
+!write(0,*) 'Attribute already defined'
if (attlist_cursor % atthandle % attType /= ATT_REAL .or. &
attlist_cursor % atthandle % attValueReal /= attValue) then
if (present(ierr)) ierr = MPAS_IO_ERR_REDEF_ATT
@@ -2931,15 +2919,15 @@
! Add attribute to field attribute list
if (.not. associated(field_cursor % fieldhandle % attlist_head)) then
field_cursor % fieldhandle % attlist_head => new_attlist_node
-write(0,*) 'Assigning att head for '//trim(attname)
+!write(0,*) 'Assigning att head for '//trim(attname)
end if
if (.not. associated(field_cursor % fieldhandle % attlist_tail)) then
field_cursor % fieldhandle % attlist_tail => new_attlist_node
-write(0,*) 'Assigning att tail for '//trim(attname)
+!write(0,*) 'Assigning att tail for '//trim(attname)
else
field_cursor % fieldhandle % attlist_tail % next => new_attlist_node
field_cursor % fieldhandle % attlist_tail => field_cursor % fieldhandle % attlist_tail % next
-write(0,*) 'Extending att tail for '//trim(attname)
+!write(0,*) 'Extending att tail for '//trim(attname)
end if
else
@@ -2948,7 +2936,7 @@
attlist_cursor => handle % attlist_head
do while (associated(attlist_cursor))
if (trim(attName) == trim(attlist_cursor % atthandle % attName)) then
-write(0,*) 'Attribute already defined'
+!write(0,*) 'Attribute already defined'
if (attlist_cursor % atthandle % attType /= ATT_REAL .or. &
attlist_cursor % atthandle % attValueReal /= attValue) then
if (present(ierr)) ierr = MPAS_IO_ERR_REDEF_ATT
@@ -2965,15 +2953,15 @@
! Add attribute to global attribute list
if (.not. associated(handle % attlist_head)) then
handle % attlist_head => new_attlist_node
-write(0,*) 'Assigning att head for '//trim(attname)
+!write(0,*) 'Assigning att head for '//trim(attname)
end if
if (.not. associated(handle % attlist_tail)) then
handle % attlist_tail => new_attlist_node
-write(0,*) 'Assigning att tail for '//trim(attname)
+!write(0,*) 'Assigning att tail for '//trim(attname)
else
handle % attlist_tail % next => new_attlist_node
handle % attlist_tail => handle % attlist_tail % next
-write(0,*) 'Extending att tail for '//trim(attname)
+!write(0,*) 'Extending att tail for '//trim(attname)
end if
end if
@@ -3003,8 +2991,7 @@
type (fieldlist_type), pointer :: field_cursor
type (attlist_type), pointer :: attlist_cursor, new_attlist_node
-!MGD
- write(0,*) 'Called MPAS_io_put_att_real1d()'
+! write(0,*) 'Called MPAS_io_put_att_real1d()'
if (present(ierr)) ierr = MPAS_IO_NOERR
! Sanity checks
@@ -3026,7 +3013,6 @@
nullify(new_attlist_node % next)
allocate(new_attlist_node % attHandle)
new_attlist_node % attHandle % attName = attName
-!MGD
new_attlist_node % attHandle % attType = ATT_REALA
allocate(new_attlist_node % attHandle % attValueRealA(size(attValue)))
new_attlist_node % attHandle % attValueRealA = attValue
@@ -3044,8 +3030,7 @@
attlist_cursor => field_cursor % fieldhandle % attlist_head
do while (associated(attlist_cursor))
if (trim(attName) == trim(attlist_cursor % atthandle % attName)) then
-write(0,*) 'Attribute already defined'
-!MGD
+!write(0,*) 'Attribute already defined'
if (attlist_cursor % atthandle % attType /= ATT_REALA .or. &
size(attlist_cursor % atthandle % attValueRealA) /= size(attValue)) then
if (present(ierr)) ierr = MPAS_IO_ERR_REDEF_ATT
@@ -3076,15 +3061,15 @@
! Add attribute to field attribute list
if (.not. associated(field_cursor % fieldhandle % attlist_head)) then
field_cursor % fieldhandle % attlist_head => new_attlist_node
-write(0,*) 'Assigning att head for '//trim(attname)
+!write(0,*) 'Assigning att head for '//trim(attname)
end if
if (.not. associated(field_cursor % fieldhandle % attlist_tail)) then
field_cursor % fieldhandle % attlist_tail => new_attlist_node
-write(0,*) 'Assigning att tail for '//trim(attname)
+!write(0,*) 'Assigning att tail for '//trim(attname)
else
field_cursor % fieldhandle % attlist_tail % next => new_attlist_node
field_cursor % fieldhandle % attlist_tail => field_cursor % fieldhandle % attlist_tail % next
-write(0,*) 'Extending att tail for '//trim(attname)
+!write(0,*) 'Extending att tail for '//trim(attname)
end if
else
@@ -3093,8 +3078,7 @@
attlist_cursor => handle % attlist_head
do while (associated(attlist_cursor))
if (trim(attName) == trim(attlist_cursor % atthandle % attName)) then
-write(0,*) 'Attribute already defined'
-!MGD
+!write(0,*) 'Attribute already defined'
if (attlist_cursor % atthandle % attType /= ATT_REALA .or. &
size(attlist_cursor % atthandle % attValueRealA) /= size(attValue)) then
if (present(ierr)) ierr = MPAS_IO_ERR_REDEF_ATT
@@ -3115,15 +3099,15 @@
! Add attribute to global attribute list
if (.not. associated(handle % attlist_head)) then
handle % attlist_head => new_attlist_node
-write(0,*) 'Assigning att head for '//trim(attname)
+!write(0,*) 'Assigning att head for '//trim(attname)
end if
if (.not. associated(handle % attlist_tail)) then
handle % attlist_tail => new_attlist_node
-write(0,*) 'Assigning att tail for '//trim(attname)
+!write(0,*) 'Assigning att tail for '//trim(attname)
else
handle % attlist_tail % next => new_attlist_node
handle % attlist_tail => handle % attlist_tail % next
-write(0,*) 'Extending att tail for '//trim(attname)
+!write(0,*) 'Extending att tail for '//trim(attname)
end if
end if
@@ -3153,7 +3137,7 @@
type (fieldlist_type), pointer :: field_cursor
type (attlist_type), pointer :: attlist_cursor, new_attlist_node
- write(0,*) 'Called MPAS_io_put_att_text()'
+! write(0,*) 'Called MPAS_io_put_att_text()'
if (present(ierr)) ierr = MPAS_IO_NOERR
! Sanity checks
@@ -3191,7 +3175,7 @@
attlist_cursor => field_cursor % fieldhandle % attlist_head
do while (associated(attlist_cursor))
if (trim(attName) == trim(attlist_cursor % atthandle % attName)) then
-write(0,*) 'Attribute already defined'
+!write(0,*) 'Attribute already defined'
if (attlist_cursor % atthandle % attType /= ATT_TEXT .or. &
trim(attlist_cursor % atthandle % attValueText) /= trim(attValue)) then
if (present(ierr)) ierr = MPAS_IO_ERR_REDEF_ATT
@@ -3218,15 +3202,15 @@
! Add attribute to field attribute list
if (.not. associated(field_cursor % fieldhandle % attlist_head)) then
field_cursor % fieldhandle % attlist_head => new_attlist_node
-write(0,*) 'Assigning att head for '//trim(attname)
+!write(0,*) 'Assigning att head for '//trim(attname)
end if
if (.not. associated(field_cursor % fieldhandle % attlist_tail)) then
field_cursor % fieldhandle % attlist_tail => new_attlist_node
-write(0,*) 'Assigning att tail for '//trim(attname)
+!write(0,*) 'Assigning att tail for '//trim(attname)
else
field_cursor % fieldhandle % attlist_tail % next => new_attlist_node
field_cursor % fieldhandle % attlist_tail => field_cursor % fieldhandle % attlist_tail % next
-write(0,*) 'Extending att tail for '//trim(attname)
+!write(0,*) 'Extending att tail for '//trim(attname)
end if
else
@@ -3235,7 +3219,7 @@
attlist_cursor => handle % attlist_head
do while (associated(attlist_cursor))
if (trim(attName) == trim(attlist_cursor % atthandle % attName)) then
-write(0,*) 'Attribute already defined'
+!write(0,*) 'Attribute already defined'
if (attlist_cursor % atthandle % attType /= ATT_TEXT .or. &
trim(attlist_cursor % atthandle % attValueText) /= trim(attValue)) then
if (present(ierr)) ierr = MPAS_IO_ERR_REDEF_ATT
@@ -3252,15 +3236,15 @@
! Add attribute to global attribute list
if (.not. associated(handle % attlist_head)) then
handle % attlist_head => new_attlist_node
-write(0,*) 'Assigning att head for '//trim(attname)
+!write(0,*) 'Assigning att head for '//trim(attname)
end if
if (.not. associated(handle % attlist_tail)) then
handle % attlist_tail => new_attlist_node
-write(0,*) 'Assigning att tail for '//trim(attname)
+!write(0,*) 'Assigning att tail for '//trim(attname)
else
handle % attlist_tail % next => new_attlist_node
handle % attlist_tail => handle % attlist_tail % next
-write(0,*) 'Extending att tail for '//trim(attname)
+!write(0,*) 'Extending att tail for '//trim(attname)
end if
end if
@@ -3283,7 +3267,7 @@
integer, intent(in) :: frame
integer, intent(out), optional :: ierr
- write(0,*) 'Called MPAS_io_set_frame()'
+! write(0,*) 'Called MPAS_io_set_frame()'
if (present(ierr)) ierr = MPAS_IO_NOERR
handle % frame_number = frame
@@ -3298,7 +3282,7 @@
type (MPAS_IO_Handle_type), intent(inout) :: handle
integer, intent(out), optional :: ierr
- write(0,*) 'Called MPAS_io_advance_frame()'
+! write(0,*) 'Called MPAS_io_advance_frame()'
if (present(ierr)) ierr = MPAS_IO_NOERR
handle % frame_number = handle % frame_number + 1
@@ -3313,7 +3297,7 @@
type (MPAS_IO_Handle_type), intent(inout) :: handle
integer, intent(out), optional :: ierr
- write(0,*) 'Called MPAS_io_sync()'
+! write(0,*) 'Called MPAS_io_sync()'
if (present(ierr)) ierr = MPAS_IO_NOERR
! Sanity checks
@@ -3338,7 +3322,7 @@
type (fieldlist_type), pointer :: fieldlist_ptr, fieldlist_del
type (attlist_type), pointer :: attlist_ptr, attlist_del
- write(0,*) 'Called MPAS_io_close()'
+! write(0,*) 'Called MPAS_io_close()'
if (present(ierr)) ierr = MPAS_IO_NOERR
! Sanity checks
@@ -3393,7 +3377,7 @@
handle % initialized = .false.
-write(0,*) 'MGD PIO_closefile'
+!write(0,*) 'MGD PIO_closefile'
call PIO_closefile(handle % pio_file)
end subroutine MPAS_io_close
@@ -3408,15 +3392,15 @@
integer :: pio_ierr
type (decomplist_type), pointer :: decomp_cursor, decomp_del
- write(0,*) 'Called MPAS_io_finalize()'
+! write(0,*) 'Called MPAS_io_finalize()'
if (present(ierr)) ierr = MPAS_IO_NOERR
decomp_cursor => decomp_list
do while (associated(decomp_cursor))
decomp_del => decomp_cursor
decomp_cursor => decomp_cursor % next
-write(0,*) 'Deallocating a decomposition...'
-if (.not. associated(decomp_del % decomphandle)) write(0,*) 'OOPS... do not have decomphandle'
+!write(0,*) 'Deallocating a decomposition...'
+!if (.not. associated(decomp_del % decomphandle)) write(0,*) 'OOPS... do not have decomphandle'
deallocate(decomp_del % decomphandle % dims)
deallocate(decomp_del % decomphandle % indices)
call PIO_freedecomp(pio_iosystem, decomp_del % decomphandle % pio_iodesc)
@@ -3424,7 +3408,7 @@
deallocate(decomp_del)
end do
-write(0,*) 'MGD PIO_finalize'
+!write(0,*) 'MGD PIO_finalize'
call PIO_finalize(pio_iosystem, pio_ierr)
if (pio_ierr /= PIO_noerr) then
if (present(ierr)) ierr = MPAS_IO_ERR_PIO
Modified: branches/omp_blocks/io/src/framework/mpas_io_input.F
===================================================================
--- branches/omp_blocks/io/src/framework/mpas_io_input.F 2012-04-24 18:18:26 UTC (rev 1800)
+++ branches/omp_blocks/io/src/framework/mpas_io_input.F 2012-04-24 22:38:28 UTC (rev 1801)
@@ -918,10 +918,6 @@
domain % blocklist % mesh % nEdgesSolve = nOwnEdges
domain % blocklist % mesh % nVerticesSolve = nOwnVertices
domain % blocklist % mesh % nVertLevelsSolve = domain % blocklist % mesh % nVertLevels ! No vertical decomp yet...
-write(0,*) 'Setting nCellsSolve = ', domain % blocklist % mesh % nCellsSolve
-write(0,*) 'Setting nEdgesSolve = ', domain % blocklist % mesh % nEdgesSolve
-write(0,*) 'Setting nVerticesSolve = ', domain % blocklist % mesh % nVerticesSolve
-write(0,*) 'Setting nVertLevelsSolve = ', domain % blocklist % mesh % nVertLevelsSolve
call mpas_io_input_init(input_obj, domain % blocklist, domain % dminfo)
@@ -1089,10 +1085,6 @@
domain % blocklist % mesh % nEdgesSolve = nOwnEdges
domain % blocklist % mesh % nVerticesSolve = ghostVertexStart-1
domain % blocklist % mesh % nVertLevelsSolve = domain % blocklist % mesh % nVertLevels ! No vertical decomp yet...
-write(0,*) 'Setting nCellsSolve = ', domain % blocklist % mesh % nCellsSolve
-write(0,*) 'Setting nEdgesSolve = ', domain % blocklist % mesh % nEdgesSolve
-write(0,*) 'Setting nVerticesSolve = ', domain % blocklist % mesh % nVerticesSolve
-write(0,*) 'Setting nVertLevelsSolve = ', domain % blocklist % mesh % nVertLevelsSolve
! Link the sendList and recvList pointers in each field type to the appropriate lists
! in parinfo, e.g., cellsToSend and cellsToRecv; in future, it can also be extended to
Modified: branches/omp_blocks/io/src/framework/mpas_io_streams.F
===================================================================
--- branches/omp_blocks/io/src/framework/mpas_io_streams.F 2012-04-24 18:18:26 UTC (rev 1800)
+++ branches/omp_blocks/io/src/framework/mpas_io_streams.F 2012-04-24 22:38:28 UTC (rev 1801)
@@ -140,7 +140,7 @@
type (MPAS_Time_type) :: sliceTime, startTime
type (MPAS_TimeInterval_type) :: timeDiff, minTimeDiff
- write(0,*) 'Called MPAS_seekStream'
+! write(0,*) 'Called MPAS_seekStream'
!
! Initialize output arguments
@@ -163,7 +163,7 @@
return
end if
-write(0,*) 'Found ', timeDim, ' times in file'
+!write(0,*) 'Found ', timeDim, ' times in file'
call MPAS_io_inq_var(stream % fileHandle, 'xtime', ierr=io_err)
if (io_err /= MPAS_IO_NOERR) then
@@ -171,14 +171,14 @@
return
end if
-write(0,*) 'Found xtime variable'
+!write(0,*) 'Found xtime variable'
allocate(xtimes(timeDim))
do i=1,timeDim
call MPAS_io_set_frame(stream % fileHandle, i, io_err)
call MPAS_io_get_var(stream % fileHandle, 'xtime', xtimes(i), io_err)
-write(0,*) '... just read in xtime='//xtimes(i)
+!write(0,*) '... just read in xtime='//xtimes(i)
end do
if (len(seekTime) > 32) then
@@ -191,7 +191,7 @@
do i=1,timeDim
write(strTemp, '(a)') trim(xtimes(i)(1:32))
-write(0,*) '... converted strTemp='//strTemp
+!write(0,*) '... converted strTemp='//strTemp
call mpas_set_time(curr_time=sliceTime, dateTimeString=strTemp)
if (seekPosition == MPAS_STREAM_EXACT_TIME) then
if (sliceTime == startTime) then
@@ -272,11 +272,11 @@
return
end if
-write(0,*) '... Adding field '//trim(field % fieldName)//' to stream'
+!write(0,*) '... Adding field '//trim(field % fieldName)//' to stream'
ndims = 0
-write(0,*) '... field has ', ndims, ' dimensions'
+!write(0,*) '... field has ', ndims, ' dimensions'
!
! Determine whether the field is decomposed, the indices that are owned by this task's blocks,
@@ -314,7 +314,7 @@
new_field_list_node % field_type = FIELD_0D_INT
new_field_list_node % int0dField => field
-write(0,*) '... done adding field'
+!write(0,*) '... done adding field'
end subroutine MPAS_streamAddField_0dInteger
@@ -354,11 +354,11 @@
return
end if
-write(0,*) '... Adding field '//trim(field % fieldName)//' to stream'
+!write(0,*) '... Adding field '//trim(field % fieldName)//' to stream'
ndims = size(field % dimSizes)
-write(0,*) '... field has ', ndims, ' dimensions'
+!write(0,*) '... field has ', ndims, ' dimensions'
!
! Determine whether the field is decomposed, the indices that are owned by this task's blocks,
@@ -415,7 +415,7 @@
new_field_list_node % int1dField => field
new_field_list_node % isAvailable => isAvailable
-write(0,*) '... done adding field'
+!write(0,*) '... done adding field'
end subroutine MPAS_streamAddField_1dInteger
@@ -453,11 +453,11 @@
return
end if
-write(0,*) '... Adding field '//trim(field % fieldName)//' to stream'
+!write(0,*) '... Adding field '//trim(field % fieldName)//' to stream'
ndims = size(field % dimSizes)
-write(0,*) '... field has ', ndims, ' dimensions'
+!write(0,*) '... field has ', ndims, ' dimensions'
!
! Determine whether the field is decomposed, the indices that are owned by this task's blocks,
@@ -514,7 +514,7 @@
new_field_list_node % int2dField => field
new_field_list_node % isAvailable => isAvailable
-write(0,*) '... done adding field'
+!write(0,*) '... done adding field'
end subroutine MPAS_streamAddField_2dInteger
@@ -552,11 +552,11 @@
return
end if
-write(0,*) '... Adding field '//trim(field % fieldName)//' to stream'
+!write(0,*) '... Adding field '//trim(field % fieldName)//' to stream'
ndims = size(field % dimSizes)
-write(0,*) '... field has ', ndims, ' dimensions'
+!write(0,*) '... field has ', ndims, ' dimensions'
!
! Determine whether the field is decomposed, the indices that are owned by this task's blocks,
@@ -612,7 +612,7 @@
new_field_list_node % int3dField => field
new_field_list_node % isAvailable => isAvailable
-write(0,*) '... done adding field'
+!write(0,*) '... done adding field'
end subroutine MPAS_streamAddField_3dInteger
@@ -648,11 +648,11 @@
return
end if
-write(0,*) '... Adding field '//trim(field % fieldName)//' to stream'
+!write(0,*) '... Adding field '//trim(field % fieldName)//' to stream'
ndims = 0
-write(0,*) '... field has ', ndims, ' dimensions'
+!write(0,*) '... field has ', ndims, ' dimensions'
!
! Determine whether the field is decomposed, the indices that are owned by this task's blocks,
@@ -690,7 +690,7 @@
new_field_list_node % field_type = FIELD_0D_REAL
new_field_list_node % real0dField => field
-write(0,*) '... done adding field'
+!write(0,*) '... done adding field'
end subroutine MPAS_streamAddField_0dReal
@@ -730,11 +730,11 @@
return
end if
-write(0,*) '... Adding field '//trim(field % fieldName)//' to stream'
+!write(0,*) '... Adding field '//trim(field % fieldName)//' to stream'
ndims = size(field % dimSizes)
-write(0,*) '... field has ', ndims, ' dimensions'
+!write(0,*) '... field has ', ndims, ' dimensions'
!
! Determine whether the field is decomposed, the indices that are owned by this task's blocks,
@@ -791,7 +791,7 @@
new_field_list_node % real1dField => field
new_field_list_node % isAvailable => isAvailable
-write(0,*) '... done adding field'
+!write(0,*) '... done adding field'
end subroutine MPAS_streamAddField_1dReal
@@ -829,11 +829,11 @@
return
end if
-write(0,*) '... Adding field '//trim(field % fieldName)//' to stream'
+!write(0,*) '... Adding field '//trim(field % fieldName)//' to stream'
ndims = size(field % dimSizes)
-write(0,*) '... field has ', ndims, ' dimensions'
+!write(0,*) '... field has ', ndims, ' dimensions'
!
! Determine whether the field is decomposed, the indices that are owned by this task's blocks,
@@ -890,7 +890,7 @@
new_field_list_node % real2dField => field
new_field_list_node % isAvailable => isAvailable
-write(0,*) '... done adding field'
+!write(0,*) '... done adding field'
end subroutine MPAS_streamAddField_2dReal
@@ -928,11 +928,11 @@
return
end if
-write(0,*) '... Adding field '//trim(field % fieldName)//' to stream'
+!write(0,*) '... Adding field '//trim(field % fieldName)//' to stream'
ndims = size(field % dimSizes)
-write(0,*) '... field has ', ndims, ' dimensions'
+!write(0,*) '... field has ', ndims, ' dimensions'
!
! Determine whether the field is decomposed, the indices that are owned by this task's blocks,
@@ -943,7 +943,7 @@
any_success = .false.
if (field % isSuperArray) then
-write(0,*) '^^^^^^^^^^^^^^^^^^^^^^^^^^^ we are adding a super-array'
+!write(0,*) '^^^^^^^^^^^^^^^^^^^^^^^^^^^ we are adding a super-array'
allocate(isAvailable(size(field % constituentNames)))
isAvailable(:) = .false.
do i=1,size(field % constituentNames)
@@ -990,8 +990,8 @@
new_field_list_node % real3dField => field
new_field_list_node % isAvailable => isAvailable
-write(0,*) '... done adding field'
-write(0,*) 'DEBUGGING : Finished adding 3d real field '//trim(field % fieldName)
+!write(0,*) '... done adding field'
+!write(0,*) 'DEBUGGING : Finished adding 3d real field '//trim(field % fieldName)
end subroutine MPAS_streamAddField_3dReal
@@ -1028,11 +1028,11 @@
return
end if
-write(0,*) '... Adding field '//trim(field % fieldName)//' to stream'
+!write(0,*) '... Adding field '//trim(field % fieldName)//' to stream'
ndims = 1
-write(0,*) '... field has ', ndims, ' dimensions'
+!write(0,*) '... field has ', ndims, ' dimensions'
!
! Determine whether the field is decomposed, the indices that are owned by this task's blocks,
@@ -1085,7 +1085,7 @@
new_field_list_node % field_type = FIELD_0D_CHAR
new_field_list_node % char0dField => field
-write(0,*) '... done adding field'
+!write(0,*) '... done adding field'
end subroutine MPAS_streamAddField_0dChar
@@ -1122,19 +1122,19 @@
ndims = size(dimNames)
-write(0,*) '... field has ', ndims, ' dimensions'
+!write(0,*) '... field has ', ndims, ' dimensions'
allocate(new_field_list_node)
nullify(new_field_list_node % next)
if (stream % ioDirection == MPAS_IO_WRITE) then
-write(0,*) '... defining field'
+!write(0,*) '... defining field'
!
! Define inner dimensions
!
do idim = 1, ndims-1
-write(0,*) '... defining dimension ', trim(dimNames(idim)), dimSizes(idim)
+!write(0,*) '... defining dimension ', trim(dimNames(idim)), dimSizes(idim)
write(dimNamesLocal(idim),'(a)') dimNames(idim)
call MPAS_io_def_dim(stream % fileHandle, trim(dimNames(idim)), dimSizes(idim), io_err)
call MPAS_io_err_mesg(io_err, .false.)
@@ -1160,7 +1160,7 @@
new_field_list_node % isDecomposed = isDecomposed
if (ndims > 0) then
-write(0,*) '... defining dimension ', trim(dimNames(idim)), globalDimSize
+!write(0,*) '... defining dimension ', trim(dimNames(idim)), globalDimSize
call MPAS_io_def_dim(stream % fileHandle, trim(dimNames(idim)), globalDimSize, io_err)
call MPAS_io_err_mesg(io_err, .false.)
if (io_err /= MPAS_IO_NOERR) then
@@ -1174,7 +1174,7 @@
! Define time dimension if necessary
!
if (hasTimeDimension) then
-write(0,*) '... defining Time dimension '
+!write(0,*) '... defining Time dimension '
call MPAS_io_def_dim(stream % fileHandle, 'Time', MPAS_IO_UNLIMITED_DIM, io_err)
call MPAS_io_err_mesg(io_err, .false.)
if (io_err /= MPAS_IO_NOERR) then
@@ -1189,7 +1189,7 @@
!
! Define variable to low-level interface
!
-write(0,*) '... defining var to low-level interface with ndims ', ndims
+!write(0,*) '... defining var to low-level interface with ndims ', ndims
call MPAS_io_def_var(stream % fileHandle, trim(fieldName), fieldType, dimNamesLocal(1:ndims), io_err)
call MPAS_io_err_mesg(io_err, .false.)
@@ -1200,10 +1200,12 @@
end if
else if (stream % ioDirection == MPAS_IO_READ) then
-write(0,*) '... inquiring about'
+!write(0,*) '... inquiring about'
call MPAS_io_inq_var(stream % fileHandle, trim(fieldName), dimnames=dimNamesInq, dimsizes=dimSizesInq, ierr=io_err)
- call MPAS_io_err_mesg(io_err, .false.)
+ ! If the field does not exist in the input file, we should handle this situation gracefully at higher levels
+ ! without printing disconcerting error messages
+ !call MPAS_io_err_mesg(io_err, .false.)
if (io_err /= MPAS_IO_NOERR) then
if (present(ierr)) ierr = MPAS_IO_ERR
deallocate(new_field_list_node)
@@ -1212,9 +1214,9 @@
! Here, we should probably do a check to make sure the file agrees with what MPAS expects for the field
do i=1,ndims
-write(0,*) 'Comparing '//trim(dimNames(i))//' '//trim(dimNamesInq(i))
+!write(0,*) 'Comparing '//trim(dimNames(i))//' '//trim(dimNamesInq(i))
if (trim(dimNames(i)) /= trim(dimNamesInq(i))) then
-write(0,*) 'Mismatched dimension name in field'
+!write(0,*) 'Mismatched dimension name in field'
if (present(ierr)) ierr = MPAS_IO_ERR
deallocate(new_field_list_node)
deallocate(dimNamesInq)
@@ -1233,9 +1235,9 @@
dimTemp = dimSizes(i)
end if
end if
-write(0,*) 'Comparing ', dimTemp, ' ', dimSizesInq(i)
+!write(0,*) 'Comparing ', dimTemp, ' ', dimSizesInq(i)
if (dimTemp /= dimSizesInq(i)) then
-write(0,*) 'Mismatched dimension size in field'
+!write(0,*) 'Mismatched dimension size in field'
if (present(ierr)) ierr = MPAS_IO_ERR
deallocate(new_field_list_node)
deallocate(dimNamesInq)
@@ -1277,10 +1279,10 @@
! Add field pointer to the list
!
if (.not. associated(stream % fieldList)) then
-write(0,*) 'Adding field to the head of the list'
+!write(0,*) 'Adding field to the head of the list'
stream % fieldList => new_field_list_node
else
-write(0,*) 'Adding field to the tail of the list'
+!write(0,*) 'Adding field to the tail of the list'
field_list_cursor => stream % fieldList
do while (associated(field_list_cursor % next))
field_list_cursor => field_list_cursor % next
@@ -1352,12 +1354,12 @@
do while (associated(field_cursor))
if (field_cursor % field_type == FIELD_0D_INT) then
-write(0,*) 'DEBUGGING : *************** '//trim(field_cursor % int0dField % fieldName)
-write(0,*) 'Reading in field '//trim(field_cursor % int0dField % fieldName)
-write(0,*) ' > is the field decomposed? ', field_cursor % isDecomposed
-write(0,*) ' > outer dimension size ', field_cursor % totalDimSize
+!write(0,*) 'DEBUGGING : *************** '//trim(field_cursor % int0dField % fieldName)
+!write(0,*) 'Reading in field '//trim(field_cursor % int0dField % fieldName)
+!write(0,*) ' > is the field decomposed? ', field_cursor % isDecomposed
+!write(0,*) ' > outer dimension size ', field_cursor % totalDimSize
-write(0,*) 'MGD calling MPAS_io_get_var now...'
+!write(0,*) 'MGD calling MPAS_io_get_var now...'
call MPAS_io_get_var(stream % fileHandle, field_cursor % int0dField % fieldName, int0d_temp, io_err)
call MPAS_io_err_mesg(io_err, .false.)
if (io_err /= MPAS_IO_NOERR) then
@@ -1365,7 +1367,7 @@
return
end if
-write(0,*) 'Distributing and Copying field to other blocks'
+!write(0,*) 'Distributing and Copying field to other blocks'
call mpas_dmpar_bcast_int(field_cursor % int0dField % block % domain % dminfo, int0d_temp)
field_0dint_ptr => field_cursor % int0dField
@@ -1375,7 +1377,7 @@
end do
else if (field_cursor % field_type == FIELD_1D_INT) then
-write(0,*) 'DEBUGGING : *************** '//trim(field_cursor % int1dField % fieldName)
+!write(0,*) 'DEBUGGING : *************** '//trim(field_cursor % int1dField % fieldName)
if (field_cursor % int1dField % isSuperArray) then
ncons = size(field_cursor % int1dField % constituentNames)
@@ -1449,7 +1451,7 @@
else if (field_cursor % field_type == FIELD_2D_INT) then
-write(0,*) 'DEBUGGING : *************** '//trim(field_cursor % int2dField % fieldName)
+!write(0,*) 'DEBUGGING : *************** '//trim(field_cursor % int2dField % fieldName)
if (field_cursor % int2dField % isSuperArray) then
ncons = size(field_cursor % int2dField % constituentNames)
allocate(int1d_temp(field_cursor % totalDimSize))
@@ -1528,7 +1530,7 @@
else if (field_cursor % field_type == FIELD_3D_INT) then
-write(0,*) 'DEBUGGING : *************** '//trim(field_cursor % int3dField % fieldName)
+!write(0,*) 'DEBUGGING : *************** '//trim(field_cursor % int3dField % fieldName)
if (field_cursor % int3dField % isSuperArray) then
ncons = size(field_cursor % int3dField % constituentNames)
allocate(int2d_temp(field_cursor % int3dField % dimSizes(2), &
@@ -1609,12 +1611,12 @@
else if (field_cursor % field_type == FIELD_0D_REAL) then
-write(0,*) 'DEBUGGING : *************** '//trim(field_cursor % real0dField % fieldName)
-write(0,*) 'Reading in field '//trim(field_cursor % real0dField % fieldName)
-write(0,*) ' > is the field decomposed? ', field_cursor % isDecomposed
-write(0,*) ' > outer dimension size ', field_cursor % totalDimSize
+!write(0,*) 'DEBUGGING : *************** '//trim(field_cursor % real0dField % fieldName)
+!write(0,*) 'Reading in field '//trim(field_cursor % real0dField % fieldName)
+!write(0,*) ' > is the field decomposed? ', field_cursor % isDecomposed
+!write(0,*) ' > outer dimension size ', field_cursor % totalDimSize
-write(0,*) 'MGD calling MPAS_io_get_var now...'
+!write(0,*) 'MGD calling MPAS_io_get_var now...'
call MPAS_io_get_var(stream % fileHandle, field_cursor % real0dField % fieldName, real0d_temp, io_err)
call MPAS_io_err_mesg(io_err, .false.)
if (io_err /= MPAS_IO_NOERR) then
@@ -1622,7 +1624,7 @@
return
end if
-write(0,*) 'Distributing and Copying field to other blocks'
+!write(0,*) 'Distributing and Copying field to other blocks'
call mpas_dmpar_bcast_real(field_cursor % real0dField % block % domain % dminfo, real0d_temp)
field_0dreal_ptr => field_cursor % real0dField
@@ -1633,7 +1635,7 @@
else if (field_cursor % field_type == FIELD_1D_REAL) then
-write(0,*) 'DEBUGGING : *************** '//trim(field_cursor % real1dField % fieldName)
+!write(0,*) 'DEBUGGING : *************** '//trim(field_cursor % real1dField % fieldName)
if (field_cursor % real1dField % isSuperArray) then
ncons = size(field_cursor % real1dField % constituentNames)
else
@@ -1706,7 +1708,7 @@
else if (field_cursor % field_type == FIELD_2D_REAL) then
-write(0,*) 'DEBUGGING : *************** '//trim(field_cursor % real2dField % fieldName)
+!write(0,*) 'DEBUGGING : *************** '//trim(field_cursor % real2dField % fieldName)
if (field_cursor % real2dField % isSuperArray) then
ncons = size(field_cursor % real2dField % constituentNames)
allocate(real1d_temp(field_cursor % totalDimSize))
@@ -1785,10 +1787,10 @@
else if (field_cursor % field_type == FIELD_3D_REAL) then
-write(0,*) 'DEBUGGING : *************** '//trim(field_cursor % real3dField % fieldName)
-write(0,*) 'DEBUGGING : reading a 3d real array'
+!write(0,*) 'DEBUGGING : *************** '//trim(field_cursor % real3dField % fieldName)
+!write(0,*) 'DEBUGGING : reading a 3d real array'
if (field_cursor % real3dField % isSuperArray) then
-write(0,*) 'DEBUGGING : reading a 3d real super-array'
+!write(0,*) 'DEBUGGING : reading a 3d real super-array'
ncons = size(field_cursor % real3dField % constituentNames)
allocate(real2d_temp(field_cursor % real3dField % dimSizes(2), &
field_cursor % totalDimSize))
@@ -1802,7 +1804,7 @@
do j=1,ncons
if (field_cursor % real3dField % isSuperArray) then
if (.not. field_cursor % isAvailable(j)) cycle
-write(0,*) 'DEBUGGING : calling get_var for a constitutent'
+!write(0,*) 'DEBUGGING : calling get_var for a constitutent'
call MPAS_io_get_var(stream % fileHandle, field_cursor % real3dField % constituentNames(j), real2d_temp, io_err)
else
call MPAS_io_get_var(stream % fileHandle, field_cursor % real3dField % fieldName, real3d_temp, io_err)
@@ -1833,7 +1835,7 @@
end if
do while (associated(field_3dreal_ptr))
if (field_cursor % real3dField % isSuperArray) then
-write(0,*) 'DEBUGGING : copying the temporary array'
+!write(0,*) 'DEBUGGING : copying the temporary array'
field_3dreal_ptr % array(j,:,1:ownedSize) = real2d_temp(:,i:i+ownedSize-1)
else
field_3dreal_ptr % array(:,:,1:ownedSize) = real3d_temp(:,:,i:i+ownedSize-1)
@@ -1870,11 +1872,11 @@
else if (field_cursor % field_type == FIELD_0D_CHAR) then
-write(0,*) 'Reading in field '//trim(field_cursor % char0dField % fieldName)
-write(0,*) ' > is the field decomposed? ', field_cursor % isDecomposed
-write(0,*) ' > outer dimension size ', field_cursor % totalDimSize
+!write(0,*) 'Reading in field '//trim(field_cursor % char0dField % fieldName)
+!write(0,*) ' > is the field decomposed? ', field_cursor % isDecomposed
+!write(0,*) ' > outer dimension size ', field_cursor % totalDimSize
-write(0,*) 'MGD calling MPAS_io_get_var now...'
+!write(0,*) 'MGD calling MPAS_io_get_var now...'
call MPAS_io_get_var(stream % fileHandle, field_cursor % char0dField % fieldName, field_cursor % char0dField % scalar, io_err)
call MPAS_io_err_mesg(io_err, .false.)
if (io_err /= MPAS_IO_NOERR) then
@@ -1882,7 +1884,7 @@
return
end if
-write(0,*) 'Distributing and Copying field to other blocks'
+!write(0,*) 'Distributing and Copying field to other blocks'
call mpas_dmpar_bcast_char(field_cursor % char0dField % block % domain % dminfo, field_cursor % char0dField % scalar)
field_0dchar_ptr => field_cursor % char0dField
@@ -1895,7 +1897,7 @@
end if
field_cursor => field_cursor % next
end do
-write(0,*) 'Finished fieldlist loop...'
+!write(0,*) 'Finished fieldlist loop...'
end subroutine MPAS_readStream
@@ -1960,14 +1962,14 @@
if (field_cursor % field_type == FIELD_0D_INT) then
-write(0,*) 'Writing out field '//trim(field_cursor % int0dField % fieldName)
-write(0,*) ' > is the field decomposed? ', field_cursor % isDecomposed
-write(0,*) ' > outer dimension size ', field_cursor % totalDimSize
+!write(0,*) 'Writing out field '//trim(field_cursor % int0dField % fieldName)
+!write(0,*) ' > is the field decomposed? ', field_cursor % isDecomposed
+!write(0,*) ' > outer dimension size ', field_cursor % totalDimSize
-write(0,*) 'Copying field from first block'
+!write(0,*) 'Copying field from first block'
int0d_temp = field_cursor % int0dField % scalar
-write(0,*) 'MGD calling MPAS_io_put_var now...'
+!write(0,*) 'MGD calling MPAS_io_put_var now...'
call MPAS_io_put_var(stream % fileHandle, field_cursor % int0dField % fieldName, int0d_temp, io_err)
call MPAS_io_err_mesg(io_err, .false.)
if (io_err /= MPAS_IO_NOERR .and. present(ierr)) ierr = MPAS_IO_ERR
@@ -2147,14 +2149,14 @@
else if (field_cursor % field_type == FIELD_0D_REAL) then
-write(0,*) 'Writing out field '//trim(field_cursor % real0dField % fieldName)
-write(0,*) ' > is the field decomposed? ', field_cursor % isDecomposed
-write(0,*) ' > outer dimension size ', field_cursor % totalDimSize
+!write(0,*) 'Writing out field '//trim(field_cursor % real0dField % fieldName)
+!write(0,*) ' > is the field decomposed? ', field_cursor % isDecomposed
+!write(0,*) ' > outer dimension size ', field_cursor % totalDimSize
-write(0,*) 'Copying field from first block'
+!write(0,*) 'Copying field from first block'
real0d_temp = field_cursor % real0dField % scalar
-write(0,*) 'MGD calling MPAS_io_put_var now...'
+!write(0,*) 'MGD calling MPAS_io_put_var now...'
call MPAS_io_put_var(stream % fileHandle, field_cursor % real0dField % fieldName, real0d_temp, io_err)
call MPAS_io_err_mesg(io_err, .false.)
if (io_err /= MPAS_IO_NOERR .and. present(ierr)) ierr = MPAS_IO_ERR
@@ -2334,12 +2336,12 @@
else if (field_cursor % field_type == FIELD_0D_CHAR) then
-write(0,*) 'Writing out field '//trim(field_cursor % char0dField % fieldName)
-write(0,*) ' > is the field decomposed? ', field_cursor % isDecomposed
-write(0,*) ' > outer dimension size ', field_cursor % totalDimSize
+!write(0,*) 'Writing out field '//trim(field_cursor % char0dField % fieldName)
+!write(0,*) ' > is the field decomposed? ', field_cursor % isDecomposed
+!write(0,*) ' > outer dimension size ', field_cursor % totalDimSize
-write(0,*) 'Copying field from first block'
-write(0,*) 'MGD calling MPAS_io_put_var now...'
+!write(0,*) 'Copying field from first block'
+!write(0,*) 'MGD calling MPAS_io_put_var now...'
call MPAS_io_put_var(stream % fileHandle, field_cursor % char0dField % fieldName, field_cursor % char0dField % scalar, io_err)
call MPAS_io_err_mesg(io_err, .false.)
if (io_err /= MPAS_IO_NOERR .and. present(ierr)) ierr = MPAS_IO_ERR
@@ -2662,15 +2664,15 @@
call MPAS_io_err_mesg(io_err, .false.)
if (io_err /= MPAS_IO_NOERR .and. present(ierr)) ierr = MPAS_IO_ERR
-write(0,*) 'Deallocating global attribute list'
+!write(0,*) 'Deallocating global attribute list'
call mpas_deallocate_attlist(stream % attList)
-write(0,*) 'Deallocating field list'
+!write(0,*) 'Deallocating field list'
field_cursor => stream % fieldList
do while (associated(field_cursor))
if (associated(field_cursor % isAvailable)) then
deallocate(field_cursor % isAvailable)
-write(0,*) 'Deallocating isAvailable array'
+!write(0,*) 'Deallocating isAvailable array'
end if
stream % fieldList => stream % fieldList % next
deallocate(field_cursor)
Modified: branches/omp_blocks/io/src/registry/gen_inc.c
===================================================================
--- branches/omp_blocks/io/src/registry/gen_inc.c 2012-04-24 18:18:26 UTC (rev 1800)
+++ branches/omp_blocks/io/src/registry/gen_inc.c 2012-04-24 22:38:28 UTC (rev 1801)
@@ -1771,7 +1771,7 @@
fortprintf(fd, " (%s %% %s %% ioinfo %% restart .and. input_obj %% stream == STREAM_RESTART) .or. &</font>
<font color="black">", struct_deref, var_ptr->super_array);
fortprintf(fd, " (%s %% %s %% ioinfo %% sfc .and. input_obj %% stream == STREAM_SFC)) then</font>
<font color="red">", struct_deref, var_ptr->super_array);
memcpy(super_array, var_ptr->super_array, 1024);
- fortprintf(fd, " write(0,*) \'adding input field %s\'</font>
<font color="blue">", var_ptr->super_array);
+/* fortprintf(fd, " write(0,*) \'adding input field %s\'</font>
<font color="black">", var_ptr->super_array); */
fortprintf(fd, " call MPAS_streamAddField(input_obj %% io_stream, %s %% %s, nferr)</font>
<font color="gray">", struct_deref, var_ptr->super_array);
while (var_list_ptr && strncmp(super_array, var_list_ptr->var->super_array, 1024) == 0) {
var_list_ptr = var_list_ptr->next;
@@ -1781,7 +1781,7 @@
fortprintf(fd, " if ((%s %% %s %% ioinfo %% input .and. input_obj %% stream == STREAM_INPUT) .or. &</font>
<font color="black">", struct_deref, var_ptr->name_in_code);
fortprintf(fd, " (%s %% %s %% ioinfo %% restart .and. input_obj %% stream == STREAM_RESTART) .or. &</font>
<font color="black">", struct_deref, var_ptr->name_in_code);
fortprintf(fd, " (%s %% %s %% ioinfo %% sfc .and. input_obj %% stream == STREAM_SFC)) then</font>
<font color="red">", struct_deref, var_ptr->name_in_code);
- fortprintf(fd, " write(0,*) \'adding input field %s\'</font>
<font color="blue">", var_ptr->name_in_code);
+/* fortprintf(fd, " write(0,*) \'adding input field %s\'</font>
<font color="black">", var_ptr->name_in_code); */
fortprintf(fd, " call MPAS_streamAddField(input_obj %% io_stream, %s %% %s, nferr)</font>
<font color="gray">", struct_deref, var_ptr->name_in_code);
}
@@ -1824,7 +1824,7 @@
fortprintf(fd, " (%s %% %s %% ioinfo %% restart .and. input_obj %% stream == STREAM_RESTART) .or. &</font>
<font color="black">", struct_deref, var_ptr->super_array);
fortprintf(fd, " (%s %% %s %% ioinfo %% sfc .and. input_obj %% stream == STREAM_SFC)) then</font>
<font color="red">", struct_deref, var_ptr->super_array);
memcpy(super_array, var_ptr->super_array, 1024);
- fortprintf(fd, " write(0,*) \'exchange halo for %s\'</font>
<font color="blue">", var_ptr->super_array);
+/* fortprintf(fd, " write(0,*) \'exchange halo for %s\'</font>
<font color="black">", var_ptr->super_array); */
fortprintf(fd, " call mpas_dmpar_exch_halo_field(%s %% %s)</font>
<font color="gray">", struct_deref, var_ptr->super_array);
while (var_list_ptr && strncmp(super_array, var_list_ptr->var->super_array, 1024) == 0) {
var_list_ptr = var_list_ptr->next;
@@ -1834,7 +1834,7 @@
fortprintf(fd, " if ((%s %% %s %% ioinfo %% input .and. input_obj %% stream == STREAM_INPUT) .or. &</font>
<font color="black">", struct_deref, var_ptr->name_in_code);
fortprintf(fd, " (%s %% %s %% ioinfo %% restart .and. input_obj %% stream == STREAM_RESTART) .or. &</font>
<font color="black">", struct_deref, var_ptr->name_in_code);
fortprintf(fd, " (%s %% %s %% ioinfo %% sfc .and. input_obj %% stream == STREAM_SFC)) then</font>
<font color="red">", struct_deref, var_ptr->name_in_code);
- fortprintf(fd, " write(0,*) \'exchange halo for %s\'</font>
<font color="blue">", var_ptr->name_in_code);
+/* fortprintf(fd, " write(0,*) \'exchange halo for %s\'</font>
<font color="black">", var_ptr->name_in_code); */
fortprintf(fd, " call mpas_dmpar_exch_halo_field(%s %% %s)</font>
<font color="black">", struct_deref, var_ptr->name_in_code);
}
</font>
</pre>