<p><b>mpetersen@lanl.gov</b> 2011-06-08 12:47:07 -0600 (Wed, 08 Jun 2011)</p><p>Correction to boundary update of SSH in the barotropic subcycling.<br>
</p><hr noshade><pre><font color="gray">Modified: branches/ocean_projects/timesplitting_mrp/src/core_ocean/module_mpas_core.F
===================================================================
--- branches/ocean_projects/timesplitting_mrp/src/core_ocean/module_mpas_core.F        2011-06-08 13:23:12 UTC (rev 883)
+++ branches/ocean_projects/timesplitting_mrp/src/core_ocean/module_mpas_core.F        2011-06-08 18:47:07 UTC (rev 884)
@@ -84,8 +84,8 @@
call rbfInterp_initialize(mesh)
! mrp temp
-! call init_reconstruct(mesh)
-! call reconstruct(block % state % time_levs(1) % state, mesh)
+ call init_reconstruct(mesh)
+ call reconstruct(block % state % time_levs(1) % state, mesh)
! initialize velocities and tracers on land to be -1e34
! The reconstructed velocity on land will have values not exactly
Modified: branches/ocean_projects/timesplitting_mrp/src/core_ocean/module_time_integration.F
===================================================================
--- branches/ocean_projects/timesplitting_mrp/src/core_ocean/module_time_integration.F        2011-06-08 13:23:12 UTC (rev 883)
+++ branches/ocean_projects/timesplitting_mrp/src/core_ocean/module_time_integration.F        2011-06-08 18:47:07 UTC (rev 884)
@@ -719,11 +719,6 @@
+ dt/config_n_btr_subcycles &
* block % tend % ssh % array(iCell) / block % mesh % areaCell % array (iCell)
-! sshNew(iCell) = sshNew(iCell) + sshSubcycleNew(iCell)
- block % state % time_levs(2) % state % ssh % array(iCell) &
- = block % state % time_levs(2) % state % ssh % array(iCell) &
- + block % state % time_levs(newBtrSubcycleTime) % state % sshSubcycle % array(iCell)
-
end do
!print *, '7.3'
@@ -739,15 +734,35 @@
! block % state % time_levs(newBtrSubcycleTime) % state % sshSubcycle % array(:), &
-! call dmpar_exch_halo_field1dReal(domain % dminfo, &
-! block % state % time_levs(1) % state % sshSubcycle % array(:), &
-! block % mesh % nCells, &
-! block % parinfo % cellsToSend, block % parinfo % cellsToRecv)
+ call dmpar_exch_halo_field1dReal(domain % dminfo, &
+ block % state % time_levs(newBtrSubcycleTime) % state % sshSubcycle % array(:), &
+ block % mesh % nCells, &
+ block % parinfo % cellsToSend, block % parinfo % cellsToRecv)
block => block % next
end do ! block
!print *, '9'
+ block => domain % blocklist
+ do while (associated(block))
+
+ do iCell=1,block % mesh % nCells
+
+
+! sshNew(iCell) = sshNew(iCell) + sshSubcycleNew(iCell)
+ block % state % time_levs(2) % state % ssh % array(iCell) &
+ = block % state % time_levs(2) % state % ssh % array(iCell) &
+ + block % state % time_levs(newBtrSubcycleTime) % state % sshSubcycle % array(iCell)
+
+ end do
+
+!print *, '7.3'
+! mrp del deallocate(tend_ssh)
+!print *, '7.4'
+ block => block % next
+ end do ! block
+!print *, '8'
+
! compute new barotropic velocity
! do iEdge=1,nEdges
@@ -1377,7 +1392,8 @@
call compute_solve_diagnostics(dt, block % state % time_levs(2) % state, block % mesh)
- call reconstruct(block % state % time_levs(2) % state, block % mesh)
+!
+! call reconstruct(block % state % time_levs(2) % state, block % mesh)
block => block % next
end do
</font>
</pre>