<p><b>mpetersen@lanl.gov</b> 2010-09-07 16:10:11 -0600 (Tue, 07 Sep 2010)</p><p>Removed the dissipation branch, which has been reviewed and merged to the trunk.<br>
</p><hr noshade><pre><font color="gray">Modified: branches/ocean_projects/topography_mrp/src/core_ocean/module_test_cases.F
===================================================================
--- branches/ocean_projects/topography_mrp/src/core_ocean/module_test_cases.F        2010-09-02 17:14:50 UTC (rev 493)
+++ branches/ocean_projects/topography_mrp/src/core_ocean/module_test_cases.F        2010-09-07 22:10:11 UTC (rev 494)
@@ -212,7 +212,7 @@
 
 
           !!!!!!!!!!!! mrp 100817 setting wind forcing to zero
-          u_src=0.0
+          !u_src=0.0
           !!!!!!!!!!!! mrp 100817 setting wind forcing to zero
 
            ! Set tracers, if not done in grid.nc file

Modified: branches/ocean_projects/topography_mrp/src/core_ocean/module_time_integration.F
===================================================================
--- branches/ocean_projects/topography_mrp/src/core_ocean/module_time_integration.F        2010-09-02 17:14:50 UTC (rev 493)
+++ branches/ocean_projects/topography_mrp/src/core_ocean/module_time_integration.F        2010-09-07 22:10:11 UTC (rev 494)
@@ -1407,11 +1407,15 @@
          do i=1,nEdgesOnCell(iCell)
             iEdge = edgesOnCell(i,iCell)
             do k=1,maxLevelEdge(iEdge)
-              pgrad(k,iCell) = pgrad(k,iCell) + 0.5 * dcEdge(iEdge) * dvEdge(iEdge) * abs(pgrad_edge(k,iEdge))
+              ! mrp first attempt, I think it is wrong:
+              !pgrad(k,iCell) = pgrad(k,iCell) + 0.5 * dcEdge(iEdge) * dvEdge(iEdge) * abs(pgrad_edge(k,iEdge))
+              pgrad(k,iCell) = pgrad(k,iCell) + abs(pgrad_edge(k,iEdge))
             end do
          end do
          do k=1,maxLevelCell(iCell)
-            pgrad(k,iCell) = pgrad(k,iCell) / areaCell(iCell)
+             ! mrp first attempt, I think it is wrong:
+!            pgrad(k,iCell) = pgrad(k,iCell) / areaCell(iCell)
+            pgrad(k,iCell) = pgrad(k,iCell) / 4.0
          end do
       end do
 

Modified: branches/ocean_projects/topography_mrp/src/framework/module_block_decomp.F
===================================================================
--- branches/ocean_projects/topography_mrp/src/framework/module_block_decomp.F        2010-09-02 17:14:50 UTC (rev 493)
+++ branches/ocean_projects/topography_mrp/src/framework/module_block_decomp.F        2010-09-07 22:10:11 UTC (rev 494)
@@ -109,7 +109,9 @@
          deallocate(global_cell_list)
       else
          allocate(local_cell_list(partial_global_graph_info % nVerticesTotal))
-         local_cell_list(:) = dminfo % my_proc_id
+         do i=1,size(local_cell_list)
+           local_cell_list(i) = i
+         enddo
       endif
 
    end subroutine block_decomp_cells_for_proc
@@ -257,19 +259,21 @@
       call hash_init(h)
 
       do i=1,local_graph_info % nVertices
-if (hash_search(h, local_graph_info % vertexID(i))) &amp;
-  write(0,*) 'block_decomp_add_halo: There appear to be duplicates in vertexID list.'
-         call hash_insert(h, local_graph_info % vertexID(i)) 
-         local_graph_with_halo % vertexID(i) = local_graph_info % vertexID(i) 
-         local_graph_with_halo % nAdjacent(i) = local_graph_info % nAdjacent(i) 
-         local_graph_with_halo % adjacencyList(:,i) = local_graph_info % adjacencyList(:,i) 
+        if (hash_search(h, local_graph_info % vertexID(i))) &amp;
+          write(0,*) 'block_decomp_add_halo:',&amp;
+            ' There appear to be duplicates in vertexID list.'
+            call hash_insert(h, local_graph_info % vertexID(i)) 
+             local_graph_with_halo % vertexID(i) = local_graph_info % vertexID(i) 
+             local_graph_with_halo % nAdjacent(i) = local_graph_info % nAdjacent(i) 
+             local_graph_with_halo % adjacencyList(:,i) = local_graph_info % adjacencyList(:,i) 
       end do
 
       k = local_graph_with_halo % ghostStart
-if (hash_size(h) /= k-1) &amp;
-  write(0,*) 'block_decomp_add_halo: Somehow we don''t have the right number of non-ghost cells.'
-      do i=1,local_graph_info % nVertices
-         do j=1,local_graph_info % nAdjacent(i)
+      if (hash_size(h) /= k-1) &amp;
+        write(0,*) 'block_decomp_add_halo: '&amp;
+          'Somehow we don''t have the right number of non-ghost cells.'
+        do i=1,local_graph_info % nVertices
+          do j=1,local_graph_info % nAdjacent(i)
             if (local_graph_info % adjacencyList(j,i) /= 0) then
                if (.not. hash_search(h, local_graph_info % adjacencyList(j,i))) then
                   call hash_insert(h, local_graph_info % adjacencyList(j,i))
@@ -279,9 +283,12 @@
             end if
          end do
       end do 
-if (local_graph_with_halo % nVerticesTotal /= k-1) &amp;
-  write(0,*) 'block_decomp_add_halo: Somehow we don''t have the right number of total cells.'
 
+      if (local_graph_with_halo % nVerticesTotal /= k-1) &amp;
+        write(0,*) 'block_decomp_add_halo:', &amp;
+          ' Somehow we don''t have the right number of total cells.', &amp;
+          local_graph_with_halo % nVerticesTotal, k-1
+
       call hash_destroy(h)
 
    end subroutine block_decomp_add_halo

Modified: branches/ocean_projects/topography_mrp/src/framework/module_io_input.F
===================================================================
--- branches/ocean_projects/topography_mrp/src/framework/module_io_input.F        2010-09-02 17:14:50 UTC (rev 493)
+++ branches/ocean_projects/topography_mrp/src/framework/module_io_input.F        2010-09-07 22:10:11 UTC (rev 494)
@@ -754,7 +754,8 @@
          !   restart file
          !
          if (input_obj % rdLocalTime &lt;= 0) then
-            write(0,*) 'Error: Couldn''t find any times in restart file.'
+            write(0,*) 'Error:',&amp;
+              ' Couldn''t find any times in restart file.'
             call dmpar_abort(domain % dminfo)
          end if
          if (domain % dminfo % my_proc_id == IO_NODE) then

</font>
</pre>