<p><b>mhoffman@lanl.gov</b> 2012-05-01 13:49:47 -0600 (Tue, 01 May 2012)</p><p>BRANCH COMMIT<br>
Updating dome test case.<br>
For the periodic hex grid, ny should always be an even number.<br>
Also added a nonzero beta value to the dome initial conditions.<br>
</p><hr noshade><pre><font color="gray">Modified: branches/land_ice_projects/test_cases/dome/namelist.input.periodic_hex
===================================================================
--- branches/land_ice_projects/test_cases/dome/namelist.input.periodic_hex        2012-05-01 16:01:14 UTC (rev 1852)
+++ branches/land_ice_projects/test_cases/dome/namelist.input.periodic_hex        2012-05-01 19:49:47 UTC (rev 1853)
@@ -1,8 +1,8 @@
&periodic_grid
nx = 30,
- ny = 35,
+ ny = 34,
dc = 2000.,
nVertLevels = 9,
nTracers = 1,
- nproc = 2,
+ nproc = 2,4
/
Modified: branches/land_ice_projects/test_cases/dome/setup_dome_initial_conditions.py
===================================================================
--- branches/land_ice_projects/test_cases/dome/setup_dome_initial_conditions.py        2012-05-01 16:01:14 UTC (rev 1852)
+++ branches/land_ice_projects/test_cases/dome/setup_dome_initial_conditions.py        2012-05-01 19:49:47 UTC (rev 1853)
@@ -32,6 +32,7 @@
normalVelocity = gridfile.variables['normalVelocity'][:]
layerThicknessFractions = gridfile.variables['layerThicknessFractions'][:]
temperature = gridfile.variables['temperature'][:]
+ beta = gridfile.variables['beta'][:]
except:
sys.exit('Error: The grid file specified is either missing or lacking needed dimensions/variables.')
@@ -56,14 +57,19 @@
temperature[:] = -20.0
# Setup layerThicknessFractions
layerThicknessFractions[:] = 1.0 / nVertLevels
+
+beta[:] = 10000.
+
# (lowerSurface and upperSurface need to be calculated in MPAS)
+
# Reassign the modified numpy array values back into netCDF variable objects
gridfile.variables['thickness'][:] = thickness
gridfile.variables['normalVelocity'][:] = normalVelocity
gridfile.variables['bedTopography'][:] = bedTopography
gridfile.variables['temperature'][:] = temperature
gridfile.variables['layerThicknessFractions'][:] = layerThicknessFractions
+gridfile.variables['beta'][:] = beta
gridfile.close()
Modified: branches/land_ice_projects/test_cases/dome/visualize_dome.py
===================================================================
--- branches/land_ice_projects/test_cases/dome/visualize_dome.py        2012-05-01 16:01:14 UTC (rev 1852)
+++ branches/land_ice_projects/test_cases/dome/visualize_dome.py        2012-05-01 19:49:47 UTC (rev 1853)
@@ -94,7 +94,7 @@
# print "Global max = ", global_max, " Global min = ", global_min
# print "Surface max = ", maxval, " Surface min = ", minval
-fig = plt.figure(1)
+fig = plt.figure(1, facecolor='w')
ax = fig.add_subplot(111, aspect='equal')
# C = plt.contourf(xCell, yCell, var_slice )
plt.scatter(xCell[:], yCell[:], 80, var_slice, marker='h', edgecolors='none')
@@ -148,7 +148,7 @@
if options.saveimages:
plt.savefig('dome_normalVelocity.png')
-fig = plt.figure(5)
+fig = plt.figure(5, facecolor='w')
ax = fig.add_subplot(121, aspect='equal')
plt.scatter(xCell[:], yCell[:], 80, uReconstructX[time_slice,:,vert_levs - 1], marker='h', edgecolors='none')
plt.colorbar()
@@ -172,3 +172,4 @@
plt.show()
f.close()
+
</font>
</pre>