<p><b>mpetersen@lanl.gov</b> 2012-11-19 09:47:52 -0700 (Mon, 19 Nov 2012)</p><p>Branch commit, basin: A correction and one more flag. The default namelist was tested with the 120km global domain.<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-11-16 23:13:15 UTC (rev 2312)
+++ branches/ocean_projects/basin/Namelists/namelist.Ilicak2_overflow        2012-11-19 16:47:52 UTC (rev 2313)
@@ -10,6 +10,7 @@
load_woce_IC = .false.
write_OpenDX_flag = .false.
monthly_forcing = .false.
+ check_mesh = .true.
cut_domain_from_sphere = .false.
solid_boundary_in_y = .true.
solid_boundary_in_x = .false.
Modified: branches/ocean_projects/basin/Namelists/namelist.Ilicak2_overflow_sigma
===================================================================
--- branches/ocean_projects/basin/Namelists/namelist.Ilicak2_overflow_sigma        2012-11-16 23:13:15 UTC (rev 2312)
+++ branches/ocean_projects/basin/Namelists/namelist.Ilicak2_overflow_sigma        2012-11-19 16:47:52 UTC (rev 2313)
@@ -10,6 +10,7 @@
load_woce_IC = .false.
write_OpenDX_flag = .false.
monthly_forcing = .false.
+ check_mesh = .true.
cut_domain_from_sphere = .false.
solid_boundary_in_y = .true.
solid_boundary_in_x = .false.
Modified: branches/ocean_projects/basin/Namelists/namelist.aquaplanet_one_layer
===================================================================
--- branches/ocean_projects/basin/Namelists/namelist.aquaplanet_one_layer        2012-11-16 23:13:15 UTC (rev 2312)
+++ branches/ocean_projects/basin/Namelists/namelist.aquaplanet_one_layer        2012-11-19 16:47:52 UTC (rev 2313)
@@ -10,6 +10,7 @@
load_woce_IC = .false.
write_OpenDX_flag = .false.
monthly_forcing = .false.
+ check_mesh = .true.
cut_domain_from_sphere = .false.
solid_boundary_in_y = .false.
solid_boundary_in_x = .false.
Modified: branches/ocean_projects/basin/Namelists/namelist.global_realistic
===================================================================
--- branches/ocean_projects/basin/Namelists/namelist.global_realistic        2012-11-16 23:13:15 UTC (rev 2312)
+++ branches/ocean_projects/basin/Namelists/namelist.global_realistic        2012-11-19 16:47:52 UTC (rev 2313)
@@ -10,6 +10,7 @@
load_woce_IC = .true.
write_OpenDX_flag = .false.
monthly_forcing = .true.
+ check_mesh = .true.
cut_domain_from_sphere = .false.
solid_boundary_in_y = .false.
solid_boundary_in_x = .false.
Modified: branches/ocean_projects/basin/src/basin.F
===================================================================
--- branches/ocean_projects/basin/src/basin.F        2012-11-16 23:13:15 UTC (rev 2312)
+++ branches/ocean_projects/basin/src/basin.F        2012-11-19 16:47:52 UTC (rev 2313)
@@ -108,7 +108,7 @@
! Variables in namelist file
character (len=32) :: on_a_sphere, zLevel_thickness,bottom_topography, initial_conditions
logical :: expand_from_unit_sphere, eliminate_inland_seas, load_woce_IC, &
- write_OpenDX_flag, monthly_forcing, &
+ write_OpenDX_flag, monthly_forcing, check_mesh, &
cut_domain_from_sphere, solid_boundary_in_y, solid_boundary_in_x
integer :: nVertLevelsMOD, top_layers_without_land
@@ -118,7 +118,7 @@
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, &
+ eliminate_inland_seas, load_woce_IC, write_OpenDX_flag, monthly_forcing, check_mesh, &
cut_domain_from_sphere, solid_boundary_in_y, solid_boundary_in_x, &
top_layers_without_land, h_total_max, u_src_max, f0, beta, omega, Lx
@@ -144,6 +144,7 @@
load_woce_IC = .true.
write_OpenDX_flag = .false.
monthly_forcing = .true.
+check_mesh = .true.
cut_domain_from_sphere = .false.
solid_boundary_in_y = .false.
solid_boundary_in_x = .false.
@@ -221,7 +222,9 @@
call map_connectivity
! check the mesh
-call error_checking
+if (check_mesh) then
+ call error_checking
+endif
if (load_woce_IC) then
write(6,*) ' getting woce t and s '
@@ -1315,7 +1318,7 @@
subroutine write_grid
implicit none
-if(expand_from_unit_sphere.eq.'YES') then
+if (expand_from_unit_sphere) then
xCellNew = xCellNew * sphere_radius
yCellNew = yCellNew * sphere_radius
zCellNew = zCellNew * sphere_radius
@@ -1406,7 +1409,7 @@
call write_netcdf_finalize
-if(expand_from_unit_sphere.eq.'YES') then
+if (expand_from_unit_sphere) then
xCellNew = xCellNew / sphere_radius
yCellNew = yCellNew / sphere_radius
zCellNew = zCellNew / sphere_radius
</font>
</pre>