<p><b>mpetersen@lanl.gov</b> 2012-10-23 16:47:33 -0600 (Tue, 23 Oct 2012)</p><p>branch commit, basin: Add namelist for one layer aquaplanet.<br>
</p><hr noshade><pre><font color="gray">Added: branches/ocean_projects/basin/namelists/namelist.aquaplanet_one_layer
===================================================================
--- branches/ocean_projects/basin/namelists/namelist.aquaplanet_one_layer                                (rev 0)
+++ branches/ocean_projects/basin/namelists/namelist.aquaplanet_one_layer        2012-10-23 22:47:33 UTC (rev 2262)
@@ -0,0 +1,26 @@
+&amp;basin
+  nVertLevelsMOD = 1
+  on_a_sphere = 'YES'
+  sphere_radius = 1
+  zLevel_thickness = 'equally_spaced'
+  bottom_topography = 'flat_bottom'
+  initial_conditions = 'uniform_TS'
+  eliminate_inland_seas=.false.
+  load_woce_IC = .false.
+  write_OpenDX_flag = .false.
+  monthly_forcing = .false.
+  cut_domain_from_sphere = .false.
+  solid_boundary_in_y = .false.
+  solid_boundary_in_x = .false.
+  top_layers_without_land = 3
+  h_total_max = 3000.0 
+
+  ! These variables are not needed for aquaplanet.
+  ! u,f,h are initialized in the code.
+
+  u_src_max = 0.0 
+  f0 = 0.0 
+  beta = 0.0
+  omega = 0.0
+  ! Lx = 3200.0e3
+/

Modified: branches/ocean_projects/basin/src/basin.F
===================================================================
--- branches/ocean_projects/basin/src/basin.F        2012-10-23 17:48:04 UTC (rev 2261)
+++ branches/ocean_projects/basin/src/basin.F        2012-10-23 22:47:33 UTC (rev 2262)
@@ -133,7 +133,7 @@
 bottom_topography = 'realistic_ETOPO'
 
 ! initial temperature and salinity options: 
-! 'realistic_WOCE', 'constant', 'Ilicak2_overflow', 'Ilicak2_overflow_sigma'
+! 'realistic_WOCE', 'uniform_TS', 'Ilicak2_overflow', 'Ilicak2_overflow_sigma'
 initial_conditions = 'realistic_WOCE'
 
 eliminate_inland_seas=.true.
@@ -480,7 +480,6 @@
    uNew = 0.0
    u_srcNew = 0.0
 
-   ! change thickness of bottom level
    do iCell=1,nCellsNew
       do k=1, nVertLevelsMod
          hNew(1,k,iCell) = hZLevel(k)
@@ -1566,6 +1565,7 @@
 elseif (bottom_topography.eq.'flat_bottom') then
 
    kmt = nVertLevelsMOD
+   bottomDepth = refBottomDepth(nVertLevelsMOD)
 
 else 
 
@@ -1636,7 +1636,7 @@
 endif
 
 ! do not allow land or PBCs in top layers
-k = top_layers_without_land
+k = min(top_layers_without_land,nVertLevelsMOD)
 where(kmt.gt.0.and.kmt.le.k) 
    bottomDepth = refBottomDepth(k)
    kmt=k

</font>
</pre>