<p><b>duda</b> 2009-12-18 12:09:33 -0700 (Fri, 18 Dec 2009)</p><p>For the Jablonowski and Williamson baroclinic wave test case,<br>
only add wind perturbation if config_test_case == 2.<br>
<br>
M src/module_test_cases.F<br>
M namelist.input<br>
</p><hr noshade><pre><font color="gray">Modified: branches/hyd_model/namelist.input
===================================================================
--- branches/hyd_model/namelist.input        2009-12-18 18:22:32 UTC (rev 88)
+++ branches/hyd_model/namelist.input        2009-12-18 19:09:33 UTC (rev 89)
@@ -1,5 +1,5 @@
&sw_model
- config_test_case = 1
+ config_test_case = 2
config_time_integration = 'SRK3'
config_dt = 3600
config_ntimesteps = 240
Modified: branches/hyd_model/src/module_test_cases.F
===================================================================
--- branches/hyd_model/src/module_test_cases.F        2009-12-18 18:22:32 UTC (rev 88)
+++ branches/hyd_model/src/module_test_cases.F        2009-12-18 19:09:33 UTC (rev 89)
@@ -243,9 +243,13 @@
lat2 = grid%latVertex%array(vtx2)
flux = (0.5*(lat2-lat1) - 0.125*(sin(4.*lat2) - sin(4.*lat1)))*a/grid % dvEdge % array(iEdge)
- r_pert = sphere_distance( grid % latEdge % array (iEdge), grid % lonEdge % array (iEdge), &
- lat_pert, lon_pert, 1.)/(pert_radius)
- u_pert = u_perturbation*exp(-r_pert**2)*(lat2-lat1)*a/grid % dvEdge % array(iEdge)
+ if (config_test_case == 2) then
+ r_pert = sphere_distance( grid % latEdge % array (iEdge), grid % lonEdge % array (iEdge), &
+ lat_pert, lon_pert, 1.)/(pert_radius)
+ u_pert = u_perturbation*exp(-r_pert**2)*(lat2-lat1)*a/grid % dvEdge % array(iEdge)
+ else
+ u_pert = 0.0
+ end if
do k=1,grid % nVertLevels
@@ -327,7 +331,7 @@
do k=1,nz1
geopotential(k+1,iCell) = geopotential(k,iCell)-dnw(k)*h(k,iCell)*alpha(k,iCell)
end do
- end do
+ end do
                
write(6,*) 'ptop = ',ptop,' zt = ',geopotential(nz,1)/gravity
@@ -356,6 +360,7 @@
end subroutine hyd_test_case_1
+
real function sphere_distance(lat1, lon1, lat2, lon2, radius)
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
! Compute the great-circle distance between (lat1, lon1) and (lat2, lon2) on a
</font>
</pre>