<p><b>mpetersen@lanl.gov</b> 2012-05-24 16:09:25 -0600 (Thu, 24 May 2012)</p><p>BRANCH COMMIT Just some style changes following Doug's review.<br>
</p><hr noshade><pre><font color="gray">Modified: branches/ocean_projects/transport_sections/src/core_ocean/Registry
===================================================================
--- branches/ocean_projects/transport_sections/src/core_ocean/Registry        2012-05-24 20:59:26 UTC (rev 1938)
+++ branches/ocean_projects/transport_sections/src/core_ocean/Registry        2012-05-24 22:09:25 UTC (rev 1939)
@@ -314,7 +314,8 @@
var persistent real acc_uVar ( nVertLevels nEdges Time ) 2 o acc_uVar state - -
var persistent real acc_uTransportSection ( nSections Time ) 2 o acc_uTransportSection state - -
-% Variables that contain sections for recording transport, read from grid or restart file:
+% Variables that contain sections for recording transport, read from grid or restart file
+% To create these variables, see mpas_repo/branches/tools/transport_sections
var persistent integer sectionEdgeIndex ( maxNEdgesInSection nSections ) 0 - sectionEdgeIndex mesh - -
var persistent integer sectionEdgeSign ( maxNEdgesInSection nSections ) 0 - sectionEdgeSign mesh - -
var persistent integer nEdgesInSection ( nSections ) 0 iro nEdgesInSection mesh - -
@@ -322,7 +323,8 @@
var persistent char sectionAbbreviation ( CharLength8 nSections ) 0 - sectionAbbreviation mesh - -
var persistent real sectionCoord ( latLonPairs nSections ) 0 - sectionCoord mesh - -
-% Variables that contain sections for recording transport, not read from grid or restart file:
+% Variables that contain sections for recording transport, not read from grid or restart file
+% These variables are initialized upon start-up from the global variables.
var persistent integer localSectionEdgeIndex ( maxNEdgesInSection nSections ) 0 - localSectionEdgeIndex mesh - -
var persistent integer localSectionEdgeSign ( maxNEdgesInSection nSections ) 0 - localSectionEdgeSign mesh - -
var persistent integer nLocalEdgesInSection ( nSections ) 0 - nLocalEdgesInSection mesh - -
Modified: branches/ocean_projects/transport_sections/src/core_ocean/mpas_ocn_time_average.F
===================================================================
--- branches/ocean_projects/transport_sections/src/core_ocean/mpas_ocn_time_average.F        2012-05-24 20:59:26 UTC (rev 1938)
+++ branches/ocean_projects/transport_sections/src/core_ocean/mpas_ocn_time_average.F        2012-05-24 22:09:25 UTC (rev 1939)
@@ -110,20 +110,15 @@
integer :: iSection, iLocalEdge, iEdge, k
- integer :: &
- nSections
- integer, dimension(:), pointer :: &
- nLocalEdgesInSection, maxLevelEdgeTop
- integer, dimension(:,:), pointer :: &
- localSectionEdgeIndex, localSectionEdgeSign
+ integer :: nSections
+ integer, dimension(:), pointer :: nLocalEdgesInSection, maxLevelEdgeTop
+ integer, dimension(:,:), pointer :: localSectionEdgeIndex, localSectionEdgeSign
real (kind=RKIND) :: tempSum, m3ps_to_Sv
- real (kind=RKIND), dimension(:), pointer :: &
- acc_uTransportSection, old_acc_uTransportSection, dvEdge, hZLevel
+ real (kind=RKIND), dimension(:), pointer :: acc_uTransportSection, old_acc_uTransportSection, dvEdge, hZLevel
- real (kind=RKIND), dimension(:,:), pointer :: &
- u, h_edge
+ real (kind=RKIND), dimension(:,:), pointer :: u, h_edge
m3ps_to_Sv = 1e-6 ! m^3/sec flux to Sverdrups
@@ -150,10 +145,7 @@
do iLocalEdge = 1,nLocalEdgesInSection(iSection)
iEdge = localSectionEdgeIndex(iLocalEdge,iSection)
do k=1,maxLevelEdgeTop(iEdge)
- tempSum = tempSum + &
- + localSectionEdgeSign(iLocalEdge,iSection) &
- * u(k,iEdge)*dvEdge(iEdge) &
- * h_edge(k,iEdge)*m3ps_to_Sv;
+ tempSum = tempSum + localSectionEdgeSign(iLocalEdge,iSection) * u(k,iEdge)*dvEdge(iEdge) * h_edge(k,iEdge)*m3ps_to_Sv;
end do
end do
acc_uTransportSection(iSection) &
</font>
</pre>