<p><b>duda</b> 2010-10-20 16:18:48 -0600 (Wed, 20 Oct 2010)</p><p>BRANCH COMMIT<br>
<br>
More minor cleanup: remove h_divergence and *_save fields<br>
from restart files; remove unused q*_old fields from registry; <br>
and rename 'pressure' to 'pressure_p' to reflect the fact that<br>
the field is actually perturbation pressure.<br>
<br>
<br>
M graphics/ncl/cells_nhyd_sphere.ncl<br>
M graphics/ncl/cells_nhyd_sph1.ncl<br>
M src/core_nhyd_atmos/module_test_cases.F<br>
M src/core_nhyd_atmos/Registry<br>
M src/core_nhyd_atmos/module_time_integration.F<br>
</p><hr noshade><pre><font color="gray">Modified: branches/atmos_nonhydrostatic/graphics/ncl/cells_nhyd_sph1.ncl
===================================================================
--- branches/atmos_nonhydrostatic/graphics/ncl/cells_nhyd_sph1.ncl 2010-10-20 18:03:40 UTC (rev 573)
+++ branches/atmos_nonhydrostatic/graphics/ncl/cells_nhyd_sph1.ncl 2010-10-20 22:18:48 UTC (rev 574)
@@ -126,7 +126,7 @@
; h = f->theta(t,:,0)-f->theta_base(t,:,0)
; h = f->surface_pressure(t,:)/100.
; h = (f->surface_pressure(t,:)-f->surface_pressure(0,:))/100.
-; h = f->pressure(t,:,0)/100.
+; h = f->pressure_p(t,:,0)/100.
; fld = h
cf1 = 2.
@@ -137,9 +137,9 @@
; cf2 = 0.
; cf3 = 0.
- pfirst = f->pressure(t,:,0)+f->pressure_base(t,:,0)
- psecond = f->pressure(t,:,1)+f->pressure_base(t,:,1)
- pthird = f->pressure(t,:,2)+f->pressure_base(t,:,2)
+ pfirst = f->pressure_p(t,:,0)+f->pressure_base(t,:,0)
+ psecond = f->pressure_p(t,:,1)+f->pressure_base(t,:,1)
+ pthird = f->pressure_p(t,:,2)+f->pressure_base(t,:,2)
; fld = (cf1*pfirst + cf2*psecond + cf3*pthird)/100.
rhofirst = f->rho(t,:,0)
@@ -156,7 +156,7 @@
; -.25*(rr(2,i)+rb(2,i))*(1.+qv(2,i)))
-; fld = f->pressure(t,:,25)+f->pressure_base(t,:,25)
+; fld = f->pressure_p(t,:,25)+f->pressure_base(t,:,25)
; fld = f->kdiff(t,:,0)
Modified: branches/atmos_nonhydrostatic/graphics/ncl/cells_nhyd_sphere.ncl
===================================================================
--- branches/atmos_nonhydrostatic/graphics/ncl/cells_nhyd_sphere.ncl 2010-10-20 18:03:40 UTC (rev 573)
+++ branches/atmos_nonhydrostatic/graphics/ncl/cells_nhyd_sphere.ncl 2010-10-20 22:18:48 UTC (rev 574)
@@ -133,7 +133,7 @@
; h = f->theta(t,:,0)-f->theta_base(t,:,0)
; h = f->surface_pressure(t,:)/100.
; h = (f->surface_pressure(t,:)-f->surface_pressure(0,:))/100.
-; h = f->pressure(t,:,0)/100.
+; h = f->pressure_p(t,:,0)/100.
; fld = h
cf1 = 2.
@@ -144,9 +144,9 @@
; cf2 = 0.
; cf3 = 0.
- pfirst = f->pressure(t,:,0)+f->pressure_base(t,:,0)
- psecond = f->pressure(t,:,1)+f->pressure_base(t,:,1)
- pthird = f->pressure(t,:,2)+f->pressure_base(t,:,2)
+ pfirst = f->pressure_p(t,:,0)+f->pressure_base(t,:,0)
+ psecond = f->pressure_p(t,:,1)+f->pressure_base(t,:,1)
+ pthird = f->pressure_p(t,:,2)+f->pressure_base(t,:,2)
fld = (cf1*pfirst + cf2*psecond + cf3*pthird)/100.
rhofirst = f->rho(t,:,0)
@@ -163,7 +163,7 @@
; -.25*(rr(2,i)+rb(2,i))*(1.+qv(2,i)))
-; fld = f->pressure(t,:,25)+f->pressure_base(t,:,25)
+; fld = f->pressure_p(t,:,25)+f->pressure_base(t,:,25)
; zg = f->zgrid
; csizes = dimsizes(pfirst)
Modified: branches/atmos_nonhydrostatic/src/core_nhyd_atmos/Registry
===================================================================
--- branches/atmos_nonhydrostatic/src/core_nhyd_atmos/Registry 2010-10-20 18:03:40 UTC (rev 573)
+++ branches/atmos_nonhydrostatic/src/core_nhyd_atmos/Registry 2010-10-20 22:18:48 UTC (rev 574)
@@ -168,7 +168,7 @@
var persistent real rt_diabatic_tend ( nVertLevels nCells Time ) 1 - rt_diabatic_tend tend - -
# state variables diagnosed from prognostic state
-var persistent real pressure ( nVertLevels nCells Time ) 1 iro pressure diag - -
+var persistent real pressure_p ( nVertLevels nCells Time ) 1 iro pressure_p diag - -
var persistent real u_init ( nVertLevels ) 0 iro u_init mesh - -
var persistent real t_init ( nVertLevels nCells ) 0 iro t_init mesh - -
@@ -194,7 +194,7 @@
var persistent real circulation ( nVertLevels nVertices Time ) 1 r circulation diag - -
var persistent real gradPVt ( nVertLevels nEdges Time ) 1 - gradPVt diag - -
var persistent real gradPVn ( nVertLevels nEdges Time ) 1 - gradPVn diag - -
-var persistent real h_divergence ( nVertLevels nCells Time ) 1 ro h_divergence diag - -
+var persistent real h_divergence ( nVertLevels nCells Time ) 1 o h_divergence diag - -
var persistent real exner ( nVertLevels nCells Time ) 1 iro exner diag - -
var persistent real exner_base ( nVertLevels nCells Time ) 1 iro exner_base diag - -
@@ -213,26 +213,22 @@
var persistent real ru ( nVertLevels nEdges Time ) 1 r ru diag - -
var persistent real ru_p ( nVertLevels nEdges Time ) 1 r ru_p diag - -
-var persistent real ru_save ( nVertLevels nEdges Time ) 1 r ru_save diag - -
+var persistent real ru_save ( nVertLevels nEdges Time ) 1 - ru_save diag - -
var persistent real rw ( nVertLevelsP1 nCells Time ) 1 iro rw diag - -
var persistent real rw_p ( nVertLevelsP1 nCells Time ) 1 r rw_p diag - -
-var persistent real rw_save ( nVertLevelsP1 nCells Time ) 1 r rw_save diag - -
+var persistent real rw_save ( nVertLevelsP1 nCells Time ) 1 - rw_save diag - -
var persistent real rtheta_p ( nVertLevels nCells Time ) 1 r rtheta_p diag - -
var persistent real rtheta_pp ( nVertLevels nCells Time ) 1 - rtheta_pp diag - -
-var persistent real rtheta_p_save ( nVertLevels nCells Time ) 1 r rtheta_p_save diag - -
+var persistent real rtheta_p_save ( nVertLevels nCells Time ) 1 - rtheta_p_save diag - -
var persistent real rtheta_pp_old ( nVertLevels nCells Time ) 1 - rtheta_pp_old diag - -
var persistent real rho_p ( nVertLevels nCells Time ) 1 r rho_p diag - -
var persistent real rho_pp ( nVertLevels nCells Time ) 1 - rho_pp diag - -
-var persistent real rho_p_save ( nVertLevels nCells Time ) 1 r rho_p_save diag - -
+var persistent real rho_p_save ( nVertLevels nCells Time ) 1 - rho_p_save diag - -
-var persistent real qv_old ( nVertLevels nCells Time ) 1 r rqv diag scalars_old moist_old
-var persistent real qc_old ( nVertLevels nCells Time ) 1 r rqc diag scalars_old moist_old
-var persistent real qr_old ( nVertLevels nCells Time ) 1 r rqr diag scalars_old moist_old
-
# Space needed for advection
var persistent real deriv_two ( FIFTEEN TWO nEdges ) 0 iro deriv_two mesh - -
var persistent integer advCells ( TWENTYONE nCells ) 0 iro advCells mesh - -
Modified: branches/atmos_nonhydrostatic/src/core_nhyd_atmos/module_test_cases.F
===================================================================
--- branches/atmos_nonhydrostatic/src/core_nhyd_atmos/module_test_cases.F 2010-10-20 18:03:40 UTC (rev 573)
+++ branches/atmos_nonhydrostatic/src/core_nhyd_atmos/module_test_cases.F 2010-10-20 22:18:48 UTC (rev 574)
@@ -217,7 +217,7 @@
p => diag % exner % array
ppb => diag % pressure_base % array
- pp => diag % pressure % array
+ pp => diag % pressure_p % array
rho => state % rho % array
rr => diag % rho_p % array
@@ -908,7 +908,7 @@
rho => state % rho % array
- pp => diag % pressure % array
+ pp => diag % pressure_p % array
rr => diag % rho_p % array
t => state % theta % array
rt => diag % rtheta_p % array
@@ -1451,7 +1451,7 @@
rho => state % rho % array
- pp => diag % pressure % array
+ pp => diag % pressure_p % array
rr => diag % rho_p % array
t => state % theta % array
rt => diag % rtheta_p % array
Modified: branches/atmos_nonhydrostatic/src/core_nhyd_atmos/module_time_integration.F
===================================================================
--- branches/atmos_nonhydrostatic/src/core_nhyd_atmos/module_time_integration.F 2010-10-20 18:03:40 UTC (rev 573)
+++ branches/atmos_nonhydrostatic/src/core_nhyd_atmos/module_time_integration.F 2010-10-20 22:18:48 UTC (rev 574)
@@ -108,8 +108,8 @@
call dmpar_exch_halo_field3dReal(domain % dminfo, block % state % time_levs(1) % state % scalars % array(:,:,:), &
block % state % time_levs(1) % state % num_scalars, block % mesh % nVertLevels, block % mesh % nCells, &
block % parinfo % cellsToSend, block % parinfo % cellsToRecv)
-! pressure
- call dmpar_exch_halo_field2dReal(domain % dminfo, block % diag % pressure % array(:,:), &
+! pressure_p
+ call dmpar_exch_halo_field2dReal(domain % dminfo, block % diag % pressure_p % array(:,:), &
block % mesh % nVertLevels, block % mesh % nCells, &
block % parinfo % cellsToSend, block % parinfo % cellsToRecv)
! vorticity
@@ -331,7 +331,7 @@
call dmpar_exch_halo_field2dReal(domain % dminfo, block % state % time_levs(2) % state % theta % array(:,:), &
block % mesh % nVertLevels, block % mesh % nCells, &
block % parinfo % cellsToSend, block % parinfo % cellsToRecv)
- call dmpar_exch_halo_field2dReal(domain % dminfo, block % diag % pressure % array(:,:), &
+ call dmpar_exch_halo_field2dReal(domain % dminfo, block % diag % pressure_p % array(:,:), &
block % mesh % nVertLevels, block % mesh % nCells, &
block % parinfo % cellsToSend, block % parinfo % cellsToRecv)
call dmpar_exch_halo_field2dReal(domain % dminfo, block % state % time_levs(2) % state % rho % array(:,:), &
@@ -396,7 +396,7 @@
call dmpar_exch_halo_field2dReal(domain % dminfo, block % state % time_levs(2) % state % theta % array(:,:), &
block % mesh % nVertLevels, block % mesh % nCells, &
block % parinfo % cellsToSend, block % parinfo % cellsToRecv)
- call dmpar_exch_halo_field2dReal(domain % dminfo, block % diag % pressure % array(:,:), &
+ call dmpar_exch_halo_field2dReal(domain % dminfo, block % diag % pressure_p % array(:,:), &
block % mesh % nVertLevels, block % mesh % nCells, &
block % parinfo % cellsToSend, block % parinfo % cellsToRecv)
call dmpar_exch_halo_field2dReal(domain % dminfo, block % tend % rt_diabatic_tend % array(:,:), &
@@ -976,7 +976,7 @@
exner => diag % exner % array
exner_base => diag % exner_base % array
- pressure_p => diag % pressure % array
+ pressure_p => diag % pressure_p % array
zz => grid % zz % array
zb => grid % zb % array
@@ -1067,7 +1067,7 @@
theta(k,iCell) = (rtheta_p(k,iCell) + rtheta_base(k,iCell))/rho(k,iCell)
exner(k,iCell) = (zz(k,iCell)*(rgas/p0)*(rtheta_p(k,iCell)+rtheta_base(k,iCell)))**rcv
- ! pressure below is perturbation pressure - perhaps we should rename it in the Registry????
+ ! pressure below is perturbation pressure
pressure_p(k,iCell) = zz(k,iCell) * rgas * (exner(k,iCell)*rtheta_p(k,iCell)+rtheta_base(k,iCell) &
* (exner(k,iCell)-exner_base(k,iCell)))
end do
@@ -1933,7 +1933,7 @@
vorticity => diag % vorticity % array
ke => diag % ke % array
pv_edge => diag % pv_edge % array
- pp => diag % pressure % array
+ pp => diag % pressure_p % array
pressure_b => diag % pressure_base % array
h_divergence => diag % h_divergence % array
@@ -3327,7 +3327,7 @@
diag % rtheta_p % array(k,iCell) &
+ diag % rtheta_base % array(k,iCell) ) )**rcv
- diag % pressure % array(k,iCell) = &
+ diag % pressure_p % array(k,iCell) = &
grid % zz % array(k,iCell) * rgas * ( &
diag % exner % array(k,iCell)*diag % rtheta_p % array(k,iCell) &
+diag % rtheta_base % array(k,iCell) * &
</font>
</pre>