<p><b>ringler@lanl.gov</b> 2012-05-02 10:39:34 -0600 (Wed, 02 May 2012)</p><p><br>
generation of initial conditions supports monthly forcing<br>
</p><hr noshade><pre><font color="gray">Modified: branches/ocean_projects/basin/src/basin.F
===================================================================
--- branches/ocean_projects/basin/src/basin.F        2012-05-02 15:33:23 UTC (rev 1856)
+++ branches/ocean_projects/basin/src/basin.F        2012-05-02 16:39:34 UTC (rev 1857)
@@ -662,6 +662,10 @@
do iMonth=1,12
ulon = TAUX_MONTHLY(ix,iy,iMonth)
ulat = TAUY_MONTHLY(ix,iy,iMonth)
+! if(abs(ulon).gt.1.0.or.abs(ulat).gt.1.0) then
+! ulon=0.0
+! ulat=0.0
+! endif
call transform_from_lonlat_to_xyz(xin,yin,zin,ulon,ulat,ux,uy,uz)
if(boundaryEdgeNew(1,iEdge).eq.1) then
windStressMonthlyNew(iMonth,iEdge) = 0.0
@@ -672,7 +676,9 @@
q(1) = xCellNew(iCell2); q(2) = yCellNew(iCell2); q(3) = zCellNew(iCell2)
q = q - p
call unit_vector_in_3space(q)
+ ! repeat
windStressMonthlyNew(iMonth,iEdge) = ux*q(1) + uy*q(2) + uz*q(3)
+ ! windStressMonthlyNew(iMonth,iEdge) = u_srcNew(1,iEdge)
endif
enddo
enddo
@@ -848,6 +854,12 @@
endif ! l_woce
+!repeat
+!do iMonth=1,12
+! temperatureRestoreMonthlyNew(iMonth,:) = temperatureRestoreNew(:)
+! salinityRestoreMonthlyNew(iMonth,:) = salinityRestoreNew(:)
+!enddo
+
endif ! real_bathymetry
write(6,*) ' done get_init_conditions'
</font>
</pre>