<p><b>lipscomb</b> 2012-01-10 17:03:13 -0700 (Tue, 10 Jan 2012)</p><p><br>
Removed more unused variables from the Registry<br>
</p><hr noshade><pre><font color="gray">Modified: branches/land_ice/mpas/src/core_land_ice/Registry
===================================================================
--- branches/land_ice/mpas/src/core_land_ice/Registry 2012-01-10 23:42:35 UTC (rev 1351)
+++ branches/land_ice/mpas/src/core_land_ice/Registry 2012-01-11 00:03:13 UTC (rev 1352)
@@ -101,10 +101,10 @@
var persistent integer edgesOnVertex ( vertexDegree nVertices ) 0 iro edgesOnVertex mesh - -
var persistent integer cellsOnVertex ( vertexDegree nVertices ) 0 iro cellsOnVertex mesh - -
var persistent real kiteAreasOnVertex ( vertexDegree nVertices ) 0 iro kiteAreasOnVertex mesh - -
-var persistent real fEdge ( nEdges ) 0 iro fEdge mesh - -
-var persistent real fVertex ( nVertices ) 0 iro fVertex mesh - -
-var persistent real fCell ( nCells ) 0 iro fCell mesh - -
-var persistent real h_s ( nCells ) 0 iro h_s mesh - -
+!!!var persistent real fEdge ( nEdges ) 0 iro fEdge mesh - -
+!!!var persistent real fVertex ( nVertices ) 0 iro fVertex mesh - -
+!!!var persistent real fCell ( nCells ) 0 iro fCell mesh - -
+!!!var persistent real h_s ( nCells ) 0 iro h_s mesh - -
% Space needed for advection
var persistent real deriv_two ( FIFTEEN TWO nEdges ) 0 o deriv_two mesh - -
@@ -124,7 +124,7 @@
var persistent integer boundaryEdge ( nVertLevels nEdges ) 0 iro boundaryEdge mesh - -
var persistent integer boundaryVertex ( nVertLevels nVertices ) 0 iro boundaryVertex mesh - -
var persistent integer boundaryCell ( nVertLevels nCells ) 0 iro boundaryCell mesh - -
-var persistent real u_src ( nVertLevels nEdges ) 0 iro u_src mesh - -
+!!!var persistent real u_src ( nVertLevels nEdges ) 0 iro u_src mesh - -
% Prognostic variables: read from input, saved in restart, and written to output
!!!var persistent real u ( nVertLevels nEdges Time ) 2 iro u state - -
@@ -138,7 +138,7 @@
var persistent real tend_temperature ( nVertLevels nCells Time ) 1 - temperature tend tracers dynamics
% Diagnostic fields: only written to output
-var persistent real v ( nVertLevels nEdges Time ) 2 o v state - -
+!!!var persistent real v ( nVertLevels nEdges Time ) 2 o v state - -
!!!var persistent real divergence ( nVertLevels nCells Time ) 2 o divergence state - -
!!!var persistent real vorticity ( nVertLevels nVertices Time ) 2 o vorticity state - -
!!!var persistent real vorticity_cell ( nVertLevels nCells Time ) 2 o vorticity_cell state - -
@@ -154,7 +154,7 @@
var persistent real uReconstructMeridional ( nVertLevels nCells Time ) 2 o uReconstructMeridional state - -
% Other diagnostic variables: neither read nor written to any files
-var persistent real vh ( nVertLevels nEdges Time ) 2 - vh state - -
+!!!var persistent real vh ( nVertLevels nEdges Time ) 2 - vh state - -
!!!var persistent real circulation ( nVertLevels nVertices Time ) 2 - circulation state - -
!!!var persistent real gradPVt ( nVertLevels nEdges Time ) 2 - gradPVt state - -
!!!var persistent real gradPVn ( nVertLevels nEdges Time ) 2 - gradPVn state - -
@@ -164,11 +164,10 @@
var persistent real thck ( nCells Time ) 2 iro thck state - -
var persistent real lsrf ( nCells Time ) 2 iro lsrf state - -
var persistent real beta ( nCells Time ) 2 iro beta state - -
-var persistent real temp ( nVertLevels nCells Time ) 2 iro temp state - -
- %whl - temp should be nVertLevels + 1?
!!!var persistent real tracers ( nTracers nVertLevels nCells Time ) 2 iro tracers state - -
var persistent real thck_layer ( nVertLevels nCells Time ) 2 iro thck_layer state - -
-var persistent real temperature ( nVertLevels nCells Time ) 2 iro temperature state tracers dynamics
+var persistent real temp ( nVertLevels nCells Time ) 2 iro temp state tracers dynamics
+ %whl - temp should be nVertLevels + 1?
% Diagnostic fields for land-ice model: only written to output
var persistent real unorm ( nVertLevels nEdges Time ) 2 iro unorm state - -
Modified: branches/land_ice/mpas/src/core_land_ice/mpas_land_ice_global_diagnostics.F
===================================================================
--- branches/land_ice/mpas/src/core_land_ice/mpas_land_ice_global_diagnostics.F 2012-01-10 23:42:35 UTC (rev 1351)
+++ branches/land_ice/mpas/src/core_land_ice/mpas_land_ice_global_diagnostics.F 2012-01-11 00:03:13 UTC (rev 1352)
@@ -47,7 +47,8 @@
! Step 1
! 1. Define the array to integrate, and the variable for the value to be stored in after the integration
- real (kind=RKIND), dimension(:), pointer :: areaCell, dcEdge, dvEdge, areaTriangle, h_s, fCell, fEdge
+ real (kind=RKIND), dimension(:), pointer :: areaCell, dcEdge, dvEdge, areaTriangle
+!!! real (kind=RKIND), dimension(:), pointer :: h_s, fCell, fEdge
!!! real (kind=RKIND), dimension(:,:), pointer :: h, u, v, h_edge, &
real (kind=RKIND), dimension(:,:), pointer :: thck_layer, unorm, h_edge, &
!!! pv_edge, pv_vertex, pv_cell, &
@@ -56,7 +57,8 @@
real (kind=RKIND), dimension(:,:,:), pointer :: tracers
real (kind=RKIND), dimension(:), allocatable :: volumeWeightedPotentialEnergyReservoir, averageThickness
- real (kind=RKIND), dimension(:), allocatable :: potentialEnstrophyReservior, areaEdge, h_s_edge
+ real (kind=RKIND), dimension(:), allocatable :: areaEdge, potentialEnstrophyReservior
+!!! real (kind=RKIND), dimension(:), allocatable :: h_s_edge
real (kind=RKIND), dimension(:,:), allocatable :: cellVolume, cellArea, volumeWeightedPotentialVorticity
real (kind=RKIND), dimension(:,:), allocatable :: volumeWeightedPotentialEnstrophy, vertexVolume, volumeWeightedKineticEnergy
@@ -89,13 +91,13 @@
nVerticesSolve = grid % nVerticesSolve
nCells = grid % nCells
- h_s => grid % h_s % array
+!!! h_s => grid % h_s % array
areaCell => grid % areaCell % array
dcEdge => grid % dcEdge % array
dvEdge => grid % dvEdge % array
areaTriangle => grid % areaTriangle % array
- fCell => grid % fCell % array
- fEdge => grid % fEdge % array
+!!! fCell => grid % fCell % array
+!!! fEdge => grid % fEdge % array
edgesOnEdge => grid % edgesOnEdge % array
nEdgesOnEdge => grid % nEdgesOnEdge % array
@@ -133,7 +135,7 @@
allocate(averageThickness(nCellsSolve))
- allocate(h_s_edge(nEdgesSOlve))
+!!! allocate(h_s_edge(nEdgesSOlve))
cellVolume = 0
@@ -151,7 +153,7 @@
keTend_PressureGradient = 0
peTend_DivThickness = 0
keTend_CoriolisForce = 0
- h_s_edge = 0
+!!! h_s_edge = 0
! Build Arrays for Global Integrals
! Step 3
@@ -171,7 +173,7 @@
!!! *h_edge(iLevel,1:nEdgesSolve)*areaEdge(1:nEdgesSolve)*0.5
!!! volumeWeightedPotentialEnergy(iLevel,:) = gravity*h(iLevel,1:nCellsSolve)*h(iLevel,1:nCellsSolve)*areaCell(1:nCellsSolve)*0.5
!!! volumeWeightedPotentialEnergyTopography(iLevel,:) = gravity*h(iLevel,1:nCellsSolve)*h_s(1:nCellsSolve)*areaCell(1:nCellsSolve)
- refAreaWeightedSurfaceHeight(iLevel,:) = areaCell(1:nCellsSolve)*(thck_layer(iLevel,1:nCellsSolve)+h_s(1:nCellsSolve))
+!!! refAreaWeightedSurfaceHeight(iLevel,:) = areaCell(1:nCellsSolve)*(thck_layer(iLevel,1:nCellsSolve)+h_s(1:nCellsSolve))
do iEdge = 1,nEdgesSolve
q = 0.0
@@ -185,7 +187,7 @@
iCell1 = cellsOnEdge(1,iEdge)
iCell2 = cellsOnEdge(2,iEdge)
- refAreaWeightedSurfaceHeight_edge(iLevel,iEdge) = areaEdge(iEdge)*(h_edge(iLevel,iEdge) + 0.5*(h_s(iCell1) + h_s(iCell2)))
+!!! refAreaWeightedSurfaceHeight_edge(iLevel,iEdge) = areaEdge(iEdge)*(h_edge(iLevel,iEdge) + 0.5*(h_s(iCell1) + h_s(iCell2)))
!!! keTend_PressureGradient(iLevel,iEdge) = areaEdge(iEdge)*h_edge(iLevel,iEdge)*u(iLevel,iEdge) &
!!! *gravity*(h(iLevel,iCell2)+h_s(iCell2) - h(iLevel,iCell1)-h_s(iCell1))/dcEdge(iEdge)
@@ -199,12 +201,12 @@
!!! *(h(iLevel,1:nCells)+h_s(1:nCells))
end do
- do iEdge = 1,nEdgesSolve
- iCell1 = cellsOnEdge(1,iEdge)
- iCell2 = cellsOnEdge(2,iEdge)
+!!! do iEdge = 1,nEdgesSolve
+!!! iCell1 = cellsOnEdge(1,iEdge)
+!!! iCell2 = cellsOnEdge(2,iEdge)
- h_s_edge(iEdge) = 0.5*(h_s(iCell1) + h_s(iCell2))
- end do
+!!! h_s_edge(iEdge) = 0.5*(h_s(iCell1) + h_s(iCell2))
+!!! end do
! Step 4
! 4. Call Function to compute Global Stat that you want.
@@ -227,7 +229,7 @@
! Reservoir computations
call land_ice_compute_global_sum(dminfo, nVertLevels, nCellsSolve, refAreaWeightedSurfaceHeight, sumrefAreaWeightedSurfaceHeight)
- averageThickness(:) = (sumrefAreaWeightedSurfaceHeight/sumCellArea)-h_s(1:nCellsSolve)
+!!! averageThickness(:) = (sumrefAreaWeightedSurfaceHeight/sumCellArea)-h_s(1:nCellsSolve)
! Compute Volume Weighted Averages of Potential Vorticity and Potential Enstrophy
!!! call land_ice_compute_global_sum(dminfo, nVertLevels, nVerticesSolve, volumeWeightedPotentialVorticity, globalPotentialVorticity)
Modified: branches/land_ice/mpas/src/core_land_ice/mpas_land_ice_time_integration.F
===================================================================
--- branches/land_ice/mpas/src/core_land_ice/mpas_land_ice_time_integration.F 2012-01-10 23:42:35 UTC (rev 1351)
+++ branches/land_ice/mpas/src/core_land_ice/mpas_land_ice_time_integration.F 2012-01-11 00:03:13 UTC (rev 1352)
@@ -267,9 +267,11 @@
real (kind=RKIND) :: flux, vorticity_abs, workpv, q, upstream_bias
integer :: nCells, nEdges, nVertices, nVertLevels
- real (kind=RKIND), dimension(:), pointer :: h_s, fVertex, fEdge, dvEdge, dcEdge, areaCell, areaTriangle, &
+ real (kind=RKIND), dimension(:), pointer :: dvEdge, dcEdge, areaCell, areaTriangle, &
meshScalingDel2, meshScalingDel4
- real (kind=RKIND), dimension(:,:), pointer :: vh, weightsOnEdge, kiteAreasOnVertex, &
+!!! real (kind=RKIND), dimension(:), pointer :: h_s, fVertex, fEdge
+!!! real (kind=RKIND), dimension(:,:), pointer :: vh
+ real (kind=RKIND), dimension(:,:), pointer :: weightsOnEdge, kiteAreasOnVertex, &
h_edge, thck_layer, unorm, tend_thck_layer, &
!!! h_edge, h, u, v, tend_h, tend_u, &
!!! circulation, vorticity, ke, pv_edge, divergence, &
@@ -283,7 +285,7 @@
!!! real (kind=RKIND), allocatable, dimension(:,:) :: delsq_u
!!! real (kind=RKIND), allocatable, dimension(:,:) :: delsq_circulation, delsq_vorticity
- real (kind=RKIND), dimension(:,:), pointer :: u_src
+!!! real (kind=RKIND), dimension(:,:), pointer :: u_src
real (kind=RKIND), parameter :: rho_ref = 1000.0
real (kind=RKIND) :: ke_edge
@@ -300,7 +302,7 @@
!!! divergence => s % divergence % array
!!! ke => s % ke % array
!!! pv_edge => s % pv_edge % array
- vh => s % vh % array
+!!! vh => s % vh % array
weightsOnEdge => grid % weightsOnEdge % array
kiteAreasOnVertex => grid % kiteAreasOnVertex % array
@@ -316,9 +318,9 @@
dvEdge => grid % dvEdge % array
areaCell => grid % areaCell % array
areaTriangle => grid % areaTriangle % array
- h_s => grid % h_s % array
- fVertex => grid % fVertex % array
- fEdge => grid % fEdge % array
+!!! h_s => grid % h_s % array
+!!! fVertex => grid % fVertex % array
+!!! fEdge => grid % fEdge % array
tend_thck_layer => tend % thck_layer % array
! tend_u => tend % u % array
@@ -328,7 +330,7 @@
nVertices = grid % nVertices
nVertLevels = grid % nVertLevels
- u_src => grid % u_src % array
+!!! u_src => grid % u_src % array
meshScalingDel2 => grid % meshScalingDel2 % array
meshScalingDel4 => grid % meshScalingDel4 % array
@@ -845,8 +847,11 @@
real (kind=RKIND) :: flux !!!, vorticity_abs, workpv
integer :: nCells, nEdges, nVertices, nVertLevels
- real (kind=RKIND), dimension(:), pointer :: h_s, fVertex, fEdge, dvEdge, dcEdge, areaCell, areaTriangle
- real (kind=RKIND), dimension(:,:), pointer :: vh, weightsOnEdge, kiteAreasOnVertex, h_edge, thck_layer, unorm, tend_thck_layer, &
+ real (kind=RKIND), dimension(:), pointer :: dvEdge, dcEdge, areaCell, areaTriangle
+!!! real (kind=RKIND), dimension(:), pointer :: h_s, fVertex, fEdge
+!!! real (kind=RKIND), dimension(:,:), pointer :: vh
+ real (kind=RKIND), dimension(:,:), pointer :: weightsOnEdge, kiteAreasOnVertex, h_edge, &
+ thck_layer, unorm, tend_thck_layer, &
!!! real (kind=RKIND), dimension(:,:), pointer :: vh, weightsOnEdge, kiteAreasOnVertex, h_edge, h, u, v, tend_h, tend_u, &
!!! circulation, vorticity, ke, pv_edge, pv_vertex, pv_cell, &
!!! gradPVn, gradPVt, divergence, vorticity_cell, &
@@ -863,7 +868,7 @@
thck_layer => s % thck_layer % array
unorm => s % unorm % array
!!! v => s % v % array
- vh => s % vh % array
+!!! vh => s % vh % array
h_edge => s % h_edge % array
h_vertex => s % h_vertex % array
tend_thck_layer => s % thck_layer % array
@@ -893,9 +898,9 @@
dvEdge => grid % dvEdge % array
areaCell => grid % areaCell % array
areaTriangle => grid % areaTriangle % array
- h_s => grid % h_s % array
- fVertex => grid % fVertex % array
- fEdge => grid % fEdge % array
+!!! h_s => grid % h_s % array
+!!! fVertex => grid % fVertex % array
+!!! fEdge => grid % fEdge % array
deriv_two => grid % deriv_two % array
nCells = grid % nCells
@@ -1119,15 +1124,15 @@
!
! Compute mass fluxes tangential to each edge (i.e., through the faces of dual grid cells)
!
- vh(:,:) = 0.0
- do iEdge=1,grid % nEdgesSolve
- do j=1,nEdgesOnEdge(iEdge)
- eoe = edgesOnEdge(j,iEdge)
- do k=1,nVertLevels
- vh(k,iEdge) = vh(k,iEdge) + weightsOnEdge(j,iEdge) * unorm(k,eoe) * h_edge(k,eoe)
- end do
- end do
- end do
+!!! vh(:,:) = 0.0
+!!! do iEdge=1,grid % nEdgesSolve
+!!! do j=1,nEdgesOnEdge(iEdge)
+!!! eoe = edgesOnEdge(j,iEdge)
+!!! do k=1,nVertLevels
+!!! vh(k,iEdge) = vh(k,iEdge) + weightsOnEdge(j,iEdge) * unorm(k,eoe) * h_edge(k,eoe)
+!!! end do
+!!! end do
+!!! end do
#endif
</font>
</pre>