<p><b>mpetersen@lanl.gov</b> 2011-06-02 16:51:55 -0600 (Thu, 02 Jun 2011)</p><p>A little clean-up.<br>
</p><hr noshade><pre><font color="gray">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-02 22:24:55 UTC (rev 872)
+++ branches/ocean_projects/timesplitting_mrp/src/core_ocean/module_time_integration.F        2011-06-02 22:51:55 UTC (rev 873)
@@ -436,12 +436,12 @@
nCells = block % mesh % nCells
nEdges = block % mesh % nEdges
nVertLevels = block % mesh % nVertLevels
-print *, 'uold ',minval(block % state % time_levs(1) % state % u % array(:,1:nEdges)),&
- maxval(block % state % time_levs(1) % state % u % array(:,1:nEdges))
-print *, 'uBtrOld',minval(block % state % time_levs(1) % state % uBtr % array(1:nEdges)),&
- maxval(block % state % time_levs(1) % state % uBtr % array(1:nEdges))
-print *, 'uBclOld',minval(block % state % time_levs(1) % state % uBcl % array(:,1:nEdges)),&
- maxval(block % state % time_levs(1) % state % uBcl % array(:,1:nEdges))
+!print *, 'uold ',minval(block % state % time_levs(1) % state % u % array(:,1:nEdges)),&
+! maxval(block % state % time_levs(1) % state % u % array(:,1:nEdges))
+!print *, 'uBtrOld',minval(block % state % time_levs(1) % state % uBtr % array(1:nEdges)),&
+! maxval(block % state % time_levs(1) % state % uBtr % array(1:nEdges))
+!print *, 'uBclOld',minval(block % state % time_levs(1) % state % uBcl % array(:,1:nEdges)),&
+! maxval(block % state % time_levs(1) % state % uBcl % array(:,1:nEdges))
!print *, 'hold',minval(block % state % time_levs(1) % state % h % array(:,1:nCells)),&
! maxval(block % state % time_levs(1) % state % h % array(:,1:nCells))
!print *, 'Told',minval(block % state % time_levs(1) % state % tracers % array(1,:,1:nCells)),&
@@ -594,8 +594,8 @@
! printing:
nCells = block % mesh % nCells
nEdges = block % mesh % nEdges
-print *, 'ubcl, j= ',j,minval(block % state % time_levs(2) % state % uBcl % array(:,1:nEdges)),&
- maxval(block % state % time_levs(2) % state % uBcl % array(:,1:nEdges))
+!print *, 'ubcl, j= ',j,minval(block % state % time_levs(2) % state % uBcl % array(:,1:nEdges)),&
+! maxval(block % state % time_levs(2) % state % uBcl % array(:,1:nEdges))
block => block % next
end do
@@ -664,7 +664,7 @@
block => block % next
end do ! block
!print *, '7'
-print *, 'Barotropic subcycle'
+!print *, 'Barotropic subcycle'
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
! BEGIN Barotropic subcycle loop
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
@@ -806,21 +806,21 @@
- block % state % time_levs(newBtrSubcycleTime) % state % sshSubcycle % array(cell1) ) &
/block % mesh % dcEdge % array(iEdge) &
+ block % state % time_levs(1) % state % GBtrForcing % array(iEdge))
-print *, '9.4'
+!print *, '9.4'
end do
-print *, '9.5'
+!print *, '9.5'
! printing:
nCells = block % mesh % nCells
nEdges = block % mesh % nEdges
-print *, 'uBtr, j= ',j,minval(block % state % time_levs(newBtrSubcycleTime) % state % uBtrSubcycle % array(1:nEdges)),&
- maxval(block % state % time_levs(newBtrSubcycleTime) % state % uBtrSubcycle % array(1:nEdges))
-print *, 'ssh, j= ',j,minval(block % state % time_levs(newBtrSubcycleTime) % state % sshSubcycle % array(1:nCells)),&
- maxval(block % state % time_levs(newBtrSubcycleTime) % state % sshSubcycle % array(1:nCells))
+!print *, 'uBtr, j= ',j,minval(block % state % time_levs(newBtrSubcycleTime) % state % uBtrSubcycle % array(1:nEdges)),&
+! maxval(block % state % time_levs(newBtrSubcycleTime) % state % uBtrSubcycle % array(1:nEdges))
+!print *, 'ssh, j= ',j,minval(block % state % time_levs(newBtrSubcycleTime) % state % sshSubcycle % array(1:nCells)),&
+! maxval(block % state % time_levs(newBtrSubcycleTime) % state % sshSubcycle % array(1:nCells))
block => block % next
end do ! block
-print *, '10'
+!print *, '10'
@@ -858,7 +858,7 @@
! advance time pointers
oldBtrSubcycleTime = mod(oldBtrSubcycleTime,2)+1
newBtrSubcycleTime = mod(newBtrSubcycleTime,2)+1
-print *, '11 oldBtrSubcycleTime, newBtrSubcycleTime',oldBtrSubcycleTime, newBtrSubcycleTime
+!print *, '11 oldBtrSubcycleTime, newBtrSubcycleTime',oldBtrSubcycleTime, newBtrSubcycleTime
end do ! j=1,config_n_btr_subcycles
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
@@ -930,10 +930,10 @@
end do
! Now can compare sshSubcycleNEW (big step using summed fluxes) with
! sshSubcycleOLD (individual steps to get there)
-print *, 'ssh, by substeps',minval(block % state % time_levs(oldBtrSubcycleTime) % state % sshSubcycle % array(1:block % mesh % nCellsSolve)), &
- maxval(block % state % time_levs(oldBtrSubcycleTime) % state % sshSubcycle % array(1:block % mesh % nCellsSolve))
-print *, 'ssh, by 1 step ',minval(block % state % time_levs(newBtrSubcycleTime) % state % sshSubcycle % array(1:block % mesh % nCellsSolve)), &
- maxval(block % state % time_levs(newBtrSubcycleTime) % state % sshSubcycle % array(1:block % mesh % nCellsSolve))
+!print *, 'ssh, by substeps',minval(block % state % time_levs(oldBtrSubcycleTime) % state % sshSubcycle % array(1:block % mesh % nCellsSolve)), &
+! maxval(block % state % time_levs(oldBtrSubcycleTime) % state % sshSubcycle % array(1:block % mesh % nCellsSolve))
+!print *, 'ssh, by 1 step ',minval(block % state % time_levs(newBtrSubcycleTime) % state % sshSubcycle % array(1:block % mesh % nCellsSolve)), &
+! maxval(block % state % time_levs(newBtrSubcycleTime) % state % sshSubcycle % array(1:block % mesh % nCellsSolve))
! Correction velocity, u^{corr}:
!u^{corr} = \left( {\overline {\bf F}}
@@ -1008,7 +1008,7 @@
-print *, '16'
+!print *, '16'
!
! Stage 3: Tracer, density, pressure, vertical velocity prediction
@@ -1027,15 +1027,15 @@
! printing:
nCells = block % mesh % nCells
-print *, '1h_tend ',minval(block % tend % h % array(1,1:nCells)),&
- maxval(block % tend % h % array(1,1:nCells))
-print *, '1tr_tend',minval(block % tend % tracers % array(3,1,1:nCells)),&
- maxval(block % tend % tracers % array(3,1,1:nCells))
+!print *, '1h_tend ',minval(block % tend % h % array(1,1:nCells)),&
+! maxval(block % tend % h % array(1,1:nCells))
+!print *, '1tr_tend',minval(block % tend % tracers % array(3,1,1:nCells)),&
+! maxval(block % tend % tracers % array(3,1,1:nCells))
block => block % next
end do
-print *, '17'
+!print *, '17'
! --- update halos for prognostic variables
@@ -1049,7 +1049,7 @@
block % parinfo % cellsToSend, block % parinfo % cellsToRecv)
block => block % next
end do
-print *, '18'
+!print *, '18'
block => domain % blocklist
</font>
</pre>