<p><b>dwj07@fsu.edu</b> 2012-02-13 14:09:48 -0700 (Mon, 13 Feb 2012)</p><p>        <br>
        -- BRANCH COMMIT --<br>
<br>
        Adding referenceBottomDepth variable, hZLevel is still present.<br>
</p><hr noshade><pre><font color="gray">Modified: branches/ocean_projects/basin/src/basin.F
===================================================================
--- branches/ocean_projects/basin/src/basin.F        2012-02-13 17:15:10 UTC (rev 1502)
+++ branches/ocean_projects/basin/src/basin.F        2012-02-13 21:09:48 UTC (rev 1503)
@@ -116,7 +116,7 @@
real, allocatable, dimension(:) :: areaCellNew, areaTriangleNew, dcEdgeNew, dvEdgeNew, angleEdgeNew
real, allocatable, dimension(:,:) :: kiteAreasOnVertexNew, weightsOnEdgeNew, normalsNew
-real, allocatable, dimension(:) :: fEdgeNew, fVertexNew, h_sNew, hZLevel
+real, allocatable, dimension(:) :: fEdgeNew, fVertexNew, h_sNew, hZLevel, referenceBottomDepth
real, allocatable, dimension(:,:) :: u_srcNew
real, allocatable, dimension(:,:,:) :: uNew, vNew, hNew
real, allocatable, dimension(:,:,:) :: rhoNew, temperatureNew, salinityNew, tracer1New
@@ -326,6 +326,11 @@
endif
hZLevel = hNew(1,:,1)
+ referenceBottomDepth(1) = hZLevel(1)
+ do k = 2,nVertLevels
+ referenceBottomDepth(k) = referenceBottomDepth(k-1) + hZLevel(k)
+ end do
+
! basin-mod
! Noise is meant to make the flow unstable at some point
! Not needed for all simulations
@@ -1055,7 +1060,8 @@
tracer1New, &
temperatureRestoreNew, &
salinityRestoreNew, &
- hZLevel &
+ hZLevel, &
+ referenceBottomDepth &
)
call write_netcdf_finalize
@@ -1333,6 +1339,7 @@
allocate(vNew(1,nVertLevelsNew,nEdgesNew))
allocate(hNew(1,nVertLevelsNew,nCellsNew))
allocate(hZLevel(nVertLevelsNew))
+allocate(referenceBottomDepth(nVertLevelsNew))
allocate(rhoNew(1,nVertLevelsNew,nCellsNew))
allocate(temperatureNew(1,nVertLevelsNew,nCellsNew))
allocate(salinityNew(1,nVertLevelsNew,nCellsNew))
Modified: branches/ocean_projects/basin/src/module_write_netcdf.F
===================================================================
--- branches/ocean_projects/basin/src/module_write_netcdf.F        2012-02-13 17:15:10 UTC (rev 1502)
+++ branches/ocean_projects/basin/src/module_write_netcdf.F        2012-02-13 21:09:48 UTC (rev 1503)
@@ -63,6 +63,7 @@
integer :: wrVarIDtemperatureRestore
integer :: wrVarIDsalinityRestore
integer :: wrVarIDhZLevel
+ integer :: wrVarIDreferenceBottomDepth
integer :: wrLocalnCells
integer :: wrLocalnEdges
@@ -224,6 +225,8 @@
dimlist( 1) = wrDimIDnVertLevels
nferr = nf_def_var(wr_ncid, 'hZLevel', NF_DOUBLE, 1, dimlist, wrVarIDhZLevel)
dimlist( 1) = wrDimIDnVertLevels
+ nferr = nf_def_var(wr_ncid, 'referenceBottomDepth', NF_DOUBLE, 1, dimlist, wrVarIDreferenceBottomDepth)
+ dimlist( 1) = wrDimIDnVertLevels
dimlist( 2) = wrDimIDnEdges
dimlist( 3) = wrDimIDTime
nferr = nf_def_var(wr_ncid, 'u', NF_DOUBLE, 3, dimlist, wrVarIDu)
@@ -325,7 +328,8 @@
tracer1, &
temperatureRestore, &
salinityRestore, &
- hZLevel &
+ hZLevel, &
+ referenceBottomDepth &
)
implicit none
@@ -386,6 +390,7 @@
real (kind=8), dimension(:), intent(in) :: temperatureRestore
real (kind=8), dimension(:), intent(in) :: salinityRestore
real (kind=8), dimension(:), intent(in) :: hZLevel
+ real (kind=8), dimension(:), intent(in) :: referenceBottomDepth
integer :: nferr
@@ -604,6 +609,10 @@
start1(1) = 1
count1( 1) = wrLocalnVertLevels
nferr = nf_put_vara_double(wr_ncid, wrVarIDhZLevel, start1, count1, hZLevel)
+
+ start1(1) = 1
+ count1( 1) = wrLocalnVertLevels
+ nferr = nf_put_vara_double(wr_ncid, wrVarIDreferenceBottomDepth, start1, count1, referenceBottomDepth)
start3(3) = time
count3( 1) = wrLocalnVertLevels
</font>
</pre>