<p><b>mpetersen@lanl.gov</b> 2012-10-24 15:09:58 -0600 (Wed, 24 Oct 2012)</p><p>branch commit, basin: a few small additions.<br>
</p><hr noshade><pre><font color="gray">Modified: branches/ocean_projects/basin/Namelists/namelist.Ilicak2_overflow
===================================================================
--- branches/ocean_projects/basin/namelists/namelist.Ilicak2_overflow        2012-10-24 20:22:05 UTC (rev 2265)
+++ branches/ocean_projects/basin/Namelists/namelist.Ilicak2_overflow        2012-10-24 21:09:58 UTC (rev 2266)
@@ -2,6 +2,7 @@
nVertLevelsMOD = 10
on_a_sphere = 'NO'
sphere_radius = 0.0
+ expand_from_unit_sphere = .false.
zLevel_thickness = 'equally_spaced'
bottom_topography = 'Ilicak2_overflow'
initial_conditions = 'Ilicak2_overflow'
Modified: branches/ocean_projects/basin/Namelists/namelist.Ilicak2_overflow_sigma
===================================================================
--- branches/ocean_projects/basin/namelists/namelist.Ilicak2_overflow_sigma        2012-10-24 20:22:05 UTC (rev 2265)
+++ branches/ocean_projects/basin/Namelists/namelist.Ilicak2_overflow_sigma        2012-10-24 21:09:58 UTC (rev 2266)
@@ -2,6 +2,7 @@
nVertLevelsMOD = 10
on_a_sphere = 'NO'
sphere_radius = 0.0
+ expand_from_unit_sphere = .false.
zLevel_thickness = 'equally_spaced'
bottom_topography = 'Ilicak2_overflow_sigma'
initial_conditions = 'Ilicak2_overflow_sigma'
Modified: branches/ocean_projects/basin/Namelists/namelist.aquaplanet_one_layer
===================================================================
--- branches/ocean_projects/basin/namelists/namelist.aquaplanet_one_layer        2012-10-24 20:22:05 UTC (rev 2265)
+++ branches/ocean_projects/basin/Namelists/namelist.aquaplanet_one_layer        2012-10-24 21:09:58 UTC (rev 2266)
@@ -1,7 +1,8 @@
&basin
nVertLevelsMOD = 1
on_a_sphere = 'YES'
- sphere_radius = 1
+ expand_from_unit_sphere = .true.
+ sphere_radius = 1.0
zLevel_thickness = 'equally_spaced'
bottom_topography = 'flat_bottom'
initial_conditions = 'uniform_TS'
Modified: branches/ocean_projects/basin/Namelists/namelist.global_realistic
===================================================================
--- branches/ocean_projects/basin/namelists/namelist.global_realistic        2012-10-24 20:22:05 UTC (rev 2265)
+++ branches/ocean_projects/basin/Namelists/namelist.global_realistic        2012-10-24 21:09:58 UTC (rev 2266)
@@ -1,6 +1,7 @@
&basin
nVertLevelsMOD = 40
on_a_sphere = 'YES'
+ expand_from_unit_sphere = .true.
sphere_radius = 6.37122e6
zLevel_thickness = 'POP_40_zLevel'
bottom_topography = 'realistic_ETOPO'
Modified: branches/ocean_projects/basin/namelist.basin
===================================================================
--- branches/ocean_projects/basin/namelist.basin        2012-10-24 20:22:05 UTC (rev 2265)
+++ branches/ocean_projects/basin/namelist.basin        2012-10-24 21:09:58 UTC (rev 2266)
@@ -1 +1 @@
-link namelists/namelist.global_realistic
\ No newline at end of file
+link Namelists/namelist.global_realistic
\ No newline at end of file
Modified: branches/ocean_projects/basin/src/basin.F
===================================================================
--- branches/ocean_projects/basin/src/basin.F        2012-10-24 20:22:05 UTC (rev 2265)
+++ branches/ocean_projects/basin/src/basin.F        2012-10-24 21:09:58 UTC (rev 2266)
@@ -107,13 +107,16 @@
! Variables in namelist file
character (len=32) :: on_a_sphere, zLevel_thickness,bottom_topography, initial_conditions
-logical :: eliminate_inland_seas, load_woce_IC, write_OpenDX_flag, monthly_forcing, &
+logical :: expand_from_unit_sphere, eliminate_inland_seas, load_woce_IC, &
+ write_OpenDX_flag, monthly_forcing, &
cut_domain_from_sphere, solid_boundary_in_y, solid_boundary_in_x
+
integer :: nVertLevelsMOD, top_layers_without_land
real (kind=8) :: sphere_radius, h_total_max, u_src_max, f0, beta, omega, Lx
! specify namelist
namelist /basin/ nVertLevelsMOD, on_a_sphere, sphere_radius, &
+ expand_from_unit_sphere, &
zLevel_thickness, bottom_topography, initial_conditions, &
eliminate_inland_seas, load_woce_IC, write_OpenDX_flag, monthly_forcing, &
cut_domain_from_sphere, solid_boundary_in_y, solid_boundary_in_x, &
@@ -123,6 +126,7 @@
nVertLevelsMOD = 40
on_a_sphere = 'YES'
sphere_radius = 6.37122e6
+expand_from_unit_sphere = .true.
! zLevel thickness options:
! 'POP_40_zLevel', 'equally_spaced', 'zero'
@@ -1311,7 +1315,7 @@
subroutine write_grid
implicit none
-if(on_a_sphere.eq.'YES') then
+if(expand_from_unit_sphere.eq.'YES') then
xCellNew = xCellNew * sphere_radius
yCellNew = yCellNew * sphere_radius
zCellNew = zCellNew * sphere_radius
@@ -1402,7 +1406,7 @@
call write_netcdf_finalize
-if(on_a_sphere.eq.'YES') then
+if(expand_from_unit_sphere.eq.'YES') then
xCellNew = xCellNew / sphere_radius
yCellNew = yCellNew / sphere_radius
zCellNew = zCellNew / sphere_radius
</font>
</pre>