<p><b>mhoffman@lanl.gov</b> 2012-04-19 16:19:10 -0600 (Thu, 19 Apr 2012)</p><p>BRANCH COMMIT<br>
Changed the temperature field to have the vertical dimension of nVertLevels instead of nVertLevelsPlus2. <br>
Added diagnostic fields for the temperature upper and lower BC in Registry.<br>
</p><hr noshade><pre><font color="gray">Modified: branches/land_ice_projects/grid_tools/add_land_ice_variables_to_mpas_grid.py
===================================================================
--- branches/land_ice_projects/grid_tools/add_land_ice_variables_to_mpas_grid.py        2012-04-19 21:35:38 UTC (rev 1797)
+++ branches/land_ice_projects/grid_tools/add_land_ice_variables_to_mpas_grid.py        2012-04-19 22:19:10 UTC (rev 1798)
@@ -45,7 +45,7 @@
else: # Copy over all other dimensions
fileout.createDimension(dim, filein.dimensions[dim])
# Create nVertLevelsPlus2 dimension
-fileout.createDimension('nVertLevelsPlus2', filein.dimensions['nVertLevels'] + 2)
+# fileout.createDimension('nVertLevelsPlus2', filein.dimensions['nVertLevels'] + 2)
@@ -69,7 +69,8 @@
newvar[:] = numpy.zeros(newvar.shape)
newvar = fileout.createVariable('normalVelocity', 'd', ('Time', 'nEdges', 'nVertLevels'))
newvar[:] = numpy.zeros(newvar.shape)
-newvar = fileout.createVariable('temperature', 'd', ('Time', 'nCells', 'nVertLevelsPlus2'))
+newvar = fileout.createVariable('temperature', 'd', ('Time', 'nCells', 'nVertLevels'))
+#newvar = fileout.createVariable('temperature', 'd', ('Time', 'nCells', 'nVertLevelsPlus2'))
newvar[:] = numpy.zeros(newvar.shape)
# Assign the global attributes
Modified: branches/land_ice_projects/implement_core/src/core_land_ice/Registry
===================================================================
--- branches/land_ice_projects/implement_core/src/core_land_ice/Registry        2012-04-19 21:35:38 UTC (rev 1797)
+++ branches/land_ice_projects/implement_core/src/core_land_ice/Registry        2012-04-19 22:19:10 UTC (rev 1798)
@@ -48,7 +48,8 @@
dim TWENTYONE 21
dim vertexDegree vertexDegree
dim nVertLevels nVertLevels
-dim nVertLevelsPlus2 nVertLevels+2
+% nvertLevels+2 is only needed if attaching b.c. to a 3-d field. We are unlikely to use this, but I am retaining it for now. MJH 04/19/12
+% dim nVertLevelsPlus2 nVertLevels+2
%
% var persistence type name_in_file ( dims ) time_levs iro- name_in_code struct super-array array_class
@@ -124,7 +125,7 @@
var persistent real bedTopography ( nCells Time ) 2 iro bedTopography state - -
% Note: beta should be moved to diagnostic fields when a process model comes online
var persistent real beta ( nCells Time ) 2 iro beta state - -
-var persistent real temperature ( nVertLevelsPlus2 nCells Time ) 2 iro temperature state tracers dynamics
+var persistent real temperature ( nVertLevels nCells Time ) 2 iro temperature state tracers dynamics
var persistent real normalVelocity ( nVertLevels nEdges Time ) 2 iro normalVelocity state - -
% Tendency variables
@@ -141,6 +142,8 @@
var persistent real layerThickness ( nVertLevels nCells Time ) 2 o layerThickness state - -
var persistent real lowerSurface ( nCells Time ) 2 o lowerSurface state - -
var persistent real upperSurface ( nCells Time ) 2 o upperSurface state - -
+var persistent real temperatureUpperBC ( nCells Time ) 2 o temperatureUpperBC state - -
+var persistent real temperatureLowerBC ( nCells Time ) 2 o temperatureLowerBC state - -
% Other diagnostic variables: neither read nor written to any files
var persistent real layerThicknessVertex ( nVertLevels nVertices Time ) 2 - layerThicknessVertex state - -
Modified: branches/land_ice_projects/implement_core/src/core_land_ice/mpas_land_ice_tendency.F
===================================================================
--- branches/land_ice_projects/implement_core/src/core_land_ice/mpas_land_ice_tendency.F        2012-04-19 21:35:38 UTC (rev 1797)
+++ branches/land_ice_projects/implement_core/src/core_land_ice/mpas_land_ice_tendency.F        2012-04-19 22:19:10 UTC (rev 1798)
@@ -345,6 +345,10 @@
end do
+ !\todo Calculate h_edge that can be used by SIA solve and FO advection scheme. ocn_diagnostic_solve in mpas_ocn_tendency.F has 2, 3, & 4th order calculations for h_edge that can be used. Right now I am using 2nd order h_edge in SIA solve and 1st order h_edge in FO advection.
+
+ !\todo Calculate masks. Right now sia driver and Forward Euler time integration have need of a mask and both do it on their own. We need to define how the masks should work.
+
end subroutine lice_diagnostic_solve
</font>
</pre>