<p><b>duda</b> 2010-10-12 18:00:58 -0600 (Tue, 12 Oct 2010)</p><p>BRANCH COMMIT<br>
<br>
Move uReconstruct* into diag structure for hydrostatic, shallow water, and<br>
ocean cores in the non-hydrostatic branch; now all cores should compile <br>
and run, since the interface for reconstruct() in module_vector_reconstruction.F<br>
was previously modified to accept three arguments: state, diag, and mesh.<br>
<br>
<br>
M src/core_hyd_atmos/mpas_interface.F<br>
M src/core_hyd_atmos/Registry<br>
M src/core_hyd_atmos/module_time_integration.F<br>
M src/core_sw/mpas_interface.F<br>
M src/core_sw/Registry<br>
M src/core_sw/module_time_integration.F<br>
M src/core_ocean/mpas_interface.F<br>
M src/core_ocean/Registry<br>
M src/core_ocean/module_time_integration.F<br>
</p><hr noshade><pre><font color="gray">Modified: branches/atmos_nonhydrostatic/src/core_hyd_atmos/Registry
===================================================================
--- branches/atmos_nonhydrostatic/src/core_hyd_atmos/Registry 2010-10-12 21:07:20 UTC (rev 546)
+++ branches/atmos_nonhydrostatic/src/core_hyd_atmos/Registry 2010-10-13 00:00:58 UTC (rev 547)
@@ -132,11 +132,11 @@
var persistent real ke ( nVertLevels nCells Time ) 2 o ke state - -
var persistent real pv_vertex ( nVertLevels nVertices Time ) 2 o pv_vertex state - -
var persistent real pv_cell ( nVertLevels nCells Time ) 2 o pv_cell state - -
-var persistent real uReconstructX ( nVertLevels nCells Time ) 2 o uReconstructX state - -
-var persistent real uReconstructY ( nVertLevels nCells Time ) 2 o uReconstructY state - -
-var persistent real uReconstructZ ( nVertLevels nCells Time ) 2 o uReconstructZ state - -
-var persistent real uReconstructZonal ( nVertLevels nCells Time ) 2 o uReconstructZonal state - -
-var persistent real uReconstructMeridional ( nVertLevels nCells Time ) 2 o uReconstructMeridional state - -
+var persistent real uReconstructX ( nVertLevels nCells Time ) 1 o uReconstructX diag - -
+var persistent real uReconstructY ( nVertLevels nCells Time ) 1 o uReconstructY diag - -
+var persistent real uReconstructZ ( nVertLevels nCells Time ) 1 o uReconstructZ diag - -
+var persistent real uReconstructZonal ( nVertLevels nCells Time ) 1 o uReconstructZonal diag - -
+var persistent real uReconstructMeridional ( nVertLevels nCells Time ) 1 o uReconstructMeridional diag - -
# Tendency variables
var persistent real tend_h ( nVertLevels nCells Time ) 1 - h tend - -
Modified: branches/atmos_nonhydrostatic/src/core_hyd_atmos/module_time_integration.F
===================================================================
--- branches/atmos_nonhydrostatic/src/core_hyd_atmos/module_time_integration.F 2010-10-12 21:07:20 UTC (rev 546)
+++ branches/atmos_nonhydrostatic/src/core_hyd_atmos/module_time_integration.F 2010-10-13 00:00:58 UTC (rev 547)
@@ -320,7 +320,7 @@
!
block => domain % blocklist
do while (associated(block))
- call reconstruct(block % state % time_levs(2) % state, block % mesh)
+ call reconstruct(block % state % time_levs(2) % state, block % diag, block % mesh)
call compute_w(block % state % time_levs(2) % state, block % state % time_levs(1) % state, block % mesh, dt)
block => block % next
end do
Modified: branches/atmos_nonhydrostatic/src/core_hyd_atmos/mpas_interface.F
===================================================================
--- branches/atmos_nonhydrostatic/src/core_hyd_atmos/mpas_interface.F 2010-10-12 21:07:20 UTC (rev 546)
+++ branches/atmos_nonhydrostatic/src/core_hyd_atmos/mpas_interface.F 2010-10-13 00:00:58 UTC (rev 547)
@@ -32,7 +32,7 @@
call initialize_advection_rk(mesh)
call rbfInterp_initialize(mesh)
call init_reconstruct(mesh)
- call reconstruct(block % state % time_levs(1) % state, mesh)
+ call reconstruct(block % state % time_levs(1) % state, block % diag, mesh)
end subroutine mpas_init
Modified: branches/atmos_nonhydrostatic/src/core_ocean/Registry
===================================================================
--- branches/atmos_nonhydrostatic/src/core_ocean/Registry 2010-10-12 21:07:20 UTC (rev 546)
+++ branches/atmos_nonhydrostatic/src/core_ocean/Registry 2010-10-13 00:00:58 UTC (rev 547)
@@ -142,11 +142,11 @@
var persistent real ke_edge ( nVertLevels nEdges Time ) 2 o ke_edge state - -
var persistent real pv_vertex ( nVertLevels nVertices Time ) 2 o pv_vertex state - -
var persistent real pv_cell ( nVertLevels nCells Time ) 2 o pv_cell state - -
-var persistent real uReconstructX ( nVertLevels nCells Time ) 2 o uReconstructX state - -
-var persistent real uReconstructY ( nVertLevels nCells Time ) 2 o uReconstructY state - -
-var persistent real uReconstructZ ( nVertLevels nCells Time ) 2 o uReconstructZ state - -
-var persistent real uReconstructZonal ( nVertLevels nCells Time ) 2 o uReconstructZonal state - -
-var persistent real uReconstructMeridional ( nVertLevels nCells Time ) 2 o uReconstructMeridional state - -
+var persistent real uReconstructX ( nVertLevels nCells Time ) 1 o uReconstructX diag - -
+var persistent real uReconstructY ( nVertLevels nCells Time ) 1 o uReconstructY diag - -
+var persistent real uReconstructZ ( nVertLevels nCells Time ) 1 o uReconstructZ diag - -
+var persistent real uReconstructZonal ( nVertLevels nCells Time ) 1 o uReconstructZonal diag - -
+var persistent real uReconstructMeridional ( nVertLevels nCells Time ) 1 o uReconstructMeridional diag - -
var persistent real zMid ( nVertLevels nCells Time ) 2 o zMid state - -
var persistent real zTop ( nVertLevelsP1 nCells Time ) 2 o zTop state - -
var persistent real zMidEdge ( nVertLevels nEdges Time ) 2 o zMidEdge state - -
Modified: branches/atmos_nonhydrostatic/src/core_ocean/module_time_integration.F
===================================================================
--- branches/atmos_nonhydrostatic/src/core_ocean/module_time_integration.F 2010-10-12 21:07:20 UTC (rev 546)
+++ branches/atmos_nonhydrostatic/src/core_ocean/module_time_integration.F 2010-10-13 00:00:58 UTC (rev 547)
@@ -238,7 +238,7 @@
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 % diag, block % mesh)
block => block % next
end do
Modified: branches/atmos_nonhydrostatic/src/core_ocean/mpas_interface.F
===================================================================
--- branches/atmos_nonhydrostatic/src/core_ocean/mpas_interface.F 2010-10-12 21:07:20 UTC (rev 546)
+++ branches/atmos_nonhydrostatic/src/core_ocean/mpas_interface.F 2010-10-13 00:00:58 UTC (rev 547)
@@ -29,7 +29,7 @@
call rbfInterp_initialize(mesh)
call init_reconstruct(mesh)
- call reconstruct(block % state % time_levs(1) % state, mesh)
+ call reconstruct(block % state % time_levs(1) % state, block % diag, mesh)
! mrp 100316 In order for this to work, we need to pass domain % dminfo as an
! input arguement into mpas_init. Ask about that later. For now, there will be
Modified: branches/atmos_nonhydrostatic/src/core_sw/Registry
===================================================================
--- branches/atmos_nonhydrostatic/src/core_sw/Registry 2010-10-12 21:07:20 UTC (rev 546)
+++ branches/atmos_nonhydrostatic/src/core_sw/Registry 2010-10-13 00:00:58 UTC (rev 547)
@@ -110,11 +110,11 @@
var persistent real ke ( nVertLevels nCells Time ) 2 o ke state - -
var persistent real pv_vertex ( nVertLevels nVertices Time ) 2 o pv_vertex state - -
var persistent real pv_cell ( nVertLevels nCells Time ) 2 o pv_cell state - -
-var persistent real uReconstructX ( nVertLevels nCells Time ) 2 o uReconstructX state - -
-var persistent real uReconstructY ( nVertLevels nCells Time ) 2 o uReconstructY state - -
-var persistent real uReconstructZ ( nVertLevels nCells Time ) 2 o uReconstructZ state - -
-var persistent real uReconstructZonal ( nVertLevels nCells Time ) 2 o uReconstructZonal state - -
-var persistent real uReconstructMeridional ( nVertLevels nCells Time ) 2 o uReconstructMeridional state - -
+var persistent real uReconstructX ( nVertLevels nCells Time ) 1 o uReconstructX diag - -
+var persistent real uReconstructY ( nVertLevels nCells Time ) 1 o uReconstructY diag - -
+var persistent real uReconstructZ ( nVertLevels nCells Time ) 1 o uReconstructZ diag - -
+var persistent real uReconstructZonal ( nVertLevels nCells Time ) 1 o uReconstructZonal diag - -
+var persistent real uReconstructMeridional ( nVertLevels nCells Time ) 1 o uReconstructMeridional diag - -
# Other diagnostic variables: neither read nor written to any files
var persistent real vh ( nVertLevels nEdges Time ) 2 - vh state - -
Modified: branches/atmos_nonhydrostatic/src/core_sw/module_time_integration.F
===================================================================
--- branches/atmos_nonhydrostatic/src/core_sw/module_time_integration.F 2010-10-12 21:07:20 UTC (rev 546)
+++ branches/atmos_nonhydrostatic/src/core_sw/module_time_integration.F 2010-10-13 00:00:58 UTC (rev 547)
@@ -218,7 +218,7 @@
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 % diag, block % mesh)
block => block % next
end do
Modified: branches/atmos_nonhydrostatic/src/core_sw/mpas_interface.F
===================================================================
--- branches/atmos_nonhydrostatic/src/core_sw/mpas_interface.F 2010-10-12 21:07:20 UTC (rev 546)
+++ branches/atmos_nonhydrostatic/src/core_sw/mpas_interface.F 2010-10-13 00:00:58 UTC (rev 547)
@@ -29,7 +29,7 @@
call rbfInterp_initialize(mesh)
call init_reconstruct(mesh)
- call reconstruct(block % state % time_levs(1) % state, mesh)
+ call reconstruct(block % state % time_levs(1) % state, block % diag, mesh)
end subroutine mpas_init
</font>
</pre>