<p><b>dwj07@fsu.edu</b> 2012-04-06 15:43:21 -0600 (Fri, 06 Apr 2012)</p><p><br>
-- BRANCH COMMIT --<br>
<br>
Renaming subroutines to fit with naming conventions.<br>
</p><hr noshade><pre><font color="gray">Modified: branches/omp_blocks/io/src/framework/mpas_dmpar.F
===================================================================
--- branches/omp_blocks/io/src/framework/mpas_dmpar.F 2012-04-06 19:02:08 UTC (rev 1755)
+++ branches/omp_blocks/io/src/framework/mpas_dmpar.F 2012-04-06 21:43:21 UTC (rev 1756)
@@ -1504,7 +1504,7 @@
dminfo = field % block % domain % dminfo
dims = field % dimSizes
- call AggregateExchangeLists(dminfo % my_proc_id, haloLayers, field % sendList, field % recvList, sendList, recvList)
+ call mpas_aggregate_exchange_lists(dminfo % my_proc_id, haloLayers, field % sendList, field % recvList, sendList, recvList)
recvListPtr => recvList
do while (associated(recvListPtr))
@@ -1546,8 +1546,8 @@
sendListPtr => sendListPtr % next
end do
- call DestroyExchangeList(sendList)
- call DestroyExchangeList(recvList)
+ call mpas_destroy_exchange_list(sendList)
+ call mpas_destroy_exchange_list(recvList)
#endif
@@ -1574,7 +1574,7 @@
dminfo = field % block % domain % dminfo
dims = field % dimSizes
- call AggregateExchangeLists(dminfo % my_proc_id, haloLayers, field % sendList, field % recvList, sendList, recvList)
+ call mpas_aggregate_exchange_lists(dminfo % my_proc_id, haloLayers, field % sendList, field % recvList, sendList, recvList)
recvListPtr => recvList
do while (associated(recvListPtr))
@@ -1619,8 +1619,8 @@
sendListPtr => sendListPtr % next
end do
- call DestroyExchangeList(sendList)
- call DestroyExchangeList(recvList)
+ call mpas_destroy_exchange_list(sendList)
+ call mpas_destroy_exchange_list(recvList)
#endif
@@ -1647,7 +1647,7 @@
dminfo = field % block % domain % dminfo
dims = field % dimSizes
- call AggregateExchangeLists(dminfo % my_proc_id, haloLayers, field % sendList, field % recvList, sendList, recvList)
+ call mpas_aggregate_exchange_lists(dminfo % my_proc_id, haloLayers, field % sendList, field % recvList, sendList, recvList)
recvListPtr => recvList
do while (associated(recvListPtr))
@@ -1694,8 +1694,8 @@
sendListPtr => sendListPtr % next
end do
- call DestroyExchangeList(sendList)
- call DestroyExchangeList(recvList)
+ call mpas_destroy_exchange_list(sendList)
+ call mpas_destroy_exchange_list(recvList)
#endif
@@ -1811,7 +1811,7 @@
dminfo = field % block % domain % dminfo
dims = field % dimSizes
- call AggregateExchangeLists(dminfo % my_proc_id, haloLayers, field % sendList, field % recvList, sendList, recvList)
+ call mpas_aggregate_exchange_lists(dminfo % my_proc_id, haloLayers, field % sendList, field % recvList, sendList, recvList)
recvListPtr => recvList
do while (associated(recvListPtr))
@@ -1853,8 +1853,8 @@
sendListPtr => sendListPtr % next
end do
- call DestroyExchangeList(sendList)
- call DestroyExchangeList(recvList)
+ call mpas_destroy_exchange_list(sendList)
+ call mpas_destroy_exchange_list(recvList)
#endif
@@ -1882,7 +1882,7 @@
dminfo = field % block % domain % dminfo
dims = field % dimSizes
- call AggregateExchangeLists(dminfo % my_proc_id, haloLayers, field % sendList, field % recvList, sendList, recvList)
+ call mpas_aggregate_exchange_lists(dminfo % my_proc_id, haloLayers, field % sendList, field % recvList, sendList, recvList)
recvListPtr => recvList
do while (associated(recvListPtr))
@@ -1927,8 +1927,8 @@
sendListPtr => sendListPtr % next
end do
- call DestroyExchangeList(sendList)
- call DestroyExchangeList(recvList)
+ call mpas_destroy_exchange_list(sendList)
+ call mpas_destroy_exchange_list(recvList)
#endif
@@ -1955,7 +1955,7 @@
dminfo = field % block % domain % dminfo
dims = field % dimSizes
- call AggregateExchangeLists(dminfo % my_proc_id, haloLayers, field % sendList, field % recvList, sendList, recvList)
+ call mpas_aggregate_exchange_lists(dminfo % my_proc_id, haloLayers, field % sendList, field % recvList, sendList, recvList)
recvListPtr => recvList
do while (associated(recvListPtr))
@@ -2002,15 +2002,15 @@
sendListPtr => sendListPtr % next
end do
- call DestroyExchangeList(sendList)
- call DestroyExchangeList(recvList)
+ call mpas_destroy_exchange_list(sendList)
+ call mpas_destroy_exchange_list(recvList)
#endif
end subroutine mpas_dmpar_exch_halo_field3d_real
- subroutine AggregateExchangeLists(myProcID, haloLayersIn, sendListArray, recvListArray, aggregateSendList, aggregateRecvList)
+ subroutine mpas_aggregate_exchange_lists(myProcID, haloLayersIn, sendListArray, recvListArray, aggregateSendList, aggregateRecvList)
implicit none
@@ -2052,7 +2052,7 @@
do while(associated(aggListPtr))
if(inListPtr % blockID == aggListPtr % blockID) then
if(inListPtr % procID .ne. myProcID) then
- call MergeIntegerArrays(aggListPtr % list, aggListPtr % nlist, inListPtr % list)
+ call mpas_merge_integer_arrays(aggListPtr % list, aggListPtr % nlist, inListPtr % list)
end if
blockAdded = .true.
exit
@@ -2097,7 +2097,7 @@
do while(associated(aggListPtr))
if(inListPtr % blockID == aggListPtr % blockID) then
if(inListPtr % procID .ne. myProcID) then
- call MergeIntegerArrays(aggListPtr % list, aggListPtr % nlist, inListPtr % list)
+ call mpas_merge_integer_arrays(aggListPtr % list, aggListPtr % nlist, inListPtr % list)
end if
blockAdded = .true.
exit
@@ -2140,10 +2140,10 @@
deallocate(haloLayers)
end if
- end subroutine AggregateExchangeLists
+ end subroutine mpas_aggregate_exchange_lists
- subroutine DestroyExchangeList(exchangeList)
+ subroutine mpas_destroy_exchange_list(exchangeList)
implicit none
@@ -2161,10 +2161,10 @@
exchangeList => exchangeListPtr
end do
- end subroutine DestroyExchangeList
+ end subroutine mpas_destroy_exchange_list
- subroutine MergeIntegerArrays(mergeArray, nMergeArray, dataToAppend)
+ subroutine mpas_merge_integer_arrays(mergeArray, nMergeArray, dataToAppend)
implicit none
@@ -2189,7 +2189,7 @@
mergeArray(nMergeArray+1:newSize) = dataToAppend
nMergeArray = newSize
- end subroutine MergeIntegerArrays
+ end subroutine mpas_merge_integer_arrays
end module mpas_dmpar
</font>
</pre>