<p><b>mpetersen@lanl.gov</b> 2011-10-11 14:43:03 -0600 (Tue, 11 Oct 2011)</p><p>Branch commit, split_explicit_timestepping, fix bug in u initialization on ocean-land boundaries. This caused incorrect vertical velocities that led to lack of tracer conservation with topography.<br>
</p><hr noshade><pre><font color="gray">Modified: branches/ocean_projects/split_explicit_timestepping/Makefile
===================================================================
--- branches/ocean_projects/split_explicit_timestepping/Makefile 2011-10-11 20:41:41 UTC (rev 1061)
+++ branches/ocean_projects/split_explicit_timestepping/Makefile 2011-10-11 20:43:03 UTC (rev 1062)
@@ -1,4 +1,3 @@
-CORE=ocean
#MODEL_FORMULATION = -DNCAR_FORMULATION
MODEL_FORMULATION = -DLANL_FORMULATION
@@ -83,7 +82,7 @@
ifort:
( make all \
- "FC = /share/apps/intel-openmpi-1.4.3/bin/mpif90" \
+ "FC = mpif90" \
"CC = gcc" \
"SFC = ifort" \
"SCC = gcc" \
Modified: branches/ocean_projects/split_explicit_timestepping/src/core_ocean/mpas_ocn_time_integration_split.F
===================================================================
--- branches/ocean_projects/split_explicit_timestepping/src/core_ocean/mpas_ocn_time_integration_split.F 2011-10-11 20:41:41 UTC (rev 1061)
+++ branches/ocean_projects/split_explicit_timestepping/src/core_ocean/mpas_ocn_time_integration_split.F 2011-10-11 20:43:03 UTC (rev 1062)
@@ -927,7 +927,12 @@
if (block % mesh % boundaryEdge % array(1,iEdge).eq.1) then
block % state % time_levs(2) % state % u % array(:,iEdge) = 0.0
else
- block % state % time_levs(2) % state % u % array(:,iEdge) = uTemp(:) + uCorr
+ do k=1,block % mesh % maxLevelEdgeTop % array(iEdge)
+ block % state % time_levs(2) % state % u % array(k,iEdge) = uTemp(k) + uCorr
+ enddo
+ do k=block % mesh % maxLevelEdgeTop % array(iEdge)+1,block % mesh % nVertLevels
+ block % state % time_levs(2) % state % u % array(k,iEdge) = 0.0
+ enddo
endif
! Put new sshEdge values in h_edge array, for the OcnTendScalar call below.
</font>
</pre>